From: Xiaoyao Li <xiaoyao.li@intel.com>
To: Binbin Wu <binbin.wu@linux.intel.com>,
seanjc@google.com, pbonzini@redhat.com
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, chao.gao@intel.com
Subject: Re: [PATCH v2] KVM: x86: Add a helper to dedup loading guest/host XCR0 and XSS
Date: Mon, 10 Nov 2025 20:54:12 +0800 [thread overview]
Message-ID: <afadfe85-413b-44fc-afa6-5770413a0488@intel.com> (raw)
In-Reply-To: <20251110050539.3398759-1-binbin.wu@linux.intel.com>
On 11/10/2025 1:05 PM, Binbin Wu wrote:
> Add and use a helper, kvm_load_xfeatures(), to dedup the code that loads
> guest/host xfeatures.
>
> Opportunistically return early if X86_CR4_OSXSAVE is not set to reduce
> indentations.
>
> No functional change intended.
>
> Suggested-by: Chao Gao <chao.gao@intel.com>
> Reviewed-by: Chao Gao <chao.gao@intel.com>
> Signed-off-by: Binbin Wu <binbin.wu@linux.intel.com>
Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
> ---
> v2:
> - Pass a bool to distinguish guest/host. [Chao, Xiaoyao]
> - Fix a typo in the short log. [Chao]
> - Opportunistically return early if X86_CR4_OSXSAVE is not set to reduce
> indentations.
>
> v1:
> - https://lore.kernel.org/kvm/20251106101138.2756175-1-binbin.wu@linux.intel.com
> ---
> arch/x86/kvm/x86.c | 33 ++++++++++-----------------------
> 1 file changed, 10 insertions(+), 23 deletions(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 9c2e28028c2b..2c521902e2c6 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -1219,34 +1219,21 @@ void kvm_lmsw(struct kvm_vcpu *vcpu, unsigned long msw)
> }
> EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_lmsw);
>
> -static void kvm_load_guest_xfeatures(struct kvm_vcpu *vcpu)
> +static void kvm_load_xfeatures(struct kvm_vcpu *vcpu, bool load_guest)
> {
> if (vcpu->arch.guest_state_protected)
> return;
>
> - if (kvm_is_cr4_bit_set(vcpu, X86_CR4_OSXSAVE)) {
> - if (vcpu->arch.xcr0 != kvm_host.xcr0)
> - xsetbv(XCR_XFEATURE_ENABLED_MASK, vcpu->arch.xcr0);
> -
> - if (guest_cpu_cap_has(vcpu, X86_FEATURE_XSAVES) &&
> - vcpu->arch.ia32_xss != kvm_host.xss)
> - wrmsrq(MSR_IA32_XSS, vcpu->arch.ia32_xss);
> - }
> -}
> -
> -static void kvm_load_host_xfeatures(struct kvm_vcpu *vcpu)
> -{
> - if (vcpu->arch.guest_state_protected)
> + if (!kvm_is_cr4_bit_set(vcpu, X86_CR4_OSXSAVE))
> return;
>
> - if (kvm_is_cr4_bit_set(vcpu, X86_CR4_OSXSAVE)) {
> - if (vcpu->arch.xcr0 != kvm_host.xcr0)
> - xsetbv(XCR_XFEATURE_ENABLED_MASK, kvm_host.xcr0);
> + if (vcpu->arch.xcr0 != kvm_host.xcr0)
> + xsetbv(XCR_XFEATURE_ENABLED_MASK,
> + load_guest ? vcpu->arch.xcr0 : kvm_host.xcr0);
>
> - if (guest_cpu_cap_has(vcpu, X86_FEATURE_XSAVES) &&
> - vcpu->arch.ia32_xss != kvm_host.xss)
> - wrmsrq(MSR_IA32_XSS, kvm_host.xss);
> - }
> + if (guest_cpu_cap_has(vcpu, X86_FEATURE_XSAVES) &&
> + vcpu->arch.ia32_xss != kvm_host.xss)
> + wrmsrq(MSR_IA32_XSS, load_guest ? vcpu->arch.ia32_xss : kvm_host.xss);
> }
>
> static void kvm_load_guest_pkru(struct kvm_vcpu *vcpu)
> @@ -11333,7 +11320,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
> if (vcpu->arch.guest_fpu.xfd_err)
> wrmsrq(MSR_IA32_XFD_ERR, vcpu->arch.guest_fpu.xfd_err);
>
> - kvm_load_guest_xfeatures(vcpu);
> + kvm_load_xfeatures(vcpu, true);
>
> if (unlikely(vcpu->arch.switch_db_regs &&
> !(vcpu->arch.switch_db_regs & KVM_DEBUGREG_AUTO_SWITCH))) {
> @@ -11429,7 +11416,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
> vcpu->mode = OUTSIDE_GUEST_MODE;
> smp_wmb();
>
> - kvm_load_host_xfeatures(vcpu);
> + kvm_load_xfeatures(vcpu, false);
>
> /*
> * Sync xfd before calling handle_exit_irqoff() which may
>
> base-commit: 9052f4f6c539ea1fb7b282a34e6bb33154ce0b63
next prev parent reply other threads:[~2025-11-10 12:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-10 5:05 [PATCH v2] KVM: x86: Add a helper to dedup loading guest/host XCR0 and XSS Binbin Wu
2025-11-10 12:54 ` Xiaoyao Li [this message]
2025-11-21 18:55 ` Sean Christopherson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=afadfe85-413b-44fc-afa6-5770413a0488@intel.com \
--to=xiaoyao.li@intel.com \
--cc=binbin.wu@linux.intel.com \
--cc=chao.gao@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox