From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3C26C531CA for ; Thu, 23 Jul 2026 12:42:27 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D6E634028A; Thu, 23 Jul 2026 14:42:26 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 36B184067C for ; Thu, 23 Jul 2026 14:42:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784810544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F41miT+MX34ACfwWwCxZ7x05tx6GisNWFdRG1unu0Lo=; b=KNR/YY2mmpM/3n4ogNDqbpPO6BTpoNDsYEHuBhyzNNI3DCh4VO3TDosfJ2MT1ZfrxQ8gc0 lREGOW+C7rQ0AI6SadYeOWODiDSaU38BYvKpRFpTR/6HO8SwHKkw86dFQjTfCuHYVDY94j RMcw1qYryuIiVJ8kLi7xHo4bKTGsJYI= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-416-i2bL4FzfMdSZGQUkwuXU1g-1; Thu, 23 Jul 2026 08:42:21 -0400 X-MC-Unique: i2bL4FzfMdSZGQUkwuXU1g-1 X-Mimecast-MFC-AGG-ID: i2bL4FzfMdSZGQUkwuXU1g_1784810539 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 101CA19539A8; Thu, 23 Jul 2026 12:42:19 +0000 (UTC) Received: from dmarchan.lan (unknown [10.44.48.202]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6357518002AE; Thu, 23 Jul 2026 12:42:15 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: rjarry@redhat.com, cfontain@redhat.com, Andrew Rybchenko , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Harman Kalra , Thomas Monjalon Subject: [PATCH v5 02/10] ethdev: skip VMDq pools unless configured Date: Thu, 23 Jul 2026 14:41:48 +0200 Message-ID: <20260723124200.3069410-3-david.marchand@redhat.com> In-Reply-To: <20260723124200.3069410-1-david.marchand@redhat.com> References: <20260403091836.1073484-1-david.marchand@redhat.com> <20260723124200.3069410-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: dLmjv55iho5lzOfCECLoO6JhJ4lkq_lMUk4vsGgPjsw_1784810539 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 The mac_addr_add API describes that only the 0 pool should be passed unless VMDq has been enabled, though there was no validation so far. Add such a check, then cleanup the MAC related operations (adding, removing, restoring). As a side effect, the net/cnxk does not need to manually reset the mac_pool_sel[] array. Signed-off-by: David Marchand Acked-by: Andrew Rybchenko --- Changes since v4: - rebased, Changes since v3: - updated doxygen comments, Changes since v2: - added an entry in release notes, - fixed duplicate mac address handling for !vmdq, - rewrote update of eth_dev_mac_restore to isolate the !vmdq case, --- doc/guides/rel_notes/release_26_11.rst | 2 + drivers/net/cnxk/cnxk_ethdev_ops.c | 1 - lib/ethdev/rte_ethdev.c | 52 ++++++++++++++++++-------- lib/ethdev/rte_ethdev.h | 2 +- 4 files changed, 39 insertions(+), 18 deletions(-) diff --git a/doc/guides/rel_notes/release_26_11.rst b/doc/guides/rel_notes/release_26_11.rst index 618b5acd2d..fe6860a47c 100644 --- a/doc/guides/rel_notes/release_26_11.rst +++ b/doc/guides/rel_notes/release_26_11.rst @@ -89,6 +89,8 @@ API Changes * At port configuration time, the number of VMDq pools advertised by a driver is now used to validate VMDq related Rx and Tx modes (``RTE_ETH_MQ_RX_VMDQ_FLAG``, ``RTE_ETH_MQ_TX_VMDQ_DCB``, ``RTE_ETH_MQ_TX_VMDQ_ONLY``). + * A check was added in ``rte_eth_dev_mac_addr_add`` to validate that the ``pool`` parameter is 0 + when VMDq is not configured. ABI Changes diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c b/drivers/net/cnxk/cnxk_ethdev_ops.c index 0ea3d7e89f..c002a93fe1 100644 --- a/drivers/net/cnxk/cnxk_ethdev_ops.c +++ b/drivers/net/cnxk/cnxk_ethdev_ops.c @@ -1240,7 +1240,6 @@ cnxk_nix_mc_addr_list_configure(struct rte_eth_dev *eth_dev, struct rte_ether_ad /* Update address in NIC data structure */ rte_ether_addr_copy(&mc_addr_set[i], &data->mac_addrs[j]); rte_ether_addr_copy(&mc_addr_set[i], &dev->dmac_addrs[j]); - data->mac_pool_sel[j] = RTE_BIT64(0); } roc_nix_npc_promisc_ena_dis(nix, true); diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 9e305d98c1..f20cc514a3 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -1677,7 +1677,7 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, { struct rte_ether_addr *addr; uint16_t i; - uint32_t pool = 0; + uint32_t pool; uint64_t pool_mask; /* replay MAC address configuration including default MAC */ @@ -1685,9 +1685,11 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, if (dev->dev_ops->mac_addr_set != NULL) dev->dev_ops->mac_addr_set(dev, addr); else if (dev->dev_ops->mac_addr_add != NULL) - dev->dev_ops->mac_addr_add(dev, addr, 0, pool); + dev->dev_ops->mac_addr_add(dev, addr, 0, 0); if (dev->dev_ops->mac_addr_add != NULL) { + bool vmdq = (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_VMDQ_FLAG) != 0; + for (i = 1; i < dev_info->max_mac_addrs; i++) { addr = &dev->data->mac_addrs[i]; @@ -1695,15 +1697,19 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, if (rte_is_zero_ether_addr(addr)) continue; - pool = 0; - pool_mask = dev->data->mac_pool_sel[i]; - - do { - if (pool_mask & UINT64_C(1)) - dev->dev_ops->mac_addr_add(dev, addr, i, pool); - pool_mask >>= 1; - pool++; - } while (pool_mask); + if (!vmdq) { + dev->dev_ops->mac_addr_add(dev, addr, i, 0); + } else { + pool = 0; + pool_mask = dev->data->mac_pool_sel[i]; + + do { + if (pool_mask & UINT64_C(1)) + dev->dev_ops->mac_addr_add(dev, addr, i, pool); + pool_mask >>= 1; + pool++; + } while (pool_mask); + } } } } @@ -5414,8 +5420,9 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, uint32_t pool) { struct rte_eth_dev *dev; - int index; uint64_t pool_mask; + bool vmdq; + int index; int ret; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); @@ -5440,6 +5447,12 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, RTE_ETHDEV_LOG_LINE(ERR, "Pool ID must be 0-%d", RTE_ETH_64_POOLS - 1); return -EINVAL; } + vmdq = (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_VMDQ_FLAG) != 0; + if (!vmdq && pool != 0) { + RTE_ETHDEV_LOG_LINE(ERR, "Port %u: VMDq is not configured (pool %d)", + port_id, pool); + return -EINVAL; + } index = eth_dev_get_mac_addr_index(port_id, addr); if (index < 0) { @@ -5450,6 +5463,9 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, return -ENOSPC; } } else { + if (!vmdq) + return 0; + pool_mask = dev->data->mac_pool_sel[index]; /* Check if both MAC address and pool is already there, and do nothing */ @@ -5464,8 +5480,10 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, /* Update address in NIC data structure */ rte_ether_addr_copy(addr, &dev->data->mac_addrs[index]); - /* Update pool bitmap in NIC data structure */ - dev->data->mac_pool_sel[index] |= RTE_BIT64(pool); + if (vmdq) { + /* Update pool bitmap in NIC data structure */ + dev->data->mac_pool_sel[index] |= RTE_BIT64(pool); + } } ret = eth_err(port_id, ret); @@ -5510,8 +5528,10 @@ rte_eth_dev_mac_addr_remove(uint16_t port_id, struct rte_ether_addr *addr) /* Update 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; + if ((dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_VMDQ_FLAG) != 0) { + /* reset pool bitmap */ + dev->data->mac_pool_sel[index] = 0; + } rte_ethdev_trace_mac_addr_remove(port_id, addr); diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index ee400b386f..e2a5ba1549 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -4636,7 +4636,7 @@ int rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id, * - (-ENODEV) if *port* is invalid. * - (-EIO) if device is removed. * - (-ENOSPC) if no more MAC addresses can be added. - * - (-EINVAL) if MAC address is invalid. + * - (-EINVAL) if MAC address is invalid or a non 0 pool was passed but VMDq is not enabled. */ int rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *mac_addr, uint32_t pool); -- 2.54.0