Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b97265a authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: VMX: align vmx->nested.nested_vmx_secondary_ctls_high to vmx->rdtscp_enabled 



The SECONDARY_EXEC_RDTSCP must be available iff RDTSCP is enabled in the
guest.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 29541bb8

arch/x86/kvm/vmx.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -8686,10 +8686,15 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu) 
					exec_control);

					exec_control);

		}

		}





		if (nested && !vmx->rdtscp_enabled)

		if (nested) {

			if (vmx->rdtscp_enabled)

				vmx->nested.nested_vmx_secondary_ctls_high |=

					SECONDARY_EXEC_RDTSCP;

			else

				vmx->nested.nested_vmx_secondary_ctls_high &=

				vmx->nested.nested_vmx_secondary_ctls_high &=

					~SECONDARY_EXEC_RDTSCP;

					~SECONDARY_EXEC_RDTSCP;

		}

		}

	}





	/* Exposing INVPCID only when PCID is exposed */

	/* Exposing INVPCID only when PCID is exposed */

	best = kvm_find_cpuid_entry(vcpu, 0x7, 0);

	best = kvm_find_cpuid_entry(vcpu, 0x7, 0);