* [PATCH] i40e: Fix error handling code of label err_set_queues
@ 2021-07-13 12:20 Dongliang Mu
2021-07-13 15:16 ` Shannon Nelson
0 siblings, 1 reply; 3+ messages in thread
From: Dongliang Mu @ 2021-07-13 12:20 UTC (permalink / raw)
To: Jesse Brandeburg, Tony Nguyen, David S. Miller, Jakub Kicinski,
Dinghao Liu, Jeff Kirsher, Shannon Nelson, Catherine Sullivan
Cc: Dongliang Mu, intel-wired-lan, netdev, linux-kernel
If i40e_up_complete fails in i40e_vsi_open, it goes to err_up_complete.
The label err_set_queues has an issue: if the else branch is executed,
there is no need to execute i40e_vsi_request_irq.
Fix this by adding a condition of i40e_vsi_free_irq.
Reported-by: Dongliang Mu (mudongliangabcd@gmail.com)
Fixes: 9c04cfcd4aad ("i40e: Fix error handling in i40e_vsi_open")
Fixes: c22e3c6c7912 ("i40e: prep vsi_open logic for non-netdev cases")
Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 861e59a350bd..ae54468c7001 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -8720,7 +8720,8 @@ int i40e_vsi_open(struct i40e_vsi *vsi)
err_up_complete:
i40e_down(vsi);
err_set_queues:
- i40e_vsi_free_irq(vsi);
+ if ((vsi->netdev) || (vsi->type == I40E_VSI_FDIR))
+ i40e_vsi_free_irq(vsi);
err_setup_rx:
i40e_vsi_free_rx_resources(vsi);
err_setup_tx:
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] i40e: Fix error handling code of label err_set_queues
2021-07-13 12:20 [PATCH] i40e: Fix error handling code of label err_set_queues Dongliang Mu
@ 2021-07-13 15:16 ` Shannon Nelson
2021-07-14 2:24 ` Dongliang Mu
0 siblings, 1 reply; 3+ messages in thread
From: Shannon Nelson @ 2021-07-13 15:16 UTC (permalink / raw)
To: Dongliang Mu, Jesse Brandeburg, Tony Nguyen, David S. Miller,
Jakub Kicinski, Dinghao Liu, Jeff Kirsher, Shannon Nelson,
Catherine Sullivan
Cc: intel-wired-lan, netdev, linux-kernel
On 7/13/21 5:20 AM, Dongliang Mu wrote:
> If i40e_up_complete fails in i40e_vsi_open, it goes to err_up_complete.
> The label err_set_queues has an issue: if the else branch is executed,
> there is no need to execute i40e_vsi_request_irq.
This is unnecessary: if the else branch is executed then control will
goto err_setup_rx, skipping over i40e_up_complete().
sln
>
> Fix this by adding a condition of i40e_vsi_free_irq.
>
> Reported-by: Dongliang Mu (mudongliangabcd@gmail.com)
> Fixes: 9c04cfcd4aad ("i40e: Fix error handling in i40e_vsi_open")
> Fixes: c22e3c6c7912 ("i40e: prep vsi_open logic for non-netdev cases")
> Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e_main.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index 861e59a350bd..ae54468c7001 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -8720,7 +8720,8 @@ int i40e_vsi_open(struct i40e_vsi *vsi)
> err_up_complete:
> i40e_down(vsi);
> err_set_queues:
> - i40e_vsi_free_irq(vsi);
> + if ((vsi->netdev) || (vsi->type == I40E_VSI_FDIR))
> + i40e_vsi_free_irq(vsi);
> err_setup_rx:
> i40e_vsi_free_rx_resources(vsi);
> err_setup_tx:
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] i40e: Fix error handling code of label err_set_queues
2021-07-13 15:16 ` Shannon Nelson
@ 2021-07-14 2:24 ` Dongliang Mu
0 siblings, 0 replies; 3+ messages in thread
From: Dongliang Mu @ 2021-07-14 2:24 UTC (permalink / raw)
To: Shannon Nelson
Cc: Jesse Brandeburg, Tony Nguyen, David S. Miller, Jakub Kicinski,
Dinghao Liu, Jeff Kirsher, Shannon Nelson, Catherine Sullivan,
intel-wired-lan, open list:NETWORKING [GENERAL],
linux-kernel
On Tue, Jul 13, 2021 at 11:16 PM Shannon Nelson <snelson@pensando.io> wrote:
>
> On 7/13/21 5:20 AM, Dongliang Mu wrote:
> > If i40e_up_complete fails in i40e_vsi_open, it goes to err_up_complete.
> > The label err_set_queues has an issue: if the else branch is executed,
> > there is no need to execute i40e_vsi_request_irq.
>
> This is unnecessary: if the else branch is executed then control will
> goto err_setup_rx, skipping over i40e_up_complete().
Oh, yes. Thank you. Please ignore this patch.
>
> sln
>
> >
> > Fix this by adding a condition of i40e_vsi_free_irq.
> >
> > Reported-by: Dongliang Mu (mudongliangabcd@gmail.com)
> > Fixes: 9c04cfcd4aad ("i40e: Fix error handling in i40e_vsi_open")
> > Fixes: c22e3c6c7912 ("i40e: prep vsi_open logic for non-netdev cases")
> > Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
> > ---
> > drivers/net/ethernet/intel/i40e/i40e_main.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
> > index 861e59a350bd..ae54468c7001 100644
> > --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> > +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> > @@ -8720,7 +8720,8 @@ int i40e_vsi_open(struct i40e_vsi *vsi)
> > err_up_complete:
> > i40e_down(vsi);
> > err_set_queues:
> > - i40e_vsi_free_irq(vsi);
> > + if ((vsi->netdev) || (vsi->type == I40E_VSI_FDIR))
> > + i40e_vsi_free_irq(vsi);
> > err_setup_rx:
> > i40e_vsi_free_rx_resources(vsi);
> > err_setup_tx:
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-14 2:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-13 12:20 [PATCH] i40e: Fix error handling code of label err_set_queues Dongliang Mu
2021-07-13 15:16 ` Shannon Nelson
2021-07-14 2:24 ` Dongliang Mu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).