From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f177.google.com (mail-dy1-f177.google.com [74.125.82.177]) (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 A27473B3BE3 for ; Fri, 20 Mar 2026 15:42:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774021334; cv=none; b=oHN6D9691QWkD0SRHxqAlqiK1VtOHOGTLffPldxgBjRaGC8GQbfOdghmOQPTB9+P1SeUb6swwlPb2d2IQBpu5wFkXZ2YwrcH9FojxIaplGAf4knFuFSykzAQ06FgeGLbelIz64Ty86M9ae6XHGxO9HPzZGqbzIyS2SuIm7mXrBM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774021334; c=relaxed/simple; bh=GlvAavZbqeljA8Sa2OJilqymV+4h9KyZBFsyNSU1R2s=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=sPvBVOEFsUgCkf62rfff9ylT5YrutQZYnPCxkf3YnYefzooive0UJkCjF9dJBbXANoRo0BXs/z2Ul4aOAkGwylJn3mnr3fkmyxB6JxIXL/LDykj72NFsK3wsJ7/Db1xiMsRV6s1Tyu0in/szCzKpHx0z7ALpC5FrE9pd5xdE3qE= 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=Vg8+E2Hv; arc=none smtp.client-ip=74.125.82.177 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="Vg8+E2Hv" Received: by mail-dy1-f177.google.com with SMTP id 5a478bee46e88-2c107ef474fso230113eec.0 for ; Fri, 20 Mar 2026 08:42:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774021331; x=1774626131; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:mail-followup-to:message-id:subject:cc:to :from:date:from:to:cc:subject:date:message-id:reply-to; bh=Qhx7QtPFHsmhBqKEQ6XlDZutQ+YSTAHptMBIGgI83fw=; b=Vg8+E2HvQBxYjm95Khh3/xH1Lq+QBhfWxH2NMRDDA0kVO3MXpnkcPN54GjnBKp4JpR +WnCIfxYCdMRAiu0UHu8WRZ/lnNlJ6eV9DLlAQ3e27TbJ9tf+gq5wEcqKu1khQ5GqeZq cfauEPV9SctzJPs20QSBV20efJAuXFkQFSS1oNo5s8/XFTsuLacCSSJ6v71NFtf7s/WQ 6pcucWOqi4Ws35jgBcv6o0wlP5ayZ0uLUBKu2Y9/Q/H5mjM2gv3zEdl66dQhAkHqmK7Y T2veQZpvxMNlxoDOhsr5e7SHlNabrnaLfWjGCqyy3ed9HaqnLvksIOYg6W47R0Bh/KMf yXJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774021331; x=1774626131; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:mail-followup-to:message-id:subject:cc:to :from:date:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Qhx7QtPFHsmhBqKEQ6XlDZutQ+YSTAHptMBIGgI83fw=; b=LBCg5t7RTm8QDKa64HNAmVFW0V83unCjLzN2Mt4rJ6DyAqm229kp4Loxw8balhg6wR jlmF71uclWCKBEPZ9EWX6KX3F7yIBar7lL1am1bxoRqua4H12kcEIJ5+5H9i2kVkR1BB jcniCwoYvPRCBz7a2nUBrkwh3fvo57vRM0KpNF8Ee7BYWdlZr0XW8DGatHp5U4fzMQSQ lRw/Z0s7e5AYS4SQB2SzkP5JOWKAAxsfL5J9TnKcPcjEAnCdHZd8lSFQMyRyXfJBIIbI E73BTCl4T9Y60lB0D/aQ6aL6/CuzHGvpMPKifvst3S+IMXr3fdEqb4XnAxEKnv8AWmtE ZXWg== X-Forwarded-Encrypted: i=1; AJvYcCWoeewRHyEbNA6brzrGLHHFlaD15W5qd0o/BIrpJeHKKWm3b3BJg8916v4/bKxTWyMn1KnYyoxoDBU=@vger.kernel.org X-Gm-Message-State: AOJu0YxfuqTS3dQjX3MtQugxOeNig+80XpkYQvnzPuyZinBuCU8vGV0p NfwOa2YJtrHlvnhpGjwecphC0oIjwsoO1/+ZkEBoaWJ/F8aYb1MQO3c= X-Gm-Gg: ATEYQzwidjtTlS40t3QAlX/7BhpinLG7fJKiWZ+To7L8V3sZ93e985FuxUIZ7xlJGMo RBU6g2EJtIb2u29sVWNGNgYny6fl/FDH5nTsgHyVCtz5uHZalyvihUoJtLUjT6QMXz1k/kaq+2j pUvmpzJ+X/VOiLDiNDHRMzo3azZeQTzGBfGJaw2SyDXvIotKi6393EPlRBWY+pfdz5rf5CsCQcj AW5WCc14Wlh6MWZ0mbc7CJCIRGOFuKsGS5JrSQ8AtQiHXjV9vz/3yQqwl6/CRdliJyPr257ijw6 ZyepMmRxiLVccxccybDMJUw5/fYMZ2Xj5riN7QSQlKSVm0YEnKxHt+QbmCTSYtLubrPBNF3OAFh s9vD9Ah9fK27m/enN6tOc4jPClxaHBd5BDMKRF1ZlwkyAK/3I9efxf0GOLp+KOz2NpgLekFnxqD b4hzi1Aqo/eqNr4UQj1t38o0/q1DmqNwy0Z3QWY0vq+TxA3IStpmkBckasc+04RRPQWW9f0xNcx 00RSqku3rDShqpQ18YcNcJ2Thex X-Received: by 2002:a05:7300:5b88:b0:2b7:32a6:82d1 with SMTP id 5a478bee46e88-2c10962a891mr1874265eec.13.1774021330366; Fri, 20 Mar 2026 08:42:10 -0700 (PDT) Received: from localhost (c-76-102-12-149.hsd1.ca.comcast.net. [76.102.12.149]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2c10b14bac4sm4502825eec.4.2026.03.20.08.42.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 08:42:09 -0700 (PDT) Date: Fri, 20 Mar 2026 08:42:09 -0700 From: Stanislav Fomichev To: Cosmin Ratiu Cc: "netdev@vger.kernel.org" , "sdf@fomichev.me" , "intel-wired-lan@lists.osuosl.org" , "bestswngs@gmail.com" , "kernel-team@meta.com" , "przemyslaw.kitszel@intel.com" , "davem@davemloft.net" , "pabeni@redhat.com" , "horms@kernel.org" , "corbet@lwn.net" , "anthony.l.nguyen@intel.com" , "willemb@google.com" , "linux-kernel@vger.kernel.org" , "skhawaja@google.com" , Dragos Tatulea , "kees@kernel.org" , Jianbo Liu , "alexanderduyck@fb.com" , "kuba@kernel.org" , "leon@kernel.org" , Saeed Mahameed , "andrew+netdev@lunn.ch" , "michael.chan@broadcom.com" , Mark Bloch , "sd@queasysnail.net" , Tariq Toukan , "jacob.e.keller@intel.com" , "skhan@linuxfoundation.org" , "mohsin.bashr@gmail.com" , "edumazet@google.com" , "pavan.chebbi@broadcom.com" , "linux-kselftest@vger.kernel.org" , "linux-rdma@vger.kernel.org" , "johannes@sipsolutions.net" , "linux-doc@vger.kernel.org" , "aleksandr.loktionov@intel.com" , "linux-wireless@vger.kernel.org" Subject: Re: [PATCH net-next v3 06/13] mlx5: convert to ndo_set_rx_mode_async Message-ID: Mail-Followup-To: Stanislav Fomichev , Cosmin Ratiu , "netdev@vger.kernel.org" , "sdf@fomichev.me" , "intel-wired-lan@lists.osuosl.org" , "bestswngs@gmail.com" , "kernel-team@meta.com" , "przemyslaw.kitszel@intel.com" , "davem@davemloft.net" , "pabeni@redhat.com" , "horms@kernel.org" , "corbet@lwn.net" , "anthony.l.nguyen@intel.com" , "willemb@google.com" , "linux-kernel@vger.kernel.org" , "skhawaja@google.com" , Dragos Tatulea , "kees@kernel.org" , Jianbo Liu , "alexanderduyck@fb.com" , "kuba@kernel.org" , "leon@kernel.org" , Saeed Mahameed , "andrew+netdev@lunn.ch" , "michael.chan@broadcom.com" , Mark Bloch , "sd@queasysnail.net" , Tariq Toukan , "jacob.e.keller@intel.com" , "skhan@linuxfoundation.org" , "mohsin.bashr@gmail.com" , "edumazet@google.com" , "pavan.chebbi@broadcom.com" , "linux-kselftest@vger.kernel.org" , "linux-rdma@vger.kernel.org" , "johannes@sipsolutions.net" , "linux-doc@vger.kernel.org" , "aleksandr.loktionov@intel.com" , "linux-wireless@vger.kernel.org" References: <20260320012501.2033548-1-sdf@fomichev.me> <20260320012501.2033548-7-sdf@fomichev.me> Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: On 03/20, Cosmin Ratiu wrote: > 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 > > 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   | 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/20260319005456.82745-1-saeed@kernel.org/T/#u Thanks for the heads up, will try to wait for this to be pulled before reposting!