patch 'net/nbl: fix multicast reception in promiscuous mode' has been queued to stable release 25.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 25.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/01/26. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/bfdf0e9e0a69aceae18eb252301492f15dbb22f2

Thanks.

Kevin

---
>From bfdf0e9e0a69aceae18eb252301492f15dbb22f2 Mon Sep 17 00:00:00 2001
From: Dimon Zhao <dimon.zhao at nebula-matrix.com>
Date: Tue, 9 Jun 2026 00:51:43 -0700
Subject: [PATCH] net/nbl: fix multicast reception in promiscuous mode

[ upstream commit b8aae3cb570855beb5a48b535293de6b2809199b ]

When promiscuous mode is enabled on NBL PMD,
the hardware does not forward multicast frames to the host,
causing the driver to fail receiving multicast packets.
This patch fixes the issue.

Fixes: 80bd3cad22c8 ("net/nbl: support promiscuous mode")

Signed-off-by: Dimon Zhao <dimon.zhao at nebula-matrix.com>
---
 drivers/net/nbl/nbl_dev/nbl_dev.c             |  5 +++
 drivers/net/nbl/nbl_dispatch.c                | 45 +++++++++++++++++++
 drivers/net/nbl/nbl_include/nbl_def_channel.h |  5 +++
 .../net/nbl/nbl_include/nbl_def_resource.h    |  2 +
 4 files changed, 57 insertions(+)

diff --git a/drivers/net/nbl/nbl_dev/nbl_dev.c b/drivers/net/nbl/nbl_dev/nbl_dev.c
index 2b0413fb7c..6a0085f90b 100644
--- a/drivers/net/nbl/nbl_dev/nbl_dev.c
+++ b/drivers/net/nbl/nbl_dev/nbl_dev.c
@@ -785,4 +785,6 @@ int nbl_promiscuous_enable(struct rte_eth_dev *eth_dev)
 
 	if (!common->is_vf) {
+		disp_ops->cfg_multi_mcast(NBL_DEV_MGT_TO_DISP_PRIV(dev_mgt),
+					  dev_mgt->net_dev->vsi_id, 1);
 		disp_ops->set_promisc_mode(NBL_DEV_MGT_TO_DISP_PRIV(dev_mgt),
 					   dev_mgt->net_dev->vsi_id, 1);
@@ -803,4 +805,6 @@ int nbl_promiscuous_disable(struct rte_eth_dev *eth_dev)
 
 	if (!common->is_vf) {
+		disp_ops->cfg_multi_mcast(NBL_DEV_MGT_TO_DISP_PRIV(dev_mgt),
+					  dev_mgt->net_dev->vsi_id, 0);
 		disp_ops->set_promisc_mode(NBL_DEV_MGT_TO_DISP_PRIV(dev_mgt),
 					   dev_mgt->net_dev->vsi_id, 0);
@@ -1013,4 +1017,5 @@ static void nbl_dev_leonis_stop(void *p)
 		disp_ops->del_macvlan(NBL_DEV_MGT_TO_DISP_PRIV(dev_mgt), mac, 0, net_dev->vsi_id);
 	}
+	disp_ops->cfg_multi_mcast(NBL_DEV_MGT_TO_DISP_PRIV(dev_mgt), net_dev->vsi_id, 0);
 }
 
diff --git a/drivers/net/nbl/nbl_dispatch.c b/drivers/net/nbl/nbl_dispatch.c
index 52d37ba7fe..f4f1ee4842 100644
--- a/drivers/net/nbl/nbl_dispatch.c
+++ b/drivers/net/nbl/nbl_dispatch.c
@@ -699,4 +699,45 @@ static void nbl_disp_chan_del_multi_rule_req(void *priv, u16 vsi)
 }
 
