DPDK patches and discussions
 help / color / mirror / Atom feed
* [dpdk-dev] [PATCH] net/fm10k: fix memory leak when Tx thresh check fails
@ 2020-10-07  7:36 wangyunjian
  2020-10-08  1:39 ` Wang, Xiao W
  0 siblings, 1 reply; 3+ messages in thread
From: wangyunjian @ 2020-10-07  7:36 UTC (permalink / raw)
  To: dev
  Cc: qi.z.zhang, xiao.w.wang, jerry.lilijun, xudingke, Yunjian Wang, stable

From: Yunjian Wang <wangyunjian@huawei.com>

In fm10k_tx_queue_setup(), we allocate memory for the queue
structure but not released when Tx thresh check fails.

Fixes: 98068e0e044e ("fm10k: add Tx queue setup/release")
Cc: stable@dpdk.org

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
 drivers/net/fm10k/fm10k_ethdev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index 309637071..c4a6fdf7f 100644
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -2024,8 +2024,10 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,
 	q->ops = &def_txq_ops;
 	q->tail_ptr = (volatile uint32_t *)
 		&((uint32_t *)hw->hw_addr)[FM10K_TDT(queue_id)];
-	if (handle_txconf(q, conf))
+	if (handle_txconf(q, conf)) {
+		rte_free(q);
 		return -EINVAL;
+	}
 
 	/* allocate memory for the software ring */
 	q->sw_ring = rte_zmalloc_socket("fm10k sw ring",
-- 
2.23.0


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-dev] [PATCH] net/fm10k: fix memory leak when Tx thresh check fails
  2020-10-07  7:36 [dpdk-dev] [PATCH] net/fm10k: fix memory leak when Tx thresh check fails wangyunjian
@ 2020-10-08  1:39 ` Wang, Xiao W
  2020-10-08  4:46   ` Zhang, Qi Z
  0 siblings, 1 reply; 3+ messages in thread
From: Wang, Xiao W @ 2020-10-08  1:39 UTC (permalink / raw)
  To: wangyunjian, dev; +Cc: Zhang, Qi Z, jerry.lilijun, xudingke, stable

Hi,

Thanks for the patch.

> -----Original Message-----
> From: wangyunjian <wangyunjian@huawei.com>
> Sent: Wednesday, October 7, 2020 3:37 PM
> To: dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Wang, Xiao W
> <xiao.w.wang@intel.com>; jerry.lilijun@huawei.com;
> xudingke@huawei.com; Yunjian Wang <wangyunjian@huawei.com>;
> stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/fm10k: fix memory leak when Tx thresh
> check fails
> 
> From: Yunjian Wang <wangyunjian@huawei.com>
> 
> In fm10k_tx_queue_setup(), we allocate memory for the queue
> structure but not released when Tx thresh check fails.
> 
> Fixes: 98068e0e044e ("fm10k: add Tx queue setup/release")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
>  drivers/net/fm10k/fm10k_ethdev.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/fm10k/fm10k_ethdev.c
> b/drivers/net/fm10k/fm10k_ethdev.c
> index 309637071..c4a6fdf7f 100644
> --- a/drivers/net/fm10k/fm10k_ethdev.c
> +++ b/drivers/net/fm10k/fm10k_ethdev.c
> @@ -2024,8 +2024,10 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev,
> uint16_t queue_id,
>  	q->ops = &def_txq_ops;
>  	q->tail_ptr = (volatile uint32_t *)
>  		&((uint32_t *)hw->hw_addr)[FM10K_TDT(queue_id)];
> -	if (handle_txconf(q, conf))
> +	if (handle_txconf(q, conf)) {
> +		rte_free(q);
>  		return -EINVAL;
> +	}
> 
>  	/* allocate memory for the software ring */
>  	q->sw_ring = rte_zmalloc_socket("fm10k sw ring",
> --
> 2.23.0

Acked-by: Xiao Wang <xiao.w.wang@intel.com>


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-dev] [PATCH] net/fm10k: fix memory leak when Tx thresh check fails
  2020-10-08  1:39 ` Wang, Xiao W
@ 2020-10-08  4:46   ` Zhang, Qi Z
  0 siblings, 0 replies; 3+ messages in thread
From: Zhang, Qi Z @ 2020-10-08  4:46 UTC (permalink / raw)
  To: Wang, Xiao W, wangyunjian, dev; +Cc: jerry.lilijun, xudingke, stable



> -----Original Message-----
> From: Wang, Xiao W <xiao.w.wang@intel.com>
> Sent: Thursday, October 8, 2020 9:39 AM
> To: wangyunjian <wangyunjian@huawei.com>; dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; jerry.lilijun@huawei.com;
> xudingke@huawei.com; stable@dpdk.org
> Subject: RE: [dpdk-dev] [PATCH] net/fm10k: fix memory leak when Tx thresh
> check fails
> 
> Hi,
> 
> Thanks for the patch.
> 
> > -----Original Message-----
> > From: wangyunjian <wangyunjian@huawei.com>
> > Sent: Wednesday, October 7, 2020 3:37 PM
> > To: dev@dpdk.org
> > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Wang, Xiao W
> > <xiao.w.wang@intel.com>; jerry.lilijun@huawei.com;
> > xudingke@huawei.com; Yunjian Wang <wangyunjian@huawei.com>;
> > stable@dpdk.org
> > Subject: [dpdk-dev] [PATCH] net/fm10k: fix memory leak when Tx thresh
> > check fails
> >
> > From: Yunjian Wang <wangyunjian@huawei.com>
> >
> > In fm10k_tx_queue_setup(), we allocate memory for the queue structure
> > but not released when Tx thresh check fails.
> >
> > Fixes: 98068e0e044e ("fm10k: add Tx queue setup/release")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> > ---
> >  drivers/net/fm10k/fm10k_ethdev.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/fm10k/fm10k_ethdev.c
> > b/drivers/net/fm10k/fm10k_ethdev.c
> > index 309637071..c4a6fdf7f 100644
> > --- a/drivers/net/fm10k/fm10k_ethdev.c
> > +++ b/drivers/net/fm10k/fm10k_ethdev.c
> > @@ -2024,8 +2024,10 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev,
> > uint16_t queue_id,  q->ops = &def_txq_ops;  q->tail_ptr = (volatile
> > uint32_t *)  &((uint32_t *)hw->hw_addr)[FM10K_TDT(queue_id)];
> > -if (handle_txconf(q, conf))
> > +if (handle_txconf(q, conf)) {
> > +rte_free(q);
> >  return -EINVAL;
> > +}
> >
> >  /* allocate memory for the software ring */  q->sw_ring =
> > rte_zmalloc_socket("fm10k sw ring",
> > --
> > 2.23.0
> 
> Acked-by: Xiao Wang <xiao.w.wang@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
> 


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-10-08  4:47 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-07  7:36 [dpdk-dev] [PATCH] net/fm10k: fix memory leak when Tx thresh check fails wangyunjian
2020-10-08  1:39 ` Wang, Xiao W
2020-10-08  4:46   ` Zhang, Qi Z

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git