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 B0EB442EAD; Wed, 19 Jul 2023 03:24:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 86FF540EDF; Wed, 19 Jul 2023 03:24:07 +0200 (CEST) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id 0911E40ED8 for ; Wed, 19 Jul 2023 03:24:05 +0200 (CEST) Received: from kwepemm600004.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4R5J3q59ZMzrRh7; Wed, 19 Jul 2023 09:23:19 +0800 (CST) Received: from [10.67.103.231] (10.67.103.231) by kwepemm600004.china.huawei.com (7.193.23.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 19 Jul 2023 09:24:03 +0800 Message-ID: <5257be49-9515-a90d-3e55-5464211c9679@huawei.com> Date: Wed, 19 Jul 2023 09:24:02 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [PATCH v3 1/3] doc: announce bonding macro change To: Chaoyong He , CC: , , Long Wu References: <20230718014809.1779730-1-chaoyong.he@corigine.com> <20230718082856.2235450-1-chaoyong.he@corigine.com> <20230718082856.2235450-2-chaoyong.he@corigine.com> From: "lihuisong (C)" In-Reply-To: <20230718082856.2235450-2-chaoyong.he@corigine.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.67.103.231] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600004.china.huawei.com (7.193.23.242) X-CFilter-Loop: Reflected 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 +1 do not use slave in macro, data and function. Acked-by: Huisong Li 在 2023/7/18 16:28, Chaoyong He 写道: > 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 | 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 */