Commit 658ece84 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: VMX: Rename vcpu_vmx's "guest_msrs_ready" to "guest_uret_msrs_loaded" 



Add "uret" to "guest_msrs_ready" to explicitly associate it with the
"guest_uret_msrs" array, and replace "ready" with "loaded" to more
precisely reflect what it tracks, e.g. "ready" could be interpreted as
meaning ready for processing (setup_msrs() has run), which is wrong.
"loaded" also aligns with the similar "guest_state_loaded" field.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200923180409.32255-8-sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e9bb1ae9

arch/x86/kvm/vmx/vmx.c

+4 −4
Original line number Diff line number Diff line
@@ -1134,8 +1134,8 @@ void vmx_prepare_switch_to_guest(struct kvm_vcpu *vcpu) 
	 * when guest state is loaded. This happens when guest transitions

	 * to/from long-mode by setting MSR_EFER.LMA.

	 */

	if (!vmx->guest_msrs_ready) {

		vmx->guest_msrs_ready = true;

	if (!vmx->guest_uret_msrs_loaded) {

		vmx->guest_uret_msrs_loaded = true;

		for (i = 0; i < vmx->nr_active_uret_msrs; ++i)

			kvm_set_user_return_msr(vmx->guest_uret_msrs[i].index,

						vmx->guest_uret_msrs[i].data,
@@ -1223,7 +1223,7 @@ static void vmx_prepare_switch_to_host(struct vcpu_vmx *vmx) 
#endif

	load_fixmap_gdt(raw_smp_processor_id());

	vmx->guest_state_loaded = false;

	vmx->guest_msrs_ready = false;

	vmx->guest_uret_msrs_loaded = false;

}



#ifdef CONFIG_X86_64
@@ -1659,7 +1659,7 @@ static void setup_msrs(struct vcpu_vmx *vmx) 
		move_msr_up(vmx, index, nr_active_uret_msrs++);



	vmx->nr_active_uret_msrs = nr_active_uret_msrs;

	vmx->guest_msrs_ready = false;

	vmx->guest_uret_msrs_loaded = false;



	if (cpu_has_vmx_msr_bitmap())

		vmx_update_msr_bitmap(&vmx->vcpu);

arch/x86/kvm/vmx/vmx.h

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ struct vcpu_vmx { 
	struct vmx_uret_msr   guest_uret_msrs[MAX_NR_USER_RETURN_MSRS];

	int                   nr_uret_msrs;

	int                   nr_active_uret_msrs;

	bool                  guest_msrs_ready;

	bool                  guest_uret_msrs_loaded;

#ifdef CONFIG_X86_64

	u64		      msr_host_kernel_gs_base;

	u64		      msr_guest_kernel_gs_base;