From patchwork Fri Jul 14 08:15:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 129537 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 1702242E70; Fri, 14 Jul 2023 10:15:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DD9F840A81; Fri, 14 Jul 2023 10:15:50 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2130.outbound.protection.outlook.com [40.107.102.130]) by mails.dpdk.org (Postfix) with ESMTP id 01BD840685 for ; Fri, 14 Jul 2023 10:15:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SsuPRhHMiTpo/6ZN1FTIPtllnOyro7z3XH9X86tW0iL3bhSTi5TB3b7Vt/rMKUeui67InocI7OIqvjoDbgyp1a1ilDkTVMuxXRJcjq3Z5aiYgWuKKuwGRIJZZGQRf/iLRLBavj1IoXF12DSxz0bJVhT5W0Mqn9cS8jjxhy4KEHLfmtDqWaHnSj3yPki742lB3g2+ICUYP+kAAg3D/PeIowyg+xfcjFGeJCG8g4NVjmRV4F4iXYeoWC2Si+5JXtmnRZy7l7rcBUlmZW4ARazxponIkVKipiFMeuDHMNmngxBIJnwgRlb5ZNYKKqWExRLBlKCi7jG7qHoRwjDYEQExdw== 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=OJoToczH9AjFHfervemfKwcYtjQ+Ng0LOXVEXiTa6tI=; b=SC+iQJYeTvIvssSFXJNCb3+mc0lpDkW8XtMuudvCGm/zAxPb9zknMc28gKe7EZs15nwb1ehf0VG7A6MST8HCJvz35u2/C67geeLkJUFFV3Ilyow8sGFeJtc0r4YWqzY/8OdEWGYLDH8De0fpTV3i4dPi8lvxao27ozahLrqzMozk8YU+oWQDQrcHEgK/M4hXgds/aukFB4Y29p9S6s2T/f+lXf2bO9B6t0wJS4I5B8YGIrzMGi1e1ejUW4UUvf5gw0h2dyFglE+MSDhCsdwbf5l73nvnYqMgBE0d095mNt8xOUEwv5r+vAo5vPSNKNBQtPZQrapSYJMju4Y5cRaZSg== 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=OJoToczH9AjFHfervemfKwcYtjQ+Ng0LOXVEXiTa6tI=; b=gdSfShn90pjdE02Ew3nuvEQuvdOsbpfYCJli1gWVYmVsjzER4Rmmt2dyTKNzCaB2ZmKq8CnYHel65dfyBQR2JZB+jZBzb7ffb6dntZFDoEn4Z2HNeClnJSlHBhoxwM76QLwytXn0BuCmZFn4Ezdyp7jarLf4rkbYiEitY2u/HS0= 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 SA0PR13MB6001.namprd13.prod.outlook.com (2603:10b6:806:152::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.27; Fri, 14 Jul 2023 08:15:47 +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.027; Fri, 14 Jul 2023 08:15:47 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Long Wu , Chaoyong He Subject: [PATCH 1/3] doc: announce bonding macro change Date: Fri, 14 Jul 2023 16:15:24 +0800 Message-Id: <20230714081526.1277786-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230714081526.1277786-1-chaoyong.he@corigine.com> References: <20230714081526.1277786-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR13CA0240.namprd13.prod.outlook.com (2603:10b6:a03:2c1::35) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA0PR13MB6001:EE_ X-MS-Office365-Filtering-Correlation-Id: 39d2146d-d583-472c-687d-08db844286f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: axO7tqHqhEAKoZ9h8U+LTGCAJODLJp8anaSS+BUeqFpa3hTzVUH3kIjK6RBDbtq2JnrzGOkrLYaGpizGH2mT97mDa+HTN8FqLE4i/j9UKwGFA9NJR2WSfrryvwyfnHUNaOJeHwhetJoU0s/rHJFuAXhHN0C2yWh1Mv1pMoJopc7xiBQC5MwjmdIiTHMaI1WJI7r7enEnZZTgEBLkZl0APqmwVM7i7XEw3x2QJnWChU1vYahf040F9+w0LF6AWIZgbnGYf4HcBS2PivYyIYahgNxEMkkkLBLeSoE/zWBTjJVrph4ZE3ThGLx7ilP86NOp/nkMkmYyx2IvBgUWC0T2W+K0+qvPbsQy77W0W4swfhTtU/N+n4fEKWZNtLDrnzyiWMR2nEmTUkhvaPMnbRnKC63mPK7C/JYXixiDSxjGy3+SoJ147oT0FtF29RRCiKW/XDZXR1QlK0yIP2PupVPKiLUOMU6rxNx42KH85js50ClVK9z5/BbD5yMN5j2cLy7YEA4qSz1nBEeITpkwFQkjiOMyHjmyjwn04Rw+gu2rCK7fWGV8he2dg9WFYTIxmwbaeTcc9Otz3ksy9kXNLXoPbkYSNeVnLFDQcvCmFlv7SEwL78GuykcXdbVYgtXo43IH2AcOi8US4/rTZ9Pr2oEGsZokCtqK7DMYt66nmp2lFYY= 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)(396003)(39840400004)(366004)(346002)(376002)(451199021)(2906002)(38100700002)(38350700002)(6512007)(83380400001)(2616005)(186003)(107886003)(26005)(1076003)(6506007)(5660300002)(86362001)(8676002)(8936002)(44832011)(36756003)(478600001)(54906003)(41300700001)(6486002)(52116002)(6666004)(316002)(4326008)(6916009)(66476007)(66556008)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7pZ+EXDt/nxJvHCG51xG5KJoZHgDWpB7417KD3XxKes0u8Wnv+fWIRqs19mCHoJNJ7So0PWK9sY3qzjdK1j8Bd9cwl5Bp7TuJbyZuQWnSS7nJpUyHrWAdX+DEna1g5BRzP/vA5aprtFdIE/el8vjLbanKaWOxncqXysV2SxK+YiFtb723W+GEs7TuQfS6Ai4xoqiwYOWA5/fJX3G+I5gbJshSgsEPWnsaRFkCaf0kzoyl2yBO55Ln+fP/2SX2I1sTRsJmekkyP1P6m/Do1fywFQ2jKXoskYTV/YFl0Vdu2nga4NraEI2J+/kCvqKZD+jxx41NCKckrcird67K6hUdgfJ9RI3E8FsTumn1iTmYma6kygZdvtdTwzA2DV8hyZ648uepyJRosj9drIf1NtbdRYj0Xio2ktVkBZgeWNt7I+t5BjNj5hxylGxM58buiJgjxL3uTBIbp8eXR67is586m3ir+V+hre2Uh2VWl0ljIsXC/XpNNfUXBFU1xrzUNCzLPam82CpbLX7APkK4BquF/SpF2mF1Dp8ZEe7cLBLYkMIzOImX5MPl5lckNvA0RUrQDHvLQSfnu5guKbe0KC5jZnxlTtZDe55cGHgSOKbJHmD7+Er/2pjIE8L8qLpYAbu8JzFz2/eCd/ur0jE3gNcLsHm1mgwC5aY7qw9N0QoWSsfUCJfe+XbOtNVW/ag4dGdKfkDEB5sN+QcL96+9x14nLpfvh3O5wYiysfkkNJoO2I8te4htWo7vhGQEMXoLURconsnLQUoKghGizaKMJpOC6i0f+IT79YZqyh7A6oXRJUwS24CscIXfWPFUezXSX1awbfcb9aSmTaPso62MViFod++atPr2jxVG99NYSTjU8lTirgdU/G/56XVukLZ+/0PdxMNY4BNgDNh9J+jY+5BXUUz5BuRNzOEMYAmsOkPj9rUkQ4ntB/ghYOv4UMAm6faH5yp59eiq5H3DDR3C3tn40uyirQ7WCLh9XiYe5v4CmGzvi34RJRIo6u+3dnnGwfV06y2UZ6NaYVYwahMDrpbQ1xfyrUDnLyOFHM2dm4DdNjA3STkQNX5VH5OEIo4VFy/l629OQAZQ1CGcBkJ4FCTbeod15N1YeED44sMpP6dFga4Khr+So12NId23NovMgWh39UmvHzUYBlbxD/bZEegmqhghGMQRh0K1fMbr2LNrYBj3pIKhZTiM6Iej/oC1MX0Lh0X+SV3SdgBq2d5js6+dCqOpLS2+2HWEK0ramAaAY9eVJAy0cQbfH47n5FEVTVOD6UoCq5s2YK71WgZrxb0/xzOWWsbI5ojZT4SOboODL7ngzCoubFXJ/PsfnRRobJxyL9UoOCgU9yGloqtZCkyoo4ubimhsc7LYsG5DgBbi7rCigSY5wewlj4YhqaAylCIbsp9dggArLE15GPbUPv6gITtFA4sDsReEk2MDu/+TXmRG3LT1QQ2OQnrqZB/hN3ZQj5zYNRpbRi03Yel6wZxevhxRL73mlvhRiGJiP3jvbLBtbnUk51rrIfrsMNT9pYkc++jMKE2KiE4lnynAjlQCY15beuFC8E82dct1e9U9ky3XjkncCyr+Y7IO13nGw36YPDGLz4rl3NUILtcstZ2ww== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39d2146d-d583-472c-687d-08db844286f4 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2023 08:15:47.3489 (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: lgKel24q+RyPGFV6AoM8g/FegdF9Zw/3dszv5zpi4GkuO2QAoI9IhXRO3xj0FVgrrSwWZZvcCpUOu8ectx7BgOlTtDGOoVMd36ONM2dr6OI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR13MB6001 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 --- 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..c9477dd0da 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -161,3 +161,7 @@ Deprecation Notices The new port library API (functions rte_swx_port_*) will gradually transition from experimental to stable status starting with DPDK 23.07 release. + +* 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``. 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 */