Skip to content

Commit 9f244e9

Browse files
Seiji Aguchiaegl
authored andcommitted
pstore: Avoid deadlock in panic and emergency-restart path
[Issue] When pstore is in panic and emergency-restart paths, it may be blocked in those paths because it simply takes spin_lock. This is an example scenario which pstore may hang up in a panic path: - cpuA grabs psinfo->buf_lock - cpuB panics and calls smp_send_stop - smp_send_stop sends IRQ to cpuA - after 1 second, cpuB gives up on cpuA and sends an NMI instead - cpuA is now in an NMI handler while still holding buf_lock - cpuB is deadlocked This case may happen if a firmware has a bug and cpuA is stuck talking with it more than one second. Also, this is a similar scenario in an emergency-restart path: - cpuA grabs psinfo->buf_lock and stucks in a firmware - cpuB kicks emergency-restart via either sysrq-b or hangcheck timer. And then, cpuB is deadlocked by taking psinfo->buf_lock again. [Solution] This patch avoids the deadlocking issues in both panic and emergency_restart paths by introducing a function, is_non_blocking_path(), to check if a cpu can be blocked in current path. With this patch, pstore is not blocked even if another cpu has taken a spin_lock, in those paths by changing from spin_lock_irqsave to spin_trylock_irqsave. In addition, according to a comment of emergency_restart() in kernel/sys.c, spin_lock shouldn't be taken in an emergency_restart path to avoid deadlock. This patch fits the comment below. <snip> /** * emergency_restart - reboot the system * * Without shutting down any hardware or taking any locks * reboot the system. This is called when we know we are in * trouble so this is our best effort to reboot. This is * safe to call in interrupt context. */ void emergency_restart(void) <snip> Signed-off-by: Seiji Aguchi <[email protected]> Acked-by: Don Zickus <[email protected]> Signed-off-by: Tony Luck <[email protected]>
1 parent d1c3ed6 commit 9f244e9

File tree

2 files changed

+35
-6
lines changed

2 files changed

+35
-6
lines changed

fs/pstore/platform.c

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,27 @@ static const char *get_reason_str(enum kmsg_dump_reason reason)
9696
}
9797
}
9898

99+
bool pstore_cannot_block_path(enum kmsg_dump_reason reason)
100+
{
101+
/*
102+
* In case of NMI path, pstore shouldn't be blocked
103+
* regardless of reason.
104+
*/
105+
if (in_nmi())
106+
return true;
107+
108+
switch (reason) {
109+
/* In panic case, other cpus are stopped by smp_send_stop(). */
110+
case KMSG_DUMP_PANIC:
111+
/* Emergency restart shouldn't be blocked by spin lock. */
112+
case KMSG_DUMP_EMERG:
113+
return true;
114+
default:
115+
return false;
116+
}
117+
}
118+
EXPORT_SYMBOL_GPL(pstore_cannot_block_path);
119+
99120
/*
100121
* callback from kmsg_dump. (s2,l2) has the most recently
101122
* written bytes, older bytes are in (s1,l1). Save as much
@@ -114,10 +135,12 @@ static void pstore_dump(struct kmsg_dumper *dumper,
114135

115136
why = get_reason_str(reason);
116137

117-
if (in_nmi()) {
118-
is_locked = spin_trylock(&psinfo->buf_lock);
119-
if (!is_locked)
120-
pr_err("pstore dump routine blocked in NMI, may corrupt error record\n");
138+
if (pstore_cannot_block_path(reason)) {
139+
is_locked = spin_trylock_irqsave(&psinfo->buf_lock, flags);
140+
if (!is_locked) {
141+
pr_err("pstore dump routine blocked in %s path, may corrupt error record\n"
142+
, in_nmi() ? "NMI" : why);
143+
}
121144
} else
122145
spin_lock_irqsave(&psinfo->buf_lock, flags);
123146
oopscount++;
@@ -143,9 +166,9 @@ static void pstore_dump(struct kmsg_dumper *dumper,
143166
total += hsize + len;
144167
part++;
145168
}
146-
if (in_nmi()) {
169+
if (pstore_cannot_block_path(reason)) {
147170
if (is_locked)
148-
spin_unlock(&psinfo->buf_lock);
171+
spin_unlock_irqrestore(&psinfo->buf_lock, flags);
149172
} else
150173
spin_unlock_irqrestore(&psinfo->buf_lock, flags);
151174
}

include/linux/pstore.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,18 @@ struct pstore_info {
6868

6969
#ifdef CONFIG_PSTORE
7070
extern int pstore_register(struct pstore_info *);
71+
extern bool pstore_cannot_block_path(enum kmsg_dump_reason reason);
7172
#else
7273
static inline int
7374
pstore_register(struct pstore_info *psi)
7475
{
7576
return -ENODEV;
7677
}
78+
static inline bool
79+
pstore_cannot_block_path(enum kmsg_dump_reason reason)
80+
{
81+
return false;
82+
}
7783
#endif
7884

7985
#endif /*_LINUX_PSTORE_H*/

0 commit comments

Comments
 (0)