[tip: x86/cleanups] x86/cpu: Provide a declaration for itlb_multihit_kvm_mitigation

tip-bot2 for Thomas Gleixner
2024-03-04T12:15:06Z

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID: 65efc4dc12c5cc296374278673b89390eba79fe6
Gitweb: https://git.kernel.org/tip/65efc4dc12c5cc296374278673b89390eba79fe6
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Mon, 04 Mar 2024 11:12:28 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Mon, 04 Mar 2024 12:09:13 +01:00

x86/cpu: Provide a declaration for itlb_multihit_kvm_mitigation

Sparse complains rightfully about the missing declaration which has been
placed sloppily into the usage site:

bugs.c:2223:6: sparse: warning: symbol 'itlb_multihit_kvm_mitigation' was not declared. Should it be static?

Add it to <asm/spec-ctrl.h> where it belongs and remove the one in the KVM code.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20240304005104.787173239@linutronix.de
---
arch/x86/include/asm/spec-ctrl.h | 2 ++
arch/x86/kvm/mmu/mmu.c | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/spec-ctrl.h b/arch/x86/include/asm/spec-ctrl.h
index c648502..658b690 100644
--- a/arch/x86/include/asm/spec-ctrl.h
+++ b/arch/x86/include/asm/spec-ctrl.h
@@ -96,4 +96,6 @@ static inline void speculative_store_bypass_ht_init(void) { }
extern void speculation_ctrl_update(unsigned long tif);
extern void speculation_ctrl_update_current(void);

+extern bool itlb_multihit_kvm_mitigation;
+
#endif
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 2d6cdea..3c89d3e 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -53,12 +53,11 @@
#include <asm/cmpxchg.h>
#include <asm/io.h>
#include <asm/set_memory.h>
+#include <asm/spec-ctrl.h>
#include <asm/vmx.h>

#include "trace.h"

-extern bool itlb_multihit_kvm_mitigation;
-
static bool nx_hugepage_mitigation_hard_disabled;

int __read_mostly nx_huge_pages = -1;