On Thu, 2026-03-19 at 18:24 -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 <[email protected]>
> Cc: Tariq Toukan <[email protected]>
> Cc: Cosmin Ratiu <[email protected]>
> Reviewed-by: Aleksandr Loktionov <[email protected]>
> Signed-off-by: Stanislav Fomichev <[email protected]>
> ---
> .../net/ethernet/mellanox/mlx5/core/en/fs.h | 5 +++-
> .../net/ethernet/mellanox/mlx5/core/en_fs.c | 30 ++++++++++++-----
> --
> .../net/ethernet/mellanox/mlx5/core/en_main.c | 16 +++++++---
> 3 files changed, 36 insertions(+), 15 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 55255fe6e415..a9daefbd8f8f 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
> @@ -609,20 +609,26 @@ 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;
>
> - netif_addr_lock_bh(netdev);
> + if (!uc || !mc) {
> + netif_addr_lock_bh(netdev);
> + mlx5e_sync_netdev_addr(fs, netdev, &netdev->uc,
> &netdev->mc);
> + netif_addr_unlock_bh(netdev);
> + return;
> + }
>
> 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);
> }
>
> static void mlx5e_fill_addr_array(struct mlx5e_flow_steering *fs,
> int list_type,
> @@ -724,7 +730,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;
> @@ -736,7 +744,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);
> }
> @@ -820,7 +828,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;
>
> @@ -850,7 +860,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);
While this chunk is correct, I think there's a logical conflict waiting
to happen with Saeed's pending patch touching this area ([1]).
You have inlined mlx5e_nic_set_rx_mode here, but after Saeed's patch
the mlx5e_is_uplink_rep condition added here should be dropped.
Not sure the automatic merge will do that.
[1]
https://lore.kernel.org/netdev/[email protected]/T/#u
> }
>
> 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) */
