Skip to content

Commit 26a01cb

Browse files
praritJiri Slaby
authored and
Jiri Slaby
committed
x86: Add check for number of available vectors before CPU down
commit da6139e upstream. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=64791 When a cpu is downed on a system, the irqs on the cpu are assigned to other cpus. It is possible, however, that when a cpu is downed there aren't enough free vectors on the remaining cpus to account for the vectors from the cpu that is being downed. This results in an interesting "overflow" condition where irqs are "assigned" to a CPU but are not handled. For example, when downing cpus on a 1-64 logical processor system: <snip> [ 232.021745] smpboot: CPU 61 is now offline [ 238.480275] smpboot: CPU 62 is now offline [ 245.991080] ------------[ cut here ]------------ [ 245.996270] WARNING: CPU: 0 PID: 0 at net/sched/sch_generic.c:264 dev_watchdog+0x246/0x250() [ 246.005688] NETDEV WATCHDOG: p786p1 (ixgbe): transmit queue 0 timed out [ 246.013070] Modules linked in: lockd sunrpc iTCO_wdt iTCO_vendor_support sb_edac ixgbe microcode e1000e pcspkr joydev edac_core lpc_ich ioatdma ptp mdio mfd_core i2c_i801 dca pps_core i2c_core wmi acpi_cpufreq isci libsas scsi_transport_sas [ 246.037633] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.12.0+ #14 [ 246.044451] Hardware name: Intel Corporation S4600LH ........../SVRBD-ROW_T, BIOS SE5C600.86B.01.08.0003.022620131521 02/26/2013 [ 246.057371] 0000000000000009 ffff88081fa03d40 ffffffff8164fbf6 ffff88081fa0ee48 [ 246.065728] ffff88081fa03d90 ffff88081fa03d80 ffffffff81054ecc ffff88081fa13040 [ 246.074073] 0000000000000000 ffff88200cce0000 0000000000000040 0000000000000000 [ 246.082430] Call Trace: [ 246.085174] <IRQ> [<ffffffff8164fbf6>] dump_stack+0x46/0x58 [ 246.091633] [<ffffffff81054ecc>] warn_slowpath_common+0x8c/0xc0 [ 246.098352] [<ffffffff81054fb6>] warn_slowpath_fmt+0x46/0x50 [ 246.104786] [<ffffffff815710d6>] dev_watchdog+0x246/0x250 [ 246.110923] [<ffffffff81570e90>] ? dev_deactivate_queue.constprop.31+0x80/0x80 [ 246.119097] [<ffffffff8106092a>] call_timer_fn+0x3a/0x110 [ 246.125224] [<ffffffff8106280f>] ? update_process_times+0x6f/0x80 [ 246.132137] [<ffffffff81570e90>] ? dev_deactivate_queue.constprop.31+0x80/0x80 [ 246.140308] [<ffffffff81061db0>] run_timer_softirq+0x1f0/0x2a0 [ 246.146933] [<ffffffff81059a80>] __do_softirq+0xe0/0x220 [ 246.152976] [<ffffffff8165fedc>] call_softirq+0x1c/0x30 [ 246.158920] [<ffffffff810045f5>] do_softirq+0x55/0x90 [ 246.164670] [<ffffffff81059d35>] irq_exit+0xa5/0xb0 [ 246.170227] [<ffffffff8166062a>] smp_apic_timer_interrupt+0x4a/0x60 [ 246.177324] [<ffffffff8165f40a>] apic_timer_interrupt+0x6a/0x70 [ 246.184041] <EOI> [<ffffffff81505a1b>] ? cpuidle_enter_state+0x5b/0xe0 [ 246.191559] [<ffffffff81505a17>] ? cpuidle_enter_state+0x57/0xe0 [ 246.198374] [<ffffffff81505b5d>] cpuidle_idle_call+0xbd/0x200 [ 246.204900] [<ffffffff8100b7ae>] arch_cpu_idle+0xe/0x30 [ 246.210846] [<ffffffff810a47b0>] cpu_startup_entry+0xd0/0x250 [ 246.217371] [<ffffffff81646b47>] rest_init+0x77/0x80 [ 246.223028] [<ffffffff81d09e8e>] start_kernel+0x3ee/0x3fb [ 246.229165] [<ffffffff81d0989f>] ? repair_env_string+0x5e/0x5e [ 246.235787] [<ffffffff81d095a5>] x86_64_start_reservations+0x2a/0x2c [ 246.242990] [<ffffffff81d0969f>] x86_64_start_kernel+0xf8/0xfc [ 246.249610] ---[ end trace fb74fdef54d79039 ]--- [ 246.254807] ixgbe 0000:c2:00.0 p786p1: initiating reset due to tx timeout [ 246.262489] ixgbe 0000:c2:00.0 p786p1: Reset adapter Last login: Mon Nov 11 08:35:14 from 10.18.17.119 [root@(none) ~]# [ 246.792676] ixgbe 0000:c2:00.0 p786p1: detected SFP+: 5 [ 249.231598] ixgbe 0000:c2:00.0 p786p1: NIC Link is Up 10 Gbps, Flow Control: RX/TX [ 246.792676] ixgbe 0000:c2:00.0 p786p1: detected SFP+: 5 [ 249.231598] ixgbe 0000:c2:00.0 p786p1: NIC Link is Up 10 Gbps, Flow Control: RX/TX (last lines keep repeating. ixgbe driver is dead until module reload.) If the downed cpu has more vectors than are free on the remaining cpus on the system, it is possible that some vectors are "orphaned" even though they are assigned to a cpu. In this case, since the ixgbe driver had a watchdog, the watchdog fired and notified that something was wrong. This patch adds a function, check_vectors(), to compare the number of vectors on the CPU going down and compares it to the number of vectors available on the system. If there aren't enough vectors for the CPU to go down, an error is returned and propogated back to userspace. v2: Do not need to look at percpu irqs v3: Need to check affinity to prevent counting of MSIs in IOAPIC Lowest Priority Mode v4: Additional changes suggested by Gong Chen. v5/v6/v7/v8: Updated comment text Signed-off-by: Prarit Bhargava <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Reviewed-by: Gong Chen <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Michel Lespinasse <[email protected]> Cc: Seiji Aguchi <[email protected]> Cc: Yang Zhang <[email protected]> Cc: Paul Gortmaker <[email protected]> Cc: Janet Morgan <[email protected]> Cc: Tony Luck <[email protected]> Cc: Ruiv Wang <[email protected]> Cc: Gong Chen <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]> Cc: <[email protected]> Signed-off-by: Jiri Slaby <[email protected]>
1 parent d8804ba commit 26a01cb

