From patchwork Tue Jul 18 08:28:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 129615 X-Patchwork-Delegate: thomas@monjalon.net 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 962FF42EA6; Tue, 18 Jul 2023 10:29:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A3A6410D3; Tue, 18 Jul 2023 10:29:21 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by mails.dpdk.org (Postfix) with ESMTP id 0C61040A84 for ; Tue, 18 Jul 2023 10:29:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SohW05SiFTjTXesciE6pcMO43r1gewYXwvNYAA28Ni7p1Zb23ww8nI3Y9WtGgaeC0nvJrqqMAFuiDIgZzZ4Lxwkftu8ZT5mFKHgUUYdfQ6AAoeHDPkxGoG0XEq5FEGEN2KTIposo1U/ON208A2R3R4mv72etgwpeSR74iLslOtMrO/xE0NkxK/bv9JWalgvuEzC29S+hsD/tna4YioXmoaF7GnMQ0z1R2wSIqNIuNMRe39dlkjvdWUw5Uie0HPHnYBmBPGqJAEMa2i03PAbGpU4//rHuT4ZgPTZs4AOsE3m3W8o5RnHkUFAcCCUZlXDRlAi851tBJeU+luTkSzfJmA== 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=uJVLsv0QJA++6UqECiFi/hzeB4aKLgKavhS664GIcUc=; b=h3H7Z3YzHDD/UR7Gh8MzfSVgZ4PONOtEXV9Rg8DJgFECgt8qH2g1+d0cTetoIabhR5NsSlPDdBkr923HyzMhnXtAo6+A0KWMckgp9ucZOeD8QPlqp8y/D69ZR6Ik3+QKP5TINQ+KJ4N7ElyrkPIWejiXuP7s3w2x07UlMe01QMscXRfirqrwkFMuuaU6W85kXDvyx1PMRgTBskC0pUcc9pT/Fa+DtssmlBwLOktkLECJXYJgFSYJP5E+TstWvA0T0Mar2iKi+YVYfr/0EeOwgXk7j5OzOOs/CT5CCS91Y1AeLOH2QssuiXFl0vEuzxAqhMrFnOzA9X1DHpu/m+r6dg== 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=uJVLsv0QJA++6UqECiFi/hzeB4aKLgKavhS664GIcUc=; b=mLBGO/PtEXkEALGuYNuvENObtGuYklUCp8BoHGRha2Gfd6mKjmX7ysR2FvFEL5E2iJxEhNvbafEVlI4gcStdTPGIVThKoSyvFADUoPuf5v3dDxvYMNZiYB24tG1v/ukd0yYdMcfNk6D7Hf3DyMqzsMzpet04j+AQxPNZfNu9Dp4= 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 BY3PR13MB5043.namprd13.prod.outlook.com (2603:10b6:a03:369::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.32; Tue, 18 Jul 2023 08:29:16 +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 08:29:16 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Long Wu , Chaoyong He Subject: [PATCH v3 1/3] doc: announce bonding macro change Date: Tue, 18 Jul 2023 16:28:54 +0800 Message-Id: <20230718082856.2235450-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230718082856.2235450-1-chaoyong.he@corigine.com> References: <20230718014809.1779730-1-chaoyong.he@corigine.com> <20230718082856.2235450-1-chaoyong.he@corigine.com> X-ClientProxiedBy: TYCP301CA0058.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:384::7) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BY3PR13MB5043:EE_ X-MS-Office365-Filtering-Correlation-Id: 6b23db52-5c9a-46ba-7dce-08db87691313 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nbcz/izwBUh87OyS96GWCjx0PD43cBZe54+iIeFku1JrsUMT1UVQ8eakp6BZ2LTUH1R5UC91OmNgWVKqVyqa+mCLFU7IKYzlB/GWl/lg0Z7nL1JeKk1qKzp16VaTK/JWDqHsXfZWWUYFiQMEteFwbrnTE55+GWj/VRrPGvQvoK3uqKnVK0Uw+rTJ56XKG9svY4jOXk+nykHU2m4qgE89+GtFz2+kIXRk7IqeZwo/5tvjfH3twW+dLIPa463lsbvEsYXbYWhsr5PchDOojfap8lOML3Z7VQz56zJeXylNEwIeWmSUyNzB4mFZTt/kyXlrQVlNDCAZl5ZdxrruT1TVMjMVzQWNGVlh7URVeMQqUzYM/nbYmwgW4Cq7lO/5VzVX85XnTbL9E3CQTq8uWzGiuPO8FVCozD8e4omOqB/dDp3kurWuj6MSCFgyEEAfdL6lBZfXZrx/bFz5pDIy7/GuV4pDPmgPTT8ugey7uI4B8Yid5+R8NwCgg6yU98xSQrB0Jw8ZY2dZeGdvoR/Iv4n1fd3zIhVcEMRpDHPBDSzAdhLwBjzkGMAH3HjP+9AI07vkYL6mMss3E3GivxF60NwPsGdE7GVAQdlHNpnXTcjYKwlLuM3dwAGksjdTLBuhYrxCQAH6CrgFyLSXO032amasLq06UC6XGyV25hbQMKFU/Dc= 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)(346002)(376002)(366004)(396003)(39830400003)(136003)(451199021)(6486002)(52116002)(54906003)(6666004)(478600001)(83380400001)(2616005)(86362001)(2906002)(44832011)(186003)(1076003)(6506007)(6512007)(107886003)(26005)(38100700002)(38350700002)(6916009)(66476007)(41300700001)(66946007)(66556008)(4326008)(316002)(36756003)(8676002)(5660300002)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VtXxCYhliy9qobTa3LtLplQZCE9fxe8691hytpfAzl8Diqv3SMVXW0/JlAQMYnLgXD+a3EQMBhV3JZ9h203stABr+5VonVHkDWYxituY1GZyBwb5UTKt6PgkW/IZKUYqjZjC9qMuZuwcmE3BBOYempnjBsURmn2RXcgOBIPL+B2/Mr/IrLr9sAhY9c4b9KKWwRBTJ1RUmRjXz+VAthTkvbmjED3x24gOFcIrUkuFyIsBNjo+Rro2fuMDhKGUdO5LjA6UozOeGRJaFuU+BVWEP9NY7r70Pj/4T9sdMzXUAOfzY4ZjaEvhusUsc5kwAJsQySq+2DO/1lif/0WAeI+s7LAnqxdleJVQ3zgxUAjxKt9Xy4FKW541J4E9FtATsn6spectjTceyw4uQK7KQlzlueBgVHpLDYj59VDy9t0hurJpj680vLvgmX0Sfm3eMbLsD33PSXuxzghejtL930vVwli9OKRlGFdV1Bmfsten0mAJt01Se7qWRKyNGOCRzLBYV+FyQqGKdPT0wOv4VnJ9zTi/QmN5OZF3vzLQEU3gJykxy7cqTMZeLyZDcO4AtVbt/n3uPwMF5BhUDEJBle0H7n1pMANHooDfrdSayBxeQ48hORtz7RcIiiVYN5lAz/xV+mmrxbqPjDDdXHMqIB6azXPtkR9qrYpQy/R1cLRVN8xv1xLw898SVuNy43IqGJjdPYNCDroZvTHrJoSiJCnoVCHbRaK12oh2TDv/R+7r8Pw6Tg2Ks7FQ82iojf0bzgwWvoDH3TdofgIrTD2hzVB1wopouTtCYu30KvO6harh6vJx0h5S5+Jc+JEFNHpoD2fsPx7rUhbY9W1p2sKRGJ+IPtc3rtqwGWUJzUGdBqEU7J9maRSsS+zlCH246T8MbcHGRdZLAjYw5KkLB2SVaw4frOSuPRFGkPprcQsLWOxjeM7buLYvzORKfnrFy5xIJJii7fBO0sPq7iDcXSxzA48A+SVPzLhHDW1KuMZU7IPtoqPuh5fOutKz0qjQzv/0tEi7V1WfyI51LCWKUwuFLz6Eic7DLntGf14ziB4mYVRoaBKHpQw/n/Vtq3M2Nd9W+v6r/HhPAj1J/DTDWpt4R8XevnM7PX3b57g+wb4+aD+w2xdKgUOsRbhwoH/xyFnD25AeY73MIQwAP4SuiAI6Qx19TLItkraPZsdYJo7Q7PvdPdU7awZkQ0DtJKHSU7SIEAU7CW8EsXIyNrPo94ZXq9TZGai7eTzjuQKLc9T2nxR2KedluHDMshCaeqU+W0dZ/tePcrh0fhrHqZupc5j0S8HWE3ambB+R2qgCFtd0ZCR8h5BdagMi7tPBIxPB17WShKIoZkIJU2dRDM8NEm+YAvICsnTrJ5VOU6oWBhI2WMrEYqmySaHVi9opY+H5EvxIBgNA1BK3OCzobbYG4ymitfdYZFBNJuNgmd1vMxTdpIgaZiRMQQVmvPVe7xH+vhwZ6vPp/Bfsv2rFsG9gPffxTKkRiV73Ig+CBmdX+F6UlHd1zUGRpwClGPB5AWQkh0L2Zbu2cl6uLNPujbaj5n4zmBEsm+o/+lmQ1V4kGWQRltL1o5cp26UDoZC6oqTQzCi51jNhE+TUCInf38tKCgkoshjdRA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b23db52-5c9a-46ba-7dce-08db87691313 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 08:29:16.7067 (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: EkP+CmJu6/ZzC++6rYqrlF5i5HWnyXH36UY1n23ZCznsF1SR21N0zU2qYgWoVhNzqAAnSCHvNiCZoi3QYlqVwFaXW8gsHwiDyDyvc5xXaeM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY3PR13MB5043 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 Acked-by: Ferruh Yigit Acked-by: Stephen Hemminger Acked-by: Huisong Li --- app/test-pmd/testpmd.c | 2 +- doc/guides/rel_notes/deprecation.rst | 4 ++++ drivers/net/bonding/rte_eth_bond_api.c | 6 +++--- lib/ethdev/rte_ethdev.h | 5 +++-- 4 files changed, 11 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..f3f2baf0b9 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -118,6 +118,10 @@ Deprecation Notices The legacy actions should be removed once ``MODIFY_FIELD`` alternative is implemented in drivers. +* bonding: 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 which got error interrupt to the application, 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 */