From: Abhishek Bhardwaj <abhishekbh@google.com>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Abhishek Bhardwaj <abhishekbh@google.com>,
Anthony Steinhauser <asteinhauser@google.com>,
Borislav Petkov <bp@alien8.de>, "H. Peter Anvin" <hpa@zytor.com>,
Ingo Molnar <mingo@redhat.com>, Jim Mattson <jmattson@google.com>,
Joerg Roedel <joro@8bytes.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Mark Gross <mgross@linux.intel.com>,
Mike Rapoport <rppt@linux.ibm.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Pawan Gupta <pawan.kumar.gupta@linux.intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Sean Christopherson <sean.j.christopherson@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Tony Luck <tony.luck@intel.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Waiman Long <longman@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
kvm@vger.kernel.org, x86@kernel.org
Subject: [PATCH v4] x86/speculation/l1tf: Add KConfig for setting the L1D cache flush mode
Date: Wed, 8 Jul 2020 12:25:46 -0700 [thread overview]
Message-ID: <20200708192546.4068026-1-abhishekbh@google.com> (raw)
This change adds a new kernel configuration that sets the l1d cache
flush setting at compile time rather than at run time.
The reasons for this change are as follows -
- Kernel command line arguments are getting unwieldy. These parameters
are not a scalable way to set the kernel config. They're intended as a
super limited way for the bootloader to pass info to the kernel and
also as a way for end users who are not compiling the kernel themselves
to tweak the kernel behavior.
- Also, if a user wants this setting from the start. It's a definite
smell that it deserves to be a compile time thing rather than adding
extra code plus whatever miniscule time at runtime to pass an
extra argument.
- Finally, it doesn't preclude the runtime / kernel command line way.
Users are free to use those as well.
Signed-off-by: Abhishek Bhardwaj <abhishekbh@google.com>
---
Changes in v4:
- Add motivation for the change in the commit message.
Changes in v3:
- Change depends on to only x86_64.
- Remove copy paste errors at the end of the KConfig.
Changes in v2:
- Fix typo in the help of the new KConfig.
arch/x86/kernel/cpu/bugs.c | 8 ++++++++
arch/x86/kvm/Kconfig | 13 +++++++++++++
2 files changed, 21 insertions(+)
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 0b71970d2d3d2..1dcc875cf5547 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -1406,7 +1406,15 @@ enum l1tf_mitigations l1tf_mitigation __ro_after_init = L1TF_MITIGATION_FLUSH;
#if IS_ENABLED(CONFIG_KVM_INTEL)
EXPORT_SYMBOL_GPL(l1tf_mitigation);
#endif
+#if (CONFIG_KVM_VMENTRY_L1D_FLUSH == 1)
+enum vmx_l1d_flush_state l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_NEVER;
+#elif (CONFIG_KVM_VMENTRY_L1D_FLUSH == 2)
+enum vmx_l1d_flush_state l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_COND;
+#elif (CONFIG_KVM_VMENTRY_L1D_FLUSH == 3)
+enum vmx_l1d_flush_state l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_ALWAYS;
+#else
enum vmx_l1d_flush_state l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_AUTO;
+#endif
EXPORT_SYMBOL_GPL(l1tf_vmx_mitigation);
/*
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index b277a2db62676..1f85374a0b812 100644
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -107,4 +107,17 @@ config KVM_MMU_AUDIT
This option adds a R/W kVM module parameter 'mmu_audit', which allows
auditing of KVM MMU events at runtime.
+config KVM_VMENTRY_L1D_FLUSH
+ int "L1D cache flush settings (1-3)"
+ range 1 3
+ default "2"
+ depends on KVM && X86_64
+ help
+ This setting determines the L1D cache flush behavior before a VMENTER.
+ This is similar to setting the option / parameter to
+ kvm-intel.vmentry_l1d_flush.
+ 1 - Never flush.
+ 2 - Conditionally flush.
+ 3 - Always flush.
+
endif # VIRTUALIZATION
--
2.27.0.383.g050319c2ae-goog
next reply other threads:[~2020-07-08 19:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 19:25 Abhishek Bhardwaj [this message]
2020-07-08 19:34 ` [PATCH v4] x86/speculation/l1tf: Add KConfig for setting the L1D cache flush mode Randy Dunlap
2020-07-08 19:49 ` Abhishek Bhardwaj
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=20200708192546.4068026-1-abhishekbh@google.com \
--to=abhishekbh@google.com \
--cc=asteinhauser@google.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=jpoimboe@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=longman@redhat.com \
--cc=mgross@linux.intel.com \
--cc=mingo@redhat.com \
--cc=pawan.kumar.gupta@linux.intel.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=rppt@linux.ibm.com \
--cc=sean.j.christopherson@intel.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).