File tree

3 files changed

+77
-0
lines changed

3 files changed

+77
-0
lines changed

arch/x86/include/asm/irq.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ extern void irq_ctx_init(int cpu);
2525

2626
#ifdef CONFIG_HOTPLUG_CPU
2727
#include <linux/cpumask.h>
28+
extern int check_irq_vectors_for_cpu_disable(void);
2829
extern void fixup_irqs(void);
2930
extern void irq_force_complete_move(int);
3031
#endif

arch/x86/kernel/irq.c

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,76 @@ __visible void smp_trace_x86_platform_ipi(struct pt_regs *regs)
262262
EXPORT_SYMBOL_GPL(vector_used_by_percpu_irq);
263263

264264
#ifdef CONFIG_HOTPLUG_CPU
265+
/*
266+
* This cpu is going to be removed and its vectors migrated to the remaining
267+
* online cpus. Check to see if there are enough vectors in the remaining cpus.
268+
* This function is protected by stop_machine().
269+
*/
270+
int check_irq_vectors_for_cpu_disable(void)
271+
{
272+
int irq, cpu;
273+
unsigned int this_cpu, vector, this_count, count;
274+
struct irq_desc *desc;
275+
struct irq_data *data;
276+
struct cpumask affinity_new, online_new;
277+
278+
this_cpu = smp_processor_id();
279+
cpumask_copy(&online_new, cpu_online_mask);
280+
cpu_clear(this_cpu, online_new);
281+
282+
this_count = 0;
283+
for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS; vector++) {
284+
irq = __this_cpu_read(vector_irq[vector]);
285+
if (irq >= 0) {
286+
desc = irq_to_desc(irq);
287+
data = irq_desc_get_irq_data(desc);
288+
cpumask_copy(&affinity_new, data->affinity);
289+
cpu_clear(this_cpu, affinity_new);
290+
291+
/* Do not count inactive or per-cpu irqs. */
292+
if (!irq_has_action(irq) || irqd_is_per_cpu(data))
293+
continue;
294+
295+
/*
296+
* A single irq may be mapped to multiple
297+
* cpu's vector_irq[] (for example IOAPIC cluster
298+
* mode). In this case we have two
299+
* possibilities:
300+
*
301+
* 1) the resulting affinity mask is empty; that is
302+
* this the down'd cpu is the last cpu in the irq's
303+
* affinity mask, or
304+
*
305+
* 2) the resulting affinity mask is no longer
306+
* a subset of the online cpus but the affinity
307+
* mask is not zero; that is the down'd cpu is the
308+
* last online cpu in a user set affinity mask.
309+
*/
310+
if (cpumask_empty(&affinity_new) ||
311+
!cpumask_subset(&affinity_new, &online_new))
312+
this_count++;
313+
}
314+
}
315+
316+
count = 0;
317+
for_each_online_cpu(cpu) {
318+
if (cpu == this_cpu)
319+
continue;
320+
for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS;
321+
vector++) {
322+
if (per_cpu(vector_irq, cpu)[vector] < 0)
323+
count++;
324+
}
325+
}
326+
327+
if (count < this_count) {
328+
pr_warn("CPU %d disable failed: CPU has %u vectors assigned and there are only %u available.\n",
329+
this_cpu, this_count, count);
330+
return -ERANGE;
331+
}
332+
return 0;
333+
}
334+
265335
/* A cpu has been removed from cpu_online_mask. Reset irq affinities. */
266336
void fixup_irqs(void)
267337
{

arch/x86/kernel/smpboot.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,6 +1317,12 @@ void cpu_disable_common(void)
13171317

13181318
int native_cpu_disable(void)
13191319
{
1320+
int ret;
1321+
1322+
ret = check_irq_vectors_for_cpu_disable();
1323+
if (ret)
1324+
return ret;
1325+
13201326
clear_local_APIC();
13211327

13221328
cpu_disable_common();

0 commit comments

Comments
 (0)