From patchwork Tue Jul 18 01:48:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 129597 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DA00F42E9F; Tue, 18 Jul 2023 03:49:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C82FD42BAC; Tue, 18 Jul 2023 03:48:59 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2108.outbound.protection.outlook.com [40.107.94.108]) by mails.dpdk.org (Postfix) with ESMTP id 0B30E406B3 for ; Tue, 18 Jul 2023 03:48:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M60zx37+DZkhnQvHS9cTD6tXf7EXLSH09BrrdCNgs4dLMqjmtsfA8w7kQyMFbXOajDC4zQuBpITIVVBNPSFIy+H7Mb0MSXlbZz9so+WTMO+G3U0Ii5hO4Bxa506DQkStKE37UIlY7H7Wp4tRTyv+6qouYZp91Vvwu8b3CpFFOvJqk7TIiL4iT5eUMoWKBthKZRgAmPiCceFoIWPWYerOgjRhOti19T0kZ5BLiChdSwcmwxqtf0MCecyWbvHZ/x6TUDtKhEoE/5Tggwkf8xeEvBHDgPPBBbXISUncvtPHGmn8wwc4HD7c+mrnyyilB1ChqiQ9Xy1gcU1QKGRsSWk/Dg== 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=xXHS71ILSDF6gw+TBC5/uj6qh4ZTstTvkeIH404P68M=; b=Cz1ndlh6SmDwyYCSwKajsSaNqd+ulRNJoL096fjaytxSFiFju1D2yfWomQd7N73PWlq4vN1MKOxRoMhhbviavzWvTJ4sHUSxT8Uixx3ANLWcJTlF9yZQvqX63Tv+/uGu7iGxHQRwgEE/MA95w72EZk4cr50ucI8ZXkRIfctkof0rqtKjcujA1p5nwyxMop73lUbeh00Csm5TZCtSlFVwIH00Guzfb1h7b+op7yuGyIKb5k7AZPuo5HF0DcYHOJyqnFwS93M6jVx1eCyvmbFzrjQYFtL5nI44zENUnHc5N2dHuvegKYQ8PSMM4URBZ3k8lMF5gIFBYT7GJKg4t8v/Gw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xXHS71ILSDF6gw+TBC5/uj6qh4ZTstTvkeIH404P68M=; b=GwZdThnR/JKD1QQcIrGoNwXl8RwviqqOZg3FJeXnaSn3woC4lod7QcQ/fZSWVJzSFrkiCKU5rgXMpJ49LRazSQ7rZfhJXUxVaXmIiEPXjJON8GG1gUUk8T3DIz3pWyI4y/HRnRcfVJU/HmBPDQw3K5ErTy/ZXTcOZ7g23sI55lU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SA3PR13MB6466.namprd13.prod.outlook.com (2603:10b6:806:39b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.31; Tue, 18 Jul 2023 01:48:54 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174%4]) with mapi id 15.20.6588.028; Tue, 18 Jul 2023 01:48:54 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Long Wu , Chaoyong He Subject: [PATCH v2 1/3] doc: announce bonding macro change Date: Tue, 18 Jul 2023 09:48:07 +0800 Message-Id: <20230718014809.1779730-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230718014809.1779730-1-chaoyong.he@corigine.com> References: <20230714081526.1277786-1-chaoyong.he@corigine.com> <20230718014809.1779730-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR03CA0112.apcprd03.prod.outlook.com (2603:1096:4:91::16) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA3PR13MB6466:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ec0ebde-a17e-42bd-5f41-08db873124c8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BF79jdHFAvOzk645F9tEengzFWV3Abb6sV5akyU0XP19EyR+yZa5R/FIiTLbf0+ub1j5HeP5GLCsCg6tiWMglBb2cQR1qPlXDwgAXIoXr3E1WLphAn+3UgGoIRzcZVX4ZzaDWWhFwQqycM8SqC4+p8mJedpviGiaLupBw7fMzF/6wr0miU63yD7FK9LF3KwU2MKkaCFX2hdpz/4YfBmS8MMQ0ZQdkib58fCtymWPzJO0Yl8TA23d7dnxJBaCZoIiXqEW6Ok6hQ9SNeKZX/HG9r0vWg+UsRm7LQFDc8k3eyphcxpk5BsX3hsmUzXwDce0dRkytHsmpukXmer8PV1e+Dd6ie/lIwabtftsG812PcBtQHOz3MVno6voVmzvxzZZxkO1tJKKzf0mGmzZj4ljlF1f+g8XkkaDp+0M/7I6sGkfibuT5JZWy8cMgcXQUBYPiz9EbWLCanEcyf/goqzx4P66MiwrDpfY7sciJ9VM+H6VCUMX+UdrnoyQdTok48+LAPob76P4ova/Z9Xhv+VUvCSxW3tXFuoOKt66TemaWLZVJifGftNxC+l76CMrojB58t32ExOfxxwFboilznsR98cgGTSHfc6wfTsSbWivxfaIdrYKSyR6+qSyu+yTYNAutz3mw5PWXQRvcpluGgMNTaEP8BR4znXf0bhBMABM77I= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(39830400003)(396003)(366004)(346002)(376002)(451199021)(478600001)(6486002)(52116002)(6666004)(54906003)(1076003)(6506007)(186003)(6512007)(107886003)(26005)(2906002)(44832011)(316002)(4326008)(41300700001)(66946007)(66556008)(5660300002)(36756003)(8676002)(8936002)(38350700002)(38100700002)(6916009)(66476007)(86362001)(2616005)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: a1wcU/H6ElkthbJKNdMAO/mLCVMwD+9SMoeWHAEwOxpcNKrySdnv7zfuzsGUgV0dtCs86fvdTp/vfJSE10WrIQPzlgb64BFi1tjYh/tlq8DWwZ57l2MDQ0G62+ZmAPS+o1eXhqdp8KqL8ZGg5aF84jG+ThxnalzTm7B9br9+YBc/t6ePkncy2dd/E8wttA6BhrcFaDvZHwALTtx1un6a/vW59qr4HjXj75eypuCS96qBBxnE7iyE3hsNdocY1t8nEmDvu622eQJAoPyYMiN8YwxMotx8oOAfTRRc65tV7wuMPzpgmDQgPZQhHAUsOkcpn+9d14pKXo7XBwUV77HxXvWrxLnhMXFkIepDnAVI/rh452XPG0uP8Ap1UfQyMncMJ7bq9+DgdJph0WX49dji83iu3a8zDytsC05yLBDZdD//qovPKdd+sKUTbtniCf/JEX6gKONJHzOVxkCeIkdin5MTTQrVXw5gz5fft9RibhlFDWmQQsICkg3PHqCGNP8vluJSZjq8uJSki5l6xFb5hrBJAVpk4tTGkRJCl9CBwAKmWxuY5NvfnGgB/zVwpXQvviMd773aq792wFoZogUmQUJhlFp919edfSWyr+B4wWNZNnC5jAaiA8Sk4I0ZBzYkOlcp9BcI332E6LLxZWNjwRcZ5DD1L80R9FrRMvk+SFv72BVt050JCWklEyD8hNyAA12dDyzQYnizAUehoVCYFFNZCzcaQkJEpfyGhG/HgiZ0X2TrVtay6lRpMYoNfyviGR2rWiZYmYEtVjdEr8aPYFBKW317WX2lQX8aBiupM3NybPI95zShdHEmGbeV8x2oRREsF3rU/MbrKDSf2pOtMzK2SswKVMJCmfvgjn5oNYOM8T1UJyB9eiCitqacehGazmxRR+4BPdjJXNVKbhZk9Mz4amRnJwP5VOuB+RvkteFUqavwXTylzRAhWk0K3wn6JCIYOZ1MvDXKgP9gNTnk3orDHjYQz4nLrkAtjEY20Pl6v9j5t/aG1CecPZAffWUaJzHbykTC40Hi5sfrMHTa21Nasj5sDMKWrxDlDu5PBYJkD1m7UiPFJyMefzqx+5HhVpuTf6WLjUZGalhTT/j5UZC0/KHpjA9qimr8tqq5hSmCDR1XnVzhOzG/20+24mXHBn83YqD3Y7janXuyQIONk8/t21+upAb6zWtdgjDXL2vNIYZI5ld5TKkQsrIYxAZELHDx8MPPbPJW4r+wjlFZHrNutc8hzK5C9zxDM/CuW+3oLKn6Sl2jfhv4pK2hiBfEI1weEf/X99ulWgxzgkDztqnOSE5wLTUwN2puGVIwpmfG43Yq3D01WBzBQm3eHdWEUtE/YGuInduhX0y1wyK/Ho4ZTtBTQpJtX5NftJe4xWzook0LuHA/gOpZKab+vV0Amk2znqlyi8A1M+BzkFyj93+/CtWff4ypsot2zPqxJhZ65gdtf1ijqtJPNxktwKCM4PqQfOWCwuSGClD7XAokcJCMLL7fTMgAvzhvZOpsoziJ+hLNnTfVItNxDpm8dDy2Jm348fxipZgESHhZ7NpH8wPdM5ezWcwqWtNR+suh7dl0cAAFzAwrEtLp/Mp/GLKZBwBuxV/AJLMUg3P1qPM5dg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ec0ebde-a17e-42bd-5f41-08db873124c8 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 01:48:54.6696 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BRWWyg2PkbZrGR8ayxMlr1vp9/po0ObJ2PDQi8GrtyckgF233h62XhnTDShFxuQmKHQjXDVx8DjtCjE/lIMvlNfUtv9tJIz61Rmva38vEg8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR13MB6466 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 From: Long Wu In order to support inclusive naming, some of the macro in DPDK will need to be renamed. Do this through deprecation process now for 23.07. Signed-off-by: Long Wu Reviewed-by: Chaoyong He --- app/test-pmd/testpmd.c | 2 +- doc/guides/rel_notes/deprecation.rst | 3 +++ drivers/net/bonding/rte_eth_bond_api.c | 6 +++--- lib/ethdev/rte_ethdev.h | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index c6ad9b18bf..938ca035d4 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -4248,7 +4248,7 @@ uint8_t port_is_bonding_slave(portid_t slave_pid) slave_pid); return 0; } - if ((*dev_info.dev_flags & RTE_ETH_DEV_BONDED_SLAVE) || (port->slave_flag == 1)) + if ((*dev_info.dev_flags & RTE_ETH_DEV_BONDING_MEMBER) || (port->slave_flag == 1)) return 1; return 0; } diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index fb771a0305..fc50b73761 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -117,6 +117,9 @@ Deprecation Notices superseded by the generic ``RTE_FLOW_ACTION_TYPE_MODIFY_FIELD``. The legacy actions should be removed once ``MODIFY_FIELD`` alternative is implemented in drivers. + The macro ``RTE_ETH_DEV_BONDED_SLAVE`` will be deprecated in + DPDK 23.07, and removed in DPDK 23.11. The relevant code can be updated using + ``RTE_ETH_DEV_BONDING_MEMBER``. * cryptodev: The function ``rte_cryptodev_cb_fn`` will be updated to have another parameter ``qp_id`` to return the queue pair ID diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c index 85d0528b7c..8b6cdce34a 100644 --- a/drivers/net/bonding/rte_eth_bond_api.c +++ b/drivers/net/bonding/rte_eth_bond_api.c @@ -472,7 +472,7 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id) return -1; slave_eth_dev = &rte_eth_devices[slave_port_id]; - if (slave_eth_dev->data->dev_flags & RTE_ETH_DEV_BONDED_SLAVE) { + if (slave_eth_dev->data->dev_flags & RTE_ETH_DEV_BONDING_MEMBER) { RTE_BOND_LOG(ERR, "Slave device is already a slave of a bonded device"); return -1; } @@ -615,7 +615,7 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id) } /* Add slave details to bonded device */ - slave_eth_dev->data->dev_flags |= RTE_ETH_DEV_BONDED_SLAVE; + slave_eth_dev->data->dev_flags |= RTE_ETH_DEV_BONDING_MEMBER; slave_vlan_filter_set(bonded_port_id, slave_port_id); @@ -724,7 +724,7 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id, slave_eth_dev = &rte_eth_devices[slave_port_id]; slave_remove(internals, slave_eth_dev); - slave_eth_dev->data->dev_flags &= (~RTE_ETH_DEV_BONDED_SLAVE); + slave_eth_dev->data->dev_flags &= (~RTE_ETH_DEV_BONDING_MEMBER); /* first slave in the active list will be the primary by default, * otherwise use first device in list */ diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 3d44979b44..04a2564f22 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -2036,8 +2036,9 @@ struct rte_eth_dev_owner { #define RTE_ETH_DEV_FLOW_OPS_THREAD_SAFE RTE_BIT32(0) /** Device supports link state interrupt */ #define RTE_ETH_DEV_INTR_LSC RTE_BIT32(1) -/** Device is a bonded slave */ -#define RTE_ETH_DEV_BONDED_SLAVE RTE_BIT32(2) +/** Device is a bonding member */ +#define RTE_ETH_DEV_BONDING_MEMBER RTE_BIT32(2) +#define RTE_ETH_DEV_BONDED_SLAVE RTE_DEPRECATED(RTE_ETH_DEV_BONDED_SLAVE) RTE_ETH_DEV_BONDING_MEMBER /** Device supports device removal interrupt */ #define RTE_ETH_DEV_INTR_RMV RTE_BIT32(3) /** Device is port representor */