From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f68.google.com (mail-oo1-f68.google.com [209.85.161.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7418936495D for ; Tue, 7 Apr 2026 15:31:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.68 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775575884; cv=none; b=oIXw5pwdzixWyv6u4vRSRJrDl98xd4KeM6PCADIBCkIfct8I186ruy+sQc1ncTHlWz31HajZbItqJ5gX8ThuOdI1B+vhv3PRi/cYg5B0weX8Xwhm2qHOYmhl8B14Q5hpOGALEPbNnECX7mCai1O8t4icaOvHmHWoSLfGJlTP/As= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775575884; c=relaxed/simple; bh=XjzNL86cTmetDlCo5ZgWO1I5qunlPJKgl5v0Gkj9irA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aDtOQ0FXb7lSuriSMsJWDYaGzFavT7BXZGHQLSsU0h8grMXW/CuefWrBodSR1mIM1iWMsP+C6sHgjf/3CoGeiS8rEjf1NYy4icKZUIBRtN4ZQk/gu8SdtRlXk8c1bVAFvOGgjyr61pyBOgye9fysaXjxBnwQh78OOfk4eWp41+w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ew4uQzox; arc=none smtp.client-ip=209.85.161.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ew4uQzox" Received: by mail-oo1-f68.google.com with SMTP id 006d021491bc7-679b072ed3aso2875009eaf.1 for ; Tue, 07 Apr 2026 08:31:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775575870; x=1776180670; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fyhu3EgcZCuMP8qAEMeQlY7RO5W4woLQHAawT8gazWQ=; b=ew4uQzoxoTIMsldMQvoLJZy58xrLKTf++pO1NT2OX8uRstMvfABZL20XAwPCuPT9zV ZkSynky48F0r++pyZaqmuOipQHja/rv4fp/BIgJxLBugXQmSwvMgTbk6pyPu87aiBf2F 2CReYuyUZegTZCNRWKEzbXycc0OlVZjwB1n3ZL2gnL1Y2DSad6jM4IfNnl3wYJFsjucB JoQm5buxZZFKuD+5Q6cvF/aiulBwpPjpMPyVu6OJyCqC/gDKraSkR2IzNJTp4Zuf3HxA +P3+nbS52lze1Eq+yqlCCFoA84fN+hJ8foxHpIuA08qO98ij05RcTaq2cOeIY6gOXtGZ p0/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775575870; x=1776180670; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fyhu3EgcZCuMP8qAEMeQlY7RO5W4woLQHAawT8gazWQ=; b=rSNVSMFcx3jTuHaVxQWMHH93NZhS1pxD/1E8bK1efGJjf62r2JJMv1mnYvz8lw/zJ5 uHc/WMfBRbq61ojC5EL/FIFzmFBrFAmnPQf4Hav+rcHIlwyBkkCnPdSkkjWL3imkaZmA 0nNO+BxvK5k5QdrNGxTevID/X4tB25kjH/zb6LXyjB6TcxGmRfuGLuWjIdcATSNHUeiX avW7WHwI2XXVBuwlBl8THerZrT41bAu751G0cKGLmfuLu/GtAgFdTXdDLoMMSrpSSdgE Dz4Gk+8RUkMND8mknj2Ffk3GG7fdyF22xErBrGMzydQsNBXOtFYcgl3fnSyJk/asetzz NNfg== X-Gm-Message-State: AOJu0YxBK/Z5x27xaNrIEPmU4NjLw4r1c4drVly1ldHoo9spZKC34TwZ VxvPAjs6YKqazHCfHb3CJyATn2wVGmHrKOjN+VpWma49AbYotw2K7RRBvIGUppos/Qg= X-Gm-Gg: AeBDieuYe7N51ABaNPSEAYK2w9wQdJqr3mZj/EjDUHJEyQpPsMwTzLjnMJTok3TJVMO Wy8dw/BZ3d0EdgPhDw899+usgo79lZVkWNRS/2II61jBRQzEMfgvWs9X6bmR71+VPpr4lvReIBM 833SgrsGs62lMpGHEDaDfkXBGH8SbxE6gOAF1aSlDonf0iL+KbBeyAQW5oAM9X3SaucEODWZzZU itco5vwex+Dq/bNQHmZBaJnMvtJsaT/eepEHbCnmUpFgrfhNK9PWgCoRoZdbWP52dkne5APMEnr lq/m/CR83cPJ3uhH2m8SMtXqmpp649iWDmzM5ZpdkvMbmShNxhnVdmGUs4jX8c/fLXtfyq0xmQs usvR77/A54/SKLTp/bQExEyDaC8iHcu2+PnV17GNJlEqkR6CZlOBqdRArcQ2ILy6ybCJLvKkkcq H2zTnwP1OjxtD4I908jQ== X-Received: by 2002:a05:6820:4c11:b0:67e:3f0d:4235 with SMTP id 006d021491bc7-6821d240302mr12186771eaf.11.1775575869710; Tue, 07 Apr 2026 08:31:09 -0700 (PDT) Received: from localhost ([2a03:2880:12ff:71::]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-682ba3cbe72sm7383504eaf.11.2026.04.07.08.31.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 08:31:09 -0700 (PDT) From: Stanislav Fomichev X-Google-Original-From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, Saeed Mahameed , Tariq Toukan , Cosmin Ratiu , Aleksandr Loktionov Subject: [PATCH net-next v6 06/14] mlx5: convert to ndo_set_rx_mode_async Date: Tue, 7 Apr 2026 08:30:53 -0700 Message-ID: <20260407153101.3694714-7-sdf@fomichev.me> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260407153101.3694714-1-sdf@fomichev.me> References: <20260407153101.3694714-1-sdf@fomichev.me> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Cc: Tariq Toukan Cc: Cosmin Ratiu Reviewed-by: Aleksandr Loktionov Signed-off-by: Stanislav Fomichev --- .../net/ethernet/mellanox/mlx5/core/en/fs.h | 5 ++- .../net/ethernet/mellanox/mlx5/core/en_fs.c | 32 ++++++++++++------- .../net/ethernet/mellanox/mlx5/core/en_main.c | 13 +++++--- 3 files changed, 34 insertions(+), 16 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 fdfe9d1cfe21..12492c4a5d41 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,13 +828,15 @@ 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_priv *priv = netdev_priv(netdev); struct mlx5e_l2_table *ea = &fs->l2; if (mlx5e_is_uplink_rep(priv)) { - mlx5e_handle_netdev_addr(fs, netdev); + mlx5e_handle_netdev_addr(fs, netdev, uc, mc); goto update_vport_context; } @@ -856,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 1238e5356012..45f5bacef255 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -4105,11 +4105,13 @@ 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); + mlx5e_fs_set_rx_mode_work(priv->fs, dev, uc, mc); } static int mlx5e_set_mac(struct net_device *netdev, void *addr) @@ -5284,7 +5286,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, @@ -6269,8 +6271,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) */ -- 2.52.0