All of lore.kernel.org
 help / color / mirror / Atom feed
From: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
To: Gaosheng Cui <cuigaosheng1@huawei.com>
Cc: "alexander.h.duyck@intel.com" <alexander.h.duyck@intel.com>,
	"intel-wired-lan@lists.osuosl.org"
	<intel-wired-lan@lists.osuosl.org>,
	"edumazet@google.com" <edumazet@google.com>,
	"jeffrey.t.kirsher@intel.com" <jeffrey.t.kirsher@intel.com>,
	"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
	"kuba@kernel.org" <kuba@kernel.org>,
	"pabeni@redhat.com" <pabeni@redhat.com>,
	"davem@davemloft.net" <davem@davemloft.net>
Subject: Re: [Intel-wired-lan] [PATCH net] intel/igbvf: free irq on the error path in igbvf_request_msix()
Date: Mon, 21 Nov 2022 19:05:25 +0100	[thread overview]
Message-ID: <Y3u95fVsT/7zXQQp@boxer> (raw)
In-Reply-To: <20221120061757.264242-1-cuigaosheng1@huawei.com>

On Sun, Nov 20, 2022 at 07:17:57AM +0100, Gaosheng Cui wrote:
> In igbvf_request_msix(), irqs have not been freed on the err path,
> we need to free it. Fix it.
> 
> Fixes: d4e0fe01a38a ("igbvf: add new driver to support 82576 virtual functions")
> Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>

Hi,

> ---
>  drivers/net/ethernet/intel/igbvf/netdev.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
> index 3a32809510fc..e212ca16df00 100644
> --- a/drivers/net/ethernet/intel/igbvf/netdev.c
> +++ b/drivers/net/ethernet/intel/igbvf/netdev.c
> @@ -1074,7 +1074,7 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter)
>  			  igbvf_intr_msix_rx, 0, adapter->rx_ring->name,
>  			  netdev);
>  	if (err)
> -		goto out;
> +		goto free_irq1;

s/free_irq1/free_irq_tx ?

>  
>  	adapter->rx_ring->itr_register = E1000_EITR(vector);
>  	adapter->rx_ring->itr_val = adapter->current_itr;
> @@ -1083,10 +1083,14 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter)
>  	err = request_irq(adapter->msix_entries[vector].vector,
>  			  igbvf_msix_other, 0, netdev->name, netdev);
>  	if (err)
> -		goto out;
> +		goto free_irq2;

s/free_irq2/free_irq_rx ?

>  
>  	igbvf_configure_msix(adapter);
>  	return 0;
> +free_irq2:
> +	free_irq(adapter->msix_entries[--vector].vector, netdev);
> +free_irq1:
> +	free_irq(adapter->msix_entries[--vector].vector, netdev);
>  out:
>  	return err;

Besides above suggestions, change LGTM.

Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>

>  }
> -- 
> 2.25.1
> 
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan

WARNING: multiple messages have this Message-ID (diff)
From: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
To: Gaosheng Cui <cuigaosheng1@huawei.com>
Cc: "Brandeburg, Jesse" <jesse.brandeburg@intel.com>,
	"Nguyen, Anthony L" <anthony.l.nguyen@intel.com>,
	"davem@davemloft.net" <davem@davemloft.net>,
	"edumazet@google.com" <edumazet@google.com>,
	"kuba@kernel.org" <kuba@kernel.org>,
	"pabeni@redhat.com" <pabeni@redhat.com>,
	"jeffrey.t.kirsher@intel.com" <jeffrey.t.kirsher@intel.com>,
	"alexander.h.duyck@intel.com" <alexander.h.duyck@intel.com>,
	"intel-wired-lan@lists.osuosl.org"
	<intel-wired-lan@lists.osuosl.org>,
	"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: Re: [PATCH net] intel/igbvf: free irq on the error path in igbvf_request_msix()
Date: Mon, 21 Nov 2022 19:05:25 +0100	[thread overview]
Message-ID: <Y3u95fVsT/7zXQQp@boxer> (raw)
In-Reply-To: <20221120061757.264242-1-cuigaosheng1@huawei.com>

On Sun, Nov 20, 2022 at 07:17:57AM +0100, Gaosheng Cui wrote:
> In igbvf_request_msix(), irqs have not been freed on the err path,
> we need to free it. Fix it.
> 
> Fixes: d4e0fe01a38a ("igbvf: add new driver to support 82576 virtual functions")
> Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>

Hi,

> ---
>  drivers/net/ethernet/intel/igbvf/netdev.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
> index 3a32809510fc..e212ca16df00 100644
> --- a/drivers/net/ethernet/intel/igbvf/netdev.c
> +++ b/drivers/net/ethernet/intel/igbvf/netdev.c
> @@ -1074,7 +1074,7 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter)
>  			  igbvf_intr_msix_rx, 0, adapter->rx_ring->name,
>  			  netdev);
>  	if (err)
> -		goto out;
> +		goto free_irq1;

s/free_irq1/free_irq_tx ?

>  
>  	adapter->rx_ring->itr_register = E1000_EITR(vector);
>  	adapter->rx_ring->itr_val = adapter->current_itr;
> @@ -1083,10 +1083,14 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter)
>  	err = request_irq(adapter->msix_entries[vector].vector,
>  			  igbvf_msix_other, 0, netdev->name, netdev);
>  	if (err)
> -		goto out;
> +		goto free_irq2;

s/free_irq2/free_irq_rx ?

>  
>  	igbvf_configure_msix(adapter);
>  	return 0;
> +free_irq2:
> +	free_irq(adapter->msix_entries[--vector].vector, netdev);
> +free_irq1:
> +	free_irq(adapter->msix_entries[--vector].vector, netdev);
>  out:
>  	return err;

Besides above suggestions, change LGTM.

Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>

>  }
> -- 
> 2.25.1
> 

  reply	other threads:[~2022-11-21 18:05 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-20  6:17 [Intel-wired-lan] [PATCH net] intel/igbvf: free irq on the error path in igbvf_request_msix() Gaosheng Cui
2022-11-20  6:17 ` Gaosheng Cui
2022-11-21 18:05 ` Maciej Fijalkowski [this message]
2022-11-21 18:05   ` Maciej Fijalkowski
2022-11-22  2:55   ` [Intel-wired-lan] " cuigaosheng
2022-11-22  2:55     ` cuigaosheng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Y3u95fVsT/7zXQQp@boxer \
    --to=maciej.fijalkowski@intel.com \
    --cc=alexander.h.duyck@intel.com \
    --cc=cuigaosheng1@huawei.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=intel-wired-lan@lists.osuosl.org \
    --cc=jeffrey.t.kirsher@intel.com \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.