Patchwork [net,v3] sfc: fix calling of free_irq with already free vector

login
register
mail settings
Submitter Nikolay Aleksandrov
Date May 9, 2014, 9:11 a.m.
Message ID <1399626699-7181-1-git-send-email-nikolay@redhat.com>
Download mbox | patch
Permalink /patch/347352/
State Accepted
Delegated to: David Miller
Headers show

Comments

Nikolay Aleksandrov - May 9, 2014, 9:11 a.m.
If the sfc driver is in legacy interrupt mode (either explicitly by
using interrupt_mode module param or by falling back to it) it will
hit a warning at kernel/irq/manage.c because it will try to free an irq
which wasn't allocated by it in the first place because the MSI(X) irqs are
zero and it'll try to free them unconditionally. So fix it by checking if
we're in legacy mode and freeing the appropriate irqs.

CC: Zenghui Shi <zshi@redhat.com>
CC: Ben Hutchings <ben@decadent.org.uk>
CC: <linux-net-drivers@solarflare.com>
CC: Shradha Shah <sshah@solarflare.com>
CC: David S. Miller <davem@davemloft.net>

Fixes: 1899c111a535 ("sfc: Fix IRQ cleanup in case of a probe failure")
Reported-by: Zenghui Shi <zshi@redhat.com>
Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
---
v3: Use the EFX_INT_MODE_USE_MSI macro instead of direct check
as suggested by Ben
v2: Change the fix to check for the interrupt mode and adjust the
commit message.

 drivers/net/ethernet/sfc/nic.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
Shradha Shah - May 9, 2014, 9:25 a.m.
On 09/05/14 10:11, Nikolay Aleksandrov wrote:
> If the sfc driver is in legacy interrupt mode (either explicitly by
> using interrupt_mode module param or by falling back to it) it will
> hit a warning at kernel/irq/manage.c because it will try to free an irq
> which wasn't allocated by it in the first place because the MSI(X) irqs are
> zero and it'll try to free them unconditionally. So fix it by checking if
> we're in legacy mode and freeing the appropriate irqs.
>
> CC: Zenghui Shi <zshi@redhat.com>
> CC: Ben Hutchings <ben@decadent.org.uk>
> CC: <linux-net-drivers@solarflare.com>
> CC: Shradha Shah <sshah@solarflare.com>
> CC: David S. Miller <davem@davemloft.net>
>
> Fixes: 1899c111a535 ("sfc: Fix IRQ cleanup in case of a probe failure")
> Reported-by: Zenghui Shi <zshi@redhat.com>
> Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>

Acked-by: Shradha Shah <sshah@solarflare.com>

> ---
> v3: Use the EFX_INT_MODE_USE_MSI macro instead of direct check
> as suggested by Ben
> v2: Change the fix to check for the interrupt mode and adjust the
> commit message.
>
>  drivers/net/ethernet/sfc/nic.c | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c
> index 32d969e857f7..89b83e59e1dc 100644
> --- a/drivers/net/ethernet/sfc/nic.c
> +++ b/drivers/net/ethernet/sfc/nic.c
> @@ -156,13 +156,15 @@ void efx_nic_fini_interrupt(struct efx_nic *efx)
>       efx->net_dev->rx_cpu_rmap = NULL;
>  #endif
>
> -     /* Disable MSI/MSI-X interrupts */
> -     efx_for_each_channel(channel, efx)
> -             free_irq(channel->irq, &efx->msi_context[channel->channel]);
> -
> -     /* Disable legacy interrupt */
> -     if (efx->legacy_irq)
> +     if (EFX_INT_MODE_USE_MSI(efx)) {
> +             /* Disable MSI/MSI-X interrupts */
> +             efx_for_each_channel(channel, efx)
> +                     free_irq(channel->irq,
> +                              &efx->msi_context[channel->channel]);
> +     } else {
> +             /* Disable legacy interrupt */
>               free_irq(efx->legacy_irq, efx);
> +     }
>  }
>
>  /* Register dump */
>
The information contained in this message is confidential and is intended for the addressee(s) only. If you have received this message in error, please notify the sender immediately and delete the message. Unless you are an addressee (or authorized to receive for an addressee), you may not use, copy or disclose to anyone this message or any information contained in this message. The unauthorized use, disclosure, copying or alteration of this message is strictly prohibited.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - May 12, 2014, 6:57 p.m.
From: Nikolay Aleksandrov <nikolay@redhat.com>
Date: Fri,  9 May 2014 11:11:39 +0200

> If the sfc driver is in legacy interrupt mode (either explicitly by
> using interrupt_mode module param or by falling back to it) it will
> hit a warning at kernel/irq/manage.c because it will try to free an irq
> which wasn't allocated by it in the first place because the MSI(X) irqs are
> zero and it'll try to free them unconditionally. So fix it by checking if
> we're in legacy mode and freeing the appropriate irqs.
> 
> CC: Zenghui Shi <zshi@redhat.com>
> CC: Ben Hutchings <ben@decadent.org.uk>
> CC: <linux-net-drivers@solarflare.com>
> CC: Shradha Shah <sshah@solarflare.com>
> CC: David S. Miller <davem@davemloft.net>
> 
> Fixes: 1899c111a535 ("sfc: Fix IRQ cleanup in case of a probe failure")
> Reported-by: Zenghui Shi <zshi@redhat.com>
> Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
> ---
> v3: Use the EFX_INT_MODE_USE_MSI macro instead of direct check
> as suggested by Ben
> v2: Change the fix to check for the interrupt mode and adjust the
> commit message.

Applied and queued up for -stable, thanks Nikolay.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c
index 32d969e857f7..89b83e59e1dc 100644
--- a/drivers/net/ethernet/sfc/nic.c
+++ b/drivers/net/ethernet/sfc/nic.c
@@ -156,13 +156,15 @@  void efx_nic_fini_interrupt(struct efx_nic *efx)
 	efx->net_dev->rx_cpu_rmap = NULL;
 #endif
 
-	/* Disable MSI/MSI-X interrupts */
-	efx_for_each_channel(channel, efx)
-		free_irq(channel->irq, &efx->msi_context[channel->channel]);
-
-	/* Disable legacy interrupt */
-	if (efx->legacy_irq)
+	if (EFX_INT_MODE_USE_MSI(efx)) {
+		/* Disable MSI/MSI-X interrupts */
+		efx_for_each_channel(channel, efx)
+			free_irq(channel->irq,
+				 &efx->msi_context[channel->channel]);
+	} else {
+		/* Disable legacy interrupt */
 		free_irq(efx->legacy_irq, efx);
+	}
 }
 
 /* Register dump */