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 4563DA034D for ; Mon, 20 Dec 2021 08:37:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 30F8341169; Mon, 20 Dec 2021 08:37:11 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id CB2AC40395; Mon, 20 Dec 2021 08:37:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639985829; x=1671521829; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=S3V1J5p8pegl957qkqqQ2P7W4s9IxOmV1AvjlzVRg1I=; b=m9MryRIOgy+ZSwspZYZC1W3hoZB1L/DkvVdxVd0ZpVXdYJF2BVEF7jRX zy4a0OCOwjrOj8Hr+CY/7IVT2tWlarBwPfZLZGcXC9iEj6EipJCuLjs+s Liwn5PrZUUilj9UBOrDmIJJ4KPMODLkgDjWCDmGJCr5SonMTGrNrFeqX1 CtmOrt149FiEIQFmtwUMyNnPNcnihHjzUuDok4hwmY5R9MgroRFb3ycJX NbeBupIYS0EZz8bGV+t+mULF6pSu2JkZ2irGjr2iQ9O5dNOQuG12yIOY1 FeQ1lv4OyaebQPQzwOBnOmtm9jND6XeGpLDtxbXWtzJ3HaD8Y3EJ+03s6 g==; X-IronPort-AV: E=McAfee;i="6200,9189,10203"; a="264298357" X-IronPort-AV: E=Sophos;i="5.88,219,1635231600"; d="scan'208";a="264298357" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2021 23:37:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,219,1635231600"; d="scan'208";a="755279376" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by fmsmga006.fm.intel.com with ESMTP; 19 Dec 2021 23:37:07 -0800 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) 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.2308.20; Sun, 19 Dec 2021 23:37:07 -0800 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Sun, 19 Dec 2021 23:37:07 -0800 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.168) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.20; Sun, 19 Dec 2021 23:37:07 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VkClIok1T354gbs06/V3+P+F/LEEbNAYPemyO5yPkPhjX4ioVNnwtSjkyHzJD6gK771E4QKS0Zz+e0lmJdHmKdSe5clgiw0ZIo+56xmkmKDsmROcb+aMVEWhzdJy+AltEa64p7AwrgDwL/0Fd/GDUuVzQ21+KLXMsbvVEC0BV0xGr/NE3B397kaaRC6PEcfHW18IOgLeRYLj+cyOt+Ab6ICsH1PbsKGWFGnTLr4zkXJfxAByMzznoiqPdiNfQOYcRICUcq0/lTxMtRGTxClc5/L5sqF1Fy0RNytiEc7JEf/XiSOsKbGL1qVdU2yrBTvVHIOAZVs4v5oQzck4Sc2HtA== 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=8Aza5AFS/2LvYUsDfkr5ZZEhhL+0rcrGOpOQPTSUH3c=; b=kn7bY5xZkzDvhU1ycOmaActrQ6D5VVZGaOXrX450bqRybxsbdlz5TG8GKMjXnlxDEKjHElpsv4mkRU6yza0iM4yFcFd5eLF2NGohKmOedfzywI3rE6lr6GoeRRTiMBLn2KSY4a9M5fJP996NAAyjzbd7nCzipe8oPdntoz/o7+M9xxX99QsuhDstpvASjJyU6yDlNx4F1dYJIgNRJ6VSMPu7MmKKeP8VvUXeHC/sOqRnKXftRGfB2E9CJ66S99rSZN8vgQH8Tj5Yhc8KfrHRoK2T8FjbUsfQ43wnuz+cw4cr0HgJoj07twz21IsYVW2R7yj1OKNez1csViWBEQdiTQ== 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 BYAPR11MB3495.namprd11.prod.outlook.com (2603:10b6:a03:8a::14) by SJ0PR11MB5938.namprd11.prod.outlook.com (2603:10b6:a03:42d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.18; Mon, 20 Dec 2021 07:37:05 +0000 Received: from BYAPR11MB3495.namprd11.prod.outlook.com ([fe80::8b:8b64:1a16:859c]) by BYAPR11MB3495.namprd11.prod.outlook.com ([fe80::8b:8b64:1a16:859c%3]) with mapi id 15.20.4801.020; Mon, 20 Dec 2021 07:37:05 +0000 From: "Wang, Haiyue" To: Yunjian Wang , "dev@dpdk.org" CC: "dingxiaoxiong@huawei.com" , "xudingke@huawei.com" , "stable@dpdk.org" Subject: RE: [dpdk-dev] [PATCH] net/ixgbe: check ixgbe filter init failure Thread-Topic: [dpdk-dev] [PATCH] net/ixgbe: check ixgbe filter init failure Thread-Index: AQHX6PkWFhFDA0vnzU6T+1yWNn123aw7FOFA Date: Mon, 20 Dec 2021 07:37:05 +0000 Message-ID: References: In-Reply-To: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.6.200.16 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b75c6e5b-75c3-44b9-ca73-08d9c38b8554 x-ms-traffictypediagnostic: SJ0PR11MB5938:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3276; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: b7kGeCOIHLCl+iFRDpC2vxMcA/IYQV4zXGL3XPEYe0zzGjYkvBHUFdfCZxS3hcTplDrrIjpTiACmlGioIcx7KABh9I67lux58b62h9x+S6Pvge5q4FOTF4v0fqyVzO5+Gl8JTZTj2ZQZ+z0g89cK0nqC4iO3N1Ivl9li3A0sNVKoDZRwkrcO/NRVYn8PcYMof1f0YjlKE5U/sOA7rkkEQEV9qbIg11zfqBBMlri7znCV+xHNJ69CpnACE6NCiWKX7eh3vEV5wdqHo19wcc9/xKXGbzG8pzfCvnquYZz6F3rqRl4/WoOeRyMi393Egaftln0XbSsxU2HeQkFkmsGOMAciHeGf4rWgseiDVklCd0/ZuTF0nnYKjZv8bqA+zdYuNI+LTGOMpiNX3z50xwV5O73TFmEUnnHrKme+ZX8GKRCaJgUnSLLmBl9k4gWK6zuvUaqj0gJ4u7RvwkQtGP5eeYvBzT/6eLgQBBkxAPMyLqSS7dAV1bvPtuPJyjRkMagrf42zwoTAEl4hpsytzvG9HSJgEEXy1UIp16+q4U+UzZfyMB51ktxQQeSEGSRhT2kI6HveDWSTQhVf6hRGnf4o41LFSrOe5B0RbU4dyofroVnpnnJuIwx9EqsG2tIFejaEJarnvZ4XNSRsL62Dy/rISs8iGKxEnot+z3G7FRNQ1hVywqdFc3Qx6cy4b1/hERjblRAoxaoGEHuerZP5pcijQQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR11MB3495.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(76116006)(71200400001)(2906002)(9686003)(4326008)(508600001)(186003)(6506007)(53546011)(66476007)(66556008)(66946007)(64756008)(38100700002)(26005)(8676002)(122000001)(66446008)(82960400001)(38070700005)(54906003)(5660300002)(8936002)(316002)(86362001)(33656002)(110136005)(83380400001)(55016003)(52536014)(7696005); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?QkpmTZq45+tcxWf+3acuoyqfkTxZo8DgJ1VTLVgcfWj0yv2loss2fs3YXaG6?= =?us-ascii?Q?TNduFqg18T2cYtnUgldfzxuxSbsydKdgpKQ4eYcwrqixC3mCFrl4MMXWSfyf?= =?us-ascii?Q?eF4V/ObaFQGlfTWmfwZ10MrEP05PZpxuCux4L5mb7V+/CqYoc3YwtPVcHD4L?= =?us-ascii?Q?AG1fsvg/078KUN4yVyiEchdEr59UHSmXghCtlsJLx6bDfZLggom5cyGVZFOx?= =?us-ascii?Q?Eq1ECnrMOW3/Lydt19gZIFZEG4Ye983rrC3N0gZHbvMOf4HiHqff1DxUlwPK?= =?us-ascii?Q?hzHgy/Ld2oqT0oAD9vX+maIl6bm7ys0W9YEx1fYivz1hMcQixxWKIq/71koU?= =?us-ascii?Q?wFLlJIIAAYLlG6GPi4495zzVEC1tKlTM3H5yeSyb5A4LeFQpB9NQcIZ3gBTN?= =?us-ascii?Q?Z26GT2dObgw3ZBz4K3vsWZxCylZpX2XVobG+70YRpRTzOI/DReKF+dcvRl9z?= =?us-ascii?Q?WvfYMifQPMmR1ZgSk++OxjPHZFLaJ2zOGnuzds1GCcT+59xpbXRWja+tS++r?= =?us-ascii?Q?dYP88tSR0iem0I1eZ5srOGIYxlkMZP3uuq4RnoJaFB578wkLFzJtIovxUp/P?= =?us-ascii?Q?zLH9qK4YUBQSQJFnP7qCpLhR+a3InbRQsvl+3ESxEwtnc3+rzBs1uWmWSTc9?= =?us-ascii?Q?n31JHAT5OhjbKFbL319wHeicID/mfLf11mHr47cfTS2cAcCr/YoAdawcAaW3?= =?us-ascii?Q?VApaPNQ6VgKTHb7UUbO+Gb0pbfhpDTA8rC/1EF6QlrQ+dRB1o4hgUCz5DzOA?= =?us-ascii?Q?VMxrUKmJqACG8cY3je+Gp5dI0J+w9P4b/l0vCYvNFopw6rvg0YBzaqWzl6l+?= =?us-ascii?Q?WFCsraipVpOwmRyT/xPw9YpjIqbYyNr9tsHRCz0EIEMWbF1gvbtxhpj4Xmo8?= =?us-ascii?Q?our+wUvF0ePCTiMu9v6ILJ4sR7P3odHAiA93OgszNsZAPL/PP1VNjiBAwwoU?= =?us-ascii?Q?e9bywnriG0KbyJm4tb2Ln6J89FMeBtMauoNIE3QUIzvQQ2QeEjSKDdT78xQD?= =?us-ascii?Q?WACg8zQl/NXAm5BLKuuOtRuR+nDnNG5OAhlkwuAUtHib30RoZrEu4PnHXjqA?= =?us-ascii?Q?jvdbVLIEUT8dgB11bB9xjxmiXINFRRmO5RPNJouEKrIb3PnLboBlHH82Tn5q?= =?us-ascii?Q?5UachTdRLhe2MpJVv3m3xJdiNEqskJxEj4DPuRAlSoxwYzB4rWrBX5Fffli4?= =?us-ascii?Q?vWnrYRJkXyQroC/hEJ3uEPIZsaM8nYW6MZxajBoJbHGBthHwQuTDzpbGXW2r?= =?us-ascii?Q?sowxRU0jvhoJzN7O5I5azfqDwYyhKJDe3KTrge/osxcJEBD4LyG5N/+6ywCw?= =?us-ascii?Q?m7PbdGUWPKe/K5eJDgl7VVOBvpvrNA3w+COKZRoseZ8xKG04FRoZq2V6Kmjd?= =?us-ascii?Q?2bh/uly4qyfEDSUddmbPRKqqr0+SdiexG4xVap5EgXv1KbG1YLybKLOVNEUC?= =?us-ascii?Q?bSiGb+TsrQcR0iI5DPwo9ZAVourC2NPiI42BKzS4gHj0rvgmi0U86Jv0mcwU?= =?us-ascii?Q?Q66enO/bAhDBT/PfyI7BUmOkCXNuOInOZwOyTTKwzNDfJoFzt2S6g6uzmngJ?= =?us-ascii?Q?qYu+5s/U9ccfZCt/kHED/QMYDvf8jETYc7v95f3OgWzXNJFxJJayffO1wnY/?= =?us-ascii?Q?OvM2faOCwfFKdq5KRTvY7q0=3D?= 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: BYAPR11MB3495.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b75c6e5b-75c3-44b9-ca73-08d9c38b8554 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Dec 2021 07:37:05.0964 (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: QmtZkYjCkwutS6lmkoVLkFlKeOYLRJItpH422sgrvjLlUkQOJm3tw+8bZzD36DSQkXx2aox6TqcVtMveQol/Rg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5938 X-OriginatorOrg: intel.com X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org > -----Original Message----- > From: Yunjian Wang > Sent: Saturday, December 4, 2021 18:24 > To: dev@dpdk.org > Cc: Wang, Haiyue ; dingxiaoxiong@huawei.com; xudin= gke@huawei.com; Yunjian Wang > ; stable@dpdk.org > Subject: [dpdk-dev] [PATCH] net/ixgbe: check ixgbe filter init failure >=20 > The function ixgbe_fdir_filter_init() and ixgbe_l2_tn_filter_init() > could return errors, the return value need to be checked and returned. >=20 > Fixes: 080e3c0ee989 ("net/ixgbe: store flow director filter") > Fixes: d0c0c416ef1f ("net/ixgbe: store L2 tunnel filter") > Cc: stable@dpdk.org >=20 > Signed-off-by: Yunjian Wang > --- > drivers/net/ixgbe/ixgbe_ethdev.c | 30 +++++++++++++++++++++--------- > 1 file changed, 21 insertions(+), 9 deletions(-) >=20 > diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_e= thdev.c > index fe61dba81d..25d6de7709 100644 > --- a/drivers/net/ixgbe/ixgbe_ethdev.c > +++ b/drivers/net/ixgbe/ixgbe_ethdev.c > @@ -1223,13 +1223,8 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, vo= id *init_params __rte_unused) >=20 > /* initialize PF if max_vfs not zero */ > ret =3D ixgbe_pf_host_init(eth_dev); > - if (ret) { > - rte_free(eth_dev->data->mac_addrs); > - eth_dev->data->mac_addrs =3D NULL; > - rte_free(eth_dev->data->hash_mac_addrs); > - eth_dev->data->hash_mac_addrs =3D NULL; > - return ret; > - } > + if (ret) > + goto err_pf_host_init; >=20 > ctrl_ext =3D IXGBE_READ_REG(hw, IXGBE_CTRL_EXT); > /* let hardware know driver is loaded */ > @@ -1268,10 +1263,14 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, v= oid *init_params __rte_unused) > TAILQ_INIT(&filter_info->fivetuple_list); >=20 > /* initialize flow director filter list & hash */ > - ixgbe_fdir_filter_init(eth_dev); > + ret =3D ixgbe_fdir_filter_init(eth_dev); > + if (ret) > + goto err_fdir_filter_init; >=20 > /* initialize l2 tunnel filter list & hash */ > - ixgbe_l2_tn_filter_init(eth_dev); > + ret =3D ixgbe_l2_tn_filter_init(eth_dev); > + if (ret) > + goto err_l2_tn_filter_init; >=20 > /* initialize flow filter lists */ > ixgbe_filterlist_init(); > @@ -1283,6 +1282,19 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, vo= id *init_params __rte_unused) > ixgbe_tm_conf_init(eth_dev); >=20 > return 0; > + > +err_l2_tn_filter_init: > + ixgbe_fdir_filter_uninit(eth_dev); > +err_fdir_filter_init: > + ixgbe_pf_host_uninit(eth_dev); The interrupt needs to be closed ? ixgbe_disable_intr(hw); rte_intr_disable(intr_handle); rte_intr_callback_unregister(intr_handle, ixgbe_dev_interrupt_handler, eth_= dev); > + rte_intr_callback_unregister(intr_handle, > + ixgbe_dev_interrupt_handler, eth_dev); > +err_pf_host_init: > + rte_free(eth_dev->data->mac_addrs); > + eth_dev->data->mac_addrs =3D NULL; > + rte_free(eth_dev->data->hash_mac_addrs); > + eth_dev->data->hash_mac_addrs =3D NULL; > + return ret; > } >=20 > static int > -- > 2.27.0