From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 2904117736 for ; Wed, 10 Sep 2025 15:31:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757518275; cv=none; b=Fcfc3aNlYS5FAzmQDnePUG/PiLsq4W+/CFg4R1ZQsGtI40DPoyrI5zMrwK1R7lC8FyX3sNINb3UiGeBYYtZoCQGfZCN0nQN6l7NGqWDl3OLhxHE6fa6BUeFeIiedtJPKbu9C2dHzLZD/bfiPQVdIgqY0OYBubeBNIMFEdIe5oXc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757518275; c=relaxed/simple; bh=jc2/UzEiHHii7qwYws85Ns4EPsygWxg33Jjz8SvEiiQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=iOioRhqGZabZNumBQ7B5rNs5xwCkk5Ph8kr3SpduNJyfbmiP13fo/V3cansUDU9QiBYY7x/SoIiKJXjb+NFUBtyJ45jUnLHySkf6K83eRmAQgCBR85/sVeCGcxXKCIsendHlZ0tLzh1lowlSY9IN32hTaZv7yLJ0Sd1GX5KPRGs= 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=PbrcSsIu; arc=none smtp.client-ip=209.85.216.46 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="PbrcSsIu" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-32c54c31ed9so4282455a91.3 for ; Wed, 10 Sep 2025 08:31:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757518273; x=1758123073; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=aslT2dP/KbCqLz9yRRveBsORSsjyA/aQ8k1L0oN8zws=; b=PbrcSsIuoYXNvNnkA8TMAiRC+U+K0vOeEVILZLZN1owUvd1zgZyNK/tO9mu/zDPnUo OdRC41SUOaE4hE6nhVnQzFfJjr8dyqXZ3TktA1I0YUlBXbbKZHUsNrhWkpPWMFq9yGeT QBZ0O4wy3goLWrL0lZPyT49UraPYUGs3ydzJRZw5gIxt+LU02ocOqXt4Jj3JcMUrqhoO ZZ4rklPgyNM3gWLnh9H/PfVKdgHzJI5lMQLclUCxZs4VT3ZWhQd5imVjQueeZsf3xcL6 NFW+u2MDg+7a1460J27Fh4/OhVF7gWQtNdKujv8w1QWzuaUOD3ZrJctSjYNF/iUXJGJp PjHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757518273; x=1758123073; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=aslT2dP/KbCqLz9yRRveBsORSsjyA/aQ8k1L0oN8zws=; b=kl7z/cxB5apE/v7eM0YFpxZaGVchbgFX3TLopyHxW3R8ONLw4wnwwt/K9gYjTTkF+K NQiAR5GmshFap/53hHd7YOC2+sf0rFjmOIZh7KLWK06wjNAV3ek63J9GfOsFRB3hxIis DtVjbLvuLfaz4gogmJKcmcfBsIiVw5zL3dniA6W1CGRtTDqEhfpw9gDTLXjZbBz2M4lC AagMKj1liBr0iYQxL87NpglWg0IcBRsONGj5MKBl6MIkpXU1ea/YcurFen03/j0qKeHE 4aFdc3qOFE5sVbbWahp/Oshdq5Twr6SflMrcYNsaAvHi5nDIqj6FmspP7cvM8HGkzL1T 7NfA== X-Gm-Message-State: AOJu0Yy8piq8olz+SxTjUtgMx/w7KEP/AwidL0k+IX82XptGeygL76Qr xNBDJF0tkp/5n9oTKjY6swN+Ug1m5MgjvCqlsiKtcIZ+MAnhKClBsag= X-Gm-Gg: ASbGncv6VuhkLFiR++MsmOEq5JsZ+D9d7/SdKy0ZVEgaHxSSo+rLCPaLHrlQpErt9kg EbfvnVAMM5pWkyZChmA658hZTfFzEmGGZUWMwa+BscgzIzc/PEFp+KBWJsRlpB5ZI8K5Cabb4AO UEhO2xw3mxGrHiHzRrYcoK29nKlP24PJeiEOY9iH2ZABce3auF2ZVNgSg+Xu67PtFJ3Ct+1bcAl H0+nd6IpM8bq34jo9GsjxmSlG4bUTrXOG1lnxMvXJBuTQIQdwSLfeuuJP8cBIocW63/UWkbP2PA OQca0ymlOCNdvPBmAuIZNwFVthQzz82YUaWd/kCWDgsgjKsdb5vNhxK/ag4x4SDkZe/6MMGJJnH miQ4zwxoKSvuvsQU0+22O/+areSAppTVJnHz9JX24bZjj9bped+Ar5SGDku1RrBOGVx39f5D1bp UVDnw2mJCGGvN2eh66whDa5Gv5DEsvVu5wlvBW02zVZASx8LGms5+fEvK1cSOc7Il1MZvR+Mhoo 8H3 X-Google-Smtp-Source: AGHT+IFJAsN22RzEZGX9qXHrJTseEBNmURBALNvMji0DSxk8mi2vxAkq0iZRnzEUXZZujDM5omoPXg== X-Received: by 2002:a17:90b:1fc7:b0:321:38a:229a with SMTP id 98e67ed59e1d1-32d43ef084fmr19911611a91.7.1757518272964; Wed, 10 Sep 2025 08:31:12 -0700 (PDT) Received: from localhost (c-73-158-218-242.hsd1.ca.comcast.net. [73.158.218.242]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-775f6b42023sm2592143b3a.87.2025.09.10.08.31.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Sep 2025 08:31:12 -0700 (PDT) Date: Wed, 10 Sep 2025 08:31:12 -0700 From: Stanislav Fomichev To: Hangbin Liu Cc: netdev@vger.kernel.org, Jay Vosburgh , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Sabrina Dubroca , Jiri Pirko , Simon Horman , Ido Schimmel , Shuah Khan , Stanislav Fomichev , Kuniyuki Iwashima , Ahmed Zaki , Alexander Lobakin , bridge@lists.linux.dev, linux-kselftest@vger.kernel.org Subject: Re: [PATCHv3 net-next 3/5] team: use common function to compute the features Message-ID: References: <20250909081853.398190-1-liuhangbin@gmail.com> <20250909081853.398190-4-liuhangbin@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20250909081853.398190-4-liuhangbin@gmail.com> On 09/09, Hangbin Liu wrote: > Use the new helper netdev_compute_features_from_lowers() to compute the > team device features. This helper performs both the feature computation > and the netdev_change_features() call. > > Note that such change replace the lower layer traversing currently done > using team->port_list with netdev_for_each_lower_dev(). Such change is > safe as `port_list` contains exactly the same elements as > `team->dev->adj_list.lower` and the helper is always invoked under the > RTNL lock. > > With this change, the explicit netdev_change_features() in > team_add_slave() can be safely removed, as team_port_add() > already takes care of the notification via > netdev_compute_features_from_lowers(), and same thing for team_del_slave() > > This also fixes missing computations for MPLS, XFRM, and TSO/GSO partial > features. > > Signed-off-by: Hangbin Liu > --- > drivers/net/team/team_core.c | 78 +++--------------------------------- > 1 file changed, 5 insertions(+), 73 deletions(-) > > diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c > index 17f07eb0ee52..c5fbe392fc62 100644 > --- a/drivers/net/team/team_core.c > +++ b/drivers/net/team/team_core.c > @@ -982,63 +982,6 @@ static void team_port_disable(struct team *team, > team_lower_state_changed(port); > } > > -#define TEAM_VLAN_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG | \ > - NETIF_F_FRAGLIST | NETIF_F_GSO_SOFTWARE | \ > - NETIF_F_HIGHDMA | NETIF_F_LRO | \ > - NETIF_F_GSO_ENCAP_ALL) > - > -#define TEAM_ENC_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG | \ > - NETIF_F_RXCSUM | NETIF_F_GSO_SOFTWARE) > - > -static void __team_compute_features(struct team *team) > -{ > - struct team_port *port; > - netdev_features_t vlan_features = TEAM_VLAN_FEATURES; > - netdev_features_t enc_features = TEAM_ENC_FEATURES; > - unsigned short max_hard_header_len = ETH_HLEN; > - unsigned int dst_release_flag = IFF_XMIT_DST_RELEASE | > - IFF_XMIT_DST_RELEASE_PERM; > - > - rcu_read_lock(); > - if (list_empty(&team->port_list)) > - goto done; > - > - vlan_features = netdev_base_features(vlan_features); > - enc_features = netdev_base_features(enc_features); > - > - list_for_each_entry_rcu(port, &team->port_list, list) { > - vlan_features = netdev_increment_features(vlan_features, > - port->dev->vlan_features, > - TEAM_VLAN_FEATURES); > - enc_features = > - netdev_increment_features(enc_features, > - port->dev->hw_enc_features, > - TEAM_ENC_FEATURES); > - > - dst_release_flag &= port->dev->priv_flags; > - if (port->dev->hard_header_len > max_hard_header_len) > - max_hard_header_len = port->dev->hard_header_len; > - } > -done: > - rcu_read_unlock(); > - > - team->dev->vlan_features = vlan_features; > - team->dev->hw_enc_features = enc_features | NETIF_F_GSO_ENCAP_ALL | > - NETIF_F_HW_VLAN_CTAG_TX | > - NETIF_F_HW_VLAN_STAG_TX; > - team->dev->hard_header_len = max_hard_header_len; > - > - team->dev->priv_flags &= ~IFF_XMIT_DST_RELEASE; > - if (dst_release_flag == (IFF_XMIT_DST_RELEASE | IFF_XMIT_DST_RELEASE_PERM)) > - team->dev->priv_flags |= IFF_XMIT_DST_RELEASE; > -} > - > -static void team_compute_features(struct team *team) > -{ > - __team_compute_features(team); > - netdev_change_features(team->dev); > -} > - > static int team_port_enter(struct team *team, struct team_port *port) > { > int err = 0; > @@ -1300,7 +1243,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev, > port->index = -1; > list_add_tail_rcu(&port->list, &team->port_list); > team_port_enable(team, port); > - __team_compute_features(team); > + netdev_compute_features_from_lowers(team->dev); > __team_port_change_port_added(port, !!netif_oper_up(port_dev)); > __team_options_change_check(team); > > @@ -1382,7 +1325,7 @@ static int team_port_del(struct team *team, struct net_device *port_dev) > dev_set_mtu(port_dev, port->orig.mtu); > kfree_rcu(port, rcu); > netdev_info(dev, "Port device %s removed\n", portname); > - __team_compute_features(team); > + netdev_compute_features_from_lowers(team->dev); > > return 0; > } > @@ -1976,27 +1919,16 @@ static int team_add_slave(struct net_device *dev, struct net_device *port_dev, > > err = team_port_add(team, port_dev, extack); > > - if (!err) > - netdev_change_features(dev); > - > return err; do the same `return team_port_add` here as you do in team_del_slave?