From: "Min Hu (Connor)" <humin29@huawei.com> To: <dev@dpdk.org> Subject: [PATCH v4 1/2] ethdev: fix one address occupies two indexes in MAC addrs Date: Wed, 1 Jun 2022 14:39:48 +0800 Message-ID: <20220601063949.43202-2-humin29@huawei.com> (raw) In-Reply-To: <20220601063949.43202-1-humin29@huawei.com> From: Huisong Li <lihuisong@huawei.com> The dev->data->mac_addrs[0] will be changed to a new MAC address when applications modify the default MAC address by rte_eth_dev_default_mac_addr_set(). However, if the new default one has been added as a non-default MAC address by rte_eth_dev_mac_addr_add(), the the rte_eth_dev_default_mac_addr_set() doesn't remove it from the mac_addrs list. As a result, one MAC address occupies two indexes in the list. Like: add(MAC1) add(MAC2) add(MAC3) add(MAC4) set_default(MAC3) default=MAC3, filters=MAC1, MAC2, MAC3, MAC4 In addition, some PMDs, such as i40e, ice, hns3 and so on, do remove the old default MAC when set default MAC. If user continues to do set_default(MAC5), and the mac_addrs list is default=MAC5, filters=(MAC1, MAC2, MAC3, MAC4). At this moment, user can still view MAC3 from the list, but packets with MAC3 aren't actually received by the PMD. Fixes: 854d8ad4ef68 ("ethdev: add default mac address modifier") Cc: stable@dpdk.org Signed-off-by: Huisong Li <lihuisong@huawei.com> Signed-off-by: Min Hu <humin29@huawei.com> --- lib/ethdev/rte_ethdev.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 46c088dc88..fc9ca8d6fd 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -4260,7 +4260,10 @@ rte_eth_dev_mac_addr_remove(uint16_t port_id, struct rte_ether_addr *addr) int rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr) { + uint64_t mac_pool_sel_bk = 0; struct rte_eth_dev *dev; + uint32_t pool; + int index; int ret; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); @@ -4278,16 +4281,48 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr) RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->mac_addr_set, -ENOTSUP); + /* + * If the address has been added as a non-default MAC address by + * rte_eth_dev_mac_addr_add API, it should be removed from + * dev->data->mac_addrs[]. + */ + index = eth_dev_get_mac_addr_index(port_id, addr); + if (index > 0) { + /* remove address in NIC data structure */ + mac_pool_sel_bk = dev->data->mac_pool_sel[index]; + ret = rte_eth_dev_mac_addr_remove(port_id, addr); + if (ret < 0) { + RTE_ETHDEV_LOG(ERR, + "Delete MAC address from the MAC list of ethdev port %u.\n", + port_id); + return ret; + } + /* reset pool bitmap */ + dev->data->mac_pool_sel[index] = 0; + } + ret = (*dev->dev_ops->mac_addr_set)(dev, addr); if (ret < 0) - return ret; + goto back; /* Update default address in NIC data structure */ rte_ether_addr_copy(addr, &dev->data->mac_addrs[0]); return 0; -} +back: + if (index > 0) { + pool = 0; + do { + if (mac_pool_sel_bk & UINT64_C(1)) + rte_eth_dev_mac_addr_add(port_id, addr, pool); + mac_pool_sel_bk >>= 1; + pool++; + } while (mac_pool_sel_bk); + } + + return ret; +} /* * Returns index into MAC address array of addr. Use 00:00:00:00:00:00 to find -- 2.33.0
next prev parent reply other threads:[~2022-06-01 6:41 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-22 3:36 [dpdk-dev] [PATCH] ethdev: fix one MAC address occupies two index in mac addrs Min Hu (Connor) 2021-09-22 6:39 ` Andrew Rybchenko 2021-09-22 7:43 ` Huisong Li 2021-09-22 8:02 ` Andrew Rybchenko 2021-09-22 9:48 ` Huisong Li 2021-10-05 19:21 ` Thomas Monjalon 2021-10-08 7:02 ` Min Hu (Connor) 2021-10-08 10:04 ` Thomas Monjalon 2021-10-09 9:53 ` Min Hu (Connor) 2021-10-11 9:02 ` Thomas Monjalon 2021-10-11 9:28 ` [dpdk-dev] [PATCH v2] " Min Hu (Connor) 2021-10-11 10:35 ` Thomas Monjalon 2021-10-12 2:58 ` lihuisong (C) 2021-10-12 7:14 ` Thomas Monjalon 2021-10-15 2:00 ` lihuisong (C) 2021-10-19 17:45 ` Ferruh Yigit 2021-10-20 6:49 ` lihuisong (C) 2021-10-20 7:41 ` Ferruh Yigit 2021-10-20 10:15 ` Kevin Traynor 2021-10-20 16:32 ` Ferruh Yigit 2021-10-21 2:05 ` lihuisong (C) 2021-10-21 8:30 ` Ferruh Yigit 2021-10-22 2:04 ` lihuisong (C) 2021-10-26 10:21 ` Ferruh Yigit 2021-11-08 6:55 ` lihuisong (C) 2022-04-25 6:42 ` Min Hu (Connor) 2022-05-14 2:00 ` [PATCH V3 0/2] ethdev: fix MAC addrs list Min Hu (Connor) 2022-05-14 2:00 ` [PATCH V3 1/2] ethdev: fix one address occupies two indexes in MAC addrs Min Hu (Connor) 2022-05-14 2:00 ` [PATCH V3 2/2] ethdev: document default and non-default MAC address Min Hu (Connor) 2022-05-31 15:22 ` [PATCH V3 0/2] ethdev: fix MAC addrs list Andrew Rybchenko 2022-06-01 6:43 ` Min Hu (Connor) 2022-06-01 6:39 ` [PATCH v4 " Min Hu (Connor) 2022-06-01 6:39 ` Min Hu (Connor) [this message] 2022-06-01 17:49 ` [PATCH v4 1/2] ethdev: fix one address occupies two indexes in MAC addrs Andrew Rybchenko 2022-06-02 3:16 ` lihuisong (C) 2022-06-02 13:54 ` Andrew Rybchenko 2022-06-11 9:04 ` lihuisong (C) 2022-06-01 6:39 ` [PATCH v4 2/2] ethdev: document default and non-default MAC address Min Hu (Connor) 2022-06-01 17:49 ` Andrew Rybchenko 2022-06-01 17:49 ` [PATCH v4 0/2] ethdev: fix MAC addrs list Andrew Rybchenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220601063949.43202-2-humin29@huawei.com \ --to=humin29@huawei.com \ --cc=dev@dpdk.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror http://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ http://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git