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 C6A8E43678; Tue, 5 Dec 2023 14:16:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B75942E4A; Tue, 5 Dec 2023 14:16:50 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by mails.dpdk.org (Postfix) with ESMTP id A504042E42; Tue, 5 Dec 2023 14:16:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701782209; x=1733318209; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=c/wJ9+Y0CsYFcSbHnhBQAuXu/5gJDJ+TOIVqoIP5dA0=; b=HraTtqCSFm+REBFt9ljkb5qyOsybjY9kLiGLk1ZMr1mwMr7Q1p+8YKec /UyEPjy4dtPBiCrfZyEQ2ADak0z2P06jqA/mACPlu5ptFXvJWVy4kURmG WlLbOZBcBO0NQY5qDjQk2KuymbU2JXH0P+2wKJow/vDvlDCca79kfUngc vWjCzgHi4k7epB2o6+3IswcL183WSnoZ8pg+xCQoip9GvjuqiZ1ACC6lX q78Ya+u5Qm8IJ/p8+R5L+CzHEJbbPi81g3vJuZBXLhH7K62aQuNJ3Dhgu mk7wp3J1Yi4ik1cD6M7yRQYvceuNdQCKedtrdUQ/+CpKEJnL6Pr0eKaqE Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10914"; a="974236" X-IronPort-AV: E=Sophos;i="6.04,252,1695711600"; d="scan'208";a="974236" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2023 05:16:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10914"; a="841451354" X-IronPort-AV: E=Sophos;i="6.04,252,1695711600"; d="scan'208";a="841451354" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga004.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 05 Dec 2023 05:16:46 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Tue, 5 Dec 2023 05:16:46 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Tue, 5 Dec 2023 05:16:46 -0800 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.101) 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.34; Tue, 5 Dec 2023 05:16:46 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KBNtVkaO25Kb6cuQxXxXQJ7lIgofqCcUTGkwayj5J/3WI9x2NcLHiAVd+k00Ag7xq0zPxhxnDvYJCSbu5g6bAHJAz18dLZqLIdNlmbgxRKC/qEnVgW77ShkeYNVSFiR/Bo2jJbJ/npE3CNsyj6OjjKf2o7rPzgoffrlz5Xw80BjyY4s/xaBr0sfjbzaT2DzDdSK0rVrxdGn2s8947pwRBnEPlH2KWwnV0y22svylSAYhyqKqT09tdP1WrXuYA0evHs0MzI9iS3AOQd0cVI27SoHiz6LlvQqYzjeZ1a5ySZBus5i8SYGkVsd4j96Y+PlT+6qz0Oky97+oTE5xIlEVug== 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=P1SSHpnpwDjPT0lkP9PwCgS6n99BltJbmHFmxvrRabU=; b=c6cqce19YtE2FMEek1NLzib8wWDA5NxsjEypxAsW7b0keJAmkBCRIloAlUv8Ub+rb0kLiqRW8hzboe19RbaiwYZWQSFK1PWYSRRgu6pUZeZIfHPUF8iSxiTk02Zoz4szGd2hiPPUCTzrFg32d0VhjHC7px4niP3kVQuW2Mo5aV2kEy8vjwRW5VnoBaAEphwr31T0GajSs7KwN0jQub1OOK1dboWw0S1hrBE+PIqeJdqt4CzHxqJ0u9Ysduk8CYuU0dlE5Gm3r1oSGwpdGolpVG3mpQdNkJYQcXU9ZvB8F/2inmRlEVWzf/g2zW98mbwg3oAG6zjjxp98bZAp+MuNZA== 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 MW4PR11MB5872.namprd11.prod.outlook.com (2603:10b6:303:169::14) by PH7PR11MB6546.namprd11.prod.outlook.com (2603:10b6:510:212::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34; Tue, 5 Dec 2023 13:16:44 +0000 Received: from MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::2f2f:41ab:b556:7257]) by MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::2f2f:41ab:b556:7257%3]) with mapi id 15.20.7046.034; Tue, 5 Dec 2023 13:16:44 +0000 From: "Loftus, Ciara" To: Yunjian Wang , "dev@dpdk.org" CC: "ferruh.yigit@amd.com" , "Zhang, Qi Z" , "xudingke@huawei.com" , "stable@dpdk.org" Subject: RE: [PATCH v2] net/af_xdp: fix memzone leak in error path Thread-Topic: [PATCH v2] net/af_xdp: fix memzone leak in error path Thread-Index: AQHaJ3YI2b9EqEoyLUi7jRIM/aXLrrCaq0Ag Date: Tue, 5 Dec 2023 13:16:44 +0000 Message-ID: References: <64117415a68e8c920efdf905f799b26dcbc3f8fb.1701415014.git.wangyunjian@huawei.com> In-Reply-To: Accept-Language: en-GB, 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: MW4PR11MB5872:EE_|PH7PR11MB6546:EE_ x-ms-office365-filtering-correlation-id: 8f20cf0b-fb42-4a44-3d46-08dbf5946d5a x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: h01Slz+d6IKVpSFBOXf35d+t1IjzABIdu2uiBxn4e8jhgQ4XGQHVkupuZWSrpZGLmJPUVztwlbHDbdSmHnWNSTlZipDvKOvoKhrh5BaKrjY+wrInT9z6n1yN68pu7a2O2nhyyM0ELfubdWXE87go9ALWDzDwrgSzfh2xW+Bap4HE1yAiuz3gkqKe9sn3IN22uSOxYGPD1aN2nsBbnO3n3aDKRPnABCc1iwZnYLAd7gxqnEOxvlIpmbUjpzZZ+xGhd7fFUB5P+/vL8muANl12Q7URQUKRGG5+CZt1c4Tx85Rj4CFK5F81/xEadFErEy8PXfrm3a5VcQFe/pRimgHAYvokhEuGO3O/abpqtQ1mccLenrUQiGRGeKhJlY661z4JRoBEMvSB/t1IpRNPU+Cb7lMPXIqFXG1nZe9xz9/qF2b2Sg57Wma3WYp/grDL+ySb7UwcTMu0E5dAW7Aks72plVDiT3EQil11oyu8pNCOCsBEpQ8KTPD6TL0JkaU2BCnwMHUB1E+1NJmtBcRMexI4+E3DkK1aFeDQ+j4jaE9ePfv6UgvAT9sdCRpHpyUGVfzOavwcgA+aRe7lB01kLNIo32ymrmgT4hOC+/gtqN7BZKyPhMmKQbPgzr7GhAOUmdiB x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MW4PR11MB5872.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39860400002)(136003)(376002)(346002)(396003)(366004)(230922051799003)(186009)(451199024)(64100799003)(1800799012)(41300700001)(5660300002)(86362001)(33656002)(2906002)(38070700009)(26005)(9686003)(82960400001)(83380400001)(55016003)(71200400001)(478600001)(6506007)(7696005)(38100700002)(122000001)(76116006)(66946007)(4326008)(54906003)(66446008)(66476007)(66556008)(64756008)(8676002)(110136005)(8936002)(316002)(52536014); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?rNWBnITMyjrJ88du1Fg/O6f1avKCRZjln8C21raqKOhZk5QeCmNBZwzCPhgq?= =?us-ascii?Q?LEzDPzBw4+Jbt18d77vGjvC5V+6wYdrdAiosNpAN78n5gafIJMj/BtkzIIgY?= =?us-ascii?Q?z829F2w6FCTy+N6n54cChAYRs6Xmrpq+iKReiE7q3mvCkDLX0+ZYuYCdm74M?= =?us-ascii?Q?IBWmzbe9dyTgh2hf3PG2LRegaCDi1idMwnqdnzv+gXQZ6OhQsMMLirUS7zOk?= =?us-ascii?Q?U8ZTm91VLYv+gKms9lP2pnuE8JKAM1/elD8qPQszLXlpfH//UCIPdbuEPkY/?= =?us-ascii?Q?H8SbrSeilEILJU5c0ThZsXozcxDb5p/g0kIFERFiikJyO1IC3eAl80lfTR+e?= =?us-ascii?Q?iJTfcJzF2W4GfIkfiozWaIcEj3Uh0k2eDBmgwAwzuVZk63NIhQ5bG2JoOe/7?= =?us-ascii?Q?cVv4kz2jQ22DuuDU74Ta8AgC6pKfKkQgS/UyAK4fs5cABkO8G6QpI5Id1HtA?= =?us-ascii?Q?jTTusScSNC9cDk3FGRoOkfM3jATdryjTrB3D3Cc+Asy9gBR/xluSTmvsuIP0?= =?us-ascii?Q?ROzrliY/QFCGXNx9VnXz3AD+m9p/Ydv33Ag9eQL/U94Pm47Bj+YC3ndhQE8e?= =?us-ascii?Q?KFYFWEFOvjhSWRsgqV/Vkmh6JfaW3qS7JqEQz+m6yJpfmv8VxsFxzoO1a2S6?= =?us-ascii?Q?rjJevaAygXZ45l89EgdT4dzviZ9L11ISxMwRYvTPD0dV/Z0SjMp5te+TOGgP?= =?us-ascii?Q?u1jUxT4JW7hvesdOxtrJlqDs79W589BHdmYGtWOWIv6ECjm/KmIYPoAWU0XF?= =?us-ascii?Q?Dob4nmAZRHKaycwDcf/aVsasblmCvjU95c3DGVh/th24zHhq9FPAHTEgV11C?= =?us-ascii?Q?qr8Yw9PRXUd5qB2+iN4DZBF55p/kgxEEVCNLmEx99FGQlBENC5kwib0HkCK9?= =?us-ascii?Q?3f0w1JdcZUGggRGBICRovNJoMn/WAU2aWuyDRRlmgu3YHHl2bij1b+PuKubt?= =?us-ascii?Q?e3np/4l1UnIookMGIsWSfr1NbMSOpdjQWglonwDikw+MKZ8WCP9OuYA6aPzN?= =?us-ascii?Q?Nwup8ZGzK0/5pVilJp4IgZsZmBqoZhoIcP7aR3nnTdeeIv4sZHRiAhAPHze/?= =?us-ascii?Q?0jwypy0YPucJO76NUC+Z9lwiIxrnFF+oByWSh77nKbOuORgNYDg4TyCjQ0yM?= =?us-ascii?Q?FJF1Br1d0QU8IaZnMZCIHrvzJUIlk9unBZCKKQXhJG82GVNIUrLf4eKRqjUS?= =?us-ascii?Q?w0be3+ipOu02toPrfNc0MBDyWcD8VxMwA11SehG22RCl8fUvteZ7t6uArZS4?= =?us-ascii?Q?JCxyjJ+87ch3lmS5JN0lrWdTYl418pS/e6raPD6SNm7JLeY0a/EPasfVxg9A?= =?us-ascii?Q?hlgHp8jWzsuIMfvCQKffn+kxcjVnIPi7+ADrkYf17iUxRBMGVU4W2j6Yuysa?= =?us-ascii?Q?wSVJciX1QOJ++Nrss6jiL8AhJx4bXif2DMpTyOnhk2kkzewFL45UrtYD6gBO?= =?us-ascii?Q?IP/EO3fMcU/A+O+zuNYE6CAZUsKkkV/FKnZD30nsJut805teuwW14gmvEElw?= =?us-ascii?Q?45Oy5thTXCkSSuHcNGyqfODAIJ89wDk36zKqIda9MGld8xc1AwwTo1q8h2UO?= =?us-ascii?Q?cKckPl9/Z2MTM0Y8ZsF9lbYE8AL5tEF1NaZYxYJJ?= 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: MW4PR11MB5872.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f20cf0b-fb42-4a44-3d46-08dbf5946d5a X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2023 13:16:44.1318 (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: CfxOyrPX3F5hdCPrj+v/Q2aLbGMYf3Xi5TS3gTnck2+lj3uy86vHtudtsk2fRwSZyw7qSq1/WTO1aoMd1uYvKg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6546 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 >=20 > In xdp_umem_configure() allocated memzone for the 'umem', we should > free it when xsk_umem__create() call fails, otherwise it will lead to > memory zone leak. To fix it move 'umem->mz =3D mz;' assignment after > 'mz =3D=3D NULL' check. >=20 > Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD") > Cc: stable@dpdk.org >=20 > Signed-off-by: Yunjian Wang > --- > v2: update code suggested by Ferruh Yigit > --- > drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c > b/drivers/net/af_xdp/rte_eth_af_xdp.c > index 353c8688ec..9f0f751d4a 100644 > --- a/drivers/net/af_xdp/rte_eth_af_xdp.c > +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c > @@ -1235,6 +1235,7 @@ xsk_umem_info *xdp_umem_configure(struct > pmd_internals *internals, > goto err; > } >=20 > + umem->mz =3D mz; > ret =3D xsk_umem__create(&umem->umem, mz->addr, > ETH_AF_XDP_NUM_BUFFERS * > ETH_AF_XDP_FRAME_SIZE, > &rxq->fq, &rxq->cq, > @@ -1244,7 +1245,6 @@ xsk_umem_info *xdp_umem_configure(struct > pmd_internals *internals, > AF_XDP_LOG(ERR, "Failed to create umem\n"); > goto err; > } > - umem->mz =3D mz; >=20 > return umem; >=20 > -- > 2.33.0 Thank you for the patch. Acked-by: Ciara Loftus