Skip to content

Commit 18a0483

Browse files
haiyangzkuba-moo
authored andcommitted
net: mana: Fix accessing freed irq affinity_hint
After calling irq_set_affinity_and_hint(), the cpumask pointer is saved in desc->affinity_hint, and will be used later when reading /proc/irq/<num>/affinity_hint. So the cpumask variable needs to be persistent. Otherwise, we are accessing freed memory when reading the affinity_hint file. Also, need to clear affinity_hint before free_irq(), otherwise there is a one-time warning and stack trace during module unloading: [ 243.948687] WARNING: CPU: 10 PID: 1589 at kernel/irq/manage.c:1913 free_irq+0x318/0x360 ... [ 243.948753] Call Trace: [ 243.948754] <TASK> [ 243.948760] mana_gd_remove_irqs+0x78/0xc0 [mana] [ 243.948767] mana_gd_remove+0x3e/0x80 [mana] [ 243.948773] pci_device_remove+0x3d/0xb0 [ 243.948778] device_remove+0x46/0x70 [ 243.948782] device_release_driver_internal+0x1fe/0x280 [ 243.948785] driver_detach+0x4e/0xa0 [ 243.948787] bus_remove_driver+0x70/0xf0 [ 243.948789] driver_unregister+0x35/0x60 [ 243.948792] pci_unregister_driver+0x44/0x90 [ 243.948794] mana_driver_exit+0x14/0x3fe [mana] [ 243.948800] __do_sys_delete_module.constprop.0+0x185/0x2f0 To fix the bug, use the persistent mask, cpumask_of(cpu#), and set affinity_hint to NULL before freeing the IRQ, as required by free_irq(). Cc: [email protected] Fixes: 71fa688 ("net: mana: Assign interrupts to CPUs based on NUMA nodes") Signed-off-by: Haiyang Zhang <[email protected]> Reviewed-by: Michael Kelley <[email protected]> Reviewed-by: Leon Romanovsky <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent b1f4fba commit 18a0483

File tree

1 file changed

+11
-26
lines changed

1 file changed

+11
-26
lines changed

drivers/net/ethernet/microsoft/mana/gdma_main.c

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,9 +1217,7 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev)
12171217
unsigned int max_queues_per_port = num_online_cpus();
12181218
struct gdma_context *gc = pci_get_drvdata(pdev);
12191219
struct gdma_irq_context *gic;
1220-
unsigned int max_irqs;
1221-
u16 *cpus;
1222-
cpumask_var_t req_mask;
1220+
unsigned int max_irqs, cpu;
12231221
int nvec, irq;
12241222
int err, i = 0, j;
12251223

@@ -1240,21 +1238,7 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev)
12401238
goto free_irq_vector;
12411239
}
12421240

1243-
if (!zalloc_cpumask_var(&req_mask, GFP_KERNEL)) {
1244-
err = -ENOMEM;
1245-
goto free_irq;
1246-
}
1247-
1248-
cpus = kcalloc(nvec, sizeof(*cpus), GFP_KERNEL);
1249-
if (!cpus) {
1250-
err = -ENOMEM;
1251-
goto free_mask;
1252-
}
1253-
for (i = 0; i < nvec; i++)
1254-
cpus[i] = cpumask_local_spread(i, gc->numa_node);
1255-
12561241
for (i = 0; i < nvec; i++) {
1257-
cpumask_set_cpu(cpus[i], req_mask);
12581242
gic = &gc->irq_contexts[i];
12591243
gic->handler = NULL;
12601244
gic->arg = NULL;
@@ -1269,17 +1253,16 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev)
12691253
irq = pci_irq_vector(pdev, i);
12701254
if (irq < 0) {
12711255
err = irq;
1272-
goto free_mask;
1256+
goto free_irq;
12731257
}
12741258

12751259
err = request_irq(irq, mana_gd_intr, 0, gic->name, gic);
12761260
if (err)
1277-
goto free_mask;
1278-
irq_set_affinity_and_hint(irq, req_mask);
1279-
cpumask_clear(req_mask);
1261+
goto free_irq;
1262+
1263+
cpu = cpumask_local_spread(i, gc->numa_node);
1264+
irq_set_affinity_and_hint(irq, cpumask_of(cpu));
12801265
}
1281-
free_cpumask_var(req_mask);
1282-
kfree(cpus);
12831266

12841267
err = mana_gd_alloc_res_map(nvec, &gc->msix_resource);
12851268
if (err)
@@ -1290,13 +1273,12 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev)
12901273

12911274
return 0;
12921275

1293-
free_mask:
1294-
free_cpumask_var(req_mask);
1295-
kfree(cpus);
12961276
free_irq:
12971277
for (j = i - 1; j >= 0; j--) {
12981278
irq = pci_irq_vector(pdev, j);
12991279
gic = &gc->irq_contexts[j];
1280+
1281+
irq_update_affinity_hint(irq, NULL);
13001282
free_irq(irq, gic);
13011283
}
13021284

@@ -1324,6 +1306,9 @@ static void mana_gd_remove_irqs(struct pci_dev *pdev)
13241306
continue;
13251307

13261308
gic = &gc->irq_contexts[i];
1309+
1310+
/* Need to clear the hint before free_irq */
1311+
irq_update_affinity_hint(irq, NULL);
13271312
free_irq(irq, gic);
13281313
}
13291314

0 commit comments

Comments
 (0)