+static int nbl_disp_cfg_multi_mcast(void *priv, u16 vsi, u16 enable)
+{
+	struct nbl_dispatch_mgt *disp_mgt = (struct nbl_dispatch_mgt *)priv;
+	struct nbl_resource_ops *res_ops = NBL_DISP_MGT_TO_RES_OPS(disp_mgt);
+	int ret = 0;
+
+	if (enable)
+		ret = NBL_OPS_CALL(res_ops->add_multi_mcast,
+				   (NBL_DISP_MGT_TO_RES_PRIV(disp_mgt), vsi));
+	else
+		NBL_OPS_CALL(res_ops->del_multi_mcast, (NBL_DISP_MGT_TO_RES_PRIV(disp_mgt), vsi));
+
+	return ret;
+}
+
+static int nbl_disp_chan_cfg_multi_mcast_req(void *priv, u16 vsi, u16 enable)
+{
+	struct nbl_dispatch_mgt *disp_mgt = (struct nbl_dispatch_mgt *)priv;
+	const struct nbl_channel_ops *chan_ops = NBL_DISP_MGT_TO_CHAN_OPS(disp_mgt);
+	struct nbl_common_info *common = NBL_DISP_MGT_TO_COMMON(disp_mgt);
+	struct nbl_chan_param_cfg_multi_mcast param = {0};
+	struct nbl_chan_send_info chan_send;
+	int ret = 0;
+
+	if (NBL_IS_COEXISTENCE(common)) {
+		ret = ioctl(common->devfd, NBL_DEV_USER_SET_MCAST_MODE, &enable);
+		if (ret) {
+			NBL_LOG(ERR, "userspace send cfg_multi_mcast ioctl msg failed ret %d",
+				ret);
+			return ret;
+		}
+		return 0;
+	}
+
+	param.vsi = vsi;
+	param.enable = enable;
+	NBL_CHAN_SEND(chan_send, 0, NBL_CHAN_MSG_CFG_MULTI_MCAST_RULE,
+		      &param, sizeof(param), NULL, 0, 1);
+	return chan_ops->send_msg(NBL_DISP_MGT_TO_CHAN_PRIV(disp_mgt), &chan_send);
+}
+
 static int nbl_disp_cfg_dsch(void *priv, u16 vsi_id, bool vld)
 {
@@ -1146,4 +1187,8 @@ do {									\
 			 NBL_CHAN_MSG_DEL_MULTI_RULE,			\
 			 nbl_disp_chan_del_multi_rule_req, NULL);	\
+	NBL_DISP_SET_OPS(cfg_multi_mcast, nbl_disp_cfg_multi_mcast,	\
+			 NBL_DISP_CTRL_LVL_MGT,				\
+			 NBL_CHAN_MSG_CFG_MULTI_MCAST_RULE,		\
+			 nbl_disp_chan_cfg_multi_mcast_req, NULL);	\
 	NBL_DISP_SET_OPS(cfg_dsch, nbl_disp_cfg_dsch,			\
 			 NBL_DISP_CTRL_LVL_MGT, NBL_CHAN_MSG_CFG_DSCH,	\
diff --git a/drivers/net/nbl/nbl_include/nbl_def_channel.h b/drivers/net/nbl/nbl_include/nbl_def_channel.h
index 55880737f1..257c81e01e 100644
--- a/drivers/net/nbl/nbl_include/nbl_def_channel.h
+++ b/drivers/net/nbl/nbl_include/nbl_def_channel.h
@@ -372,4 +372,9 @@ struct nbl_chan_param_del_multi_rule {
 };
 
+struct nbl_chan_param_cfg_multi_mcast {
+	u16 vsi;
+	u16 enable;
+};
+
 struct nbl_chan_param_cfg_dsch {
 	u16 vsi_id;
diff --git a/drivers/net/nbl/nbl_include/nbl_def_resource.h b/drivers/net/nbl/nbl_include/nbl_def_resource.h
index 6935598789..a803c59dc0 100644
--- a/drivers/net/nbl/nbl_include/nbl_def_resource.h
+++ b/drivers/net/nbl/nbl_include/nbl_def_resource.h
@@ -78,4 +78,6 @@ struct nbl_resource_ops {
 	void (*del_multi_rule)(void *priv, u16 vsi_id);
 	int (*cfg_multi_mcast)(void *priv, u16 vsi_id, u16 enable);
+	int (*add_multi_mcast)(void *priv, u16 vsi);
+	void (*del_multi_mcast)(void *priv, u16 vsi);
 	void (*clear_flow)(void *priv, u16 vsi_id);
 	int (*cfg_dsch)(void *priv, u16 vsi_id, bool vld);
-- 
2.55.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-07-28 16:54:53.185153238 +0100
+++ 0082-net-nbl-fix-multicast-reception-in-promiscuous-mode.patch	2026-07-28 16:54:50.836729042 +0100
@@ -1 +1 @@
-From b8aae3cb570855beb5a48b535293de6b2809199b Mon Sep 17 00:00:00 2001
+From bfdf0e9e0a69aceae18eb252301492f15dbb22f2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b8aae3cb570855beb5a48b535293de6b2809199b ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 35485ea691..3c0e98d687 100644
+index 2b0413fb7c..6a0085f90b 100644