| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20241227011011.2331381-5-guoren@kernel.org>
Date: Thu, 26 Dec 2024 20:10:11 -0500
From: guoren@...nel.org
To: paul.walmsley@...ive.com,
palmer@...belt.com,
guoren@...nel.org,
bjorn@...osinc.com,
conor@...nel.org,
leobras@...hat.com,
peterz@...radead.org,
parri.andrea@...il.com,
will@...nel.org,
longman@...hat.com,
boqun.feng@...il.com,
arnd@...db.de,
alexghiti@...osinc.com,
ajones@...tanamicro.com,
rkrcmar@...tanamicro.com,
atishp@...osinc.com
Cc: linux-riscv@...ts.infradead.org,
linux-kernel@...r.kernel.org,
Guo Ren <guoren@...ux.alibaba.com>
Subject: [RFC PATCH V2 4/4] RISC-V: paravirt: Enable virt_spin_lock() when disable PARAVIRT_SPINLOCKS
From: Guo Ren <guoren@...ux.alibaba.com>
The VM guests should fall back to a Test-and-Set spinlock when
PARAVIRT_SPINLOCKS disabled, because fair locks have horrible lock
'holder' preemption issues. The virt_spin_lock_key would shortcut for
the queued_spin_lock_- slowpath() function that allow virt_spin_lock
to hijack it. ref: 43b3f02899f7 ("locking/qspinlock/x86: Fix
performance regression under unaccelerated VMs").
Add a static key controlling whether virt_spin_lock() should be
called or not. Add nopvspin support as x86.
Signed-off-by: Guo Ren <guoren@...ux.alibaba.com>
Signed-off-by: Guo Ren <guoren@...nel.org>
---
.../admin-guide/kernel-parameters.txt | 2 +-
arch/riscv/include/asm/qspinlock.h | 24 +++++++++++++++
arch/riscv/include/asm/sbi.h | 16 ++++++++++
arch/riscv/kernel/qspinlock_paravirt.c | 3 ++
arch/riscv/kernel/sbi.c | 2 +-
arch/riscv/kernel/setup.c | 29 +++++++++++++++++++
6 files changed, 74 insertions(+), 2 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 3872bc6ec49d..541202ff0f36 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4048,7 +4048,7 @@
as generic guest with no PV drivers. Currently support
XEN HVM, KVM, HYPER_V and VMWARE guest.
- nopvspin [X86,XEN,KVM,EARLY]
+ nopvspin [X86,RISCV,XEN,KVM,EARLY]
Disables the qspinlock slow path using PV optimizations
which allow the hypervisor to 'idle' the guest on lock
contention.
diff --git a/arch/riscv/include/asm/qspinlock.h b/arch/riscv/include/asm/qspinlock.h
index 1d9f32334ff1..4a62dcb43617 100644
--- a/arch/riscv/include/asm/qspinlock.h
+++ b/arch/riscv/include/asm/qspinlock.h
@@ -14,6 +14,8 @@
/* How long a lock should spin before we consider blocking */
#define SPIN_THRESHOLD (1 << 15)
+extern bool nopvspin;
+
void native_queued_spin_lock_slowpath(struct qspinlock *lock, u32 val);
void __pv_init_lock_hash(void);
void __pv_queued_spin_lock_slowpath(struct qspinlock *lock, u32 val);
@@ -31,5 +33,27 @@ static inline void queued_spin_unlock(struct qspinlock *lock)
#endif /* CONFIG_PARAVIRT_SPINLOCKS */
#include <asm-generic/qspinlock.h>
+#include <asm/jump_label.h>
+
+/*
+ * The KVM guests fall back to a Test-and-Set spinlock, because fair locks
+ * have horrible lock 'holder' preemption issues. The test_and_set_spinlock_key
+ * would shortcut for the queued_spin_lock_slowpath() function that allow
+ * virt_spin_lock to hijack it.
+ */
+DECLARE_STATIC_KEY_FALSE(test_and_set_spinlock_key);
+
+#define virt_spin_lock test_and_set_spinlock
+static inline bool test_and_set_spinlock(struct qspinlock *lock)
+{
+ if (!static_branch_likely(&test_and_set_spinlock_key))
+ return false;
+
+ do {
+ smp_cond_load_relaxed((s32 *)&lock->val, VAL == 0);
+ } while (atomic_cmpxchg(&lock->val, 0, _Q_LOCKED_VAL) != 0);
+
+ return true;
+}
#endif /* _ASM_RISCV_QSPINLOCK_H */
diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h
index 03e719f076ad..13669c29ead3 100644
--- a/arch/riscv/include/asm/sbi.h
+++ b/arch/riscv/include/asm/sbi.h
@@ -56,6 +56,21 @@ enum sbi_ext_base_fid {
SBI_EXT_BASE_GET_MIMPID,
};
+enum sbi_ext_base_impl_id {
+ SBI_EXT_BASE_IMPL_ID_BBL = 0,
+ SBI_EXT_BASE_IMPL_ID_OPENSBI,
+ SBI_EXT_BASE_IMPL_ID_XVISOR,
+ SBI_EXT_BASE_IMPL_ID_KVM,
+ SBI_EXT_BASE_IMPL_ID_RUSTSBI,
+ SBI_EXT_BASE_IMPL_ID_DIOSIX,
+ SBI_EXT_BASE_IMPL_ID_COFFER,
+ SBI_EXT_BASE_IMPL_ID_XEN,
+ SBI_EXT_BASE_IMPL_ID_POLARFIRE,
+ SBI_EXT_BASE_IMPL_ID_COREBOOT,
+ SBI_EXT_BASE_IMPL_ID_OREBOOT,
+ SBI_EXT_BASE_IMPL_ID_BHYVE,
+};
+
enum sbi_ext_time_fid {
SBI_EXT_TIME_SET_TIMER = 0,
};
@@ -449,6 +464,7 @@ static inline int sbi_console_getchar(void) { return -ENOENT; }
long sbi_get_mvendorid(void);
long sbi_get_marchid(void);
long sbi_get_mimpid(void);
+long sbi_get_firmware_id(void);
void sbi_set_timer(uint64_t stime_value);
void sbi_shutdown(void);
void sbi_send_ipi(unsigned int cpu);
diff --git a/arch/riscv/kernel/qspinlock_paravirt.c b/arch/riscv/kernel/qspinlock_paravirt.c
index 781ed2190334..0f2e50754689 100644
--- a/arch/riscv/kernel/qspinlock_paravirt.c
+++ b/arch/riscv/kernel/qspinlock_paravirt.c
@@ -58,6 +58,9 @@ void __init pv_qspinlock_init(void)
if (!sbi_probe_extension(SBI_EXT_PVLOCK))
return;
+ if (nopvspin)
+ return;
+
pr_info("PV qspinlocks enabled\n");
__pv_init_lock_hash();
diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c
index 1989b8cade1b..2cbacc345e5d 100644
--- a/arch/riscv/kernel/sbi.c
+++ b/arch/riscv/kernel/sbi.c
@@ -488,7 +488,7 @@ static inline long sbi_get_spec_version(void)
return __sbi_base_ecall(SBI_EXT_BASE_GET_SPEC_VERSION);
}
-static inline long sbi_get_firmware_id(void)
+long sbi_get_firmware_id(void)
{
return __sbi_base_ecall(SBI_EXT_BASE_GET_IMP_ID);
}
diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
index 8b51ff5c7300..bb76133e684f 100644
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@ -249,6 +249,32 @@ DEFINE_STATIC_KEY_TRUE(qspinlock_key);
EXPORT_SYMBOL(qspinlock_key);
#endif
+#ifdef CONFIG_QUEUED_SPINLOCKS
+DEFINE_STATIC_KEY_FALSE(test_and_set_spinlock_key);
+
+static bool __init virt_spin_lock_init(void)
+{
+ if (sbi_get_firmware_id() == SBI_EXT_BASE_IMPL_ID_KVM &&
+ !IS_ENABLED(CONFIG_PARAVIRT_SPINLOCKS))
+ goto out;
+
+#ifdef CONFIG_PARAVIRT_SPINLOCKS
+ if (sbi_probe_extension(SBI_EXT_PVLOCK) && nopvspin)
+ goto out;
+#endif
+
+ return false;
+out:
+ static_branch_enable(&test_and_set_spinlock_key);
+ return true;
+}
+#else
+static bool __init virt_spin_lock_init(void)
+{
+ return false;
+}
+#endif
+
static void __init riscv_spinlock_init(void)
{
char *using_ext = NULL;
@@ -274,6 +300,9 @@ static void __init riscv_spinlock_init(void)
}
#endif
+ if (virt_spin_lock_init())
+ using_ext = "using test and set";
+
if (!using_ext)
pr_err("Queued spinlock without Zabha or Ziccrse");
else
--
2.40.1
Powered by blists - more mailing lists