From patchwork Thu Nov 10 01:30:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 17889 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp664026wru; Wed, 9 Nov 2022 17:34:47 -0800 (PST) X-Google-Smtp-Source: AMsMyM4mySZr5qUhI5mldvBT2cJDc7O7NYMTWjjUnPq62CCeCUQninAZ39ZnrOiuMks8zgRchPaU X-Received: by 2002:a63:5219:0:b0:459:16e5:9dd9 with SMTP id g25-20020a635219000000b0045916e59dd9mr1481613pgb.362.1668044087595; Wed, 09 Nov 2022 17:34:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668044087; cv=none; d=google.com; s=arc-20160816; b=XStdMETyVVSUBwtmAhQj7pyEZf03WivFNgQFA/VmLhwD3qlfidiDIh1fnW/AXVhGdY dfP/zM1OTL8sJ0WOnrUt1keKZ8XgRn5z30KUs2mkNwL3scU8yR675azQ/NEeK0av/t3r djNa+WU0aZkLTkDOwub3acvYj+/4Ph58inYMLrcQ7eflDxIBJ4c1t+JiU0AwEXY+9owz U657KKrOUUoAkE/aAzgfQ+Q0PpDZiaTBBW+mj/fCfkUD1TYeb1ImWJTS17UuT2BTflBl mNIzPEQCVVJyGh70M7fJh6xeZX6Uwx+jLy/6XpBDsd/4KQuuA6pxhWjcP06b8CLke2hk tK6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=8CUr/OIWb5uA6RYsOSzZ05CCdXKaCyDdB9TR+zmvZr8=; b=xFYY0E29pglUMuJhS6xi0G0FUtRt4s6ZczpwQJ/Z/VI2T1NNGxy4RwJRt0923lTk5d eY7jChZasI7oUh6li0fNdWsGTX5JD0DcTvSo9lNKOVL5FHdes1vL2qxbCs5JPf8B3r/p DF4S+SynckeoY2xyML6ME/1ycfl/ieCHwtI6L0bGcJt9T2y+tKZg3v1eSnN5Aouts2G+ oLg0j0QRnPOUTjEkQMrJhnwOrt38exwXX8A5nTn6mvtM1BiIXYAvB+Kz45NwPyBDcuUN 04TzkGSNkShp8mjce65jk4KGeqQia4cbn9tlfCK+dNYM0xFLYy3iYI9kx3vw3F/Kh4+S LNkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=IY4Hnp9n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f132-20020a636a8a000000b004622caf9ac4si17656052pgc.805.2022.11.09.17.34.33; Wed, 09 Nov 2022 17:34:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=IY4Hnp9n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229848AbiKJBaQ (ORCPT + 99 others); Wed, 9 Nov 2022 20:30:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232273AbiKJBaJ (ORCPT ); Wed, 9 Nov 2022 20:30:09 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D4AB22B19 for ; Wed, 9 Nov 2022 17:30:08 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id e8-20020a5b0cc8000000b006bca0fa3ab6so576516ybr.0 for ; Wed, 09 Nov 2022 17:30:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=8CUr/OIWb5uA6RYsOSzZ05CCdXKaCyDdB9TR+zmvZr8=; b=IY4Hnp9nEnEWHOuWMXN4OSnd8wrZeOFxLo/VhaYoC1w456+3TkOHkZQi3KGTexqOlH Wlza3rSXhvcTGaSu1ke2JOG5He/C2la4fpKvU6a4r96II3nfgG8NFyq2bZfez24vcwR5 MMp4mv+xBL9FqzPVI6wZ/8zhspUXr+L0ZJcZAzk4dLDngAXinRZVhqexSTvf6IQ1P2sI C/JkLgKbxt7DhD6m0DRwPI+sPWJw3aQSpGn+589BQKLSa5hsWVsV80XRTSpUp7NzTaAX wkq3uOupa/TaJCuoKTr0ROikLx1i3bOUErGnsde6DLbIYqIYyVIJDNxTCcxhzDNO17+7 bvJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8CUr/OIWb5uA6RYsOSzZ05CCdXKaCyDdB9TR+zmvZr8=; b=eg604qkUvK720UhEheJc3+xwjngpIZGiV6isQiijybUdnKXQnPBCA1Ej2G9Dy7mTD8 bfDbYdlK2DCftSTwB58DBALmei+FpoMjceX9u/TxrPp5N9fJlabU+Jn5NC5pnlAKekc+ qkRqHSgjqe3pksLep2AP8ZCBulZXngwf52fOlg8nqEJWypzwvDHCqyJ2MKYVDaCnf+C5 LiDfCdSGQltNU+n1LrHaQcXyo2wbZ1LpGHqzIxdzVzTifmqGEXe6jE1aLgz+XiPKiThp u5QxxbdedvtUo6TjrcFY+gC2lUBbjIaRsfGLyIdrqqMlBG6bwUeycioE2x+dQf/GkzVj iDuQ== X-Gm-Message-State: ACrzQf3ma6ud/OnVbZWbwLYEcIyjTOLKivjpgo1pVyoAJLbwj3nTU6+G 3gkSr+wgZwW3bst1j7qi6ptqecdrIVI= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:2455:0:b0:6d0:465:e186 with SMTP id k82-20020a252455000000b006d00465e186mr1047003ybk.278.1668043807310; Wed, 09 Nov 2022 17:30:07 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 10 Nov 2022 01:30:01 +0000 In-Reply-To: <20221110013003.1421895-1-seanjc@google.com> Mime-Version: 1.0 References: <20221110013003.1421895-1-seanjc@google.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Message-ID: <20221110013003.1421895-2-seanjc@google.com> Subject: [PATCH 1/3] KVM: VMX: Make module params and other variables read-only after init From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749070996881249118?= X-GMAIL-MSGID: =?utf-8?q?1749070996881249118?= Tag VMX's module params and global variables that are configured under the vmx_init() umbrella as read-only after init. The global knobs should never change once KVM is fully loaded. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/capabilities.h | 16 +++++++-------- arch/x86/kvm/vmx/nested.c | 4 ++-- arch/x86/kvm/vmx/sgx.c | 2 +- arch/x86/kvm/vmx/sgx.h | 2 +- arch/x86/kvm/vmx/vmx.c | 36 ++++++++++++++++----------------- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/arch/x86/kvm/vmx/capabilities.h b/arch/x86/kvm/vmx/capabilities.h index cd2ac9536c99..1339634ead07 100644 --- a/arch/x86/kvm/vmx/capabilities.h +++ b/arch/x86/kvm/vmx/capabilities.h @@ -9,14 +9,14 @@ #include "../pmu.h" #include "../cpuid.h" -extern bool __read_mostly enable_vpid; -extern bool __read_mostly flexpriority_enabled; -extern bool __read_mostly enable_ept; -extern bool __read_mostly enable_unrestricted_guest; -extern bool __read_mostly enable_ept_ad_bits; -extern bool __read_mostly enable_pml; -extern bool __read_mostly enable_ipiv; -extern int __read_mostly pt_mode; +extern bool __ro_after_init enable_vpid; +extern bool __ro_after_init flexpriority_enabled; +extern bool __ro_after_init enable_ept; +extern bool __ro_after_init enable_unrestricted_guest; +extern bool __ro_after_init enable_ept_ad_bits; +extern bool __ro_after_init enable_pml; +extern bool __ro_after_init enable_ipiv; +extern int __ro_after_init pt_mode; #define PT_MODE_SYSTEM 0 #define PT_MODE_HOST_GUEST 1 diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index 61a2e551640a..bae81a50cbd7 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -18,10 +18,10 @@ #include "x86.h" #include "smm.h" -static bool __read_mostly enable_shadow_vmcs = 1; +static bool __ro_after_init enable_shadow_vmcs = 1; module_param_named(enable_shadow_vmcs, enable_shadow_vmcs, bool, S_IRUGO); -static bool __read_mostly nested_early_check = 0; +static bool __ro_after_init nested_early_check; module_param(nested_early_check, bool, S_IRUGO); #define CC KVM_NESTED_VMENTER_CONSISTENCY_CHECK diff --git a/arch/x86/kvm/vmx/sgx.c b/arch/x86/kvm/vmx/sgx.c index 8f95c7c01433..ca66e6ce7e5d 100644 --- a/arch/x86/kvm/vmx/sgx.c +++ b/arch/x86/kvm/vmx/sgx.c @@ -10,7 +10,7 @@ #include "vmx.h" #include "x86.h" -bool __read_mostly enable_sgx = 1; +bool __ro_after_init enable_sgx = 1; module_param_named(sgx, enable_sgx, bool, 0444); /* Initial value of guest's virtual SGX_LEPUBKEYHASHn MSRs */ diff --git a/arch/x86/kvm/vmx/sgx.h b/arch/x86/kvm/vmx/sgx.h index a400888b376d..1e7fb11eabcf 100644 --- a/arch/x86/kvm/vmx/sgx.h +++ b/arch/x86/kvm/vmx/sgx.h @@ -8,7 +8,7 @@ #include "vmx_ops.h" #ifdef CONFIG_X86_SGX_KVM -extern bool __read_mostly enable_sgx; +extern bool __ro_after_init enable_sgx; int handle_encls(struct kvm_vcpu *vcpu); diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index aca88524fd1e..c36d29416d52 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -79,34 +79,34 @@ static const struct x86_cpu_id vmx_cpu_id[] = { MODULE_DEVICE_TABLE(x86cpu, vmx_cpu_id); #endif -bool __read_mostly enable_vpid = 1; +bool __ro_after_init enable_vpid = 1; module_param_named(vpid, enable_vpid, bool, 0444); -static bool __read_mostly enable_vnmi = 1; +static bool __ro_after_init enable_vnmi = 1; module_param_named(vnmi, enable_vnmi, bool, S_IRUGO); -bool __read_mostly flexpriority_enabled = 1; +bool __ro_after_init flexpriority_enabled = 1; module_param_named(flexpriority, flexpriority_enabled, bool, S_IRUGO); -bool __read_mostly enable_ept = 1; +bool __ro_after_init enable_ept = 1; module_param_named(ept, enable_ept, bool, S_IRUGO); -bool __read_mostly enable_unrestricted_guest = 1; +bool __ro_after_init enable_unrestricted_guest = 1; module_param_named(unrestricted_guest, enable_unrestricted_guest, bool, S_IRUGO); -bool __read_mostly enable_ept_ad_bits = 1; +bool __ro_after_init enable_ept_ad_bits = 1; module_param_named(eptad, enable_ept_ad_bits, bool, S_IRUGO); -static bool __read_mostly emulate_invalid_guest_state = true; +static bool __ro_after_init emulate_invalid_guest_state = true; module_param(emulate_invalid_guest_state, bool, S_IRUGO); -static bool __read_mostly fasteoi = 1; +static bool __ro_after_init fasteoi = 1; module_param(fasteoi, bool, S_IRUGO); module_param(enable_apicv, bool, S_IRUGO); -bool __read_mostly enable_ipiv = true; +bool __ro_after_init enable_ipiv = true; module_param(enable_ipiv, bool, 0444); /* @@ -114,13 +114,13 @@ module_param(enable_ipiv, bool, 0444); * VMX and be a hypervisor for its own guests. If nested=0, guests may not * use VMX instructions. */ -static bool __read_mostly nested = 1; +static bool __ro_after_init nested = 1; module_param(nested, bool, S_IRUGO); -bool __read_mostly enable_pml = 1; +bool __ro_after_init enable_pml = 1; module_param_named(pml, enable_pml, bool, S_IRUGO); -static bool __read_mostly error_on_inconsistent_vmcs_config = true; +static bool __ro_after_init error_on_inconsistent_vmcs_config = true; module_param(error_on_inconsistent_vmcs_config, bool, 0444); static bool __read_mostly dump_invalid_vmcs = 0; @@ -132,8 +132,8 @@ module_param(dump_invalid_vmcs, bool, 0644); #define KVM_VMX_TSC_MULTIPLIER_MAX 0xffffffffffffffffULL /* Guest_tsc -> host_tsc conversion requires 64-bit division. */ -static int __read_mostly cpu_preemption_timer_multi; -static bool __read_mostly enable_preemption_timer = 1; +static int __ro_after_init cpu_preemption_timer_multi; +static bool __ro_after_init enable_preemption_timer = 1; #ifdef CONFIG_X86_64 module_param_named(preemption_timer, enable_preemption_timer, bool, S_IRUGO); #endif @@ -211,7 +211,7 @@ static unsigned int ple_window_max = KVM_VMX_DEFAULT_PLE_WINDOW_MAX; module_param(ple_window_max, uint, 0444); /* Default is SYSTEM mode, 1 for host-guest mode */ -int __read_mostly pt_mode = PT_MODE_SYSTEM; +int __ro_after_init pt_mode = PT_MODE_SYSTEM; module_param(pt_mode, int, S_IRUGO); static DEFINE_STATIC_KEY_FALSE(vmx_l1d_should_flush); @@ -237,7 +237,7 @@ static const struct { static void *vmx_l1d_flush_pages; /* Control for disabling CPU Fill buffer clear */ -static bool __read_mostly vmx_fb_clear_ctrl_available; +static bool __ro_after_init vmx_fb_clear_ctrl_available; static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state l1tf) { @@ -370,7 +370,7 @@ static int vmentry_l1d_flush_get(char *s, const struct kernel_param *kp) return sprintf(s, "%s\n", vmentry_l1d_param[l1tf_vmx_mitigation].option); } -static void vmx_setup_fb_clear_ctrl(void) +__init static void vmx_setup_fb_clear_ctrl(void) { u64 msr; @@ -524,7 +524,7 @@ static inline void vmx_segment_cache_clear(struct vcpu_vmx *vmx) static unsigned long host_idt_base; #if IS_ENABLED(CONFIG_HYPERV) -static bool __read_mostly enlightened_vmcs = true; +static bool __ro_after_init enlightened_vmcs = true; module_param(enlightened_vmcs, bool, 0444); static int hv_enable_direct_tlbflush(struct kvm_vcpu *vcpu)