Commit 73c25546 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

KVM: nSVM: Track whether changes in L0 require MSR bitmap for L2 to be rebuilt 



Similar to nVMX commit ed2a4800 ("KVM: nVMX: Track whether changes in
L0 require MSR bitmap for L2 to be rebuilt"), introduce a flag to keep
track of whether MSR bitmap for L2 needs to be rebuilt due to changes in
MSR bitmap for L1 or switching to a different L2.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20220202095100.129834-2-vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 951cb0a3

arch/x86/kvm/svm/nested.c

+4 −0
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ static bool nested_svm_vmrun_msrpm(struct vcpu_svm *svm) 
		svm->nested.msrpm[p] = svm->msrpm[p] | value;

	}



	svm->nested.force_msr_bitmap_recalc = false;



	svm->vmcb->control.msrpm_base_pa = __sme_set(__pa(svm->nested.msrpm));



	return true;
@@ -494,6 +496,7 @@ static void nested_vmcb02_prepare_save(struct vcpu_svm *svm, struct vmcb *vmcb12 
	if (svm->nested.vmcb12_gpa != svm->nested.last_vmcb12_gpa) {

		new_vmcb12 = true;

		svm->nested.last_vmcb12_gpa = svm->nested.vmcb12_gpa;

		svm->nested.force_msr_bitmap_recalc = true;

	}



	if (unlikely(new_vmcb12 || vmcb_is_dirty(vmcb12, VMCB_SEG))) {
@@ -1495,6 +1498,7 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, 
	if (WARN_ON_ONCE(ret))

		goto out_free;



	svm->nested.force_msr_bitmap_recalc = true;



	kvm_make_request(KVM_REQ_GET_NESTED_STATE_PAGES, vcpu);

	ret = 0;

arch/x86/kvm/svm/svm.c

+2 −1
Original line number Diff line number Diff line
@@ -668,6 +668,7 @@ static bool msr_write_intercepted(struct kvm_vcpu *vcpu, u32 msr) 
static void set_msr_interception_bitmap(struct kvm_vcpu *vcpu, u32 *msrpm,

					u32 msr, int read, int write)

{

	struct vcpu_svm *svm = to_svm(vcpu);

	u8 bit_read, bit_write;

	unsigned long tmp;

	u32 offset;
@@ -698,7 +699,7 @@ static void set_msr_interception_bitmap(struct kvm_vcpu *vcpu, u32 *msrpm, 
	msrpm[offset] = tmp;



	svm_hv_vmcb_dirty_nested_enlightenments(vcpu);



	svm->nested.force_msr_bitmap_recalc = true;

}



void set_msr_interception(struct kvm_vcpu *vcpu, u32 *msrpm, u32 msr,

arch/x86/kvm/svm/svm.h

+9 −0
Original line number Diff line number Diff line
@@ -163,6 +163,15 @@ struct svm_nested_state { 
	struct vmcb_save_area_cached save;



	bool initialized;



	/*

	 * Indicates whether MSR bitmap for L2 needs to be rebuilt due to

	 * changes in MSR bitmap for L1 or switching to a different L2. Note,

	 * this flag can only be used reliably in conjunction with a paravirt L1

	 * which informs L0 whether any changes to MSR bitmap for L2 were done

	 * on its side.

	 */

	bool force_msr_bitmap_recalc;

};



struct vcpu_sev_es_state {