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 3AC0043703 for ; Sat, 16 Dec 2023 01:55:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C14F402A8; Sat, 16 Dec 2023 01:55:58 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2083.outbound.protection.outlook.com [40.107.102.83]) by mails.dpdk.org (Postfix) with ESMTP id 4B5B740261 for ; Sat, 16 Dec 2023 01:55:56 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J8DJ9LOHICnSqmTrQWlBwKRnkrrGZBRYa+6/rOBsRK2QplK3cGZs58FhaGKn0Ln2y3D/h43MsgVmPpBWFpVYOIJ8t6GWVYKMx1VgS5Zdtbvw+Rf1uzpkK2e+id7ckPhnWre8cvwcPyq42XdhCIIcePz0r1IAPskFxdt0zBI16zslZL17y1AM/e/X93dfTr0w/pM1AUEUwVedo+sYRWd+AllyGLnkwgpYInNrKO8HBvdOtUiszyDEvSo+NuX8Zqx0Xc0W2MRkeJ67x2rs4E8BYDmn2H5qZRsYR3yur+OgYHN12LtRYzGDvbJxOYr3ewgIcW+MtRhSvS69UVSL/6Mr1Q== 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=GcdxbHIPKDH8c8CRgBXIKX8aBS0+8NVc+m7M5n5tiqA=; b=UDP3OuyXL0ZFAfvIjyosPCtJvu1VXXd70aFmNJ4VSiVA8uEnXr3hFCgZuHejAJH1rkiTCakBok1fmUHC73Si0bi76Ah0bkB/lTqMmtgsZ9q8IAD11ep8MYeueYQAklZYhJDvzg7mhiE7/yk0SUPkWh0qw2AisFxQsyTKkecH5doi0YvjtIV+I9ferfg2cBsFgvP2ZboEPGnsSAAyoujkG9PZUwGG/+S+39CVj45lDOAybywJCXybRwvNY0sy7Bv86YFYjXn3zMWTWI/yNU0LZNqg0Cue2jMRMc1Yejl0oZS4/eXXpevdGdA2mH2mBY2InU6t9cGj2SB+erWUeko7pQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GcdxbHIPKDH8c8CRgBXIKX8aBS0+8NVc+m7M5n5tiqA=; b=XyxP+7TDEPFhCN9mlM9dZdvcbdvPAJttIsmPSPYy1p/vWxa9dGPPc/3UDNYFmeYoLc+kJz4mr3fbAms1OJTyacpwOO+J3cf83NTRE/UUkvQtJAPxNd/0eSkvpj7/kwlY3pn248Ce1FhiCrHn+po0m4tXkIJP3kUa2/7Al9Xbj55/iSybEWSI97b0NbuPaB5okg0DR2rc8cTW39PcFPmmQgyqyozTBJFos0K4VVA/imidDPVtvk6gw8ukXwamKJipiOaWbrRzZg4LgtuY8kbwHb7p1cKnOvRxW36iU9/gY/wb9Rr9NNXUwfAv4DZQseqEe3uMSaB797ph4gjsG3nLlw== Received: from DM4PR12MB5373.namprd12.prod.outlook.com (2603:10b6:5:39d::14) by DM6PR12MB4091.namprd12.prod.outlook.com (2603:10b6:5:222::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.28; Sat, 16 Dec 2023 00:55:53 +0000 Received: from DM4PR12MB5373.namprd12.prod.outlook.com ([fe80::6e12:5648:d8f4:ab2d]) by DM4PR12MB5373.namprd12.prod.outlook.com ([fe80::6e12:5648:d8f4:ab2d%4]) with mapi id 15.20.7091.032; Sat, 16 Dec 2023 00:55:53 +0000 From: "Xueming(Steven) Li" To: Chaoyong He , "stable@dpdk.org" CC: "oss-drivers@corigine.com" , Long Wu , Peng Zhang Subject: RE: [PATCH 22.11] net/nfp: fix reconfigure logic of set MAC address Thread-Topic: [PATCH 22.11] net/nfp: fix reconfigure logic of set MAC address Thread-Index: AQHaLKj5JJ8E5RWn1kKkO8FMy46eLbCrG7yA Date: Sat, 16 Dec 2023 00:55:53 +0000 Message-ID: References: <20231212031136.1817003-1-chaoyong.he@corigine.com> In-Reply-To: <20231212031136.1817003-1-chaoyong.he@corigine.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=nvidia.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM4PR12MB5373:EE_|DM6PR12MB4091:EE_ x-ms-office365-filtering-correlation-id: 8d9e1684-8664-4f2a-f6b9-08dbfdd1c168 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: VaEV/TPcVhfXsfr/ds/vc7dpCVAblsuhk1rQ4317v+qL0XYPwKUqUz56Ds84IrVCfC4L/czh+G5QIWvFPgQggK28J1QRBrnwByzoNLuF4R+GhKFnmD5gOAksHYkMfux5icJ3YSVbRxhMc6N9wxtJTFbeN1MKDL67d2QVk6fSfqtww7QYVNYcrH43Eaa9YlvNXiXWtDqOkUdhgWXDSOuWImPvDLudjOnHulnPbla/HZLoHhtBrgZWQa/vVJopQtKkzzbwqwa5SQa1BWM3XeagQHWENk4zScdLFqzY//8CcKoq4NcGhLf+eRvYarAT2TQzmTjq0w4xpgKqD27aOyUg1UxZyeq3rhTjsLtvvgGLms6/BSlUiQqiXhfxKb6zBztCi4LvauF4vPQZ/rEz7tcLe4KK1EDqSLtsE8OL1M+onFTeNpEl/2acvPTAK77xImggBc4wU/yxp50dbs7JYKQ0ANg0FyUm8WrMfh5QwQM8PVIKtys9WBYHdNIbdVS+HXVcucgVFTqi4c9Fc3/gvFRYifxJiYQe1ZAOclsINHGVz2jL8WK2kSyW/jf9wns+TFuC0S11Ibe3sWUTOXxm72M8bPSUDfNJdLf6jyyIWprurQy4Ifv4BVS+jl2GoPfCdctW x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR12MB5373.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(346002)(376002)(366004)(136003)(39860400002)(396003)(230922051799003)(186009)(451199024)(64100799003)(1800799012)(26005)(6506007)(9686003)(53546011)(7696005)(71200400001)(83380400001)(5660300002)(52536014)(8936002)(41300700001)(2906002)(478600001)(54906003)(64756008)(8676002)(76116006)(110136005)(66946007)(66476007)(316002)(4326008)(66556008)(66446008)(86362001)(33656002)(122000001)(38070700009)(38100700002)(55016003); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?U4sa+E2pOMk1gt2hC0AXUZGyJSK2DqOrtHbvRAGucdziETswIkkb5AmWkQ/Z?= =?us-ascii?Q?gM548KnahJk5uT3NBwIv9vyh2Cyi5Y4tz2n67YjH97TEdaXaGwEQCkCQcJBT?= =?us-ascii?Q?pA4K6y/0LHQHouI8k4XjBnlV5xvfmoHaCo6FOyPMT6c2TG4YHhpf6Y5NWz34?= =?us-ascii?Q?dZ6KYXgJCPNMZxkrQ1Gg4YL/Xt2NhmUpujjq83WHCXLhh+fLAA5SC+U0k8yW?= =?us-ascii?Q?O0zPWLymOaFBSmKsgsOTznU9exnQnGdUmPN/uESl9e6wQlG61bXcezXPNMUi?= =?us-ascii?Q?R6hGi+0NGN1C/lQbTWGQxucEAJIvomAp6lEmrGn8bDasjnkWD6MNF9n/TqoE?= =?us-ascii?Q?vMsk/bVmBa/X3QfDrB26ydLhFJdUO4twS8D7zs4/c+Eds1I8w/LPBGbPzfz7?= =?us-ascii?Q?AMosTg7TgFKiVx8a3DUgx7Sg3RJNAV1ZppvNrrQLqBOZ79FjF+F81vlK9/l1?= =?us-ascii?Q?gk4AGw1u2HezpahMPxeK5QNLKzz7LJXZG9T2CvU6box4PhVFe0DY1tr3oFCW?= =?us-ascii?Q?2orQN2s7Z1l6NqOW3mU9ec3qw7FdgXdYM48DyIc7gNT6yjNS83BbQWqpOdo/?= =?us-ascii?Q?QkVjgQHrExwio54oDShxaXPgajc4VKR5TQzhzJPwGtrJx6FD2vY9Qv7k/RU3?= =?us-ascii?Q?QvmJtANUHeO9uyWDrmSIc52qbTFxhD05y6fBOD5DT31aZEkw9JJRJbYSw80V?= =?us-ascii?Q?UiJxYm8XSPvBPrpARGUm9g+/Aw3mFN/aTG54hrTi0N3lY6kNm/rKKmeWBbVV?= =?us-ascii?Q?f5nUCGAgb9B2lusNLDllcAoYw99dGsNSm+mAAX79qblxvnWV5blf+FXghq+H?= =?us-ascii?Q?UhWG0FfN19XY8LJOM8TeNNQ2cn2cc7vqPXexpGAMwCF202e29xBrp6P28Lrn?= =?us-ascii?Q?wPgczXjI2MOgTxBPNU3d0lPxi+9YqF53em65X2nC+jyd0xhb5XZSxK/j5lM1?= =?us-ascii?Q?CaPXKaJJ5e9sBq5e3bNfyOBvI0g1cxl7R4raR8XkrB3Eb+5mkod0kFOcosjJ?= =?us-ascii?Q?VFEqIktplg/ZWXDtd8ySLjUOwOP3/vHkk5z1bLsD/j5Ujyz49wa02nz/2hcC?= =?us-ascii?Q?0VL5LJ6r3Ogwjk4sXFCRVrkGzLIeJTTsCLFLERFHJCC4U0FdZ67qrKM2Hmd1?= =?us-ascii?Q?USOBm40n6x4GefqcE1TWheDWWXctqsEsatd+b4AfNAI2MijUYQTRMSeTC9R+?= =?us-ascii?Q?5bn6KhNn0O7F+o2aPIXOR0zU+XZn7ZIPQBPk8NtS+D55KBNlpqJHW37SO3LL?= =?us-ascii?Q?Xd+Ab6k9BWqCa3DW1LnI0yYLY9oR/47QPyx/dduUSlG+8/HSedA+//cy587/?= =?us-ascii?Q?UGWiECLROQlUG/5KtAj3lPaUUmCeglL3XX69Z2TKnNDfqJr5p3zFHpf0PxYl?= =?us-ascii?Q?ly5bSLcwhxBkVWKwai3z/BCi/mGUlr3kGzbk4a4wLeBKcXqenu/QVdclkA1t?= =?us-ascii?Q?Kwdz1wgrBj7gZ8/8IR+2d7W7sK59ZV+5SSURFlKNGGdluyiSDoYai8nNoyy2?= =?us-ascii?Q?38m0mBFMSzeZny7cJlJmAx0UzLHZrdHlhNKUlJHdAgnNQL4BqwI3LzjzrCtd?= =?us-ascii?Q?/5wMtONxx9Y1Cr39gy5riWHOeTLk+EJOk/hT/fim?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB5373.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d9e1684-8664-4f2a-f6b9-08dbfdd1c168 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Dec 2023 00:55:53.7374 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 9LFAihxX+i3Cwj2ueM6Yp8SRElMOf/hNPjV7JLBWJcdrGR604FVA3cGa4nbYpRHTv/8wvuqzO0fnqvB4qGF4GA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4091 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 Hi Chaoyong, Patch applied to 22.11 LTS branch, thanks for the backporting! > -----Original Message----- > From: Chaoyong He > Sent: 12/12/2023 11:12 > To: stable@dpdk.org > Cc: oss-drivers@corigine.com; Chaoyong He ; Lon= g > Wu ; Peng Zhang > Subject: [PATCH 22.11] net/nfp: fix reconfigure logic of set MAC address >=20 > [ upstream commit d67022275d3b423850c629036d33fdfadeb874a8 ] >=20 > If the reconfigure API exit abnormally, the value in the config bar will = not same > with the value stored in the data structure. >=20 > Fix this by add a local variable to hold the temporary value and the logi= c of store it > when no error happen. >=20 > Fixes: 2fe669f4bcd2 ("net/nfp: support MAC address change") >=20 > Signed-off-by: Chaoyong He > Reviewed-by: Long Wu > Reviewed-by: Peng Zhang > --- > drivers/net/nfp/nfp_common.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) >=20 > diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c > index 0fa74a43e4..33613bb2b3 100644 > --- a/drivers/net/nfp/nfp_common.c > +++ b/drivers/net/nfp/nfp_common.c > @@ -279,7 +279,7 @@ int > nfp_net_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr > *mac_addr) { > struct nfp_net_hw *hw; > - uint32_t update, ctrl; > + uint32_t update, new_ctrl; >=20 > hw =3D NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); > if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) && @@ -294,14 +294,18 > @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr > *mac_addr) >=20 > /* Signal the NIC about the change */ > update =3D NFP_NET_CFG_UPDATE_MACADDR; > - ctrl =3D hw->ctrl; > + new_ctrl =3D hw->ctrl; > if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) && > (hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR)) > - ctrl |=3D NFP_NET_CFG_CTRL_LIVE_ADDR; > - if (nfp_net_reconfig(hw, ctrl, update) < 0) { > + new_ctrl |=3D NFP_NET_CFG_CTRL_LIVE_ADDR; > + > + if (nfp_net_reconfig(hw, new_ctrl, update) < 0) { > PMD_INIT_LOG(INFO, "MAC address update failed"); > return -EIO; > } > + > + hw->ctrl =3D new_ctrl; > + > return 0; > } >=20 > -- > 2.39.1