Skip to contentSkip to conversation

FAILED: patch "[PATCH] net: mana: Fix IRQ name - add PCI and queue number" failed to apply to 6.1-stable tree

PATCH [email protected] 2 participants 2 messages Jan 29, 2023

Subsystems (5)
Networking Network drivers Stable branch Hyper-V/Azure core and drivers +1 more subsystems
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

20e3028c39a5 ("net: mana: Fix IRQ name - add PCI and queue number")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 20e3028c39a5bf882e91e717da96d14f1acec40e Mon Sep 17 00:00:00 2001
From: Haiyang Zhang <[email protected]>
Date: Thu, 19 Jan 2023 12:59:10 -0800
Subject: [PATCH] net: mana: Fix IRQ name - add PCI and queue number

The PCI and queue number info is missing in IRQ names.

Add PCI and queue number to IRQ names, to allow CPU affinity tuning scripts to work.

Cc [email protected]
Fixes ca9c54d2d6a5 ("net: mana: Add a driver for Microsoft Azure Network Adapter (MANA)")
Signed-off-by Haiyang Zhang <[email protected]>
Reviewed-by Jesse Brandeburg <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Jakub Kicinski <[email protected]>
drivers/net/ethernet/microsoft/mana/gdma_main.c +8 -1
index e708c2d04983..b144f2237748 100644
@@ -1259,13 +1259,20 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev)
 		gic->handler = NULL;
 		gic->arg = NULL;
 
+		if (!i)
+			snprintf(gic->name, MANA_IRQ_NAME_SZ, "mana_hwc@pci:%s",
+				 pci_name(pdev));
+		else
+			snprintf(gic->name, MANA_IRQ_NAME_SZ, "mana_q%d@pci:%s",
+				 i - 1, pci_name(pdev));
+
 		irq = pci_irq_vector(pdev, i);
 		if (irq < 0) {
 			err = irq;
 			goto free_mask;
 		}
 
-		err = request_irq(irq, mana_gd_intr, 0, "mana_intr", gic);
+		err = request_irq(irq, mana_gd_intr, 0, gic->name, gic);
 		if (err)
 			goto free_mask;
 		irq_set_affinity_and_hint(irq, req_mask);
include/net/mana/gdma.h +3 -0
index b3ba04615caa..56189e4252da 100644
@@ -336,9 +336,12 @@ struct gdma_queue_spec {
 	};
 };
 
+#define MANA_IRQ_NAME_SZ 32
+
 struct gdma_irq_context {
 	void (*handler)(void *arg);
 	void *arg;
+	char name[MANA_IRQ_NAME_SZ];
 };
 
 struct gdma_context {
maintainer
#1 lore raw
Quoted 12 lines

-----Original Message-----
From: [email protected] <[email protected]>
Sent: Sunday, January 29, 2023 8:30 AM
To: Haiyang Zhang <[email protected]>; [email protected]; [email protected]
Cc: [email protected]
Subject: FAILED: patch "[PATCH] net: mana: Fix IRQ name - add PCI and queue number" failed to apply to 6.1-stable tree

Quoted 9 lines

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

20e3028c39a5 ("net: mana: Fix IRQ name - add PCI and queue number")

Will do.

Thanks,
- Haiyang