From: "Min Hu (Connor)" <humin29@huawei.com> To: <dev@dpdk.org> Cc: <ferruh.yigit@intel.com>, <thomas@monjalon.net> Subject: [dpdk-dev] [PATCH v2] ethdev: fix one MAC address occupies two index in mac addrs Date: Mon, 11 Oct 2021 17:28:11 +0800 Message-ID: <20211011092811.55172-1-humin29@huawei.com> (raw) In-Reply-To: <20210922033630.41130-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() API. However, If the new default MAC address has been added as a non-default MAC address by rte_eth_dev_mac_addr_add() API, the rte_eth_dev_default_mac_addr_set() API doesn't remove it from dev->data->mac_addrs[]. As a result, one MAC address occupies two index capacities in dev->data->mac_addrs[]. This patch adds the logic of removing MAC addresses for this scenario. 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 (Connor) <humin29@huawei.com> --- v2: * fixed commit log. --- lib/ethdev/rte_ethdev.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 028907bc4b..7faff17d9a 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -4340,6 +4340,7 @@ int rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr) { struct rte_eth_dev *dev; + int index; int ret; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); @@ -4361,6 +4362,20 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr) if (ret < 0) return ret; + /* + * 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 */ + rte_ether_addr_copy(&null_mac_addr, + &dev->data->mac_addrs[index]); + /* reset pool bitmap */ + dev->data->mac_pool_sel[index] = 0; + } + /* Update default address in NIC data structure */ rte_ether_addr_copy(addr, &dev->data->mac_addrs[0]); -- 2.33.0
next prev parent reply other threads:[~2021-10-11 9:29 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-22 3:36 [dpdk-dev] [PATCH] " 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 ` Min Hu (Connor) [this message] 2021-10-11 10:35 ` [dpdk-dev] [PATCH v2] " 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 ` [PATCH v4 1/2] ethdev: fix one address occupies two indexes in MAC addrs Min Hu (Connor) 2022-06-01 17:49 ` 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=20211011092811.55172-1-humin29@huawei.com \ --to=humin29@huawei.com \ --cc=dev@dpdk.org \ --cc=ferruh.yigit@intel.com \ --cc=thomas@monjalon.net \ /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