DPDK patches and discussions
 help / color / mirror / Atom feed
From: Ferruh Yigit <ferruh.yigit@intel.com>
To: ZhangTengfei <zypscode@outlook.com>
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v2] driver/net/pcap fix: fd leak bug
Date: Tue, 2 Mar 2021 11:00:06 +0000	[thread overview]
Message-ID: <ac6939b5-6e17-b5e8-6070-87b81ee2cb74@intel.com> (raw)
In-Reply-To: <ME3P282MB16681ABCD565AE44C6950E72D19A9@ME3P282MB1668.AUSP282.PROD.OUTLOOK.COM>

On 3/1/2021 3:30 PM, ZhangTengfei wrote:
> pcap fd was opend when vdev probed,
> but not closed when vdev removed.
> This bug appears in dpdk-pdump

The patch title should have "net/pcap: " as module name instead of 
"driver/net/pcap: ", suggested title:
net/pcap: fix fd leak on uninit


Also needs fixes line, I guess following can be used:
     Fixes: c956caa6eabf ("pcap: support port hotplug")
     Cc: stable@dpdk.org


> 
> Signed-off-by: ZhangTengfei <zypscode@outlook.com>

Would you mind using the sign-off as:
"Tengfei Zhang <zypscode@outlook.com>

> ---
>   drivers/net/pcap/rte_eth_pcap.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
> index 90f5d75ea..396de29de 100644
> --- a/drivers/net/pcap/rte_eth_pcap.c
> +++ b/drivers/net/pcap/rte_eth_pcap.c
> @@ -755,6 +755,8 @@ eth_dev_close(struct rte_eth_dev *dev)
>   	PMD_LOG(INFO, "Closing pcap ethdev on NUMA socket %d",
>   			rte_socket_id());
>   
> +	eth_dev_stop(dev);
> +
>   	rte_free(dev->process_private);
>   
>   	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> 

Now since 'eth_dev_stop()' can be called multiple times with this change, 
'pcap_close()' is causing a crash when it gets NULL pointer, following check is 
required, can you please send a new version with it?


  --- a/drivers/net/pcap/rte_eth_pcap.c
  +++ b/drivers/net/pcap/rte_eth_pcap.c
  @@ -682,9 +682,11 @@ eth_dev_stop(struct rte_eth_dev *dev)
          /* Special iface case. Single pcap is open and shared between tx/rx. */
          if (internals->single_iface) {
                  queue_missed_stat_on_stop_update(dev, 0);
  -               pcap_close(pp->tx_pcap[0]);
  -               pp->tx_pcap[0] = NULL;
  -               pp->rx_pcap[0] = NULL;
  +               if (pp->tx_pcap[0] != NULL) {
  +                       pcap_close(pp->tx_pcap[0]);
  +                       pp->tx_pcap[0] = NULL;
  +                       pp->rx_pcap[0] = NULL;
  +               }
                  goto status_down;
          }


      reply	other threads:[~2021-03-02 11:00 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-01 15:30 ZhangTengfei
2021-03-02 11:00 ` Ferruh Yigit [this message]

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=ac6939b5-6e17-b5e8-6070-87b81ee2cb74@intel.com \
    --to=ferruh.yigit@intel.com \
    --cc=dev@dpdk.org \
    --cc=zypscode@outlook.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 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).