| Message ID | 20230519214602.3961912-1-ahmed.zaki@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Anthony Nguyen |
| Headers | show |
| Series | [iwl-net,v2] iavf: use internal state to free traffic IRQs | expand |
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of > Ahmed Zaki > Sent: piątek, 19 maja 2023 23:46 > To: intel-wired-lan@lists.osuosl.org > Subject: [Intel-wired-lan] [PATCH iwl-net v2] iavf: use internal state to free > traffic IRQs > > If the system tries to close the netdev while iavf_reset_task() is running, > __LINK_STATE_START will be cleared and netif_running() will return false in > iavf_reinit_interrupt_scheme(). This will result in > iavf_free_traffic_irqs() not being called and a leak as follows: > > [7632.489326] remove_proc_entry: removing non-empty directory > 'irq/999', leaking at least 'iavf-enp24s0f0v0-TxRx-0' > [7632.490214] WARNING: CPU: 0 PID: 10 at fs/proc/generic.c:718 > remove_proc_entry+0x19b/0x1b0 > > is shown when pci_disable_msix() is later called. Fix by using the internal > adapter state. The traffic IRQs will always exist if state == __IAVF_RUNNING. > > Fixes: 5b36e8d04b44 ("i40evf: Enable VF to request an alternate queue > allocation") > Signed-off-by: Ahmed Zaki <ahmed.zaki@intel.com> > --- > v2: update iavf_reinit_interrupt_scheme()'s kdoc description > --- > drivers/net/ethernet/intel/iavf/iavf_main.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c > b/drivers/net/ethernet/intel/iavf/iavf_main.c > index 1ad0fe7f6dda..89892a0fd5b7 100644 > --- a/drivers/net/ethernet/intel/iavf/iavf_main.c > +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c > @@ -1943,15 +1943,16 @@ static void iavf_free_rss(struct iavf_adapter > *adapter) > /** > * iavf_reinit_interrupt_scheme - Reallocate queues and vectors > * @adapter: board private structure > + * @running: true if adapter->state == __IAVF_RUNNING > * > * Returns 0 on success, negative on failure > **/ > -static int iavf_reinit_interrupt_scheme(struct iavf_adapter *adapter) > +static int iavf_reinit_interrupt_scheme(struct iavf_adapter *adapter, > +bool running) > { > struct net_device *netdev = adapter->netdev; > int err; > > - if (netif_running(netdev)) > + if (running) > iavf_free_traffic_irqs(adapter); > iavf_free_misc_irq(adapter); > iavf_reset_interrupt_capability(adapter); > @@ -3067,7 +3068,7 @@ static void iavf_reset_task(struct work_struct > *work) > > if ((adapter->flags & IAVF_FLAG_REINIT_MSIX_NEEDED) || > (adapter->flags & IAVF_FLAG_REINIT_ITR_NEEDED)) { > - err = iavf_reinit_interrupt_scheme(adapter); > + err = iavf_reinit_interrupt_scheme(adapter, running); > if (err) > goto reset_err; > } > -- > 2.34.1 > > _______________________________________________ > Intel-wired-lan mailing list > Intel-wired-lan@osuosl.org > https://lists.osuosl.org/mailman/listinfo/intel-wired-lan Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c index 1ad0fe7f6dda..89892a0fd5b7 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -1943,15 +1943,16 @@ static void iavf_free_rss(struct iavf_adapter *adapter) /** * iavf_reinit_interrupt_scheme - Reallocate queues and vectors * @adapter: board private structure + * @running: true if adapter->state == __IAVF_RUNNING * * Returns 0 on success, negative on failure **/ -static int iavf_reinit_interrupt_scheme(struct iavf_adapter *adapter) +static int iavf_reinit_interrupt_scheme(struct iavf_adapter *adapter, bool running) { struct net_device *netdev = adapter->netdev; int err; - if (netif_running(netdev)) + if (running) iavf_free_traffic_irqs(adapter); iavf_free_misc_irq(adapter); iavf_reset_interrupt_capability(adapter); @@ -3067,7 +3068,7 @@ static void iavf_reset_task(struct work_struct *work) if ((adapter->flags & IAVF_FLAG_REINIT_MSIX_NEEDED) || (adapter->flags & IAVF_FLAG_REINIT_ITR_NEEDED)) { - err = iavf_reinit_interrupt_scheme(adapter); + err = iavf_reinit_interrupt_scheme(adapter, running); if (err) goto reset_err; }
If the system tries to close the netdev while iavf_reset_task() is running, __LINK_STATE_START will be cleared and netif_running() will return false in iavf_reinit_interrupt_scheme(). This will result in iavf_free_traffic_irqs() not being called and a leak as follows: [7632.489326] remove_proc_entry: removing non-empty directory 'irq/999', leaking at least 'iavf-enp24s0f0v0-TxRx-0' [7632.490214] WARNING: CPU: 0 PID: 10 at fs/proc/generic.c:718 remove_proc_entry+0x19b/0x1b0 is shown when pci_disable_msix() is later called. Fix by using the internal adapter state. The traffic IRQs will always exist if state == __IAVF_RUNNING. Fixes: 5b36e8d04b44 ("i40evf: Enable VF to request an alternate queue allocation") Signed-off-by: Ahmed Zaki <ahmed.zaki@intel.com> --- v2: update iavf_reinit_interrupt_scheme()'s kdoc description --- drivers/net/ethernet/intel/iavf/iavf_main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)