Commit 7a6a6a3b authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: nSVM: Use KVM-governed feature framework to track "NRIPS enabled" 



Track "NRIPS exposed to L1" via a governed feature flag instead of using
a dedicated bit/flag in vcpu_svm.

No functional change intended.

Reviewed-by: default avatarYuan Yao <yuan.yao@intel.com>
Link: https://lore.kernel.org/r/20230815203653.519297-9-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 1c18efda

arch/x86/kvm/governed_features.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ BUILD_BUG() 
KVM_GOVERNED_X86_FEATURE(GBPAGES)

KVM_GOVERNED_X86_FEATURE(XSAVES)

KVM_GOVERNED_X86_FEATURE(VMX)

KVM_GOVERNED_X86_FEATURE(NRIPS)



#undef KVM_GOVERNED_X86_FEATURE

#undef KVM_GOVERNED_FEATURE

arch/x86/kvm/svm/nested.c

+3 −3
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm, 
	 * what a nrips=0 CPU would do (L1 is responsible for advancing RIP

	 * prior to injecting the event).

	 */

	if (svm->nrips_enabled)

	if (guest_can_use(vcpu, X86_FEATURE_NRIPS))

		vmcb02->control.next_rip    = svm->nested.ctl.next_rip;

	else if (boot_cpu_has(X86_FEATURE_NRIPS))

		vmcb02->control.next_rip    = vmcb12_rip;
@@ -726,7 +726,7 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm, 
		svm->soft_int_injected = true;

		svm->soft_int_csbase = vmcb12_csbase;

		svm->soft_int_old_rip = vmcb12_rip;

		if (svm->nrips_enabled)

		if (guest_can_use(vcpu, X86_FEATURE_NRIPS))

			svm->soft_int_next_rip = svm->nested.ctl.next_rip;

		else

			svm->soft_int_next_rip = vmcb12_rip;
@@ -1026,7 +1026,7 @@ int nested_svm_vmexit(struct vcpu_svm *svm) 
	if (vmcb12->control.exit_code != SVM_EXIT_ERR)

		nested_save_pending_event_to_vmcb12(svm, vmcb12);



	if (svm->nrips_enabled)

	if (guest_can_use(vcpu, X86_FEATURE_NRIPS))

		vmcb12->control.next_rip  = vmcb02->control.next_rip;



	vmcb12->control.int_ctl           = svm->nested.ctl.int_ctl;

arch/x86/kvm/svm/svm.c

+1 −3
Original line number Diff line number Diff line
@@ -4259,9 +4259,7 @@ static void svm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) 
	    guest_cpuid_has(vcpu, X86_FEATURE_XSAVE))

		kvm_governed_feature_set(vcpu, X86_FEATURE_XSAVES);



	/* Update nrips enabled cache */

	svm->nrips_enabled = kvm_cpu_cap_has(X86_FEATURE_NRIPS) &&

			     guest_cpuid_has(vcpu, X86_FEATURE_NRIPS);

	kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_NRIPS);



	svm->tsc_scaling_enabled = tsc_scaling && guest_cpuid_has(vcpu, X86_FEATURE_TSCRATEMSR);

	svm->lbrv_enabled = lbrv && guest_cpuid_has(vcpu, X86_FEATURE_LBRV);

arch/x86/kvm/svm/svm.h

+0 −1
Original line number Diff line number Diff line
@@ -259,7 +259,6 @@ struct vcpu_svm { 
	bool soft_int_injected;



	/* optional nested SVM features that are enabled for this guest  */

	bool nrips_enabled                : 1;

	bool tsc_scaling_enabled          : 1;

	bool v_vmload_vmsave_enabled      : 1;

	bool lbrv_enabled                 : 1;