2023-01-19 21:31:41

by Haiyang Zhang

Subject: [PATCH net] 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]>
---
drivers/net/ethernet/microsoft/mana/gdma_main.c | 9 ++++++++-
include/net/mana/gdma.h | 3 +++
2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c
index e708c2d04983..b144f2237748 100644
--- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
+++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
@@ -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);
diff --git a/include/net/mana/gdma.h b/include/net/mana/gdma.h
index b3ba04615caa..56189e4252da 100644
--- a/include/net/mana/gdma.h
+++ b/include/net/mana/gdma.h
@@ -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 {
--
2.25.1

2023-01-20 03:03:34

by Jesse Brandeburg

Subject: Re: [PATCH net] net: mana: Fix IRQ name - add PCI and queue number

On 1/19/2023 12:59 PM, Haiyang Zhang wrote:
> 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]>

seems reasonable!

Reviewed-by: Jesse Brandeburg <[email protected]>

2023-01-21 02:50:34

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net] net: mana: Fix IRQ name - add PCI and queue number

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

On Thu, 19 Jan 2023 12:59:10 -0800 you wrote:
> 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]>
>
> [...]

Here is the summary with links:
- [net] net: mana: Fix IRQ name - add PCI and queue number
https://git.kernel.org/netdev/net/c/20e3028c39a5

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html