From: Will Deacon <will.deacon@arm.com>
To: linux-arch@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Will Deacon <will.deacon@arm.com>,
"Paul E. McKenney" <paulmck@linux.ibm.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Arnd Bergmann <arnd@arndb.de>,
Peter Zijlstra <peterz@infradead.org>,
Andrea Parri <andrea.parri@amarulasolutions.com>,
Palmer Dabbelt <palmer@sifive.com>,
Daniel Lustig <dlustig@nvidia.com>,
David Howells <dhowells@redhat.com>,
Alan Stern <stern@rowland.harvard.edu>,
Linus Torvalds <torvalds@linux-foundation.org>,
"Maciej W. Rozycki" <macro@linux-mips.org>,
Paul Burton <paul.burton@mips.com>,
Ingo Molnar <mingo@kernel.org>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Rich Felker <dalias@libc.org>, Tony Luck <tony.luck@intel.com>
Subject: [RFC PATCH 01/20] asm-generic/mmiowb: Add generic implementation of mmiowb() tracking
Date: Fri, 22 Feb 2019 18:50:07 +0000 [thread overview]
Message-ID: <20190222185026.10973-2-will.deacon@arm.com> (raw)
In-Reply-To: <20190222185026.10973-1-will.deacon@arm.com>
In preparation for removing all explicit mmiowb() calls from driver
code, implement a tracking system in asm-generic based on the PowerPC
implementation. This allows architectures with a non-empty mmiowb()
definition to automatically have the barrier inserted in spin_unlock()
following a critical section containing an I/O write.
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
include/asm-generic/mmiowb.h | 60 ++++++++++++++++++++++++++++++++++++++++++++
kernel/Kconfig.locks | 3 +++
kernel/locking/spinlock.c | 5 ++++
3 files changed, 68 insertions(+)
create mode 100644 include/asm-generic/mmiowb.h
diff --git a/include/asm-generic/mmiowb.h b/include/asm-generic/mmiowb.h
new file mode 100644
index 000000000000..1cec8907806f
--- /dev/null
+++ b/include/asm-generic/mmiowb.h
@@ -0,0 +1,60 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __ASM_GENERIC_MMIOWB_H
+#define __ASM_GENERIC_MMIOWB_H
+
+/*
+ * Generic implementation of mmiowb() tracking for spinlocks.
+ *
+ * If your architecture doesn't ensure that writes to an I/O peripheral
+ * within two spinlocked sections on two different CPUs are seen by the
+ * peripheral in the order corresponding to the lock handover, then you
+ * need to follow these FIVE easy steps:
+ *
+ * 1. Implement mmiowb() in asm/mmiowb.h and then #include this file
+ * 2. Ensure your I/O write accessors call mmiowb_set_pending()
+ * 3. Select ARCH_HAS_MMIOWB
+ * 4. Untangle the resulting mess of header files
+ * 5. Complain to your architects
+ */
+#if defined(CONFIG_ARCH_HAS_MMIOWB) && defined(CONFIG_SMP)
+
+#include <linux/types.h>
+#include <asm/percpu.h>
+#include <asm/smp.h>
+
+struct mmiowb_state {
+ u16 nesting_count;
+ u16 mmiowb_pending;
+};
+DECLARE_PER_CPU(struct mmiowb_state, __mmiowb_state);
+
+#ifndef mmiowb_set_pending
+static inline void mmiowb_set_pending(void)
+{
+ __this_cpu_write(__mmiowb_state.mmiowb_pending, 1);
+}
+#endif
+
+#ifndef mmiowb_spin_lock
+static inline void mmiowb_spin_lock(void)
+{
+ if (__this_cpu_inc_return(__mmiowb_state.nesting_count) == 1)
+ __this_cpu_write(__mmiowb_state.mmiowb_pending, 0);
+}
+#endif
+
+#ifndef mmiowb_spin_unlock
+static inline void mmiowb_spin_unlock(void)
+{
+ if (__this_cpu_xchg(__mmiowb_state.mmiowb_pending, 0))
+ mmiowb();
+ __this_cpu_dec_return(__mmiowb_state.nesting_count);
+}
+#endif
+
+#else
+#define mmiowb_set_pending() do { } while (0)
+#define mmiowb_spin_lock() do { } while (0)
+#define mmiowb_spin_unlock() do { } while (0)
+#endif /* CONFIG_ARCH_HAS_MMIOWB && CONFIG_SMP */
+#endif /* __ASM_GENERIC_MMIOWB_H */
diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks
index 84d882f3e299..04976ae41176 100644
--- a/kernel/Kconfig.locks
+++ b/kernel/Kconfig.locks
@@ -248,3 +248,6 @@ config ARCH_USE_QUEUED_RWLOCKS
config QUEUED_RWLOCKS
def_bool y if ARCH_USE_QUEUED_RWLOCKS
depends on SMP
+
+config ARCH_HAS_MMIOWB
+ bool
diff --git a/kernel/locking/spinlock.c b/kernel/locking/spinlock.c
index 936f3d14dd6b..cbae365d7dd1 100644
--- a/kernel/locking/spinlock.c
+++ b/kernel/locking/spinlock.c
@@ -22,6 +22,11 @@
#include <linux/debug_locks.h>
#include <linux/export.h>
+#ifdef CONFIG_ARCH_HAS_MMIOWB
+DEFINE_PER_CPU(struct mmiowb_state, __mmiowb_state);
+EXPORT_PER_CPU_SYMBOL(__mmiowb_state);
+#endif
+
/*
* If lockdep is enabled then we use the non-preemption spin-ops
* even on CONFIG_PREEMPT, because lockdep assumes that interrupts are
--
2.11.0
next prev parent reply other threads:[~2019-02-22 18:50 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-22 18:50 [RFC PATCH 00/20] Remove Mysterious Macro Intended to Obscure Weird Behaviours (mmiowb()) Will Deacon
2019-02-22 18:50 ` Will Deacon [this message]
2019-02-22 21:49 ` [RFC PATCH 01/20] asm-generic/mmiowb: Add generic implementation of mmiowb() tracking Linus Torvalds
2019-02-22 21:55 ` Linus Torvalds
2019-02-26 18:25 ` Will Deacon
2019-02-26 18:26 ` Will Deacon
2019-02-26 18:33 ` Peter Zijlstra
2019-02-26 19:02 ` Linus Torvalds
2019-02-27 10:19 ` Peter Zijlstra
2019-02-22 18:50 ` [RFC PATCH 02/20] arch: Use asm-generic header for asm/mmiowb.h Will Deacon
2019-02-22 18:50 ` [RFC PATCH 03/20] mmiowb: Hook up mmiowb helpers to spinlocks and generic I/O accessors Will Deacon
2019-02-22 18:50 ` [RFC PATCH 04/20] ARM: io: Remove useless definition of mmiowb() Will Deacon
2019-02-22 18:50 ` [RFC PATCH 05/20] arm64: " Will Deacon
2019-02-22 18:50 ` [RFC PATCH 06/20] x86: " Will Deacon
2019-02-22 18:50 ` [RFC PATCH 07/20] nds32: " Will Deacon
2019-02-22 18:50 ` [RFC PATCH 08/20] m68k: " Will Deacon
2019-02-25 9:25 ` Geert Uytterhoeven
2019-02-25 12:12 ` Will Deacon
2019-02-22 18:50 ` [RFC PATCH 09/20] sh: Add unconditional mmiowb() to arch_spin_unlock() Will Deacon
2019-02-22 18:50 ` [RFC PATCH 10/20] mips: " Will Deacon
2019-02-22 18:50 ` [RFC PATCH 11/20] ia64: " Will Deacon
2019-02-27 4:36 ` Nicholas Piggin
2019-02-22 18:50 ` [RFC PATCH 12/20] powerpc: mmiowb: Hook up mmwiob() implementation to asm-generic code Will Deacon
2019-02-22 18:50 ` [RFC PATCH 13/20] riscv: " Will Deacon
2019-02-22 18:50 ` [RFC PATCH 14/20] Documentation: Kill all references to mmiowb() Will Deacon
2019-02-22 18:50 ` [RFC PATCH 15/20] drivers: Remove useless trailing comments from mmiowb() invocations Will Deacon
2019-02-22 18:50 ` [RFC PATCH 16/20] drivers: Remove explicit invocations of mmiowb() Will Deacon
2019-02-22 18:50 ` [RFC PATCH 17/20] scsi: qla1280: Remove stale comment about mmiowb() Will Deacon
2019-02-22 18:50 ` [RFC PATCH 18/20] i40iw: Redefine i40iw_mmiowb() to do nothing Will Deacon
2019-02-22 18:50 ` [RFC PATCH 19/20] net: silan: sc92031: Remove stale comment about mmiowb() Will Deacon
2019-02-22 18:50 ` [RFC PATCH 20/20] arch: Remove dummy mmiowb() definitions from arch code Will Deacon
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=20190222185026.10973-2-will.deacon@arm.com \
--to=will.deacon@arm.com \
--cc=andrea.parri@amarulasolutions.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=dalias@libc.org \
--cc=dhowells@redhat.com \
--cc=dlustig@nvidia.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=macro@linux-mips.org \
--cc=mingo@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=palmer@sifive.com \
--cc=paul.burton@mips.com \
--cc=paulmck@linux.ibm.com \
--cc=peterz@infradead.org \
--cc=stern@rowland.harvard.edu \
--cc=tony.luck@intel.com \
--cc=torvalds@linux-foundation.org \
--cc=ysato@users.sourceforge.jp \
/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
Powered by JetHome