From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 567D5A04BA; Thu, 8 Oct 2020 03:39:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1ADEC2C16; Thu, 8 Oct 2020 03:39:39 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 8F05A2B84; Thu, 8 Oct 2020 03:39:36 +0200 (CEST) IronPort-SDR: 85xarnRg3S+sU5NZ47+LsXyN+D4wr2M6bZG7TE2SCzV24P9kvCcoFCVT0B2dWx0okeHquCK/ip GQ+G7iDa3IMw== X-IronPort-AV: E=McAfee;i="6000,8403,9767"; a="153053760" X-IronPort-AV: E=Sophos;i="5.77,349,1596524400"; d="scan'208";a="153053760" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Oct 2020 18:39:32 -0700 IronPort-SDR: Ept3iCC99jf7t3Vg9xK6tIun63GFG5HHxU3sFHardI0f8tM3IeIr7oGa4nurNhLOJYp4RnSDZj c3tFN2aPxO5g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,349,1596524400"; d="scan'208";a="312025406" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by orsmga003.jf.intel.com with ESMTP; 07 Oct 2020 18:39:32 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 7 Oct 2020 18:39:31 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx609.amr.corp.intel.com (10.18.126.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 7 Oct 2020 18:39:31 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 7 Oct 2020 18:39:31 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.104) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Wed, 7 Oct 2020 18:39:31 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fd021OLyoeWUT1VKRGz6RQfiG+ZSUpLVoE5zFfowtQYOl3QM2BN3jtgnDzgiMjYOqFqZRxJ7gfAjcTwW0uPaxm/EtQcAnupgQYRi67dnXesPBZzcQ9mWxAI3CSH75rp7IlzfrFBYVLYZucd9eCK1yiVDzNxWyW123NRO+7HqO7T+mJuSqQwHYHtOVmQl6C+46/01WOHWji2315+WRuswqAkU/H70qrjBKCmxe/hVPXGl7cPXlDqt9eWCEWcCu6XU8ovHjYNhmHWWCZUdn1Na2QIeMdC0IFApixoaXr10r4/PRukNrazb76SaRIdX6snjCIic+K1xpBOvi42T77r4wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Rw1P5UljiKtGXud99Dv9y21A6XOKpZtvZn4PnIKl1z4=; b=j2OpJPNoksWUgfZEsWpZDGTESFOMSZ8WoXSPeaZq9eUtzzLgJZhwkUltl50/w85gLAGdZzsgnLyiExDF0iBBh88I8D51NUnUeEr55SNhgto2Vi1Wvq4BBhYWO6C4Ts+vQj3sssQ32Lxm7O52+VDjVpnGXqhVuwC6s6S01kucLqF9uSTUwoTXLUjWbw9xBsmQ3kYdd+rsOg6STrEMGgDXiUGJk741kG2lR17BMEKEe9wh1o0CTGaHX+MKmvgP1V92oVWr9aLe/CbPxiFkM2nSlchWcr7AsFmb5blPJCgAgY46l7SVXOH+LvCWgyXVmA4s0Fy2KznC7+XHKWRuB5N2kQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Rw1P5UljiKtGXud99Dv9y21A6XOKpZtvZn4PnIKl1z4=; b=sHm2OoMtz5j4x/HWHEPaUYjzXADi2Pzc2oyNG3rNHmxx2gxlvqF4M/JsUjYrBZlYM8b7+FTKzINxWVD3HwoNi46cfyHL17MVXWMuwaJ8Y7FuViUcksnYUInXyU2QJFv3GCp64J7WgdGwu5KPIXNH2n6ZOqG5bIvVuz4SHRWewHk= Received: from BN8PR11MB3795.namprd11.prod.outlook.com (2603:10b6:408:82::31) by BN6PR11MB1908.namprd11.prod.outlook.com (2603:10b6:404:103::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23; Thu, 8 Oct 2020 01:39:29 +0000 Received: from BN8PR11MB3795.namprd11.prod.outlook.com ([fe80::e4a8:91ab:e032:b8ae]) by BN8PR11MB3795.namprd11.prod.outlook.com ([fe80::e4a8:91ab:e032:b8ae%5]) with mapi id 15.20.3455.021; Thu, 8 Oct 2020 01:39:29 +0000 From: "Wang, Xiao W" To: wangyunjian , "dev@dpdk.org" CC: "Zhang, Qi Z" , "jerry.lilijun@huawei.com" , "xudingke@huawei.com" , "stable@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH] net/fm10k: fix memory leak when Tx thresh check fails Thread-Index: AQHWnHy5hNlNqTu8PESzoJr3ogqnMamM7orA Date: Thu, 8 Oct 2020 01:39:28 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows authentication-results: huawei.com; dkim=none (message not signed) header.d=none;huawei.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [112.65.8.219] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8edbfc07-09b2-4d2f-023e-08d86b2aff92 x-ms-traffictypediagnostic: BN6PR11MB1908: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7691; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: PXglE2w5iFKofRE7mTH0U5T5pp0VLePKXdOOlzXxpmMWCdwtyBTNZIknnjGJWbs4rp6XC7RQYXTnHjvJPYJCy7cg73JbbJY0kLDHSkIC/Sf2B2KLenEwOpsU9Jinjrprba+t7he48XZIOyDG+VG+r5MIXV16be3/v8m19x+gF1lJW6rzl1MJdKOS0MzAU3hgGABF4frMZW/VSS9OQILpOLw9ugUNvNHDl9XyrNnIaRHkrN+3HSapyRWBwfS+ZFa8oAUyQwLSxsM0mSUzjYBJuyHkRc0l99e1sLvDQBnGrgQ6y5uiY1Wx6aLKxauGpunD7rRYW0fNxusR8NZpdeyZoQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN8PR11MB3795.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(366004)(396003)(346002)(136003)(39860400002)(54906003)(7696005)(83380400001)(8676002)(55016002)(110136005)(33656002)(52536014)(478600001)(2906002)(9686003)(26005)(53546011)(71200400001)(8936002)(316002)(5660300002)(4326008)(86362001)(66476007)(64756008)(76116006)(6506007)(66446008)(66946007)(66556008)(186003); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: BAsqjzcT7htAUkSYS/T/SziSzvCm4Ys6TrTVE1Agw0p2Qyq9tue2Nkaw1XymvAr8rMAYsrCPcfmJLV52ptmBmjg/Rfuv5WhGryrjUq7QcwVrc9kr/xNikCQ/DJfWlcpstx5dMA2orG2YaoHcwQ4OrabfZ72TmscpqDBrHYAdihHV0hh5oT/gT9zhjBkxgw/PdRwYnWcUn2J2e7x9bGA4Qy+Bn8v7cvMZj8/3MDxA2WRig0fm5r79Ijq0CVPWj1fvc1sbVsC1DP9aopB/2cqoZsQy7MnbDrKb7tSqew4jQscmfQAMYi4+UfzQJ3xMtJTeRUn8U9ekl3ssqQhCqw92iCpfrq7favzg/NCwVDmssSBqid1HACNwiLFLNdZ+IYffuzlOuNOPNGzhWYOWoOvIMapom80u8ZZuQ/fpZeZdHcuRsJxHZ313Ny5lDPTK0HFogUKs+B7JBJ0lM5AzAHg+1bvftBvspsl1KDQPZyypF6FCEsDLyuoayZYnZTyNyvim1tw0oMIWh5QsjXER9/0xTIzz3JOVCdGmtOdsRmBa/z4pj3fmuuAN90zt91HoMtkOS/HhZAGP5RDVpG+QlFS6N67PmyFGiTMfDMo1d3nXqt0e6AFbEj6WT2WuFO4HHR4IAvEG+WH9u6htN/qUVXghLg== Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN8PR11MB3795.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8edbfc07-09b2-4d2f-023e-08d86b2aff92 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Oct 2020 01:39:29.1723 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 69Aj9NUctn6PcS7AdaL3tVDwRXVVGN4xmTSZnUMcWm/UsiwRrZgBBDLLOO7l3bmNeHLh/VaMYgoneJZOdJU8Yg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1908 X-OriginatorOrg: intel.com Subject: Re: [dpdk-dev] [PATCH] net/fm10k: fix memory leak when Tx thresh check fails X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi, Thanks for the patch. > -----Original Message----- > From: wangyunjian > Sent: Wednesday, October 7, 2020 3:37 PM > To: dev@dpdk.org > Cc: Zhang, Qi Z ; Wang, Xiao W > ; jerry.lilijun@huawei.com; > xudingke@huawei.com; Yunjian Wang ; > stable@dpdk.org > Subject: [dpdk-dev] [PATCH] net/fm10k: fix memory leak when Tx thresh > check fails >=20 > From: Yunjian Wang >=20 > In fm10k_tx_queue_setup(), we allocate memory for the queue > structure but not released when Tx thresh check fails. >=20 > Fixes: 98068e0e044e ("fm10k: add Tx queue setup/release") > Cc: stable@dpdk.org >=20 > Signed-off-by: Yunjian Wang > --- > drivers/net/fm10k/fm10k_ethdev.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) >=20 > 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 =3D &def_txq_ops; > q->tail_ptr =3D (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; > + } >=20 > /* allocate memory for the software ring */ > q->sw_ring =3D rte_zmalloc_socket("fm10k sw ring", > -- > 2.23.0 Acked-by: Xiao Wang