Skip to contentSkip to conversation

locking: add default arch_*_relax definitions for GENERIC_LOCKBREAK

PATCH New Will Deacon 1 participant 1 message Jul 23, 2013 Generic include/asm header files

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 locking: add default arch_*_relax definitions for GENERIC_LOCKBREAK

When running with GENERIC_LOCKBREAK=y, the locking implementations emit calls to arch_{read,write,spin}_relax when spinning on a contended lock in order to allow architectures to favour the CPU owning the lock if possible.

In reality, everybody apart from PowerPC and S390 just does cpu_relax() here, so make that the default behaviour and allow it to be overridden if required.

Cc Benjamin Herrenschmidt <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Thomas Gleixner <[email protected]>

---

Hi guys,

This is v2 of the RFC I sent last month (got tied up with conferences since then):

http://marc.info/?l=linux-arch&m=137183506819071&w=2

I have corresponding arch/ changes, but I'd like to get the core change merged first so that I don't inadvertently break things if the arch/ patches are merged out-of-order.

Cheers,

Will

 kernel/spinlock.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
kernel/spinlock.c +14 -0
index 5cdd806..4b082b5 100644
@@ -34,6 +34,20 @@
 #else
 #define raw_read_can_lock(l)	read_can_lock(l)
 #define raw_write_can_lock(l)	write_can_lock(l)
+
+/*
+ * Some architectures can relax in favour of the CPU owning the lock.
+ */
+#ifndef arch_read_relax
+# define arch_read_relax(l)	cpu_relax()
+#endif
+#ifndef arch_write_relax
+# define arch_write_relax(l)	cpu_relax()
+#endif
+#ifndef arch_spin_relax
+# define arch_spin_relax(l)	cpu_relax()
+#endif
+
 /*
  * We build the __lock_function inlines here. They are too large for
  * inlining all over the place, but here is only one user per function
Signature · 1 line
1.8.2.2