From: Sean Christopherson <seanjc@google.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 0/5] KVM: SVM: Fix and clean up OSVW handling
Date: Thu, 13 Nov 2025 15:14:15 -0800 [thread overview]
Message-ID: <20251113231420.1695919-1-seanjc@google.com> (raw)
Fix a long-standing bug where KVM could clobber its OS-visible workarounds
handling (not that anyone would notice), and then clean up the code to make
it easier understand and maintain (I didn't even know what "osvw" stood for
until I ran into this code when trying to moving actual SVM pieces of
svm_enable_virtualization_cpu() out of KVM (for TDX purposes)).
Tested by running in a VM and generating unique per-vCPU MSR values in the
host (see below), and verifying KVM ended up with the right values.
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index c9c2aa6f4705..d8b8eff733d8 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -4631,12 +4631,20 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
case MSR_AMD64_OSVW_ID_LENGTH:
if (!guest_cpu_cap_has(vcpu, X86_FEATURE_OSVW))
return 1;
+
+ if (vcpu->vcpu_idx == 64)
+ return 1;
+
msr_info->data = vcpu->arch.osvw.length;
+ if (vcpu->vcpu_idx < 64)
+ msr_info->data = max(vcpu->vcpu_idx, 8);
break;
case MSR_AMD64_OSVW_STATUS:
if (!guest_cpu_cap_has(vcpu, X86_FEATURE_OSVW))
return 1;
msr_info->data = vcpu->arch.osvw.status;
+ if (vcpu->vcpu_idx < 64)
+ msr_info->data |= BIT_ULL(vcpu->vcpu_idx);
break;
case MSR_PLATFORM_INFO:
if (!msr_info->host_initiated &&
Sean Christopherson (5):
KVM: SVM: Serialize updates to global OS-Visible Workarounds variables
KVM: SVM: Skip OSVW MSR reads if KVM is treating all errata as present
KVM: SVM: Extract OS-visible workarounds setup to helper function
KVM: SVM: Skip OSVW variable updates if current CPU's errata are a
subset
KVM: SVM: Skip OSVW MSR reads if current CPU doesn't support the
feature
arch/x86/kvm/svm/svm.c | 72 ++++++++++++++++++++++++++----------------
1 file changed, 44 insertions(+), 28 deletions(-)
base-commit: 16ec4fb4ac95d878b879192d280db2baeec43272
--
2.52.0.rc1.455.g30608eb744-goog
next reply other threads:[~2025-11-13 23:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-13 23:14 Sean Christopherson [this message]
2025-11-13 23:14 ` [PATCH 1/5] KVM: SVM: Serialize updates to global OS-Visible Workarounds variables Sean Christopherson
2025-11-13 23:14 ` [PATCH 2/5] KVM: SVM: Skip OSVW MSR reads if KVM is treating all errata as present Sean Christopherson
2025-11-13 23:14 ` [PATCH 3/5] KVM: SVM: Extract OS-visible workarounds setup to helper function Sean Christopherson
2025-11-13 23:14 ` [PATCH 4/5] KVM: SVM: Skip OSVW variable updates if current CPU's errata are a subset Sean Christopherson
2025-11-13 23:14 ` [PATCH 5/5] KVM: SVM: Skip OSVW MSR reads if current CPU doesn't support the feature Sean Christopherson
2026-03-05 17:08 ` [PATCH 0/5] KVM: SVM: Fix and clean up OSVW handling 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=20251113231420.1695919-1-seanjc@google.com \
--to=seanjc@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.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
all inboxes | Powered by JetHome®