mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 3/3] KVM: x86: Explicitly zero kvm_caps during vendor module load
Date: Tue, 23 Apr 2024 09:53:28 -0700	[thread overview]
Message-ID: <20240423165328.2853870-4-seanjc@google.com> (raw)
In-Reply-To: <20240423165328.2853870-1-seanjc@google.com>

Zero out all of kvm_caps when loading a new vendor module to ensure that
KVM can't inadvertently rely on global initialization of a field, and add
a comment above the definition of kvm_caps to call out that all fields
needs to be explicitly computed during vendor module load.

Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 arch/x86/kvm/x86.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 44ce187bad89..8f3979d5fc80 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -92,6 +92,11 @@
 #define MAX_IO_MSRS 256
 #define KVM_MAX_MCE_BANKS 32
 
+/*
+ * Note, kvm_caps fields should *never* have default values, all fields must be
+ * recomputed from scratch during vendor module load, e.g. to account for a
+ * vendor module being reloaded with different module parameters.
+ */
 struct kvm_caps kvm_caps __read_mostly;
 EXPORT_SYMBOL_GPL(kvm_caps);
 
@@ -9755,6 +9760,8 @@ int kvm_x86_vendor_init(struct kvm_x86_init_ops *ops)
 		return -EIO;
 	}
 
+	memset(&kvm_caps, 0, sizeof(kvm_caps));
+
 	x86_emulator_cache = kvm_alloc_emulator_cache();
 	if (!x86_emulator_cache) {
 		pr_err("failed to allocate cache for x86 emulator\n");
-- 
2.44.0.769.g3c40516874-goog


  parent reply	other threads:[~2024-04-23 16:53 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-23 16:53 [PATCH 0/3] KVM: x86: Fix supported VM_TYPES caps Sean Christopherson
2024-04-23 16:53 ` [PATCH 1/3] KVM: x86: Fully re-initialize supported_vm_types on vendor module load Sean Christopherson
2024-04-23 16:53 ` [PATCH 2/3] KVM: x86: Fully re-initialize supported_mce_cap " Sean Christopherson
2024-04-23 16:53 ` Sean Christopherson [this message]
2024-04-24  3:25   ` [PATCH 3/3] KVM: x86: Explicitly zero kvm_caps during " Huang, Kai
2024-04-24 15:33     ` Sean Christopherson
2024-04-25 10:07       ` Huang, Kai
2024-04-25 13:43 ` [PATCH 0/3] KVM: x86: Fix supported VM_TYPES caps Xiaoyao Li
2024-04-25 14:30   ` Sean Christopherson
2024-04-26  1:17     ` Huang, Kai
2024-04-26 15:47       ` Sean Christopherson
2024-04-29  2:45         ` Huang, Kai
2024-04-29 15:56           ` Sean Christopherson
2024-05-07 17:20             ` Paolo Bonzini
2024-05-07 17:08 ` Paolo Bonzini
2024-05-10 14:50 ` Paolo Bonzini

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=20240423165328.2853870-4-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®