From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Peter Zijlstra <peterz@infradead.org>
Cc: "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Nick Piggin" <npiggin@kernel.dk>,
"Mathieu Desnoyers" <mathieu.desnoyers@polymtl.ca>,
"Américo Wang" <xiyou.wangcong@gmail.com>,
"Eric Dumazet" <dada1@cosmosbay.com>,
"Jan Beulich" <JBeulich@novell.com>,
"Avi Kivity" <avi@redhat.com>,
Xen-devel <xen-devel@lists.xensource.com>,
"H. Peter Anvin" <hpa@zytor.com>,
"Linux Virtualization"
<virtualization@lists.linux-foundation.org>,
"Srivatsa Vaddagiri" <vatsa@linux.vnet.ibm.com>,
"Jeremy Fitzhardinge" <jeremy.fitzhardinge@citrix.com>
Subject: [PATCH 07/14] x86/spinlocks: replace pv spinlocks with pv ticketlocks
Date: Tue, 16 Nov 2010 13:08:38 -0800 [thread overview]
Message-ID: <953be91216a749d9eea3800e18c1ffa32841786c.1289940821.git.jeremy.fitzhardinge@citrix.com> (raw)
In-Reply-To: <cover.1289940821.git.jeremy.fitzhardinge@citrix.com>
In-Reply-To: <cover.1289940821.git.jeremy.fitzhardinge@citrix.com>
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Rather than outright replacing the entire spinlock implementation in
order to paravirtualize it, keep the ticket lock implementation but add
a couple of pvops hooks on the slow patch (long spin on lock, unlocking
a contended lock).
Ticket locks have a number of nice properties, but they also have some
surprising behaviours in virtual environments. They enforce a strict
FIFO ordering on cpus trying to take a lock; however, if the hypervisor
scheduler does not schedule the cpus in the correct order, the system can
waste a huge amount of time spinning until the next cpu can take the lock.
(See Thomas Friebel's talk "Prevent Guests from Spinning Around"
http://www.xen.org/files/xensummitboston08/LHP.pdf for more details.)
To address this, we add two hooks:
- __ticket_spin_lock which is called after the cpu has been
spinning on the lock for a significant number of iterations but has
failed to take the lock (presumably because the cpu holding the lock
has been descheduled). The lock_spinning pvop is expected to block
the cpu until it has been kicked by the current lock holder.
- __ticket_spin_unlock, which on releasing a contended lock
(there are more cpus with tail tickets), it looks to see if the next
cpu is blocked and wakes it if so.
When compiled with CONFIG_PARAVIRT_SPINLOCKS disabled, a set of stub
functions causes all the extra code to go away.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---
arch/x86/include/asm/paravirt.h | 30 +++-------------------
arch/x86/include/asm/paravirt_types.h | 8 +----
arch/x86/include/asm/spinlock.h | 44 +++++++++++++++++++++++++++------
arch/x86/kernel/paravirt-spinlocks.c | 15 +---------
arch/x86/xen/spinlock.c | 7 ++++-
5 files changed, 50 insertions(+), 54 deletions(-)
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 18e3b8a..c864775 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -717,36 +717,14 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
#if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
-static inline int arch_spin_is_locked(struct arch_spinlock *lock)
+static inline void __ticket_lock_spinning(struct arch_spinlock *lock, unsigned ticket)
{
- return PVOP_CALL1(int, pv_lock_ops.spin_is_locked, lock);
+ PVOP_VCALL2(pv_lock_ops.lock_spinning, lock, ticket);
}
-static inline int arch_spin_is_contended(struct arch_spinlock *lock)
+static inline void ____ticket_unlock_kick(struct arch_spinlock *lock, unsigned ticket)
{
- return PVOP_CALL1(int, pv_lock_ops.spin_is_contended, lock);
-}
-#define arch_spin_is_contended arch_spin_is_contended
-
-static __always_inline void arch_spin_lock(struct arch_spinlock *lock)
-{
- PVOP_VCALL1(pv_lock_ops.spin_lock, lock);
-}
-
-static __always_inline void arch_spin_lock_flags(struct arch_spinlock *lock,
- unsigned long flags)
-{
- PVOP_VCALL2(pv_lock_ops.spin_lock_flags, lock, flags);
-}
-
-static __always_inline int arch_spin_trylock(struct arch_spinlock *lock)
-{
- return PVOP_CALL1(int, pv_lock_ops.spin_trylock, lock);
-}
-
-static __always_inline void arch_spin_unlock(struct arch_spinlock *lock)
-{
- PVOP_VCALL1(pv_lock_ops.spin_unlock, lock);
+ PVOP_VCALL2(pv_lock_ops.unlock_kick, lock, ticket);
}
#endif
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
index b82bac9..1078474 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -315,12 +315,8 @@ struct pv_mmu_ops {
struct arch_spinlock;
struct pv_lock_ops {
- int (*spin_is_locked)(struct arch_spinlock *lock);
- int (*spin_is_contended)(struct arch_spinlock *lock);
- void (*spin_lock)(struct arch_spinlock *lock);
- void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
- int (*spin_trylock)(struct arch_spinlock *lock);
- void (*spin_unlock)(struct arch_spinlock *lock);
+ void (*lock_spinning)(struct arch_spinlock *lock, unsigned ticket);
+ void (*unlock_kick)(struct arch_spinlock *lock, unsigned ticket);
};
/* This contains all the paravirt structures: we get a convenient
diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
index 3afb1a7..8e379d3 100644
--- a/arch/x86/include/asm/spinlock.h
+++ b/arch/x86/include/asm/spinlock.h
@@ -50,6 +50,21 @@ static __always_inline void __ticket_unlock_release(struct arch_spinlock *lock)
}
#endif
+/* How long a lock should spin before we consider blocking */
+#define SPIN_THRESHOLD (1 << 11)
+
+#ifndef CONFIG_PARAVIRT_SPINLOCKS
+
+static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock, unsigned ticket)
+{
+}
+
+static __always_inline void ____ticket_unlock_kick(struct arch_spinlock *lock, unsigned ticket)
+{
+}
+
+#endif /* CONFIG_PARAVIRT_SPINLOCKS */
+
/*
* Ticket locks are conceptually two parts, one indicating the current head of
* the queue, and the other indicating the current tail. The lock is acquired
@@ -83,6 +98,16 @@ static __always_inline struct __raw_tickets __ticket_spin_claim(struct arch_spin
return tickets;
}
+/*
+ * If a spinlock has someone waiting on it, then kick the appropriate
+ * waiting cpu.
+ */
+static __always_inline void __ticket_unlock_kick(struct arch_spinlock *lock, __ticket_t next)
+{
+ if (unlikely(lock->tickets.tail != next))
+ ____ticket_unlock_kick(lock, next);
+}
+
static __always_inline void __ticket_spin_lock(struct arch_spinlock *lock)
{
register struct __raw_tickets inc;
@@ -90,10 +115,15 @@ static __always_inline void __ticket_spin_lock(struct arch_spinlock *lock)
inc = __ticket_spin_claim(lock);
for (;;) {
- if (inc.head == inc.tail)
- goto out;
- cpu_relax();
- inc.head = ACCESS_ONCE(lock->tickets.head);
+ unsigned count = SPIN_THRESHOLD;
+
+ do {
+ if (inc.head == inc.tail)
+ goto out;
+ cpu_relax();
+ inc.head = ACCESS_ONCE(lock->tickets.head);
+ } while (--count);
+ __ticket_lock_spinning(lock, inc.tail);
}
out: barrier(); /* make sure nothing creeps before the lock is taken */
}
@@ -114,7 +144,9 @@ static __always_inline int __ticket_spin_trylock(arch_spinlock_t *lock)
static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
{
+ __ticket_t next = lock->tickets.head + 1;
__ticket_unlock_release(lock);
+ __ticket_unlock_kick(lock, next);
barrier(); /* prevent reordering into locked region */
}
@@ -132,8 +164,6 @@ static inline int __ticket_spin_is_contended(arch_spinlock_t *lock)
return ((tmp.tail - tmp.head) & TICKET_MASK) > 1;
}
-#ifndef CONFIG_PARAVIRT_SPINLOCKS
-
static inline int arch_spin_is_locked(arch_spinlock_t *lock)
{
return __ticket_spin_is_locked(lock);
@@ -166,8 +196,6 @@ static __always_inline void arch_spin_lock_flags(arch_spinlock_t *lock,
arch_spin_lock(lock);
}
-#endif /* CONFIG_PARAVIRT_SPINLOCKS */
-
static inline void arch_spin_unlock_wait(arch_spinlock_t *lock)
{
while (arch_spin_is_locked(lock))
diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
index 676b8c7..c2e010e 100644
--- a/arch/x86/kernel/paravirt-spinlocks.c
+++ b/arch/x86/kernel/paravirt-spinlocks.c
@@ -7,21 +7,10 @@
#include <asm/paravirt.h>
-static inline void
-default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
-{
- arch_spin_lock(lock);
-}
-
struct pv_lock_ops pv_lock_ops = {
#ifdef CONFIG_SMP
- .spin_is_locked = __ticket_spin_is_locked,
- .spin_is_contended = __ticket_spin_is_contended,
-
- .spin_lock = __ticket_spin_lock,
- .spin_lock_flags = default_spin_lock_flags,
- .spin_trylock = __ticket_spin_trylock,
- .spin_unlock = __ticket_spin_unlock,
+ .lock_spinning = paravirt_nop,
+ .unlock_kick = paravirt_nop,
#endif
};
EXPORT_SYMBOL(pv_lock_ops);
diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
index 23e061b..3d9da72 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -121,6 +121,9 @@ struct xen_spinlock {
unsigned short spinners; /* count of waiting cpus */
};
+static DEFINE_PER_CPU(int, lock_kicker_irq) = -1;
+
+#if 0
static int xen_spin_is_locked(struct arch_spinlock *lock)
{
struct xen_spinlock *xl = (struct xen_spinlock *)lock;
@@ -148,7 +151,6 @@ static int xen_spin_trylock(struct arch_spinlock *lock)
return old == 0;
}
-static DEFINE_PER_CPU(int, lock_kicker_irq) = -1;
static DEFINE_PER_CPU(struct xen_spinlock *, lock_spinners);
/*
@@ -338,6 +340,7 @@ static void xen_spin_unlock(struct arch_spinlock *lock)
if (unlikely(xl->spinners))
xen_spin_unlock_slow(xl);
}
+#endif
static irqreturn_t dummy_handler(int irq, void *dev_id)
{
@@ -373,12 +376,14 @@ void xen_uninit_lock_cpu(int cpu)
void __init xen_init_spinlocks(void)
{
+#if 0
pv_lock_ops.spin_is_locked = xen_spin_is_locked;
pv_lock_ops.spin_is_contended = xen_spin_is_contended;
pv_lock_ops.spin_lock = xen_spin_lock;
pv_lock_ops.spin_lock_flags = xen_spin_lock_flags;
pv_lock_ops.spin_trylock = xen_spin_trylock;
pv_lock_ops.spin_unlock = xen_spin_unlock;
+#endif
}
#ifdef CONFIG_XEN_DEBUG_FS
--
1.7.2.3
next prev parent reply other threads:[~2010-11-16 21:11 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-16 21:08 [PATCH 00/14] PV ticket locks without expanding spinlock Jeremy Fitzhardinge
2010-11-16 21:08 ` [PATCH 01/14] x86/ticketlock: clean up types and accessors Jeremy Fitzhardinge
2011-01-11 17:21 ` [Xen-devel] " Konrad Rzeszutek Wilk
2010-11-16 21:08 ` [PATCH 02/14] x86/ticketlock: convert spin loop to C Jeremy Fitzhardinge
2010-11-16 21:08 ` [PATCH 03/14] x86/ticketlock: Use C for __ticket_spin_unlock Jeremy Fitzhardinge
2010-11-16 21:08 ` [PATCH 04/14] x86/ticketlock: make large and small ticket versions of spin_lock the same Jeremy Fitzhardinge
2010-11-16 21:08 ` [PATCH 05/14] x86/ticketlock: make __ticket_spin_lock common Jeremy Fitzhardinge
2010-11-16 21:08 ` [PATCH 06/14] x86/ticketlock: make __ticket_spin_trylock common Jeremy Fitzhardinge
2010-11-16 21:08 ` Jeremy Fitzhardinge [this message]
2010-11-16 21:08 ` [PATCH 08/14] x86/ticketlock: collapse a layer of functions Jeremy Fitzhardinge
2010-11-16 21:08 ` [PATCH 09/14] xen/pvticketlock: Xen implementation for PV ticket locks Jeremy Fitzhardinge
2010-11-17 8:11 ` Jan Beulich
2010-11-17 8:52 ` Jeremy Fitzhardinge
2010-11-17 9:57 ` [Xen-devel] " Jeremy Fitzhardinge
2010-11-17 10:34 ` Jan Beulich
2010-11-17 17:41 ` Jeremy Fitzhardinge
2010-11-16 21:08 ` [PATCH 10/14] x86/pvticketlock: use callee-save for lock_spinning Jeremy Fitzhardinge
2010-11-16 21:08 ` [PATCH 11/14] x86/ticketlock: don't inline _spin_unlock when using paravirt spinlocks Jeremy Fitzhardinge
2010-11-16 21:08 ` [PATCH 12/14] x86/ticketlocks: when paravirtualizing ticket locks, increment by 2 Jeremy Fitzhardinge
2010-11-16 21:08 ` [PATCH 13/14] x86/ticketlock: add slowpath logic Jeremy Fitzhardinge
2010-11-17 8:31 ` Jan Beulich
2010-11-17 8:52 ` Jeremy Fitzhardinge
2010-11-17 8:56 ` Jeremy Fitzhardinge
2010-11-17 9:08 ` Jeremy Fitzhardinge
2010-11-17 9:34 ` Jan Beulich
2010-11-17 8:58 ` Avi Kivity
2010-11-17 9:05 ` Jeremy Fitzhardinge
2010-11-17 9:10 ` Avi Kivity
2010-11-17 12:21 ` Peter Zijlstra
2010-11-17 15:25 ` [Xen-devel] " Jeremy Fitzhardinge
2011-01-17 15:22 ` Srivatsa Vaddagiri
2011-01-19 16:23 ` Srivatsa Vaddagiri
2011-01-24 21:56 ` Jeremy Fitzhardinge
2011-02-18 17:03 ` Srivatsa Vaddagiri
2011-01-19 18:31 ` Jeremy Fitzhardinge
2011-01-19 18:39 ` Srivatsa Vaddagiri
2011-01-19 18:55 ` Jeremy Fitzhardinge
2011-01-20 4:28 ` Srivatsa Vaddagiri
2011-01-20 9:52 ` Jan Beulich
2010-11-16 21:08 ` [PATCH 14/14] x86/ticketlocks: tidy up __ticket_unlock_kick() Jeremy Fitzhardinge
2010-11-17 8:56 ` [PATCH 00/14] PV ticket locks without expanding spinlock Avi Kivity
2011-01-19 16:44 ` Srivatsa Vaddagiri
2011-01-19 17:07 ` [PATCH 1/3] debugfs: Add support to print u32 array Srivatsa Vaddagiri
2011-01-19 17:12 ` [PATCH 2/3] kvm hypervisor : Add hypercalls to support pv-ticketlock Srivatsa Vaddagiri
2011-01-19 17:21 ` Peter Zijlstra
2011-01-19 18:29 ` Srivatsa Vaddagiri
2011-01-19 18:53 ` Jeremy Fitzhardinge
2011-01-20 11:42 ` Srivatsa Vaddagiri
2011-01-20 17:49 ` Jeremy Fitzhardinge
2011-01-20 11:59 ` Srivatsa Vaddagiri
2011-01-20 13:41 ` Peter Zijlstra
2011-01-20 14:34 ` Srivatsa Vaddagiri
2011-01-20 17:56 ` Jeremy Fitzhardinge
2011-01-21 14:02 ` Srivatsa Vaddagiri
2011-01-21 14:48 ` Rik van Riel
2011-01-22 6:14 ` Srivatsa Vaddagiri
2011-01-22 14:53 ` Rik van Riel
2011-01-24 17:49 ` Jeremy Fitzhardinge
2011-01-19 17:23 ` Srivatsa Vaddagiri
2011-01-19 17:50 ` Peter Zijlstra
2011-01-19 17:17 ` [PATCH 3/3] kvm guest : Add support for pv-ticketlocks Srivatsa Vaddagiri
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=953be91216a749d9eea3800e18c1ffa32841786c.1289940821.git.jeremy.fitzhardinge@citrix.com \
--to=jeremy@goop.org \
--cc=JBeulich@novell.com \
--cc=avi@redhat.com \
--cc=dada1@cosmosbay.com \
--cc=hpa@zytor.com \
--cc=jeremy.fitzhardinge@citrix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@polymtl.ca \
--cc=npiggin@kernel.dk \
--cc=peterz@infradead.org \
--cc=vatsa@linux.vnet.ibm.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=xen-devel@lists.xensource.com \
--cc=xiyou.wangcong@gmail.com \
/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).