From: Cosmin Ratiu <cratiu@nvidia.com>
To: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"sdf@fomichev.me" <sdf@fomichev.me>
Cc: Tariq Toukan <tariqt@nvidia.com>,
Saeed Mahameed <saeedm@nvidia.com>,
"edumazet@google.com" <edumazet@google.com>,
"davem@davemloft.net" <davem@davemloft.net>,
"kuba@kernel.org" <kuba@kernel.org>,
"pabeni@redhat.com" <pabeni@redhat.com>
Subject: Re: [PATCH net-next 05/11] mlx5: convert to ndo_set_rx_mode_async
Date: Fri, 13 Mar 2026 16:13:04 +0000 [thread overview]
Message-ID: <10534fecb1be59b3468767d291c42ab502f85af2.camel@nvidia.com> (raw)
In-Reply-To: <20260313145113.1424442-6-sdf@fomichev.me>
On Fri, 2026-03-13 at 07:51 -0700, Stanislav Fomichev wrote:
> Convert mlx5 from ndo_set_rx_mode to ndo_set_rx_mode_async. The
> driver's mlx5e_set_rx_mode now receives uc/mc snapshots and calls
> mlx5e_fs_set_rx_mode_work directly instead of queueing work.
>
> mlx5e_sync_netdev_addr and mlx5e_handle_netdev_addr now take
> explicit uc/mc list parameters and iterate with
> netdev_hw_addr_list_for_each instead of netdev_for_each_{uc,mc}_addr.
>
> Fallback to netdev's uc/mc in a few places and grab addr lock.
>
> Cc: Saeed Mahameed <saeedm@nvidia.com>
> Cc: Tariq Toukan <tariqt@nvidia.com>
> Cc: Cosmin Ratiu <cratiu@nvidia.com>
> Signed-off-by: Stanislav Fomichev <sdf@fomichev.me>
> ---
> .../net/ethernet/mellanox/mlx5/core/en/fs.h | 5 ++-
> .../net/ethernet/mellanox/mlx5/core/en_fs.c | 33 ++++++++++++++---
> --
> .../net/ethernet/mellanox/mlx5/core/en_main.c | 16 ++++++---
> 3 files changed, 40 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/fs.h
> b/drivers/net/ethernet/mellanox/mlx5/core/en/fs.h
> index c3408b3f7010..091b80a67189 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en/fs.h
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/fs.h
> @@ -201,7 +201,10 @@ int mlx5e_add_vlan_trap(struct
> mlx5e_flow_steering *fs, int trap_id, int tir_nu
> void mlx5e_remove_vlan_trap(struct mlx5e_flow_steering *fs);
> int mlx5e_add_mac_trap(struct mlx5e_flow_steering *fs, int trap_id,
> int tir_num);
> void mlx5e_remove_mac_trap(struct mlx5e_flow_steering *fs);
> -void mlx5e_fs_set_rx_mode_work(struct mlx5e_flow_steering *fs,
> struct net_device *netdev);
> +void mlx5e_fs_set_rx_mode_work(struct mlx5e_flow_steering *fs,
> + struct net_device *netdev,
> + struct netdev_hw_addr_list *uc,
> + struct netdev_hw_addr_list *mc);
> int mlx5e_fs_vlan_rx_add_vid(struct mlx5e_flow_steering *fs,
> struct net_device *netdev,
> __be16 proto, u16 vid);
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
> b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
> index 9352e2183312..3469b5a197db 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
> @@ -610,20 +610,31 @@ static void mlx5e_execute_l2_action(struct
> mlx5e_flow_steering *fs,
> }
>
> static void mlx5e_sync_netdev_addr(struct mlx5e_flow_steering *fs,
> - struct net_device *netdev)
> + struct net_device *netdev,
> + struct netdev_hw_addr_list *uc,
> + struct netdev_hw_addr_list *mc)
> {
> struct netdev_hw_addr *ha;
> + bool unlock = false;
>
> - netif_addr_lock_bh(netdev);
> + if (!uc || !mc) {
> + uc = &netdev->uc;
> + mc = &netdev->mc;
> +
> + netif_addr_lock_bh(netdev);
> + unlock = true;
> + }
>
> mlx5e_add_l2_to_hash(fs->l2.netdev_uc, netdev->dev_addr);
> - netdev_for_each_uc_addr(ha, netdev)
> +
> + netdev_hw_addr_list_for_each(ha, uc)
> mlx5e_add_l2_to_hash(fs->l2.netdev_uc, ha->addr);
>
> - netdev_for_each_mc_addr(ha, netdev)
> + netdev_hw_addr_list_for_each(ha, mc)
> mlx5e_add_l2_to_hash(fs->l2.netdev_mc, ha->addr);
>
> - netif_addr_unlock_bh(netdev);
> + if (unlock)
> + netif_addr_unlock_bh(netdev);
> }
Rather than the lock/unlock dance, wouldn't calling the same function
recursively (guaranteed once) look cleaner:
if (!uc || !mc) {
netdev_addr_lock_bh(netdev);
mlx5e_sync_netdev_addr(fs, netdev, netdev->uc, netdev->mc);
netdev_addr_unlock_bh(netdev);
return;
}
>
> static void mlx5e_fill_addr_array(struct mlx5e_flow_steering *fs,
> int list_type,
> @@ -725,7 +736,9 @@ static void mlx5e_apply_netdev_addr(struct
> mlx5e_flow_steering *fs)
> }
>
> static void mlx5e_handle_netdev_addr(struct mlx5e_flow_steering *fs,
> - struct net_device *netdev)
> + struct net_device *netdev,
> + struct netdev_hw_addr_list *uc,
> + struct netdev_hw_addr_list *mc)
> {
> struct mlx5e_l2_hash_node *hn;
> struct hlist_node *tmp;
> @@ -737,7 +750,7 @@ static void mlx5e_handle_netdev_addr(struct
> mlx5e_flow_steering *fs,
> hn->action = MLX5E_ACTION_DEL;
>
> if (fs->state_destroy)
> - mlx5e_sync_netdev_addr(fs, netdev);
> + mlx5e_sync_netdev_addr(fs, netdev, uc, mc);
>
> mlx5e_apply_netdev_addr(fs);
> }
> @@ -821,7 +834,9 @@ static void mlx5e_destroy_promisc_table(struct
> mlx5e_flow_steering *fs)
> }
>
> void mlx5e_fs_set_rx_mode_work(struct mlx5e_flow_steering *fs,
> - struct net_device *netdev)
> + struct net_device *netdev,
> + struct netdev_hw_addr_list *uc,
> + struct netdev_hw_addr_list *mc)
> {
> struct mlx5e_l2_table *ea = &fs->l2;
>
> @@ -851,7 +866,7 @@ void mlx5e_fs_set_rx_mode_work(struct
> mlx5e_flow_steering *fs,
> if (enable_broadcast)
> mlx5e_add_l2_flow_rule(fs, &ea->broadcast,
> MLX5E_FULLMATCH);
>
> - mlx5e_handle_netdev_addr(fs, netdev);
> + mlx5e_handle_netdev_addr(fs, netdev, uc, mc);
>
> if (disable_broadcast)
> mlx5e_del_l2_flow_rule(fs, &ea->broadcast);
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> index f7009da94f0b..e86cf1ee108d 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> @@ -4108,11 +4108,16 @@ static void mlx5e_nic_set_rx_mode(struct
> mlx5e_priv *priv)
> queue_work(priv->wq, &priv->set_rx_mode_work);
> }
>
> -static void mlx5e_set_rx_mode(struct net_device *dev)
> +static void mlx5e_set_rx_mode(struct net_device *dev,
> + struct netdev_hw_addr_list *uc,
> + struct netdev_hw_addr_list *mc)
> {
> struct mlx5e_priv *priv = netdev_priv(dev);
>
> - mlx5e_nic_set_rx_mode(priv);
> + if (mlx5e_is_uplink_rep(priv))
> + return; /* no rx mode for uplink rep */
> +
> + mlx5e_fs_set_rx_mode_work(priv->fs, dev, uc, mc);
> }
>
> static int mlx5e_set_mac(struct net_device *netdev, void *addr)
> @@ -5287,7 +5292,7 @@ const struct net_device_ops mlx5e_netdev_ops =
> {
> .ndo_setup_tc = mlx5e_setup_tc,
> .ndo_select_queue = mlx5e_select_queue,
> .ndo_get_stats64 = mlx5e_get_stats,
> - .ndo_set_rx_mode = mlx5e_set_rx_mode,
> + .ndo_set_rx_mode_async = mlx5e_set_rx_mode,
> .ndo_set_mac_address = mlx5e_set_mac,
> .ndo_vlan_rx_add_vid = mlx5e_vlan_rx_add_vid,
> .ndo_vlan_rx_kill_vid = mlx5e_vlan_rx_kill_vid,
> @@ -6272,8 +6277,11 @@ void mlx5e_set_rx_mode_work(struct work_struct
> *work)
> {
> struct mlx5e_priv *priv = container_of(work, struct
> mlx5e_priv,
> set_rx_mode_work);
> + struct net_device *dev = priv->netdev;
>
> - return mlx5e_fs_set_rx_mode_work(priv->fs, priv->netdev);
> + netdev_lock_ops(dev);
> + mlx5e_fs_set_rx_mode_work(priv->fs, dev, NULL, NULL);
> + netdev_unlock_ops(dev);
> }
>
> /* mlx5e generic netdev management API (move to en_common.c) */
next prev parent reply other threads:[~2026-03-13 16:13 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-13 14:51 [PATCH net-next 00/11] net: sleepable ndo_set_rx_mode Stanislav Fomichev
2026-03-13 14:51 ` [PATCH net-next 01/11] net: add address list snapshot and reconciliation infrastructure Stanislav Fomichev
2026-03-13 14:51 ` [PATCH net-next 02/11] net: introduce ndo_set_rx_mode_async and dev_rx_mode_work Stanislav Fomichev
2026-03-13 14:51 ` [PATCH net-next 03/11] net: move promiscuity handling into dev_rx_mode_work Stanislav Fomichev
2026-03-13 14:51 ` [PATCH net-next 04/11] fbnic: convert to ndo_set_rx_mode_async Stanislav Fomichev
2026-03-13 14:51 ` [PATCH net-next 05/11] mlx5: " Stanislav Fomichev
2026-03-13 16:13 ` Cosmin Ratiu [this message]
2026-03-16 15:42 ` Stanislav Fomichev
2026-03-13 14:51 ` [PATCH net-next 06/11] bnxt: " Stanislav Fomichev
2026-03-13 18:36 ` Michael Chan
2026-03-16 15:50 ` Stanislav Fomichev
2026-03-16 17:33 ` Michael Chan
2026-03-13 14:51 ` [PATCH net-next 07/11] iavf: " Stanislav Fomichev
2026-03-13 14:51 ` [PATCH net-next 08/11] netdevsim: " Stanislav Fomichev
2026-03-13 14:51 ` [PATCH net-next 09/11] dummy: " Stanislav Fomichev
2026-03-13 14:51 ` [PATCH net-next 10/11] net: warn ops-locked drivers still using ndo_set_rx_mode Stanislav Fomichev
2026-03-13 14:51 ` [PATCH net-next 11/11] selftests: net: add team_bridge_macvlan rx_mode test Stanislav Fomichev
2026-03-13 19:38 ` [PATCH net-next 00/11] net: sleepable ndo_set_rx_mode Jakub Kicinski
2026-03-16 15:58 ` Stanislav Fomichev
2026-03-14 18:48 ` [syzbot ci] " syzbot ci
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=10534fecb1be59b3468767d291c42ab502f85af2.camel@nvidia.com \
--to=cratiu@nvidia.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=saeedm@nvidia.com \
--cc=sdf@fomichev.me \
--cc=tariqt@nvidia.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox