Skip to content

Commit 94b3f0b

Browse files
rikvanrielpaulmckrcu
authored andcommitted
smp,csd: Throw an error if a CSD lock is stuck for too long
The CSD lock seems to get stuck in 2 "modes". When it gets stuck temporarily, it usually gets released in a few seconds, and sometimes up to one or two minutes. If the CSD lock stays stuck for more than several minutes, it never seems to get unstuck, and gradually more and more things in the system end up also getting stuck. In the latter case, we should just give up, so the system can dump out a little more information about what went wrong, and, with panic_on_oops and a kdump kernel loaded, dump a whole bunch more information about what might have gone wrong. In addition, there is an smp.panic_on_ipistall kernel boot parameter that by default retains the old behavior, but when set enables the panic after the CSD lock has been stuck for more than the specified number of milliseconds, as in 300,000 for five minutes. [ paulmck: Apply Imran Khan feedback. ] [ paulmck: Apply Leonardo Bras feedback. ] Link: https://lore.kernel.org/lkml/bc7cc8b0-f587-4451-8bcd-0daae627bcc7@paulmck-laptop/ Signed-off-by: Rik van Riel <riel@surriel.com> Signed-off-by: Paul E. McKenney <paulmck@kernel.org> Reviewed-by: Imran Khan <imran.f.khan@oracle.com> Reviewed-by: Leonardo Bras <leobras@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Valentin Schneider <vschneid@redhat.com> Cc: Juergen Gross <jgross@suse.com> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Randy Dunlap <rdunlap@infradead.org>
1 parent 0bb80ec commit 94b3f0b

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5858,6 +5858,13 @@
58585858
This feature may be more efficiently disabled
58595859
using the csdlock_debug- kernel parameter.
58605860

5861+
smp.panic_on_ipistall= [KNL]
5862+
If a csd_lock_timeout extends for more than
5863+
the specified number of milliseconds, panic the
5864+
system. By default, let CSD-lock acquisition
5865+
take as long as they take. Specifying 300,000
5866+
for this value provides a 5-minute timeout.
5867+
58615868
smsc-ircc2.nopnp [HW] Don't use PNP to discover SMC devices
58625869
smsc-ircc2.ircc_cfg= [HW] Device configuration I/O port
58635870
smsc-ircc2.ircc_sir= [HW] SIR base I/O port

kernel/smp.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@ static DEFINE_PER_CPU(void *, cur_csd_info);
170170

171171
static ulong csd_lock_timeout = 5000; /* CSD lock timeout in milliseconds. */
172172
module_param(csd_lock_timeout, ulong, 0444);
173+
static int panic_on_ipistall; /* CSD panic timeout in milliseconds, 300000 for five minutes. */
174+
module_param(panic_on_ipistall, int, 0444);
173175

174176
static atomic_t csd_bug_count = ATOMIC_INIT(0);
175177

@@ -230,6 +232,7 @@ static bool csd_lock_wait_toolong(struct __call_single_data *csd, u64 ts0, u64 *
230232
}
231233

232234
ts2 = sched_clock();
235+
/* How long since we last checked for a stuck CSD lock.*/
233236
ts_delta = ts2 - *ts1;
234237
if (likely(ts_delta <= csd_lock_timeout_ns || csd_lock_timeout_ns == 0))
235238
return false;
@@ -243,9 +246,17 @@ static bool csd_lock_wait_toolong(struct __call_single_data *csd, u64 ts0, u64 *
243246
else
244247
cpux = cpu;
245248
cpu_cur_csd = smp_load_acquire(&per_cpu(cur_csd, cpux)); /* Before func and info. */
249+
/* How long since this CSD lock was stuck. */
250+
ts_delta = ts2 - ts0;
246251
pr_alert("csd: %s non-responsive CSD lock (#%d) on CPU#%d, waiting %llu ns for CPU#%02d %pS(%ps).\n",
247-
firsttime ? "Detected" : "Continued", *bug_id, raw_smp_processor_id(), ts2 - ts0,
252+
firsttime ? "Detected" : "Continued", *bug_id, raw_smp_processor_id(), ts_delta,
248253
cpu, csd->func, csd->info);
254+
/*
255+
* If the CSD lock is still stuck after 5 minutes, it is unlikely
256+
* to become unstuck. Use a signed comparison to avoid triggering
257+
* on underflows when the TSC is out of sync between sockets.
258+
*/
259+
BUG_ON(panic_on_ipistall > 0 && (s64)ts_delta > ((s64)panic_on_ipistall * NSEC_PER_MSEC));
249260
if (cpu_cur_csd && csd != cpu_cur_csd) {
250261
pr_alert("\tcsd: CSD lock (#%d) handling prior %pS(%ps) request.\n",
251262
*bug_id, READ_ONCE(per_cpu(cur_csd_func, cpux)),

0 commit comments

Comments
 (0)