net: thunderx: Do not invoke pci_irq_vector() from interrupt context
Subsystems (3)
PATCH 1/1 net: thunderx: Do not invoke pci_irq_vector() from interrupt context
pci_irq_vector() can't be used in atomic context any longer. This conflicts with the usage of this function in nic_mbx_intr_handler().
Cache the Linux interrupt numbers in struct nicpf and use that cache in the interrupt handler to select the mailbox.
--- drivers/net/ethernet/cavium/thunder/nic_main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/cavium/thunder/nic_main.c +8 -8
@@ -59,7 +59,7 @@ struct nicpf {/* MSI-X */ u8 num_vec; -bool irq_allocated[NIC_PF_MSIX_VECTORS ]; +unsigned int irq_allocated[NIC_PF_MSIX_VECTORS ];char irq_name[NIC_PF_MSIX_VECTORS ][20 ]; };
@@ -1150,7 +1150,7 @@ static irqreturn_t nic_mbx_intr_handler(u64 intr;u8 vf; -if (irq ==pci_irq_vector (nic->pdev,NIC_PF_INTR_ID_MBOX0 )) +if (irq == nic->irq_allocated[NIC_PF_INTR_ID_MBOX0 ]) mbx =0 ;else mbx =1 ;
@@ -1176,14 +1176,14 @@ static void nic_free_all_interrupts(strufor (irq =0 ; irq < nic->num_vec; irq++) {if (nic->irq_allocated[irq]) -free_irq (pci_irq_vector (nic->pdev, irq), nic); - nic->irq_allocated[irq] = false; +free_irq (nic->irq_allocated[irq], nic); + nic->irq_allocated[irq] =0 ; } }static int nic_register_interrupts (struct nicpf *nic) { -int i, ret; +int i, ret, irq; nic->num_vec =pci_msix_vec_count (nic->pdev);/* Enable MSI-X */
@@ -1201,13 +1201,13 @@ static int nic_register_interrupts(strucsprintf (nic->irq_name[i],"NICPF Mbox%d" , (i -NIC_PF_INTR_ID_MBOX0 )); - ret =request_irq (pci_irq_vector (nic->pdev, i), - nic_mbx_intr_handler,0 , + irq =pci_irq_vector (nic->pdev, i); + ret =request_irq (irq, nic_mbx_intr_handler,0 , nic->irq_name[i], nic);if (ret) goto fail; - nic->irq_allocated[i] = true; + nic->irq_allocated[i] = irq; }/* Enable mailbox interrupt */
Re: ['[PATCH] net: thunderx: Do not invoke pci_irq_vector() from\n interrupt context', '']
This patch was applied to netdev/net.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:
Quoted 17 lines · On Fri, 29 Apr 2022 15:54:24 +0200 you wrote:
pci_irq_vector()can't be used in atomic context any longer. This conflicts with the usage of this function innic_mbx_intr_handler().Cache the Linux interrupt numbers in struct nicpf and use that cache in the interrupt handler to select the mailbox.
Fixes 495c66aca3da ("genirq/msi: Convert to new functions")Reported-by Ondrej Mosnacek <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>Cc Sunil Goutham <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Paolo Abeni <[email protected]>
Quoted 1 line
[...]
Here is the summary with links:
- net: thunderx: Do not invoke pci_irq_vector() from interrupt context
https://git.kernel.org/netdev/net/c/6b292a04c694
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Re: ['[PATCH] net: thunderx: Do not invoke pci_irq_vector() from\n interrupt context', '']
Hi David,
Quoted 24 lines · On Sun, May 1, 2022 at 6:10 PM <[email protected]> wrote:
Hello:
This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:Quoted 17 lines · On Fri, 29 Apr 2022 15:54:24 +0200 you wrote:
pci_irq_vector()can't be used in atomic context any longer. This conflicts with the usage of this function innic_mbx_intr_handler().Cache the Linux interrupt numbers in struct nicpf and use that cache in the interrupt handler to select the mailbox.
Fixes 495c66aca3da ("genirq/msi: Convert to new functions")Reported-by Ondrej Mosnacek <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>Cc Sunil Goutham <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Paolo Abeni <[email protected]>
Quoted 5 lines
Quoted 1 line
[...]
Here is the summary with links:
- net: thunderx: Do not invokepci_irq_vector()from interrupt contexthttps://git.kernel.org/netdev/net/c/6b292a04c694
It seems the patch got mangled when applying? The commit is missing the subject line.
--
Ondrej Mosnacek
Software Engineer, Linux Security - SELinux kernel Red Hat, Inc.
Re: ['[PATCH] net: thunderx: Do not invoke pci_irq_vector() from\n interrupt context', '']
Quoted 7 lines · Ondrej Mosnacek
Quoted 3 lines · On Sun, May 1, 2022 at 6:10 PM <[email protected]> wrote:
Here is the summary with links:
- net: thunderx: Do not invokepci_irq_vector()from interrupt contexthttps://git.kernel.org/netdev/net/c/6b292a04c694It seems the patch got mangled when applying? The commit is missing the subject line.
Probably my fault. I somehow managed to have the proper Subject: line and another empty 'Subject:' header in that mail.
Thanks,
tglx