From: Yi Sun <yi.y.sun@linux.intel.com>
To: linux-kernel@vger.kernel.org
Cc: x86@kernel.org, tglx@linutronix.de, jgross@suse.com,
chao.p.peng@intel.com, chao.gao@intel.com,
isaku.yamahata@intel.com, michael.h.kelley@microsoft.com,
tianyu.lan@microsoft.com, Yi Sun <yi.y.sun@linux.intel.com>,
"K. Y. Srinivasan" <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Stephen Hemminger <sthemmin@microsoft.com>,
"Michael Kelley (EOSG)" <Michael.H.Kelley@microsoft.com>
Subject: [PATCH v1 2/2] x86/hyperv: make HvNotifyLongSpinWait hypercall
Date: Fri, 19 Oct 2018 21:13:55 +0800 [thread overview]
Message-ID: <1539954835-34035-3-git-send-email-yi.y.sun@linux.intel.com> (raw)
In-Reply-To: <1539954835-34035-1-git-send-email-yi.y.sun@linux.intel.com>
The HvNotifyLongSpinWait hypercall (HVCALL_NOTIFY_LONG_SPIN_WAIT)
is used by a guest OS to notify the hypervisor that the calling
virtual processor is attempting to acquire a resource that is
potentially held by another virtual processor within the same
Virtual Machine. This scheduling hint improves the scalability of
VMs with more than one virtual processor on Hyper-V.
Per MSFT TLFS, the retry number (SpinWaitInfo) is sent to hypervisor
only when the retry number exceeds the recommended number. If
recommended number is 0xFFFFFFFF, never retry.
Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Stephen Hemminger <sthemmin@microsoft.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Michael Kelley (EOSG) <Michael.H.Kelley@microsoft.com>
Cc: Juergen Gross <jgross@suse.com>
---
arch/x86/hyperv/hv_spinlock.c | 18 ++++++++++++++++++
arch/x86/include/asm/mshyperv.h | 1 +
kernel/locking/qspinlock_paravirt.h | 10 ++++++++++
3 files changed, 29 insertions(+)
diff --git a/arch/x86/hyperv/hv_spinlock.c b/arch/x86/hyperv/hv_spinlock.c
index a861b04..723dccb 100644
--- a/arch/x86/hyperv/hv_spinlock.c
+++ b/arch/x86/hyperv/hv_spinlock.c
@@ -18,6 +18,24 @@
static bool __initdata hv_pvspin = true;
+bool hv_notify_long_spin_wait(int retry_num)
+{
+ /*
+ * Per MSFT TLFS, the SpinWaitInfo is sent to hypervisor only when
+ * the retry number exceeds the recommended number.
+ *
+ * If recommended number is 0xFFFFFFFF, never retry.
+ */
+ if (ms_hyperv.num_spin_retry == HYPERV_SPINLOCK_RETRY_NEVER)
+ return false;
+
+ if ((0 == retry_num % ms_hyperv.num_spin_retry) && retry_num)
+ hv_do_fast_hypercall8(HVCALL_NOTIFY_LONG_SPIN_WAIT,
+ retry_num);
+
+ return true;
+}
+
static void hv_qlock_kick(int cpu)
{
apic->send_IPI(cpu, X86_PLATFORM_IPI_VECTOR);
diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
index f909365..bd87868 100644
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -356,6 +356,7 @@ static inline int cpumask_to_vpset(struct hv_vpset *vpset,
void hv_apic_init(void);
void __init hv_init_spinlocks(void);
bool hv_vcpu_is_preempted(int vcpu);
+bool hv_notify_long_spin_wait(int retry_num);
#else
static inline void hv_apic_init(void) {}
#endif
diff --git a/kernel/locking/qspinlock_paravirt.h b/kernel/locking/qspinlock_paravirt.h
index 0130e48..9e88c7e 100644
--- a/kernel/locking/qspinlock_paravirt.h
+++ b/kernel/locking/qspinlock_paravirt.h
@@ -7,6 +7,8 @@
#include <linux/bootmem.h>
#include <linux/debug_locks.h>
+#include <asm/mshyperv.h>
+
/*
* Implement paravirt qspinlocks; the general idea is to halt the vcpus instead
* of spinning them.
@@ -305,6 +307,10 @@ static void pv_wait_node(struct mcs_spinlock *node, struct mcs_spinlock *prev)
wait_early = true;
break;
}
+#if defined(CONFIG_X86_64) && defined(CONFIG_PARAVIRT_SPINLOCKS) && IS_ENABLED(CONFIG_HYPERV)
+ if (!hv_notify_long_spin_wait(SPIN_THRESHOLD - loop))
+ break;
+#endif
cpu_relax();
}
@@ -433,6 +439,10 @@ static void pv_kick_node(struct qspinlock *lock, struct mcs_spinlock *node)
for (loop = SPIN_THRESHOLD; loop; loop--) {
if (trylock_clear_pending(lock))
goto gotlock;
+#if defined(CONFIG_X86_64) && defined(CONFIG_PARAVIRT_SPINLOCKS) && IS_ENABLED(CONFIG_HYPERV)
+ if (!hv_notify_long_spin_wait(SPIN_THRESHOLD - loop))
+ break;
+#endif
cpu_relax();
}
clear_pending(lock);
--
1.9.1
next prev parent reply other threads:[~2018-10-19 13:39 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-19 13:13 [PATCH v1 0/2] Enable HvNotifyLongSpinWait for Hyper-V Yi Sun
2018-10-19 13:13 ` [PATCH v1 1/2] x86/hyperv: get spinlock retry number on Hyper-V Yi Sun
2018-10-19 13:13 ` Yi Sun [this message]
2018-10-19 14:20 ` [PATCH v1 2/2] x86/hyperv: make HvNotifyLongSpinWait hypercall Juergen Gross
2018-10-22 1:53 ` Yi Sun
2018-10-22 7:32 ` Juergen Gross
2018-10-22 16:31 ` Waiman Long
2018-10-22 17:15 ` Peter Zijlstra
2018-10-22 17:27 ` Waiman Long
2018-10-22 17:31 ` Peter Zijlstra
2018-10-22 18:01 ` Waiman Long
2018-10-23 2:57 ` Yi Sun
2018-10-23 8:51 ` Peter Zijlstra
2018-10-23 9:33 ` Yi Sun
2018-10-31 1:54 ` Yi Sun
2018-10-31 14:10 ` Peter Zijlstra
2018-10-31 15:07 ` Waiman Long
2018-10-31 17:15 ` Peter Zijlstra
2018-11-01 3:20 ` Yi Sun
2018-11-01 8:59 ` Peter Zijlstra
2018-11-01 12:59 ` Waiman Long
2018-11-05 6:54 ` Yi Sun
2018-10-24 16:53 ` Michael Kelley
2018-10-25 2:23 ` Yi Sun
2018-10-31 2:06 ` Yi Sun
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=1539954835-34035-3-git-send-email-yi.y.sun@linux.intel.com \
--to=yi.y.sun@linux.intel.com \
--cc=chao.gao@intel.com \
--cc=chao.p.peng@intel.com \
--cc=haiyangz@microsoft.com \
--cc=isaku.yamahata@intel.com \
--cc=jgross@suse.com \
--cc=kys@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.h.kelley@microsoft.com \
--cc=sthemmin@microsoft.com \
--cc=tglx@linutronix.de \
--cc=tianyu.lan@microsoft.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).