From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8D6A843861; Mon, 8 Jan 2024 08:27:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 10C5B402B0; Mon, 8 Jan 2024 08:27:10 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by mails.dpdk.org (Postfix) with ESMTP id EECF140263; Mon, 8 Jan 2024 08:27:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1704698828; x=1736234828; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=ZpJS5ExZ1/CE5oKh//oJMfUW8OtSzWzToti57wLie2c=; b=CjFpZvWLw6RO2Od5dcAqz4zS+aEizi8peRPkCgxiSUPThyvZkJvGKLYP EpV9qfT7gGclIx9Ad6pyCwmZIaPMBA4jOPctA+jcKBTCwknnp1o9H3DpZ YCtt/Sf7L6suPLkSBWTBsdnS++DONvTgWQmF8dZ0Cw1oR5iLwpTls0oQK jSsi8Dc5WpzoQ9G6Jc8Zg6zxfMJvZwydk95hUu83Url6Jg7fCHMjHWdHZ ofKExOqhn/wUlGUlQt1vabWDDJvDKG30P1RtShmurTpW9azdXioTFToH2 jxRLbC6RaXIJ3UIHILYno9Y4bL4MVK5hLcIJjDyCRT57pnlcjiMeJhGQi A==; X-IronPort-AV: E=McAfee;i="6600,9927,10946"; a="4573035" X-IronPort-AV: E=Sophos;i="6.04,340,1695711600"; d="scan'208";a="4573035" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jan 2024 23:27:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10946"; a="781332647" X-IronPort-AV: E=Sophos;i="6.04,340,1695711600"; d="scan'208";a="781332647" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga002.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 07 Jan 2024 23:27:06 -0800 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Sun, 7 Jan 2024 23:27:06 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Sun, 7 Jan 2024 23:26:59 -0800 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (104.47.73.168) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Sun, 7 Jan 2024 23:26:59 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kYHHpJkM7QrOeGt7iv0uHbjmgAkE8b/vnAzYjq1tyeNlCU2HY0S/KuQ7NboGoVpA4JOX30pOl0gY1sbQ/i9i7KnV1+DpYe58EV/gwEVuDqRVaniilGIIkELAHhC4KpmTzP9RMR7M+gLCHY7jRdmthNB3kenLiG532w6IAQW3KIA1E4ixJjqQLclnN7rkGC0E0cCAGPGfn8GU0AZjt0u/Ly/GfG1vGqyNa8hvrlfIJpmz/oKrw5NrmLOF+mFVkuqn0J+8R4kXnXIuJnl8nj2hUkTOqlLYLqV7Kf/ZAug3qljrEuhsGc6Pba/v7xfVxhVdsjzdQABqUIP+WZt9dMPu7Q== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=do+XIzszJQTVhpdjXW+/hPuZ7wd4E1uPey1PezFiVFk=; b=A+JV14LCEaGbZ6PaBQH+pWeEzZAmqxNNAjXxp3HXDzZHlDeRmxweToJAcBSjB2nmHyd1fDGub3vl9aRUHhGHH/rWRHhkig35IU6Rw1ge2YgixKcDIb64fnxlxvTi1NAJes2wQOyaNc2XMLWn27qYwtwIqjzwLP3GuvuB+ocXI0iPQXgUlXLh8aZcNqM1G/FCxFGQ9VqzYeH0hVEFdk7rFxm4vv47G0sbeLUHQRFwZQbk4+BWSNIJFOo2Bl/HTNyUmCTBqi7IFtWoba0/waSXQe1MaRjR1j+sDf9kXZL259K+B/+jnio0mwnz32tWhRStfb61q44vIP9Ue2Aj4pMStQ== 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 Received: from IA0PR11MB7955.namprd11.prod.outlook.com (2603:10b6:208:3dd::6) by MN0PR11MB6184.namprd11.prod.outlook.com (2603:10b6:208:3c4::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.21; Mon, 8 Jan 2024 07:26:57 +0000 Received: from IA0PR11MB7955.namprd11.prod.outlook.com ([fe80::1ec3:e3e7:c7e7:b89c]) by IA0PR11MB7955.namprd11.prod.outlook.com ([fe80::1ec3:e3e7:c7e7:b89c%7]) with mapi id 15.20.7159.020; Mon, 8 Jan 2024 07:26:57 +0000 From: "Wu, Wenjun1" To: "Zhang, Qi Z" , "Yang, Qiming" CC: "dev@dpdk.org" , "stable@dpdk.org" Subject: RE: [PATCH] net/ice: fix memory leak Thread-Topic: [PATCH] net/ice: fix memory leak Thread-Index: AQHaQWQVw2p5MPp27keAgS9ak6FVmLDPhUNQ Date: Mon, 8 Jan 2024 07:26:57 +0000 Message-ID: References: <20240107204914.483140-1-qi.z.zhang@intel.com> In-Reply-To: <20240107204914.483140-1-qi.z.zhang@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: IA0PR11MB7955:EE_|MN0PR11MB6184:EE_ x-ms-office365-filtering-correlation-id: 386f944e-fa03-47fa-3bb8-08dc101b3277 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Djwo8oqcXa3XO0CfEbWKyLNrkrLTbf2XKvUbx185/8U1FdKqUC9DoM1Wgi+HdZp8iyjLpeGzb42HndsuCWRHK6toJAPmGoFHQOBDerwTN8eKtaI+Kzja3/XSrFU4d1s5UCaR1Ls2RlmV1hajbkYcZl31CEPtUqtH1nEyn9/mG8UIjX2w3QtbY+vT8jWl73BY8GVx97PmbwBf/Ifss5horNnW1hRSLicmbavwhubNcAXQMMWpvA9OMveSaLfidpgQVsVMmejANJdKXxjXobrAu/PG3rt/i4xrzUO95nKFNwTNktQ4u+g7CQdlyRLdoTaFws3UaVS4Rb84/gojQ8CnMGQBBWSmVoR0U5Qg6vX4s9FGLDy3qlBpUfr0v+BCSjLhK7SFQM9rpm3kvc6Pjy0vWfsZh1APJ9p6XmBm5P3WCqfEtF0kwP6cqv8ghG2V8NbEHLJ9bImPfuXobuExuafnocE/vDfWGspOgArlkeJqW8lLplvwipla1uyP0laBwMCeVy2xp7emmSlI3xt2Q0x4ibZIkKa+fMZVe23Nd5x6jEzsHJxv5bGxqgtgMU7VNDYoArPP9LCpXXfNLF296rRzmpVdngrI5tcxMaWYDS6/1mKAAfabB/ku3d2lJ8tY/MYE x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:IA0PR11MB7955.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(346002)(396003)(136003)(376002)(366004)(39860400002)(230922051799003)(1800799012)(186009)(64100799003)(451199024)(41300700001)(55016003)(53546011)(6506007)(33656002)(7696005)(83380400001)(71200400001)(38070700009)(66946007)(2906002)(6636002)(66556008)(64756008)(66446008)(66476007)(54906003)(110136005)(76116006)(316002)(38100700002)(122000001)(26005)(478600001)(9686003)(82960400001)(86362001)(5660300002)(8936002)(450100002)(52536014)(8676002)(4326008); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?FwpvEPa+56Ar0AD/Q766Lk8nBOMawjBdOA8+N+5u+YhbE4ZTmzl9dYknbDnQ?= =?us-ascii?Q?eafz2kKLKD+r712Lw5UC867OqJkQd7en/Ft14qlsy+P1ySkCzt+CkS+TCVtF?= =?us-ascii?Q?7cqH1hfEjSWKzOG/DD7uMb2BfzIfl9dUL0VQhYAHsVqZcUwSPKS0q3UQBZNj?= =?us-ascii?Q?WkzaYBRyCqhy8MNJexJVFwoeqQzswO3GbKjOyEHBdaB6ylkmZm364nibw/NW?= =?us-ascii?Q?uISBf9XSBfTQflo9GH49Np53uzYaZgJBiL0es7FNzdoafkNAtGlbN/ztgDiM?= =?us-ascii?Q?1G5PiXUxmymjxgqmXAJ57edFc9Wej5msrFt1+g7b/UzNvYdJ4xXnZtxCjlcL?= =?us-ascii?Q?E2P7FZ8ynf/4Ujlct1eijZ5udYPf2abvQXyYx2huRkqS2xzQ1xXJCpOA9Gvp?= =?us-ascii?Q?pTJyj5B0q2aDwMfSfvoj9x31CRkh3CAKD2epfkFVvrvo1DlXB0j2XE4sphIg?= =?us-ascii?Q?SahWmL7aXMk0BW4zZLjD+FMd51bVgWtdoP3o16jd1FA04eSbxtELPUFqyMZ/?= =?us-ascii?Q?z/CZ7p5cuTEauJyK2lTqcDnq7wLUhXl2VoU8FWwKEP2OHtiazE8B65A899tQ?= =?us-ascii?Q?0ibmVMcjq75qITn3JYIzPxPHK9tuGw3ydFQqb6ChJjLrOm9UujBurRk9znMZ?= =?us-ascii?Q?hxg7290Fe5SJFNZJw+L1jrZdy39FjwBkXros7j5hx4R7ktdnUCsWBJXnkPwy?= =?us-ascii?Q?k0ohTPzvlpey2xuFnK349YFHIezgxnjGCik+zz8GbCIl9HVgInMwjwTdhGTj?= =?us-ascii?Q?KyBCbqb2nLxPtmvVkFdxDqMWpscg0u8PsD4Gu2Kh/VvMXyMijYRSaAw7JPc7?= =?us-ascii?Q?8ThAYJ53m2j7ug8qrWkEX8xMpjkZoi0PZZFVu3UDqEUFfcYmrZfRie5asDx4?= =?us-ascii?Q?9bfsexD2lDl/KKpPVJBxlKhAjO2YY7ach91bA1BO8BwXe/Cc+EU6EOz/wyB6?= =?us-ascii?Q?ibj0W9qmF7SKNDz/zOyumer9Rkws4IVQj22R42tRlDK0diAQKYe2ZxlblW7X?= =?us-ascii?Q?GYi4FLfgWh9WWCiSmkzW+WCvjIfQnKQkZUBHBbT35QhFqlaLh6e3M1whX1ne?= =?us-ascii?Q?6bwFgNKQ/X/OaYDX7lrcWRbA0fkhLpiMdbn1fPqJLHGGJJCEimlu6z7Ba1u1?= =?us-ascii?Q?RaBzBmP4xi9GvhL58vymly/qqfQLcCQqO9ySo031kVkgBqeQUAs36UQzznWE?= =?us-ascii?Q?o1H/0CTiajyc5oNOr09VRUD8wnMwSFEQg3BZMVwhdwecilU3DyZzSxSoy7Tl?= =?us-ascii?Q?mJZVUBO7yvi9UlFq15xcHIK22ZeJzvBul4W1vxaui6ZtCLrKj2K4RWKjW2l4?= =?us-ascii?Q?bbZ4dpN9Ulnv0QiF9SScj9OKOKnw27x6PS9lcXdKOe+RqwO9vaSppp/UUvgd?= =?us-ascii?Q?H4aqYIJGjapl6/6SWY6lKOoX87qNVe4plrgBAX7wi09DUTl6HDLarqR5pDQT?= =?us-ascii?Q?icLnJXrXjd/NY7ODOBtDR7OToBoKtez9z1UkiwdhP2F04iQAhFxrBqnrzrlS?= =?us-ascii?Q?IdbsBOEBeR+bNOyrlCS6tFaN1omYBnhFz6Rl6rz9Vl3Xns7MMbP6yVgTUgkz?= =?us-ascii?Q?JS2Op1Rxv1JKuC4gcHC7YTLggXCe3hb1xSg/0i0M?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: IA0PR11MB7955.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 386f944e-fa03-47fa-3bb8-08dc101b3277 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jan 2024 07:26:57.6455 (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: J/ODtfxQdTRtkaLtNWMpf0Ku6szZLW7GLvfp/V+4XcSBBGGwWvGcE9cw4z1UeAcYbrVnocZKZL4DaQkpZ0j6HA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR11MB6184 X-OriginatorOrg: intel.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org > -----Original Message----- > From: Zhang, Qi Z > Sent: Monday, January 8, 2024 4:49 AM > To: Yang, Qiming ; Wu, Wenjun1 > > Cc: dev@dpdk.org; Zhang, Qi Z ; stable@dpdk.org > Subject: [PATCH] net/ice: fix memory leak >=20 > Free memory for AQ buffer at icd_move_recfg_lan_txq Free memory for > profile list at ice_tm_conf_uninit >=20 > Fixes: 8c481c3bb65b ("net/ice: support queue and queue group bandwidth > limit") > Cc: stable@dpdk.org >=20 > Signed-off-by: Qi Zhang > --- > drivers/net/ice/ice_tm.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) >=20 > diff --git a/drivers/net/ice/ice_tm.c b/drivers/net/ice/ice_tm.c index > b570798f07..c00ecb6a97 100644 > --- a/drivers/net/ice/ice_tm.c > +++ b/drivers/net/ice/ice_tm.c > @@ -59,8 +59,15 @@ void > ice_tm_conf_uninit(struct rte_eth_dev *dev) { > struct ice_pf *pf =3D ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private); > + struct ice_tm_shaper_profile *shaper_profile; > struct ice_tm_node *tm_node; >=20 > + /* clear profile */ > + while ((shaper_profile =3D TAILQ_FIRST(&pf- > >tm_conf.shaper_profile_list))) { > + TAILQ_REMOVE(&pf->tm_conf.shaper_profile_list, > shaper_profile, node); > + rte_free(shaper_profile); > + } > + > /* clear node configuration */ > while ((tm_node =3D TAILQ_FIRST(&pf->tm_conf.queue_list))) { > TAILQ_REMOVE(&pf->tm_conf.queue_list, tm_node, node); > @@ -636,6 +643,8 @@ static int ice_move_recfg_lan_txq(struct rte_eth_dev > *dev, > uint16_t buf_size =3D ice_struct_size(buf, txqs, 1); >=20 > buf =3D (struct ice_aqc_move_txqs_data *)ice_malloc(hw, sizeof(*buf)); > + if (buf =3D=3D NULL) > + return -ENOMEM; >=20 > queue_parent_node =3D queue_sched_node->parent; > buf->src_teid =3D queue_parent_node->info.node_teid; > @@ -647,6 +656,7 @@ static int ice_move_recfg_lan_txq(struct rte_eth_dev > *dev, > NULL, buf, buf_size, &txqs_moved, > NULL); > if (ret || txqs_moved =3D=3D 0) { > PMD_DRV_LOG(ERR, "move lan queue %u failed", queue_id); > + rte_free(buf); > return ICE_ERR_PARAM; > } >=20 > @@ -656,12 +666,14 @@ static int ice_move_recfg_lan_txq(struct > rte_eth_dev *dev, > } else { > PMD_DRV_LOG(ERR, "invalid children number %d for > queue %u", > queue_parent_node->num_children, queue_id); > + rte_free(buf); > return ICE_ERR_PARAM; > } > dst_node->children[dst_node->num_children++] =3D > queue_sched_node; > queue_sched_node->parent =3D dst_node; > ice_sched_query_elem(hw, queue_sched_node->info.node_teid, > &queue_sched_node->info); >=20 > + rte_free(buf); > return ret; > } >=20 > -- > 2.31.1 Acked-by: Wenjun Wu