On Thu, Jun 01, 2023 at 08:33:10PM +0800, Z qiang wrote:
> >
> > Hi Paul,
> >
> > On 30/03/2023 23:47, Paul E. McKenney wrote:
> > > This commit moves the ->srcu_gp_seq, ->srcu_gp_seq_needed,
> > > ->srcu_gp_seq_needed_exp, ->srcu_gp_start, and ->srcu_last_gp_end fields
> > > from the srcu_struct structure to the srcu_usage structure to reduce
> > > the size of the former in order to improve cache locality.
> > >
> > > Suggested-by: Christoph Hellwig <hch@xxxxxx>
> > > Tested-by: Sachin Sant <sachinp@xxxxxxxxxxxxx>
> > > Tested-by: "Zhang, Qiang1" <qiang1.zhang@xxxxxxxxx>
> > > Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxx>
> >
> >
> > I have noticed a suspend regression on some of our Tegra boards recently
> with v6.4-rc and interestingly bisect is pointing to this commit. I was
> unable revert this on top of the latest mainline but if I checkout this
> commit suspend fails and if I checkout the previous commit is passes.
> >
> > Enabling more debug I was able to capture the following crash log I see
> on one of the boards ...
> >
> > [ 57.327645] PM: suspend entry (deep)
> > [ 57.331660] Filesystems sync: 0.000 seconds
> > [ 57.340147] Freezing user space processes
> > [ 57.347470] Freezing user space processes completed (elapsed 0.007
> seconds)
> > [ 57.347501] OOM killer disabled.
> > [ 57.347508] Freezing remaining freezable tasks
> > [ 57.348834] Freezing remaining freezable tasks completed (elapsed
> 0.001 seconds)
> > [ 57.349932] 8<--- cut here ---
> > [ 57.349943] Unable to handle kernel NULL pointer dereference at
> virtual address 00000000 when write
> > [ 57.349960] [00000000] *pgd=00000000
> > [ 57.349986] Internal error: Oops: 805 [#1] PREEMPT SMP ARM
> > [ 57.350007] Modules linked in: tegra30_tsensor
> > [ 57.350033] CPU: 0 PID: 589 Comm: rtcwake Not tainted
> 6.3.0-rc1-00011-g03200b5ca3b4-dirty #3
> > [ 57.350057] Hardware name: NVIDIA Tegra SoC (Flattened Device Tree)
> > [ 57.350067] PC is at rcu_segcblist_enqueue+0x2c/0x38
> > [ 57.350120] LR is at srcu_gp_start_if_needed+0xe4/0x544
> > [ 57.350169] pc : [<c01a5120>] lr : [<c0198b5c>] psr: a0070093
> > [ 57.350183] sp : f0b2dd20 ip : 3b5870ef fp : 00000000
> > [ 57.350194] r10: ef787d84 r9 : 00000000 r8 : ef787d80
> > [ 57.350205] r7 : 80070013 r6 : c131ec30 r5 : ef787d40 r4 : f0b2dd64
> > [ 57.350217] r3 : 00000000 r2 : 00000000 r1 : f0b2dd64 r0 : ef787d84
> > [ 57.350230] Flags: NzCv IRQs off FIQs on Mode SVC_32 ISA ARM
> Segment none
> > [ 57.350251] Control: 10c5387d Table: 81d8004a DAC: 00000051
> > [ 57.350261] Register r0 information: non-slab/vmalloc memory
> > [ 57.350283] Register r1 information: 2-page vmalloc region starting at
> 0xf0b2c000 allocated at kernel_clone+0xb4/0x3e4
> > [ 57.350322] Register r2 information: NULL pointer
> > [ 57.350337] Register r3 information: NULL pointer
> > [ 57.350350] Register r4 information: 2-page vmalloc region starting at
> 0xf0b2c000 allocated at kernel_clone+0xb4/0x3e4
> > [ 57.350379] Register r5 information: non-slab/vmalloc memory
> > [ 57.350394] Register r6 information: non-slab/vmalloc memory
> > [ 57.350408] Register r7 information: non-paged memory
> > [ 57.350422] Register r8 information: non-slab/vmalloc memory
> > [ 57.350436] Register r9 information: NULL pointer
> > [ 57.350449] Register r10 information: non-slab/vmalloc memory
> > [ 57.350463] Register r11 information: NULL pointer
> > [ 57.350477] Register r12 information: non-paged memory
> > [ 57.350491] Process rtcwake (pid: 589, stack limit = 0x410bb531)
> > [ 57.350510] Stack: (0xf0b2dd20 to 0xf0b2e000)
> > [ 57.350534] dd20: 00000000 c1ee4a40 f0b2dd7c c0184f24 ef781495
> 3b5870ef c1ee4a40 c1ee4a40
> > [ 57.350555] dd40: c131ec30 00000000 00000002 c0f3d1fc c3542ac0
> c2abbb10 c1ee4a40 c0199044
> > [ 57.350574] dd60: 60070013 00000000 c0195924 00000000 00000000
> f0b2dd74 f0b2dd74 3b5870ef
> > [ 57.350592] dd80: 00000000 c131ebc0 c120ab28 c0146d9c c2785b94
> c2785b40 c0fee9f4 c0872590
> > [ 57.350611] dda0: c2785b40 c08c39cc c2785b40 c08c3a3c c2788c00
> c08c40b0 c0f3d1fc c066f028
> > [ 57.350630] ddc0: f0b2de14 c2788c00 c1325ef4 c08c1d40 c2788c00
> c1325ef4 c0fee9f4 c08c31cc
> > [ 57.350648] dde0: c13708a0 0000000d 00000000 c0681c10 c16afe84
> 00000002 56508788 0000000d
> > [ 57.350665] de00: 00000002 c13708a0 10624dd3 56409580 0000000d
> 00000000 00000002 c0f3d1fc
> > [ 57.350685] de20: c3542ac0 c2abbb10 c1ee4a40 c06824e4 00000000
> ffffa900 00000000 c1386510
> > [ 57.350703] de40: 00000003 00000003 c1204f75 c017e8a8 c3542ac0
> c2abbb10 00428228 c0171574
> > [ 57.350721] de60: 00000000 00000000 00000003 3b5870ef c1204f75
> 00000000 00000003 c137aeb4
> > [ 57.350739] de80: c1204f75 c0f3d1fc c3542ac0 c2abbb10 00428228
> c017f380 00000003 c0f38a54
> > [ 57.350757] dea0: 00000003 c1386524 00000004 c017d708 00000004
> c2abbb00 00000000 00000000
> > [ 57.350775] dec0: c3542ac0 f0b2df28 c2abbb10 c03305b4 00000000
> 00000000 c2953c00 c1ee4a40
> > [ 57.350794] dee0: 00429438 00000004 c0d18488 00004004 00000000
> c02b1094 00000a55 c1d80010
> > [ 57.350812] df00: c1d80010 00000000 00000000 f0b2df78 01010006
> 00000004 00000000 00429438
> > [ 57.350830] df20: 00000000 00000000 c2953c00 00000000 00000000
> 00000000 00000000 00000000
> > [ 57.350848] df40: 00000000 00004004 00000000 00000000 0000006c
> 3b5870ef c2953c00 c2953c00
> > [ 57.350866] df60: 00000000 00000000 c1ee4a40 00429438 00000004
> c02b12c8 00000000 00000000
> > [ 57.350885] df80: 00001008 3b5870ef 0000006c 00429438 00428228
> 00000004 c0100324 c1ee4a40
> > [ 57.350902] dfa0: 00000004 c01000c0 0000006c 00429438 00000004
> 00429438 00000004 00000000
> > [ 57.350920] dfc0: 0000006c 00429438 00428228 00000004 00000004
> 00000004 0041578c 00428228
> > [ 57.350938] dfe0: 00000004 becda9a8 b6e9bc0b b6e26206 600f0030
> 00000004 00000000 00000000
> > [ 57.350960] rcu_segcblist_enqueue from
> srcu_gp_start_if_needed+0xe4/0x544
> > [ 57.351023] srcu_gp_start_if_needed from
> __synchronize_srcu.part.6+0x70/0x98
> > [ 57.351084] __synchronize_srcu.part.6 from
> srcu_notifier_chain_unregister+0x6c/0xdc
> > [ 57.351155] srcu_notifier_chain_unregister from
> cpufreq_unregister_notifier+0x60/0xbc
> > [ 57.351215] cpufreq_unregister_notifier from
> tegra_actmon_pause.part.0+0x1c/0x54
> > [ 57.351277] tegra_actmon_pause.part.0 from tegra_actmon_stop+0x38/0x3c
> > [ 57.351324] tegra_actmon_stop from
> tegra_governor_event_handler+0x100/0x11c
> > [ 57.351373] tegra_governor_event_handler from
> devfreq_suspend_device+0x64/0xac
> > [ 57.351423] devfreq_suspend_device from devfreq_suspend+0x30/0x64
> > [ 57.351467] devfreq_suspend from dpm_suspend+0x34/0x33c
> > [ 57.351506] dpm_suspend from dpm_suspend_start+0x90/0x98
> > [ 57.351528] dpm_suspend_start from
> suspend_devices_and_enter+0xe4/0x93c
> > [ 57.351573] suspend_devices_and_enter from pm_suspend+0x280/0x3ac
> > [ 57.351614] pm_suspend from state_store+0x6c/0xc8
> > [ 57.351654] state_store from kernfs_fop_write_iter+0x118/0x1b4
> > [ 57.351696] kernfs_fop_write_iter from vfs_write+0x314/0x3d4
> > [ 57.351733] vfs_write from ksys_write+0xa0/0xd0
> > [ 57.351760] ksys_write from ret_fast_syscall+0x0/0x54
> > [ 57.351788] Exception stack(0xf0b2dfa8 to 0xf0b2dff0)
> > [ 57.351809] dfa0: 0000006c 00429438 00000004
> 00429438 00000004 00000000
> > [ 57.351828] dfc0: 0000006c 00429438 00428228 00000004 00000004
> 00000004 0041578c 00428228
> > [ 57.351843] dfe0: 00000004 becda9a8 b6e9bc0b b6e26206
> > [ 57.351863] Code: e2833001 e5803034 e5812000 e5903010 (e5831000)
> > [ 57.351875] ---[ end trace 0000000000000000 ]---
> >
> >
> > I have not dug into this yet and so wanted to see if you have any
> thoughts on this?
> >
>
> Hi, Jon
>
> Please try it:
>
> diff --git a/include/linux/notifier.h b/include/linux/notifier.h
> index 2aba75145144..3ce6b59e02e5 100644
> --- a/include/linux/notifier.h
> +++ b/include/linux/notifier.h
> @@ -110,6 +110,7 @@ extern void srcu_init_notifier_head(struct
> srcu_notifier_head *nh);
> { \
> .mutex = __MUTEX_INITIALIZER(name.mutex), \
> .head = NULL, \
> + .srcuu = __SRCU_USAGE_INIT(name.srcuu), \
> .srcu = __SRCU_STRUCT_INIT(name.srcu, name.srcuu, pcpu), \
> }
Thank you both!
Huh. It looks like Chen-Yu Tsai sent a patch to this effect and
AngeloGioacchino Del Regno tested it. No one has picked it up yet.
https://lore.kernel.org/all/20230526073539.339203-1-wenst@xxxxxxxxxxxx/
This is clearly a regression, and I don't see it in -next. I will pick
it up and send it along in a few days if Matthias or Rafael don't beat
me to it.
In the meantime, I would be happy to add Jon's Reported-by and Tested-by,
along with Qiang's Acked-by or Reviewed-by.
Thanx, Paul
------------------------------------------------------------------------
commit bf7da55fcdd1478839b21697cf0534be1f149a49
Author: Chen-Yu Tsai <wenst@xxxxxxxxxxxx>
Date: Fri May 26 15:35:37 2023 +0800
notifier: Initialize new struct srcu_usage field
In commit 95433f726301 ("srcu: Begin offloading srcu_struct fields to
srcu_update"), a new struct srcu_usage field was added, but was not
properly initialized. This led to a "spinlock bad magic" BUG when the
SRCU notifier was ever used. This was observed in the MediaTek CCI
devfreq driver on next-20230525. The trimmed stack trace is as follows:
BUG: spinlock bad magic on CPU#4, swapper/0/1
lock: 0xffffff80ff529ac0, .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0
Call trace:
spin_bug+0xa4/0xe8
do_raw_spin_lock+0xec/0x120
_raw_spin_lock_irqsave+0x78/0xb8
synchronize_srcu+0x3c/0x168
srcu_notifier_chain_unregister+0x5c/0xa0
cpufreq_unregister_notifier+0x94/0xe0
devfreq_passive_event_handler+0x7c/0x3e0
devfreq_remove_device+0x48/0xe8
Add __SRCU_USAGE_INIT() to SRCU_NOTIFIER_INIT() so that srcu_usage gets
initialized properly.
Fixes: 95433f726301 ("srcu: Begin offloading srcu_struct fields to srcu_update")
Signed-off-by: Chen-Yu Tsai <wenst@xxxxxxxxxxxx>
Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@xxxxxxxxxxxxx>
Cc: Matthias Brugger <matthias.bgg@xxxxxxxxx>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@xxxxxxxxx>
Cc: "Michał Mirosław" <mirq-linux@xxxxxxxxxxxx>
Cc: Dmitry Osipenko <dmitry.osipenko@xxxxxxxxxxxxx>
Cc: Sachin Sant <sachinp@xxxxxxxxxxxxx>
Cc: "Zhang, Qiang1" <qiang1.zhang@xxxxxxxxx>
Cc: Joel Fernandes (Google) <joel@xxxxxxxxxxxxxxxxx
Cc: Jon Hunter <jonathanh@xxxxxxxxxx>
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxx>
diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index 2aba75145144..86544707236a 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 = \
