Commit f505c7b1 authored by Xin Li's avatar Xin Li Committed by Sean Christopherson
Browse files

KVM: nVMX: Use vcpu instead of vmx->vcpu when vcpu is available 



Prefer using vcpu directly when available, instead of accessing it
through vmx->vcpu.

Signed-off-by: default avatarXin Li (Intel) <xin@zytor.com>
Link: https://lore.kernel.org/r/20250924145421.2046822-1-xin@zytor.com


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

arch/x86/kvm/vmx/nested.c

+4 −4
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ static void nested_cache_shadow_vmcs12(struct kvm_vcpu *vcpu, 
				      vmcs12->vmcs_link_pointer, VMCS12_SIZE))

		return;



	kvm_read_guest_cached(vmx->vcpu.kvm, ghc, get_shadow_vmcs12(vcpu),

	kvm_read_guest_cached(vcpu->kvm, ghc, get_shadow_vmcs12(vcpu),

			      VMCS12_SIZE);

}
@@ -780,7 +780,7 @@ static void nested_flush_cached_shadow_vmcs12(struct kvm_vcpu *vcpu, 
				      vmcs12->vmcs_link_pointer, VMCS12_SIZE))

		return;



	kvm_write_guest_cached(vmx->vcpu.kvm, ghc, get_shadow_vmcs12(vcpu),

	kvm_write_guest_cached(vcpu->kvm, ghc, get_shadow_vmcs12(vcpu),

			       VMCS12_SIZE);

}
@@ -2749,7 +2749,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, 
		vmcs_write64(GUEST_IA32_PAT, vmcs12->guest_ia32_pat);

		vcpu->arch.pat = vmcs12->guest_ia32_pat;

	} else if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT) {

		vmcs_write64(GUEST_IA32_PAT, vmx->vcpu.arch.pat);

		vmcs_write64(GUEST_IA32_PAT, vcpu->arch.pat);

	}



	vcpu->arch.tsc_offset = kvm_calc_nested_tsc_offset(
@@ -3880,7 +3880,7 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) 
		goto vmentry_failed;



	/* Hide L1D cache contents from the nested guest.  */

	vmx->vcpu.arch.l1tf_flush_l1d = true;

	vcpu->arch.l1tf_flush_l1d = true;



	/*

	 * Must happen outside of nested_vmx_enter_non_root_mode() as it will