diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-16 11:43:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-16 11:43:15 -0700 |
| commit | b73056e9f82ebdf9f5dbcd378e5e51ae95d5000c (patch) | |
| tree | 4b8a89709fab99d17e93dbb2f0f42115f40e336b | |
| parent | f4fd69a32551036ac84bf4487b680167df77477d (diff) | |
| parent | de29a96acceae732c68a4094d08dc49079eefa02 (diff) | |
| download | linux-b73056e9f82ebdf9f5dbcd378e5e51ae95d5000c.tar.gz | |
Merge tag 'urgent-rcu.2023.06.11a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu
Pull RCU fix from Paul McKenney:
"This fixes a spinlock-initialization regression in SRCU that causes
the SRCU notifier to fail.
The fix simply adds the initialization, but introduces a #ifdef
because there is no spinlock to initialize for the Tiny SRCU used in
!SMP builds.
Yes, it would be nice to abstract this somehow in order to hide it in
SRCU, but I still don't see a good way of doing this"
* tag 'urgent-rcu.2023.06.11a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu:
notifier: Initialize new struct srcu_usage field
| -rw-r--r-- | include/linux/notifier.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/notifier.h b/include/linux/notifier.h index 2aba75145144c9..86544707236a6e 100644 --- a/include/linux/notifier.h +++ b/include/linux/notifier.h @@ -106,12 +106,22 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh); #define RAW_NOTIFIER_INIT(name) { \ .head = NULL } +#ifdef CONFIG_TREE_SRCU #define SRCU_NOTIFIER_INIT(name, pcpu) \ { \ .mutex = __MUTEX_INITIALIZER(name.mutex), \ .head = NULL, \ + .srcuu = __SRCU_USAGE_INIT(name.srcuu), \ .srcu = __SRCU_STRUCT_INIT(name.srcu, name.srcuu, pcpu), \ } +#else +#define SRCU_NOTIFIER_INIT(name, pcpu) \ + { \ + .mutex = __MUTEX_INITIALIZER(name.mutex), \ + .head = NULL, \ + .srcu = __SRCU_STRUCT_INIT(name.srcu, name.srcuu, pcpu), \ + } +#endif #define ATOMIC_NOTIFIER_HEAD(name) \ struct atomic_notifier_head name = \ |