Skip to content

Commit aebafc7

Browse files
committed
net: mana: Fix accessing freed irq affinity_hint
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2168970 commit 18a0483 Author: Haiyang Zhang <haiyangz@microsoft.com> Date: Mon Feb 6 13:28:49 2023 -0800 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: stable@vger.kernel.org Fixes: 71fa688 ("net: mana: Assign interrupts to CPUs based on NUMA nodes") Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Reviewed-by: Michael Kelley <mikelley@microsoft.com> Reviewed-by: Leon Romanovsky <leonro@nvidia.com> Link: https://lore.kernel.org/r/1675718929-19565-1-git-send-email-haiyangz@microsoft.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
1 parent 10c04c9 commit aebafc7

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
@@ -1207,9 +1207,7 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev)
12071207
unsigned int max_queues_per_port = num_online_cpus();
12081208
struct gdma_context *gc = pci_get_drvdata(pdev);
12091209
struct gdma_irq_context *gic;
1210-
unsigned int max_irqs;
1211-
u16 *cpus;
1212-
cpumask_var_t req_mask;
1210+
unsigned int max_irqs, cpu;
12131211
int nvec, irq;
12141212
int err, i = 0, j;
12151213

@@ -1230,39 +1228,24 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev)
12301228
goto free_irq_vector;
12311229
}
12321230

1233-
if (!zalloc_cpumask_var(&req_mask, GFP_KERNEL)) {
1234-
err = -ENOMEM;
1235-
goto free_irq;
1236-
}
1237-
1238-
cpus = kcalloc(nvec, sizeof(*cpus), GFP_KERNEL);
1239-
if (!cpus) {
1240-
err = -ENOMEM;
1241-
goto free_mask;
1242-
}
1243-
for (i = 0; i < nvec; i++)
1244-
cpus[i] = cpumask_local_spread(i, gc->numa_node);
1245-
12461231
for (i = 0; i < nvec; i++) {
1247-
cpumask_set_cpu(cpus[i], req_mask);
12481232
gic = &gc->irq_contexts[i];
12491233
gic->handler = NULL;
12501234
gic->arg = NULL;
12511235

12521236
irq = pci_irq_vector(pdev, i);
12531237
if (irq < 0) {
12541238
err = irq;
1255-
goto free_mask;
1239+
goto free_irq;
12561240
}
12571241

12581242
err = request_irq(irq, mana_gd_intr, 0, "mana_intr", gic);
12591243
if (err)
1260-
goto free_mask;
1261-
irq_set_affinity_and_hint(irq, req_mask);
1262-
cpumask_clear(req_mask);
1244+
goto free_irq;
1245+
1246+
cpu = cpumask_local_spread(i, gc->numa_node);
1247+
irq_set_affinity_and_hint(irq, cpumask_of(cpu));
12631248
}
1264-
free_cpumask_var(req_mask);
1265-
kfree(cpus);
12661249

12671250
err = mana_gd_alloc_res_map(nvec, &gc->msix_resource);
12681251
if (err)
@@ -1273,13 +1256,12 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev)
12731256

12741257
return 0;
12751258

1276-
free_mask:
1277-
free_cpumask_var(req_mask);
1278-
kfree(cpus);
12791259
free_irq:
12801260
for (j = i - 1; j >= 0; j--) {
12811261
irq = pci_irq_vector(pdev, j);
12821262
gic = &gc->irq_contexts[j];
1263+
1264+
irq_update_affinity_hint(irq, NULL);
12831265
free_irq(irq, gic);
12841266
}
12851267

@@ -1307,6 +1289,9 @@ static void mana_gd_remove_irqs(struct pci_dev *pdev)
13071289
continue;
13081290

13091291
gic = &gc->irq_contexts[i];
1292+
1293+
/* Need to clear the hint before free_irq */
1294+
irq_update_affinity_hint(irq, NULL);
13101295
free_irq(irq, gic);
13111296
}
13121297

0 commit comments

Comments
 (0)