From nobody Sun Jun 14 20:01:21 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (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 8A42E31E852 for ; Mon, 6 Apr 2026 03:04:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444692; cv=none; b=Ni3Czjk01tJxGBCwszXCUgapjLozmPdJJybbrrEa0qlItvkbZ9DNa2MyEwH1oBkqhVMROuPMINN+QuANOKXdTn+6mxq9dYvXSjjXGkKeDKK5FORs96tlMA6eaS3h3qM3+OJ53wwZjqV2AOaPJyZbNfVso8Q4Rgu271x4ch/KmEQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444692; c=relaxed/simple; bh=EGR2do1QkkfSK4R8lXhdlVvbF/4OvTtLuIBm/ueL2Ig=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=oKYH3ypAdIvr7SVN+n8E22lVvkUZh4hVDmgYrie6BYvSKKVm4yLuuGh3irF7EPEMPVuMU36IttZx9JHJS0bhF4EHnB4kkbPBoQHIuuC6Qy3KFOEx+AYONbIeCpeT4coQd1gjZLoIY9iWAokukCKA8gHkcPx1JrHQANtN2M9HIU4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=rangBls/; arc=none smtp.client-ip=74.125.82.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rangBls/" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-12c06d061abso2231897c88.1 for ; Sun, 05 Apr 2026 20:04:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775444690; x=1776049490; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=jVkIJQHKJwN6whJ0IODUma8G+uAZ5mIZh/A/X8+gNmk=; b=rangBls/zkVxKudmcOheDWMG+oVAuDkWIsmD9zPiFtrrFTJ5TfT9ITIMfYUdU9Qk3H 2yem4So/7UfaVilMCMqllfrkKFAUJ5pYqGsqF3Hg44LIS8LtzIw2G6LbO4h0sRwj0kK8 XbyvfCVQ/9bvGQDBk6QgIrdCnJbcKkxl7yIho7sHs1T0MbVpZ+fBM+cJCUmxKJ9ZbGHD QNWOQXHn9Sduu+daEBIyHSeKvb60PchfBEJXxnaTAm1U3S/4bDKO5yuReQOV6Xw26Wmd JWJ3T4KqWH3T/NZhKv1ksWxKGkzu3QFtVbiAdsf/ISerTQGL/8m8TMWAmB1mMkPYKlwU 3kcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775444690; x=1776049490; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jVkIJQHKJwN6whJ0IODUma8G+uAZ5mIZh/A/X8+gNmk=; b=UkExbW12azM8/fTnB1Bpj5bdLeTGjXXTnu7pP2/j64NZTfxFvajyTvhmeyiNwJgMDN WaRkY4IDiQmUqAOvx2ZMrl3fJ9Px5rbs7pyyLRQM/LC5hXfP/G4B0flOseJpgLDue3U4 c9w4Q9PPQw3m43AEleUMwflvHKMckegrojg1umeq5i/RfIFbfYjao4wVZ6K85or0iAY5 NSM3sgxTtJlB0oHlmRbzm5+8HryzGRyzzPKopKkN4JqkNlKvimEOkm0ngFvc0tTxm0WC rvAVm4VILjaaFWFsBhMjIB34mjbjVMZi4gYg2IzKLztmNfG/MG9XcT98CCLLk5PkDz33 9kyQ== X-Forwarded-Encrypted: i=1; AJvYcCV9IEUSUiX9bamjxg3bWA4xHLH7Oshy2hixS5sAgCfHywr2ikwRGZ9NYsmvrXKHzgeMu0gDAysS64/YDpg=@vger.kernel.org X-Gm-Message-State: AOJu0YyVJJtwn+LLmadqelDtnmWWBPcL2oBi3ScHFWuhs+tRpYd1IGGg meD/9jh+2YoN9caXuQsq8i8bPgvdz+t9RLCkOYSA6Lwsthl+5jV+lys/Vd0OQPjUTiRcNM72v8I OVMsSYQ90jmdUEWZXaTGL+A== X-Received: from dlaj19.prod.google.com ([2002:a05:701b:2813:b0:12c:71e:5ab3]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:41a3:b0:12b:f616:1a1a with SMTP id a92af1059eb24-12bfb6ed5d7mr4563924c88.5.1775444689562; Sun, 05 Apr 2026 20:04:49 -0700 (PDT) Date: Mon, 06 Apr 2026 03:03:37 +0000 In-Reply-To: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775444686; l=3743; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=EGR2do1QkkfSK4R8lXhdlVvbF/4OvTtLuIBm/ueL2Ig=; b=kBZdP1vgRBEMKFD8Ql/D+QTthUFmGyt+s2uF3pIAJ5/2cWekyzpy+8SK+gReSRDnnnCkwHDBH AOcmnLrGwKqAXa8n7ulyv93pMGz14j+kgAKiDVIIAxwCi9wQydtZHXE X-Mailer: b4 0.14.3 Message-ID: <20260406-teaming-driver-internal-v5-1-e8a3f348a1c5@google.com> Subject: [PATCH net-next v5 01/10] net: team: Annotate reads and writes for mixed lock accessed values From: Marc Harvey To: Jiri Pirko , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Marc Harvey Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The team_port's "index" and the team's "en_port_count" are read in the hot transmit path, but are only written to when holding the rtnl lock. Use READ_ONCE() for all lockless reads of these values, and use WRITE_ONCE() for all writes. Signed-off-by: Marc Harvey Reviewed-by: Jiri Pirko --- Changes in v5: - None Changes in v4: - None Changes in v3: - None Changes in v2: - None --- drivers/net/team/team_core.c | 11 ++++++----- drivers/net/team/team_mode_random.c | 2 +- include/linux/if_team.h | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c index 566a5d102c23..becd066279a6 100644 --- a/drivers/net/team/team_core.c +++ b/drivers/net/team/team_core.c @@ -938,7 +938,8 @@ static void team_port_enable(struct team *team, { if (team_port_enabled(port)) return; - port->index =3D team->en_port_count++; + WRITE_ONCE(port->index, team->en_port_count); + WRITE_ONCE(team->en_port_count, team->en_port_count + 1); hlist_add_head_rcu(&port->hlist, team_port_index_hash(team, port->index)); team_adjust_ops(team); @@ -958,7 +959,7 @@ static void __reconstruct_port_hlist(struct team *team,= int rm_index) for (i =3D rm_index + 1; i < team->en_port_count; i++) { port =3D team_get_port_by_index(team, i); hlist_del_rcu(&port->hlist); - port->index--; + WRITE_ONCE(port->index, port->index - 1); hlist_add_head_rcu(&port->hlist, team_port_index_hash(team, port->index)); } @@ -973,8 +974,8 @@ static void team_port_disable(struct team *team, team->ops.port_disabled(team, port); hlist_del_rcu(&port->hlist); __reconstruct_port_hlist(team, port->index); - port->index =3D -1; - team->en_port_count--; + WRITE_ONCE(port->index, -1); + WRITE_ONCE(team->en_port_count, team->en_port_count - 1); team_queue_override_port_del(team, port); team_adjust_ops(team); team_lower_state_changed(port); @@ -1245,7 +1246,7 @@ static int team_port_add(struct team *team, struct ne= t_device *port_dev, netif_addr_unlock_bh(dev); } =20 - port->index =3D -1; + WRITE_ONCE(port->index, -1); list_add_tail_rcu(&port->list, &team->port_list); team_port_enable(team, port); netdev_compute_master_upper_features(dev, true); diff --git a/drivers/net/team/team_mode_random.c b/drivers/net/team/team_mo= de_random.c index 53d0ce34b8ce..169a7bc865b2 100644 --- a/drivers/net/team/team_mode_random.c +++ b/drivers/net/team/team_mode_random.c @@ -16,7 +16,7 @@ static bool rnd_transmit(struct team *team, struct sk_buf= f *skb) struct team_port *port; int port_index; =20 - port_index =3D get_random_u32_below(team->en_port_count); + port_index =3D get_random_u32_below(READ_ONCE(team->en_port_count)); port =3D team_get_port_by_index_rcu(team, port_index); if (unlikely(!port)) goto drop; diff --git a/include/linux/if_team.h b/include/linux/if_team.h index ccb5327de26d..06f4d7400c1e 100644 --- a/include/linux/if_team.h +++ b/include/linux/if_team.h @@ -77,7 +77,7 @@ static inline struct team_port *team_port_get_rcu(const s= truct net_device *dev) =20 static inline bool team_port_enabled(struct team_port *port) { - return port->index !=3D -1; + return READ_ONCE(port->index) !=3D -1; } =20 static inline bool team_port_txable(struct team_port *port) @@ -272,7 +272,7 @@ static inline struct team_port *team_get_port_by_index_= rcu(struct team *team, struct hlist_head *head =3D team_port_index_hash(team, port_index); =20 hlist_for_each_entry_rcu(port, head, hlist) - if (port->index =3D=3D port_index) + if (READ_ONCE(port->index) =3D=3D port_index) return port; return NULL; } --=20 2.53.0.1185.g05d4b7b318-goog From nobody Sun Jun 14 20:01:21 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (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 1AD9032B981 for ; Mon, 6 Apr 2026 03:04:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444694; cv=none; b=OQdrPtO3J9fie8MdZyfeE7nsfxhpMXRbwE6/vBpczYwv3MhTcIkee5lq0mIxMD+Kz0wPCkgzFeopyEdlp6IJtmbS3LSVGjDLMChJxnMqY7xscw4D7TLyRETzg5cfKxRkw8K4irDGMqlIlIrjk46a91wyJ3SB1kqtE18mRYnQoKw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444694; c=relaxed/simple; bh=dDEsjk6lTezLXsoeUbs9k8ZxA3nYUDwshHj9esC4o5k=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=sVUEL8yf/73rhwRr7thQBRgIOklAqNz9aDwXD5jgZ7o+D2kswlY86cJdHGx5WxX8HD9H11PMKOyRTfXGU+pe5Jy0cbavZEiOxHIVUqAEwNPgeVfm4dN3zCcTQxqfTp9f/P0qxH/CQZ6AGYQAYU1WojvCMSuZ2Xbu/Sm2FZWmKkE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=KvIBkvrK; arc=none smtp.client-ip=74.125.82.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="KvIBkvrK" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-127337c8e52so16792572c88.1 for ; Sun, 05 Apr 2026 20:04:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775444692; x=1776049492; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=3pDnUicyot0V41/RigwjoadTUASPAO7D8CjiFKP3m/g=; b=KvIBkvrKTQyokCEmr56h53+LAvhO7EFoIPskqdf+ZPYEA6I7lAOatr6TCf1FHyhsmx CnfuISs8OmoBGe+iG7+cvFJjAqUlOdDcPDcBy3IgXO1DYiq9EB02RKOIoPp6xNzI6YX/ mSo3YGo++QLU6VK+zKrSstgd6iLXsUWQfhImr/r3gLZAIHKdTNdhiFw6H/WeP/IyDHt/ jRv8q4TQyd8d2UrLxk5+u63tjS7fH52/8qlb/sVE2mCTZiFqFrNhMEbFp4xyV+RLPVN7 Csclv7O+QqKtvoowMa4uc2StDjFomTW3/VOUVYKluTXPEe2jJI68jsn1RjJC62P0BAdU 80hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775444692; x=1776049492; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3pDnUicyot0V41/RigwjoadTUASPAO7D8CjiFKP3m/g=; b=UQ88IMJ8WMoZXcySCmzgj5npONyQGvqKaKp0RUSht29QiOeWU78RswfZcQSIG2InmC 1eScnTe9SxBUDk++5DB8nYoljBbGR5SM2YiqykHwtzWnJ2r/8fTujE2sEbvKzeCNBj1R /oQ+CxYqCBzjhahmrOBVLHlgbo5h21MwdYLVUQ07Ju8l4IdUzjQpuUgbsUYvK1hrjmlM z1mj3IRgHN/vfAq2S2vGzQXDkKKm4PF4UOuvfB3MpF717XZFaJnh/VokRQdi0YR8ix4J LKaLr0x8Y+jrDtCoceChYMXMdVjzr3IE76PeyIp3dtA9jWOHN3CHnaS6aqLTqPSQIfqN ESAQ== X-Forwarded-Encrypted: i=1; AJvYcCXJu71ZkYzqlubCxe0SQPONRwV+l708W/IBmYcw7LdsFIAToDJYSCIm0ziQyPFIW4XihR3wPNxm2ngr6zE=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/6wERkqlAMu/Bl/nWVUYoGrEGhfXUwlPNIW8LW465AFP/u8n4 9i/49smgbPK3g7XRtHNlBjKwiW9byWA+xaTJjnx/rJ8RrRswLL2C6oMWao/2/AZPaU5zjc/N6x8 qSOy1YNKEIDBulvhVzDRyOA== X-Received: from dlbrl19.prod.google.com ([2002:a05:7022:f513:b0:12a:c3aa:1a1e]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:ec14:b0:128:bae0:e03c with SMTP id a92af1059eb24-12bfb765c2emr5877606c88.30.1775444692085; Sun, 05 Apr 2026 20:04:52 -0700 (PDT) Date: Mon, 06 Apr 2026 03:03:38 +0000 In-Reply-To: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775444686; l=1487; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=dDEsjk6lTezLXsoeUbs9k8ZxA3nYUDwshHj9esC4o5k=; b=+vEU6Ba3XhmzULJa0Fkia7jJUI2tfFYs2cBvO+aA2ci9u60lkgE8aUNl8IiZ1mwAsf8l4WkWA 0hG6WAKgNUEAmJBIYy4YBNd61LW2J2gXcOQcYYnW+me3tJQa8XCZ5JQ X-Mailer: b4 0.14.3 Message-ID: <20260406-teaming-driver-internal-v5-2-e8a3f348a1c5@google.com> Subject: [PATCH net-next v5 02/10] net: team: Remove unused team_mode_op, port_enabled From: Marc Harvey To: Jiri Pirko , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Marc Harvey Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This team_mode_op wasn't used by any of the team modes, so remove it. Signed-off-by: Marc Harvey Reviewed-by: Jiri Pirko --- Changes in v5: - None Changes in v4: - None Changes in v3: - None Changes in v2: - None --- drivers/net/team/team_core.c | 2 -- include/linux/if_team.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c index becd066279a6..e54bd21bd068 100644 --- a/drivers/net/team/team_core.c +++ b/drivers/net/team/team_core.c @@ -944,8 +944,6 @@ static void team_port_enable(struct team *team, team_port_index_hash(team, port->index)); team_adjust_ops(team); team_queue_override_port_add(team, port); - if (team->ops.port_enabled) - team->ops.port_enabled(team, port); team_notify_peers(team); team_mcast_rejoin(team); team_lower_state_changed(port); diff --git a/include/linux/if_team.h b/include/linux/if_team.h index 06f4d7400c1e..a761f5282bcf 100644 --- a/include/linux/if_team.h +++ b/include/linux/if_team.h @@ -121,7 +121,6 @@ struct team_mode_ops { int (*port_enter)(struct team *team, struct team_port *port); void (*port_leave)(struct team *team, struct team_port *port); void (*port_change_dev_addr)(struct team *team, struct team_port *port); - void (*port_enabled)(struct team *team, struct team_port *port); void (*port_disabled)(struct team *team, struct team_port *port); }; =20 --=20 2.53.0.1185.g05d4b7b318-goog From nobody Sun Jun 14 20:01:21 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (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 C3342330648 for ; Mon, 6 Apr 2026 03:04:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444697; cv=none; b=gXUwSRyJppc/jp9eT+T6ed80eLrMg+DymbEVH4LveYgoT7e+f9AHriH8ubV6EEUM/lw7uH0jTCgb9vxo17iuKs1tuN9T3PfpHGOEXliOrn27+GtOHgsMBRqWs2W8bczO0lpwhruRacyymeWH5e3AP17URNDvBPmy6iQgXi4RZNY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444697; c=relaxed/simple; bh=o6Pod91e7/9t3b2/Bm72vJKPPOfa7e2ANUl5kI+qtIg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=eHu6oeE7jQaR8W+KpPyvJzsErfswEGC5jubYfixPTpNhXnCMLBcAtPe6tmedvOslM95wz+6yv9T4L4zbro3jkrCsoLk/g33kPGSJ3Lv9yNd74TwHfIcVt+zAgBRxp6OQCOhmveoz3XJejEQ4xnH0ATQ7GFeO+hxbVAX4CAsrE5E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=XzdSgbUY; arc=none smtp.client-ip=74.125.82.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="XzdSgbUY" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2cc9118dc2eso9589994eec.0 for ; Sun, 05 Apr 2026 20:04:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775444694; x=1776049494; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=4URTC5SIPOJboJ7bC77dvH5LDjPWmAdcDPJzBNM8Qk0=; b=XzdSgbUYPhRTcVnSmrQwLYsupAbzqyzkR4nN/sEWdecEToW7PFf3KZ1uZigRCmwBDO Jz7aoDxkf1w0E4AwpSCsBRBW1sBDmkxQxTGuxDer9BoyC3F9SpqcQr4xPj3LCpfuMPhG CrweWJlM0yYyNiG5E24dGXgd2gMofimbArbgyKQ17ry+zQ86oQHBHydpeLflGn7DZO6l 0fK69tzZpY2Ekm/eUyL7qcEWPmxnLhzEptKCB3IugtJIwP2KG3ZX9nb03zMsmhUKjtkw 1VkEZNpdlRO/wNVcMcy3dpWLZ0z/ba2yefiRSPdljAPIrXGNz7aJvUwW3dgZT4j+WyVI vDbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775444694; x=1776049494; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4URTC5SIPOJboJ7bC77dvH5LDjPWmAdcDPJzBNM8Qk0=; b=UIH56zFMZ7ppi9HFgjz/XeVtzRr+lpjOAe+HpVbOkDovA/Y8yXfFNZyfyZtZrk/PZN uPjdOc6bg8G8Vyk6j6srwrjPA4z9yH6a93/1uZUaWX+0EXLZWUV8x/zMvuoFlpqx2a1P Q7bopTJD1ppI+igFv3yAYRM5wstkIkHzJ8TtJMJEE5S67KqtgzbfQ/znQFdJ8d8ybKKz IbKU1IZWIDgsYehvfF+3XRtj0vwUJWoUWf9yyVnYyWJGMK1qbV1Qwy3cCaj654MNMs1m qAzbw8OtZjrB0VPFlCE8z9DfUctllygkAA4rAkScW4eLYUCtLla6n2Z4rCp8u7HSVrG1 kb2A== X-Forwarded-Encrypted: i=1; AJvYcCVKIyCalmks2bYLvrTMkFrqsxKicJ812K7W0CXzee84Jwz9EksJT92k4bp1GU0UQ5zxIj4e6V0uDKuDf28=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/K4hBevsHZFKyLsQx/olKBDvUuCf16uBYmNVceTWD/34RKDI9 vWbHE+cQMRl/BaatdIYzQU7LrIlZ6HniipIhWsLDo/Mn3MlYF/cJDc1OHks0j7f/3JXyVyUS30A csof353RfAmlhqF5tLSlfXA== X-Received: from dycac24.prod.google.com ([2002:a05:7301:5518:b0:2c4:3a40:8acd]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:fd09:b0:2c6:1557:998f with SMTP id 5a478bee46e88-2cbfc16c435mr5221567eec.25.1775444693757; Sun, 05 Apr 2026 20:04:53 -0700 (PDT) Date: Mon, 06 Apr 2026 03:03:39 +0000 In-Reply-To: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775444686; l=2611; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=o6Pod91e7/9t3b2/Bm72vJKPPOfa7e2ANUl5kI+qtIg=; b=zTZohA5zj/dgsl5f+2TjmB6csNXcByUzymeOpU3t0RybGmZFJCp2RtVTm8BvbI0KFTCh6XUBg H/fbAcXs6sgAVlVx2yrW5k94zPotbsNiT2B25EIRA9uA3u5LCM7E5Kz X-Mailer: b4 0.14.3 Message-ID: <20260406-teaming-driver-internal-v5-3-e8a3f348a1c5@google.com> Subject: [PATCH net-next v5 03/10] net: team: Rename port_disabled team mode op to port_tx_disabled From: Marc Harvey To: Jiri Pirko , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Marc Harvey Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This team mode op is only used by the load balance mode, and it only uses it in the tx path. Signed-off-by: Marc Harvey --- Changes in v5: - None Changes in v4: - None Changes in v3: - None Changes in v2: - None --- drivers/net/team/team_core.c | 4 ++-- drivers/net/team/team_mode_loadbalance.c | 4 ++-- include/linux/if_team.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c index e54bd21bd068..2ce31999c99f 100644 --- a/drivers/net/team/team_core.c +++ b/drivers/net/team/team_core.c @@ -968,8 +968,8 @@ static void team_port_disable(struct team *team, { if (!team_port_enabled(port)) return; - if (team->ops.port_disabled) - team->ops.port_disabled(team, port); + if (team->ops.port_tx_disabled) + team->ops.port_tx_disabled(team, port); hlist_del_rcu(&port->hlist); __reconstruct_port_hlist(team, port->index); WRITE_ONCE(port->index, -1); diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/te= am_mode_loadbalance.c index 684954c2a8de..840f409d250b 100644 --- a/drivers/net/team/team_mode_loadbalance.c +++ b/drivers/net/team/team_mode_loadbalance.c @@ -655,7 +655,7 @@ static void lb_port_leave(struct team *team, struct tea= m_port *port) free_percpu(lb_port_priv->pcpu_stats); } =20 -static void lb_port_disabled(struct team *team, struct team_port *port) +static void lb_port_tx_disabled(struct team *team, struct team_port *port) { lb_tx_hash_to_port_mapping_null_port(team, port); } @@ -665,7 +665,7 @@ static const struct team_mode_ops lb_mode_ops =3D { .exit =3D lb_exit, .port_enter =3D lb_port_enter, .port_leave =3D lb_port_leave, - .port_disabled =3D lb_port_disabled, + .port_tx_disabled =3D lb_port_tx_disabled, .receive =3D lb_receive, .transmit =3D lb_transmit, }; diff --git a/include/linux/if_team.h b/include/linux/if_team.h index a761f5282bcf..740cb3100dfc 100644 --- a/include/linux/if_team.h +++ b/include/linux/if_team.h @@ -121,7 +121,7 @@ struct team_mode_ops { int (*port_enter)(struct team *team, struct team_port *port); void (*port_leave)(struct team *team, struct team_port *port); void (*port_change_dev_addr)(struct team *team, struct team_port *port); - void (*port_disabled)(struct team *team, struct team_port *port); + void (*port_tx_disabled)(struct team *team, struct team_port *port); }; =20 extern int team_modeop_port_enter(struct team *team, struct team_port *por= t); --=20 2.53.0.1185.g05d4b7b318-goog From nobody Sun Jun 14 20:01:21 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (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 889C73314A1 for ; Mon, 6 Apr 2026 03:04:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444703; cv=none; b=BR3w5wVp4zHFyYUP/8/LzWO/LnVsNjWBTLUmDT0VP58bOerm11SJ87fGGu+tI85CeRL3xVO1tYgAfSfx5LtOM9VdKxh4xepw78v3HprFNofde+nIBojNYQfwbvJrXVaDya4TfjbapY/s7eSEum3IyoKt3X+r4hmlc8yWObaV8Ag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444703; c=relaxed/simple; bh=Db5ANaDUIt7kmFK02wSpBRgj82OPh/6iZAe/SH+eEtc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=IIGwyJFpWyKl2BkXKtgHnSB9XAyHdITL2JoYExnIIyNyqgwIaR5GsClmZkqf9AZ7zshewPsKvokUO+UxyoffnVW2NpCsa0tYK+gsdHquGFPJDhICjqSIC+04uCfww5sRFfPaWh5P9cxzYDkRB2UXUgf+6AFR7aNBmHcDDydnqUs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Dxv8xKke; arc=none smtp.client-ip=74.125.82.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Dxv8xKke" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2c895e7de52so14890818eec.0 for ; Sun, 05 Apr 2026 20:04:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775444696; x=1776049496; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=mi929OOnx+TlAsSDxyl9tWxsrY5rZlmtK2iHkRLypQY=; b=Dxv8xKkezTdANUE4dEze4DDVXDq6bYs3sJ5q0pJsJb/YcfWWOMp+rTgbWeMyQr5QqU muPy4+9bXrvZ/qZoCuszXeW4O7N/EDRF/ePfYC+I4G5dj3kHTu6qrGhm3dyhqJ3otg+k Eoyoq+V34eQqL1i5wpOYXe5kwWDcJEWYHWjiLnEnopPaA7tx9m2F+VoJ1xgZtoAw2nRT 7x+JQWxdHXIdc2DIGmqtzdHTzQPrK/eM4WFKRNoPKMfD9wPG5T3i4Y2rC9I712h3CKgG 18jmCgZK6G7iCOtFctwa3uWbGzQkdOk4RxFR3jf0vzonFnlEZEJM/Q9m1ooI7ak+YAA9 U2KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775444696; x=1776049496; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mi929OOnx+TlAsSDxyl9tWxsrY5rZlmtK2iHkRLypQY=; b=KEsoXey+VHc5BasT6J75vS/slRJ9J26IMTEsQaw9yBs0a/3fsbeZOXr1E+FB2JQjPR Bzs3FyPpfRvOD9xC2r/CFsqV1R0xcjqP/wxg8WKpeqniSqwyPOmYwqMtyumM8EMsXKME Uh9/13iTwmkD66NWBbS171VZ6sxyiZmpbnFMTDCicLQAuh+6F6KZNGpgtmCHm3YYjfkP sThqrUqDwo9/Dc1qw9cXHv3cvSeqw9kRH74hCfmFffU66D6kDg2Mxd5g8cgdp91WXC0N kXy9gm9Z2m2NUADCfHNl6TvWldmTtLkl8WddGfUIYBvCEmQZ8/dbbtE6aiG8B4FaB1qx +fYg== X-Forwarded-Encrypted: i=1; AJvYcCU8Fwv/IWeBNc6bY9/yH4hyoYaCxefpj7VicgKKnJNEttnGsaC7iSqWqIo5evSyWAqK5n6KzTP+yxQPUco=@vger.kernel.org X-Gm-Message-State: AOJu0YwxWEzkUBAOki9J6j8AU0QNkOyDyMLi4Nvyad9LOrPLdqRYr55Q 4lMyWFky+pCRr4hltUylnKKPJl2aqNY7r6oqLoOU3aQp7iM3ljDJfxyfRjSOdMQA8TkjUxhgU2p EKsiHd3N7An3AmNLJViknLA== X-Received: from dlbpy13.prod.google.com ([2002:a05:7022:e98d:b0:12a:77b3:9893]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:45a6:b0:124:9dea:188d with SMTP id a92af1059eb24-12bfb7670d0mr5696408c88.30.1775444695455; Sun, 05 Apr 2026 20:04:55 -0700 (PDT) Date: Mon, 06 Apr 2026 03:03:40 +0000 In-Reply-To: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775444686; l=12555; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=Db5ANaDUIt7kmFK02wSpBRgj82OPh/6iZAe/SH+eEtc=; b=r7I60JPEel5Yqw2+l+9Z6yNTl8VoJjj4edmVf89nNOB+T5YY69mHPnesippD/H4kt8H+TjPQF UVnX0K7W3nvCK3f3svlcaDhejIsckK0rHIHpsnzQDtXg+tEx+CmAQuO X-Mailer: b4 0.14.3 Message-ID: <20260406-teaming-driver-internal-v5-4-e8a3f348a1c5@google.com> Subject: [PATCH net-next v5 04/10] selftests: net: Add tests for failover of team-aggregated ports From: Marc Harvey To: Jiri Pirko , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Marc Harvey Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable There are currently no kernel tests that verify the effect of setting the enabled team driver option. In a followup patch, there will be changes to this option, so it will be important to make sure it still behaves as it does now. The test verifies that tcp continues to work across two different team devices in separate network namespaces, even when member links are manually disabled. Signed-off-by: Marc Harvey --- Changes in v5: - Use tcpdump for collecting traffic, rather than reading rx counters. - Link to v4: https://lore.kernel.org/netdev/20260403-teaming-driver-intern= al-v4-4-d3032f33ca25@google.com/ Changes in v4: - None Changes in v3: - None Changes in v2: - Fix shellcheck failures. - Remove dependency on net forwarding lib and pipe viewer tools. - Use iperf3 for tcp instead of netcat. - Link to v1: https://lore.kernel.org/all/20260331053353.2504254-5-marcharv= ey@google.com/ --- tools/testing/selftests/drivers/net/team/Makefile | 2 + tools/testing/selftests/drivers/net/team/config | 4 + .../testing/selftests/drivers/net/team/team_lib.sh | 146 +++++++++++++++++= ++ .../drivers/net/team/transmit_failover.sh | 158 +++++++++++++++++= ++++ tools/testing/selftests/net/forwarding/lib.sh | 7 +- 5 files changed, 316 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/drivers/net/team/Makefile b/tools/test= ing/selftests/drivers/net/team/Makefile index 02d6f51d5a06..777da2e0429e 100644 --- a/tools/testing/selftests/drivers/net/team/Makefile +++ b/tools/testing/selftests/drivers/net/team/Makefile @@ -7,9 +7,11 @@ TEST_PROGS :=3D \ options.sh \ propagation.sh \ refleak.sh \ + transmit_failover.sh \ # end of TEST_PROGS =20 TEST_INCLUDES :=3D \ + team_lib.sh \ ../bonding/lag_lib.sh \ ../../../net/forwarding/lib.sh \ ../../../net/in_netns.sh \ diff --git a/tools/testing/selftests/drivers/net/team/config b/tools/testin= g/selftests/drivers/net/team/config index 5d36a22ef080..8f04ae419c53 100644 --- a/tools/testing/selftests/drivers/net/team/config +++ b/tools/testing/selftests/drivers/net/team/config @@ -6,4 +6,8 @@ CONFIG_NETDEVSIM=3Dm CONFIG_NET_IPGRE=3Dy CONFIG_NET_TEAM=3Dy CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=3Dy +CONFIG_NET_TEAM_MODE_BROADCAST=3Dy CONFIG_NET_TEAM_MODE_LOADBALANCE=3Dy +CONFIG_NET_TEAM_MODE_RANDOM=3Dy +CONFIG_NET_TEAM_MODE_ROUNDROBIN=3Dy +CONFIG_VETH=3Dy diff --git a/tools/testing/selftests/drivers/net/team/team_lib.sh b/tools/t= esting/selftests/drivers/net/team/team_lib.sh new file mode 100644 index 000000000000..a3102bdcb99c --- /dev/null +++ b/tools/testing/selftests/drivers/net/team/team_lib.sh @@ -0,0 +1,146 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +test_dir=3D"$(dirname "$0")" +export REQUIRE_MZ=3Dno +export NUM_NETIFS=3D0 +# shellcheck disable=3DSC1091 +source "${test_dir}/../../../net/forwarding/lib.sh" + +# Create a team interface inside of a given network namespace with a given +# mode, members, and IP address. +# Arguments: +# namespace - Network namespace to put the team interface into. +# team - The name of the team interface to setup. +# mode - The team mode of the interface. +# ip_address - The IP address to assign to the team interface. +# prefix_length - The prefix length for the IP address subnet. +# $@ - members - The member interfaces of the aggregation. +setup_team() +{ + local namespace=3D$1 + local team=3D$2 + local mode=3D$3 + local ip_address=3D$4 + local prefix_length=3D$5 + shift 5 + local members=3D("$@") + + # Prerequisite: team must have no members + for member in "${members[@]}"; do + ip -n "${namespace}" link set "${member}" nomaster + done + + # Prerequisite: team must have no address in order to set it + # shellcheck disable=3DSC2086 + ip -n "${namespace}" addr del "${ip_address}/${prefix_length}" \ + ${NODAD} dev "${team}" + + echo "Setting team in ${namespace} to mode ${mode}" + + if ! ip -n "${namespace}" link set "${team}" down; then + echo "Failed to bring team device down" + return 1 + fi + if ! ip netns exec "${namespace}" teamnl "${team}" setoption mode \ + "${mode}"; then + echo "Failed to set ${team} mode to '${mode}'" + return 1 + fi + + # Aggregate the members into teams. + for member in "${members[@]}"; do + ip -n "${namespace}" link set "${member}" master "${team}" + done + + # Bring team devices up and give them addresses. + if ! ip -n "${namespace}" link set "${team}" up; then + echo "Failed to set ${team} up" + return 1 + fi + + # shellcheck disable=3DSC2086 + if ! ip -n "${namespace}" addr add "${ip_address}/${prefix_length}" \ + ${NODAD} dev "${team}"; then + echo "Failed to give ${team} IP address in ${namespace}" + return 1 + fi +} + +# This is global used to keep track of the sender's iperf3 process, so tha= t it +# can be terminated. +declare sender_pid + +# Start sending and receiving TCP traffic with iperf3. +# Globals: +# sender_pid - The process ID of the iperf3 sender process. Used to kill = it +# later. +start_listening_and_sending() +{ + ip netns exec "${NS2}" iperf3 -s -p 1234 --logfile /dev/null & + # Wait for server to become reachable before starting client. + slowwait 5 ip netns exec "${NS1}" iperf3 -c "${NS2_IP}" -p 1234 -t 1 \ + --logfile /dev/null + ip netns exec "${NS1}" iperf3 -c "${NS2_IP}" -p 1234 -b 1M -l 1K -t 0 \ + --logfile /dev/null & + sender_pid=3D$! +} + +# Stop sending TCP traffic with iperf3. +# Globals: +# sender_pid - The process ID of the iperf3 sender process. +stop_sending_and_listening() +{ + kill "${sender_pid}" && wait "${sender_pid}" 2>/dev/null || true +} + +# Monitor for TCP traffic with Tcpdump, save results to temp files. +# Arguments: +# namespace - The network namespace to run tcpdump inside of. +# $@ - interfaces - The interfaces to listen to. +save_tcpdump_outputs() +{ + local namespace=3D$1 + shift 1 + local interfaces=3D("$@") + + for interface in "${interfaces[@]}"; do + tcpdump_start "${interface}" "${namespace}" + done + + sleep 1 + + for interface in "${interfaces[@]}"; do + tcpdump_stop_nosleep "${interface}" + done +} + +clear_tcpdump_outputs() +{ + local interfaces=3D("$@") + + for interface in "${interfaces[@]}"; do + tcpdump_cleanup "${interface}" + done +} + +# Read Tcpdump output, determine packet counts. +# Arguments: +# interface - The name of the interface to count packets for. +# ip_address - The destination IP address. +did_interface_receive() +{ + local interface=3D"$1" + local ip_address=3D"$2" + local packet_count + + packet_count=3D$(tcpdump_show "$interface" | grep -c \ + "> ${ip_address}.1234") + echo "Packet count for ${interface} was ${packet_count}" + + if [[ "${packet_count}" -gt 0 ]]; then + true + else + false + fi +} diff --git a/tools/testing/selftests/drivers/net/team/transmit_failover.sh = b/tools/testing/selftests/drivers/net/team/transmit_failover.sh new file mode 100755 index 000000000000..b2bdcd27bc98 --- /dev/null +++ b/tools/testing/selftests/drivers/net/team/transmit_failover.sh @@ -0,0 +1,158 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +# These tests verify the basic failover capability of the team driver via = the +# `enabled` team driver option across different team driver modes. This do= es not +# rely on teamd, and instead just uses teamnl to set the `enabled` option +# directly. +# +# Topology: +# +# +-------------------------+ NS1 +# | test_team1 | +# | + | +# | eth0 | eth1 | +# | +---+---+ | +# | | | | +# +-------------------------+ +# | | +# +-------------------------+ NS2 +# | | | | +# | +-------+ | +# | eth0 | eth1 | +# | + | +# | test_team2 | +# +-------------------------+ + +export ALL_TESTS=3D"team_test_failover" + +test_dir=3D"$(dirname "$0")" +# shellcheck disable=3DSC1091 +source "${test_dir}/../../../net/lib.sh" +# shellcheck disable=3DSC1091 +source "${test_dir}/team_lib.sh" + +NS1=3D"" +NS2=3D"" +export NODAD=3D"nodad" +PREFIX_LENGTH=3D"64" +NS1_IP=3D"fd00::1" +NS2_IP=3D"fd00::2" +NS1_IP4=3D"192.168.0.1" +NS2_IP4=3D"192.168.0.2" +MEMBERS=3D("eth0" "eth1") + +while getopts "4" opt; do + case $opt in + 4) + echo "IPv4 mode selected." + export NODAD=3D + PREFIX_LENGTH=3D"24" + NS1_IP=3D"${NS1_IP4}" + NS2_IP=3D"${NS2_IP4}" + ;; + \?) + echo "Invalid option: -$OPTARG" >&2 + exit 1 + ;; + esac +done + +# Create the network namespaces, veth pair, and team devices in the specif= ied +# mode. +# Globals: +# RET - Used by test infra, set by `check_err` functions. +# Arguments: +# mode - The team driver mode to use for the team devices. +environment_create() +{ + trap cleanup_all_ns EXIT + setup_ns ns1 ns2 + NS1=3D"${NS_LIST[0]}" + NS2=3D"${NS_LIST[1]}" + + # Create the interfaces. + ip -n "${NS1}" link add eth0 type veth peer name eth0 netns "${NS2}" + ip -n "${NS1}" link add eth1 type veth peer name eth1 netns "${NS2}" + ip -n "${NS1}" link add test_team1 type team + ip -n "${NS2}" link add test_team2 type team + + # Set up the receiving network namespace's team interface. + setup_team "${NS2}" test_team2 roundrobin "${NS2_IP}" \ + "${PREFIX_LENGTH}" "${MEMBERS[@]}" +} + + +# Check that failover works for a specific team driver mode. +# Globals: +# RET - Used by test infra, set by `check_err` functions. +# Arguments: +# mode - The mode to set the team interfaces to. +team_test_mode_failover() +{ + local mode=3D"$1" + export RET=3D0 + + # Set up the sender team with the correct mode. + setup_team "${NS1}" test_team1 "${mode}" "${NS1_IP}" \ + "${PREFIX_LENGTH}" "${MEMBERS[@]}" + check_err $? "Failed to set up sender team" + + start_listening_and_sending + + ### Scenario 1: All interfaces initially enabled. + save_tcpdump_outputs "${NS2}" "${MEMBERS[@]}" + did_interface_receive eth0 "${NS2_IP}" + check_err $? "eth0 not transmitting when both links enabled" + did_interface_receive eth1 "${NS2_IP}" + check_err $? "eth1 not transmitting when both links enabled" + clear_tcpdump_outputs "${MEMBERS[@]}" + + ### Scenario 2: One tx-side interface disabled. + ip netns exec "${NS1}" teamnl test_team1 setoption enabled false \ + --port=3Deth1 + slowwait 2 bash -c "ip netns exec ${NS1} teamnl test_team1 getoption \ + enabled --port=3Deth1 | grep -q false" + + save_tcpdump_outputs "${NS2}" "${MEMBERS[@]}" + did_interface_receive eth0 "${NS2_IP}" + check_err $? "eth0 not transmitting when enabled" + did_interface_receive eth1 "${NS2_IP}" + check_fail $? "eth1 IS transmitting when disabled" + clear_tcpdump_outputs "${MEMBERS[@]}" + + ### Scenario 3: The interface is re-enabled. + ip netns exec "${NS1}" teamnl test_team1 setoption enabled true \ + --port=3Deth1 + slowwait 2 bash -c "ip netns exec ${NS1} teamnl test_team1 getoption \ + enabled --port=3Deth1 | grep -q true" + + save_tcpdump_outputs "${NS2}" "${MEMBERS[@]}" + did_interface_receive eth0 "${NS2_IP}" + check_err $? "eth0 not transmitting when both links enabled" + did_interface_receive eth1 "${NS2_IP}" + check_err $? "eth1 not transmitting when both links enabled" + clear_tcpdump_outputs "${MEMBERS[@]}" + + log_test "Failover of '${mode}' test" + + # Clean up + stop_sending_and_listening +} + +team_test_failover() +{ + team_test_mode_failover broadcast + team_test_mode_failover roundrobin + team_test_mode_failover random + # Don't test `activebackup` or `loadbalance` modes, since they are too + # complicated for just setting `enabled` to work. They use more than + # the `enabled` option for transmit. +} + +require_command teamnl +require_command iperf3 +require_command tcpdump +environment_create +tests_run +exit "${EXIT_STATUS}" diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/= selftests/net/forwarding/lib.sh index d8cc4c64148d..a1017b11e3ea 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -1749,12 +1749,17 @@ tcpdump_start() sleep 1 } =20 -tcpdump_stop() +tcpdump_stop_nosleep() { local if_name=3D$1 local pid=3D${cappid[$if_name]} =20 $ns_cmd kill "$pid" && wait "$pid" +} + +tcpdump_stop() +{ + tcpdump_stop_nosleep "$1" sleep 1 } =20 --=20 2.53.0.1185.g05d4b7b318-goog From nobody Sun Jun 14 20:01:21 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (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 D38AC332610 for ; Mon, 6 Apr 2026 03:04:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444703; cv=none; b=c+5SuP+j6NAv+MMZisX+l3F/ZNValcnaxJPTuWGIwCezoGan3AGPAroo6STl0O1JjgIysgVT+Ut1zn0r5QVhFOpNSq+p95yb6ugtE0FRxnY3x7VNB+QgElVtwNTWTAI+FDgkNz+rwW6EhHe1Mg45PuuHNpmLkWARnjKSnvR0zlU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444703; c=relaxed/simple; bh=0YVOs6mvzRfLSGgpBVleOvTUosfL7jK3Yi1QX4/ZK24=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=bfH1qKkhRj76oRQJIlKDgsvqTKwc//3UvA6aFOU54MQsslLHzvzqfhnF53blmsgfC474//x6+6aYQIUEkF7+lTTDk4kgtnCEzb3/i+jxCFL7yVmntZKq8anYZU3BMZ7lY7u/uPktpMHbeW1jwhAhQGLmnyUXrz1Zjq4YsO1ELds= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=uInh/hjS; arc=none smtp.client-ip=74.125.82.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="uInh/hjS" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2c3b8880ca9so4037350eec.1 for ; Sun, 05 Apr 2026 20:04:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775444697; x=1776049497; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=oEaMAxrEww+uVIXzB0dGp70Z6IRO+JDIEBNf8Q3zoDo=; b=uInh/hjSyl/Kg9/lS0U8Zfp8ONZsMjBhCtdobW/lXuyyt6VJUrgyCOd72goMKRPjfl 7YVNkhzHrWVjjT8Y4sG/o/G4k2gIWFvSqIYQXFiYzAhz6YEhMwg/2TNbNXNOrnA4vwID 0lrz0iR8A3udRp4b31Q9DWFw6RZaW64ZVlmDd64VW0b5CawlGgDEHcJAL+sf2HRtNEoE 6IZ+1RoR41Hdlae0V2B8QkPwEO3wH+xAqcBg8LOcavFtxB+ozAnSiR7aD3/gQLlM3YF7 O1p32AE5Khb+MEayfMvkCxQWVXqVnwBcAukiOQcBeUYBO5GKH3TXc4PW9YEbblU/OTC7 r8Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775444697; x=1776049497; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oEaMAxrEww+uVIXzB0dGp70Z6IRO+JDIEBNf8Q3zoDo=; b=NCOZoGReXUsf2g379Tjqv7Ci54Oikqu90wkl6I1SWCZ5bI+/xAXvd6dAWxJjtKQeyV w2/7lto7yX/vGjvQC/sQ1AE1KtUIf0uBxLAzjKCj+7elBSHnlc/H6YU1iWOtOKU6bLXR iFLiPSGb+18rWm/xUa/XugAJ7ielwZqfFNyPVzosarIy3V1imoK5FqpW8YJkvMAEfPnK 0u+nvtkdrOgXW6BxccReU9JXIqTw+yOeUEGQMq2Jk8/JOxzyVzmIDwtOjI80yA7XBkBf J8yDIFzVLfKvRZ5si9lru5d+v0ebXAcz2eG9Z3CVWNfFlH7T4wyix5IaRk7hW5ol2pH4 qXAw== X-Forwarded-Encrypted: i=1; AJvYcCVnvQ54ZfFzBU+9CXa9y2EBBAgYQIL48ZbYx9QCaFUkTSWGSAAZNWcZRAl53358TyEfzCu6G3omkHfu1Mo=@vger.kernel.org X-Gm-Message-State: AOJu0YzppoVO0a2HhBsR4kgbiwvcciHIds7WhuOJmIiUvx3pmTQeYcbF QuwtuZ0OHDy+mnzX6GzWwAl/WuZr4/Mmv7AWIlg8oD2Ode8r6MyCCu7oIKpXCtqPzOmM1sTNQua a4y5dZ4UAKUh72zWjmNIhpA== X-Received: from dycqz3.prod.google.com ([2002:a05:7301:df43:b0:2c7:e5a2:e154]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:478f:b0:2cb:c1f8:a7f5 with SMTP id 5a478bee46e88-2cbfb98f856mr4961970eec.19.1775444696851; Sun, 05 Apr 2026 20:04:56 -0700 (PDT) Date: Mon, 06 Apr 2026 03:03:41 +0000 In-Reply-To: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775444686; l=11204; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=0YVOs6mvzRfLSGgpBVleOvTUosfL7jK3Yi1QX4/ZK24=; b=NcidsS6imbvbIpo7qVxPTh1J+olq28BF4dpUnZ3bMIi4f4lERYkmrWF5KZMLDiFr+M129TjJb GkJYRl46OOGAxS/WbsrsSoGl6rbdLtChxZU0uRdKYlZziy7VN8SZFbm X-Mailer: b4 0.14.3 Message-ID: <20260406-teaming-driver-internal-v5-5-e8a3f348a1c5@google.com> Subject: [PATCH net-next v5 05/10] selftests: net: Add test for enablement of ports with teamd From: Marc Harvey To: Jiri Pirko , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Marc Harvey Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable There are no tests that verify enablement and disablement of team driver ports with teamd. This should work even with changes to the enablement option, so it is important to test. This test sets up an active-backup network configuration across two network namespaces, and tries to send traffic while changing which link is the active one. Signed-off-by: Marc Harvey --- Changes in v5: - Make test wait for inactive link to stop receiving traffic after setting it to inactive, since there was a race condition. - Change test teardown to try graceful shutdown first, then use sigkill if needed. - Manually delete leftover teamd files during teardown. - Use tcpdump instead of checking rx counters. - Link to v4: https://lore.kernel.org/netdev/20260403-teaming-driver-intern= al-v4-5-d3032f33ca25@google.com/ Changes in v4: - None Changed in v3: - Make test cleanup kill teamd instead of terminate. - Link to v2: https://lore.kernel.org/netdev/20260401-teaming-driver-intern= al-v2-5-f80c1291727b@google.com/ Changes in v2: - Fix shellcheck failures. - Remove dependency on net forwarding lib and pipe viewer tools. - Use iperf3 for tcp instead of netcat. - Link to v1: https://lore.kernel.org/all/20260331053353.2504254-6-marcharv= ey@google.com/ --- tools/testing/selftests/drivers/net/team/Makefile | 1 + .../testing/selftests/drivers/net/team/team_lib.sh | 26 +++ .../drivers/net/team/teamd_activebackup.sh | 251 +++++++++++++++++= ++++ tools/testing/selftests/net/lib.sh | 13 ++ 4 files changed, 291 insertions(+) diff --git a/tools/testing/selftests/drivers/net/team/Makefile b/tools/test= ing/selftests/drivers/net/team/Makefile index 777da2e0429e..dab922d7f83d 100644 --- a/tools/testing/selftests/drivers/net/team/Makefile +++ b/tools/testing/selftests/drivers/net/team/Makefile @@ -7,6 +7,7 @@ TEST_PROGS :=3D \ options.sh \ propagation.sh \ refleak.sh \ + teamd_activebackup.sh \ transmit_failover.sh \ # end of TEST_PROGS =20 diff --git a/tools/testing/selftests/drivers/net/team/team_lib.sh b/tools/t= esting/selftests/drivers/net/team/team_lib.sh index a3102bdcb99c..43db0be19a42 100644 --- a/tools/testing/selftests/drivers/net/team/team_lib.sh +++ b/tools/testing/selftests/drivers/net/team/team_lib.sh @@ -144,3 +144,29 @@ did_interface_receive() false fi } + +# Return true if the given interface in the given namespace does NOT recei= ve +# traffic over a 1 second period. +# Arguments: +# interface - The name of the interface. +# ip_address - The destination IP address. +# namespace - The name of the namespace that the interface is in. +check_no_traffic() +{ + local interface=3D"$1" + local ip_address=3D"$2" + local namespace=3D"$3" + local rc + + save_tcpdump_outputs "${namespace}" "${interface}" + did_interface_receive "${interface}" "${ip_address}" + rc=3D$? + + clear_tcpdump_outputs "${interface}" + + if [[ "${rc}" -eq 0 ]]; then + return 1 + else + return 0 + fi +} diff --git a/tools/testing/selftests/drivers/net/team/teamd_activebackup.sh= b/tools/testing/selftests/drivers/net/team/teamd_activebackup.sh new file mode 100755 index 000000000000..9061fdcdfc1b --- /dev/null +++ b/tools/testing/selftests/drivers/net/team/teamd_activebackup.sh @@ -0,0 +1,251 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +# These tests verify that teamd is able to enable and disable ports via the +# active backup runner. +# +# Topology: +# +# +-------------------------+ NS1 +# | test_team1 | +# | + | +# | eth0 | eth1 | +# | +---+---+ | +# | | | | +# +-------------------------+ +# | | +# +-------------------------+ NS2 +# | | | | +# | +-------+ | +# | eth0 | eth1 | +# | + | +# | test_team2 | +# +-------------------------+ + +export ALL_TESTS=3D"teamd_test_active_backup" + +test_dir=3D"$(dirname "$0")" +# shellcheck disable=3DSC1091 +source "${test_dir}/../../../net/lib.sh" +# shellcheck disable=3DSC1091 +source "${test_dir}/team_lib.sh" + +NS1=3D"" +NS2=3D"" +export NODAD=3D"nodad" +PREFIX_LENGTH=3D"64" +NS1_IP=3D"fd00::1" +NS2_IP=3D"fd00::2" +NS1_IP4=3D"192.168.0.1" +NS2_IP4=3D"192.168.0.2" +NS1_TEAMD_CONF=3D"" +NS2_TEAMD_CONF=3D"" +NS1_TEAMD_PID=3D"" +NS2_TEAMD_PID=3D"" + +while getopts "4" opt; do + case $opt in + 4) + echo "IPv4 mode selected." + export NODAD=3D + PREFIX_LENGTH=3D"24" + NS1_IP=3D"${NS1_IP4}" + NS2_IP=3D"${NS2_IP4}" + ;; + \?) + echo "Invalid option: -${OPTARG}" >&2 + exit 1 + ;; + esac +done + +teamd_config_create() +{ + local runner=3D$1 + local dev=3D$2 + local conf + + conf=3D$(mktemp) + + cat > "${conf}" <<-EOF + { + "device": "${dev}", + "runner": {"name": "${runner}"}, + "ports": { + "eth0": {}, + "eth1": {} + } + } + EOF + echo "${conf}" +} + +# Create the network namespaces, veth pair, and team devices in the specif= ied +# runner. +# Globals: +# RET - Used by test infra, set by `check_err` functions. +# Arguments: +# runner - The Teamd runner to use for the Team devices. +environment_create() +{ + local runner=3D$1 + + echo "Setting up two-link aggregation for runner ${runner}" + echo "Teamd version is: $(teamd --version)" + trap environment_destroy EXIT + + setup_ns ns1 ns2 + NS1=3D"${NS_LIST[0]}" + NS2=3D"${NS_LIST[1]}" + + for link in $(seq 0 1); do + ip -n "${NS1}" link add "eth${link}" type veth peer name \ + "eth${link}" netns "${NS2}" + check_err $? "Failed to create veth pair" + done + + NS1_TEAMD_CONF=3D$(teamd_config_create "${runner}" "test_team1") + NS2_TEAMD_CONF=3D$(teamd_config_create "${runner}" "test_team2") + echo "Conf files are ${NS1_TEAMD_CONF} and ${NS2_TEAMD_CONF}" + + ip netns exec "${NS1}" teamd -d -f "${NS1_TEAMD_CONF}" + check_err $? "Failed to create team device in ${NS1}" + NS1_TEAMD_PID=3D$(pgrep -f "teamd -d -f ${NS1_TEAMD_CONF}") + + ip netns exec "${NS2}" teamd -d -f "${NS2_TEAMD_CONF}" + check_err $? "Failed to create team device in ${NS2}" + NS2_TEAMD_PID=3D$(pgrep -f "teamd -d -f ${NS2_TEAMD_CONF}") + + echo "Created team devices" + echo "Teamd PIDs are ${NS1_TEAMD_PID} and ${NS2_TEAMD_PID}" + + for link in $(seq 0 1); do + in_all_ns "ip link set eth${link} up" + check_err $? "Failed to set eth${link} up" + done + + ip -n "${NS1}" link set test_team1 up + check_err $? "Failed to set test_team1 up in ${NS1}" + ip -n "${NS2}" link set test_team2 up + check_err $? "Failed to set test_team2 up in ${NS2}" + + ip -n "${NS1}" addr add "${NS1_IP}/${PREFIX_LENGTH}" "${NODAD}" dev \ + test_team1 + check_err $? "Failed to add address to team device in ${NS1}" + ip -n "${NS2}" addr add "${NS2_IP}/${PREFIX_LENGTH}" "${NODAD}" dev \ + test_team2 + check_err $? "Failed to add address to team device in ${NS2}" + + slowwait 2 timeout 0.5 ip netns exec "${NS1}" ping -W 1 -c 1 "${NS2_IP}" +} + +# Tear down the environment: kill teamd and delete network namespaces. +environment_destroy() +{ + echo "Tearing down two-link aggregation" + + rm "${NS1_TEAMD_CONF}" + rm "${NS2_TEAMD_CONF}" + + # First, try graceful teamd teardown. + ip netns exec "${NS1}" teamd -k -t test_team1 + ip netns exec "${NS2}" teamd -k -t test_team2 + + # If teamd can't be killed gracefully, then sigkill. + if kill -0 "${NS1_TEAMD_PID}" 2>/dev/null; then + echo "Sending sigkill to teamd for test_team1" + kill -9 "${NS1_TEAMD_PID}" + rm /var/run/teamd/test_team1.{pid,sock} + fi + if kill -0 "${NS2_TEAMD_PID}" 2>/dev/null; then + echo "Sending sigkill to teamd for test_team2" + kill -9 "${NS2_TEAMD_PID}" + rm /var/run/teamd/test_team2.{pid,sock} + fi + cleanup_all_ns +} + +# Change the active port for an active-backup mode team. +# Arguments: +# namespace - The network namespace that the team is in. +# team - The name of the team. +# active_port - The port to make active. +set_active_port() +{ + local namespace=3D$1 + local team=3D$2 + local active_port=3D$3 + + ip netns exec "${namespace}" teamdctl "${team}" state item set \ + runner.active_port "${active_port}" + slowwait 2 bash -c "ip netns exec ${namespace} teamdctl ${team} state \ + item get runner.active_port | grep -q ${active_port}" +} + +# Wait for an interface to stop receiving traffic. If it keeps receiving t= raffic +# for the duration of the timeout, then return an error. +# Arguments: +# - namespace - The network namespace that the interface is in. +# - interface - The name of the interface. +wait_to_stop_receiving() +{ + local namespace=3D$1 + local interface=3D$2 + + echo "Waiting for ${interface} in ${namespace} to stop receiving" + slowwait 10 check_no_traffic "${interface}" "${NS2_IP}" \ + "${namespace}" +} + +# Test that active backup runner can change active ports. +# Globals: +# RET - Used by test infra, set by `check_err` functions. +teamd_test_active_backup() +{ + export RET=3D0 + + start_listening_and_sending + + ### Scenario 1: Don't manually set active port, just make sure team + # works. + save_tcpdump_outputs "${NS2}" test_team2 + did_interface_receive test_team2 "${NS2_IP}" + check_err $? "Traffic did not reach team interface in NS2." + clear_tcpdump_outputs test_team2 + + ### Scenario 2: Choose active port. + set_active_port "${NS1}" test_team1 eth1 + set_active_port "${NS2}" test_team2 eth1 + + wait_to_stop_receiving "${NS2}" eth0 + save_tcpdump_outputs "${NS2}" eth0 eth1 + did_interface_receive eth0 "${NS2_IP}" + check_fail $? "eth0 IS transmitting when inactive" + did_interface_receive eth1 "${NS2_IP}" + check_err $? "eth1 not transmitting when active" + clear_tcpdump_outputs eth0 eth1 + + ### Scenario 3: Change active port. + set_active_port "${NS1}" test_team1 eth0 + set_active_port "${NS2}" test_team2 eth0 + + wait_to_stop_receiving "${NS2}" eth1 + save_tcpdump_outputs "${NS2}" eth0 eth1 + did_interface_receive eth0 "${NS2_IP}" + check_err $? "eth0 not transmitting when active" + did_interface_receive eth1 "${NS2_IP}" + check_fail $? "eth1 IS transmitting when inactive" + clear_tcpdump_outputs eth0 eth1 + + log_test "teamd active backup runner test" + + stop_sending_and_listening +} + +require_command teamd +require_command teamdctl +require_command iperf3 +require_command tcpdump +environment_create activebackup +tests_run +exit "${EXIT_STATUS}" diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/n= et/lib.sh index e915386daf1b..b3827b43782b 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -224,6 +224,19 @@ setup_ns() NS_LIST+=3D("${ns_list[@]}") } =20 +in_all_ns() +{ + local ret=3D0 + local ns_list=3D("${NS_LIST[@]}") + + for ns in "${ns_list[@]}"; do + ip netns exec "${ns}" "$@" + (( ret =3D ret || $? )) + done + + return "${ret}" +} + # Create netdevsim with given id and net namespace. create_netdevsim() { local id=3D"$1" --=20 2.53.0.1185.g05d4b7b318-goog From nobody Sun Jun 14 20:01:21 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (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 45A5B3164B7 for ; Mon, 6 Apr 2026 03:04:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444700; cv=none; b=JdKoUv+K2K+PLVmr+cDFZm7TsuLCvcC/hog1rvTROOS6UiElfWjmVwjWix+K+IHHkRiPYG7rRMUwxTEm3g8Xms7o7rnTJ34blvpHvLALRtSMhEyQDvNscXetcJSo4+8ZCWw6IDinmz2uWmjX/VNgz/VhoSZQyxQugk0BvtMd+do= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444700; c=relaxed/simple; bh=biHtaqnCkVWYvD1MHtoevRgnEl83RoOSvj2JXiPiDuA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=eaiakXntZUoFceHt60MaRsNK/VHg/n0CPLIbyR3OetqiDnyvQ0XMDSK0m9KzqBkrptlECZ1mGhhq3dMUyhaDQgaviK5FBgeKq3ladnaX11hewYDOS5wcjFEk1nV3SW4w57lxeC8XvFmnKiM0Lj+U16DlvK9mpwiaPtZJ7/q4XJY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=h0jS1wNd; arc=none smtp.client-ip=74.125.82.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="h0jS1wNd" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2bdc1b30ac8so23362512eec.1 for ; Sun, 05 Apr 2026 20:04:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775444698; x=1776049498; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=oJVXoJFDF4MWsrJq6n151uobNJINC3/AsozOGQxwp9E=; b=h0jS1wNdFSelLeZqsd+n9hOqNcq3IlWShpisZqKAaKa9ikXzpxWC6mLIyNvolayS+C OvFZNdi5Uh2CaquYqF27hGloUggYebwIoKD7/HHwZ+Sw3xgFvN9no57Rc7BOQNlmT3h5 crkMRla0P08lOVys2SwRF7lhb0wqTeIOsM66olFukmZU+Xo6lIUaaO8LxYu8LTqkJX0d Y3HfaPh5UOWz7BOSK0/dmg6IY28RuEZcNCNhfRPgLQS3NyhN/DPa+NZVrtGP0O7Xpckl QAUTe6L7JKQGMdWewbu6H1hY8hNDfh7pyJhVJKK/sp9YORAgGUo4jOAn6wg3+lCWqQNx TDdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775444698; x=1776049498; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oJVXoJFDF4MWsrJq6n151uobNJINC3/AsozOGQxwp9E=; b=pjX0qpRkNm8brD9dpv+A9R5MNHkX67e3rljaKIpzssdFLTx+JOnm4g84TzbJzfVcYw Pa1qFjdtVHPDPMS0KHEY1lCSlsm8nwjivcnrrwSpViNNSyvfF31gSSgGmbctPXoU4utb laq1/lebpojpX470YxAS+DwuY1JlmdzBmb74VhUO2JLTYChBuOnRhkeIlN8+WVmDdx5w PU+3eM33vodpuMRIizWQxLhWuX9cG2rLKIvj+vG9r4KG2DixhZH+kFOc57SZ7pNXvPq8 QmRCPOGvl+garFPrRhyCGfFovPdVLMPbMvaEESixde4Gwtwan/ew8D7x8WyHRKqoUy1f NufA== X-Forwarded-Encrypted: i=1; AJvYcCXgOAUcKwu11duSuGc680dwPHPKrtcOAcNvd4GLVZH0smeUhjM8oqOZ74ASXC0ew39AJi0xI+Oe/k+uW6c=@vger.kernel.org X-Gm-Message-State: AOJu0YxI45KNAK2LxxtVGdxhgw5PPu+uyZ9tEYRUpl5o3dBz3OmlO2GI bCbrRvlUwhtGGML6+LP/Y8iAgZlk2gDpH4FCcOJYM24LzQU92PC4cl0URar/qlERuSPyZLM6npM d/pdEUQdF14q86tZ6LGhjXA== X-Received: from dyhd22.prod.google.com ([2002:a05:7300:8296:b0:2c0:b626:c453]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:f797:b0:2cc:4951:37d9 with SMTP id 5a478bee46e88-2cc49514676mr4057501eec.5.1775444698324; Sun, 05 Apr 2026 20:04:58 -0700 (PDT) Date: Mon, 06 Apr 2026 03:03:42 +0000 In-Reply-To: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775444686; l=10736; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=biHtaqnCkVWYvD1MHtoevRgnEl83RoOSvj2JXiPiDuA=; b=ki6x9GzFl9N/xOP02YJfMPOp20StLVxFrepbWGOU7QeJzKKyxMEJ1/zEoIqoJp0sTCt9xao1H PcLy/TQcl60A+SgqrnpefCFehLUPXajozdTbE7E9TqHFP1qqvyIHIUR X-Mailer: b4 0.14.3 Message-ID: <20260406-teaming-driver-internal-v5-6-e8a3f348a1c5@google.com> Subject: [PATCH net-next v5 06/10] net: team: Rename enablement functions and struct members to tx From: Marc Harvey To: Jiri Pirko , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Marc Harvey Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Add no functional changes, but rename enablement functions, variables etc. that are used in teaming driver transmit decisions. Since rx and tx enablement are still coupled, some of the variables renamed in this patch are still used for the rx path, but that will change in a follow-up patch. Signed-off-by: Marc Harvey Reviewed-by: Jiri Pirko --- Changes in v5: - None Changes in v4: - New patch: split from the original monolithic v3 patch "net: team: Decouple rx and tx enablement in the team driver". - Link to v3: https://lore.kernel.org/netdev/20260402-teaming-driver-intern= al-v3-6-e8cfdec3b5c2@google.com/ --- drivers/net/team/team_core.c | 44 +++++++++++++++-------------= -- drivers/net/team/team_mode_loadbalance.c | 2 +- drivers/net/team/team_mode_random.c | 4 +-- drivers/net/team/team_mode_roundrobin.c | 2 +- include/linux/if_team.h | 46 +++++++++++++++++-----------= ---- 5 files changed, 51 insertions(+), 47 deletions(-) diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c index 2ce31999c99f..826769473878 100644 --- a/drivers/net/team/team_core.c +++ b/drivers/net/team/team_core.c @@ -532,13 +532,13 @@ static void team_adjust_ops(struct team *team) * correct ops are always set. */ =20 - if (!team->en_port_count || !team_is_mode_set(team) || + if (!team->tx_en_port_count || !team_is_mode_set(team) || !team->mode->ops->transmit) team->ops.transmit =3D team_dummy_transmit; else team->ops.transmit =3D team->mode->ops->transmit; =20 - if (!team->en_port_count || !team_is_mode_set(team) || + if (!team->tx_en_port_count || !team_is_mode_set(team) || !team->mode->ops->receive) team->ops.receive =3D team_dummy_receive; else @@ -831,7 +831,7 @@ static bool team_queue_override_port_has_gt_prio_than(s= truct team_port *port, return true; if (port->priority > cur->priority) return false; - if (port->index < cur->index) + if (port->tx_index < cur->tx_index) return true; return false; } @@ -929,7 +929,7 @@ static bool team_port_find(const struct team *team, =20 /* * Enable/disable port by adding to enabled port hashlist and setting - * port->index (Might be racy so reader could see incorrect ifindex when + * port->tx_index (Might be racy so reader could see incorrect ifindex when * processing a flying packet, but that is not a problem). Write guarded * by RTNL. */ @@ -938,10 +938,10 @@ static void team_port_enable(struct team *team, { if (team_port_enabled(port)) return; - WRITE_ONCE(port->index, team->en_port_count); - WRITE_ONCE(team->en_port_count, team->en_port_count + 1); - hlist_add_head_rcu(&port->hlist, - team_port_index_hash(team, port->index)); + WRITE_ONCE(port->tx_index, team->tx_en_port_count); + WRITE_ONCE(team->tx_en_port_count, team->tx_en_port_count + 1); + hlist_add_head_rcu(&port->tx_hlist, + team_tx_port_index_hash(team, port->tx_index)); team_adjust_ops(team); team_queue_override_port_add(team, port); team_notify_peers(team); @@ -951,15 +951,17 @@ static void team_port_enable(struct team *team, =20 static void __reconstruct_port_hlist(struct team *team, int rm_index) { - int i; + struct hlist_head *tx_port_index_hash; struct team_port *port; + int i; =20 - for (i =3D rm_index + 1; i < team->en_port_count; i++) { - port =3D team_get_port_by_index(team, i); - hlist_del_rcu(&port->hlist); - WRITE_ONCE(port->index, port->index - 1); - hlist_add_head_rcu(&port->hlist, - team_port_index_hash(team, port->index)); + for (i =3D rm_index + 1; i < team->tx_en_port_count; i++) { + port =3D team_get_port_by_tx_index(team, i); + hlist_del_rcu(&port->tx_hlist); + WRITE_ONCE(port->tx_index, port->tx_index - 1); + tx_port_index_hash =3D team_tx_port_index_hash(team, + port->tx_index); + hlist_add_head_rcu(&port->tx_hlist, tx_port_index_hash); } } =20 @@ -970,10 +972,10 @@ static void team_port_disable(struct team *team, return; if (team->ops.port_tx_disabled) team->ops.port_tx_disabled(team, port); - hlist_del_rcu(&port->hlist); - __reconstruct_port_hlist(team, port->index); - WRITE_ONCE(port->index, -1); - WRITE_ONCE(team->en_port_count, team->en_port_count - 1); + hlist_del_rcu(&port->tx_hlist); + __reconstruct_port_hlist(team, port->tx_index); + WRITE_ONCE(port->tx_index, -1); + WRITE_ONCE(team->tx_en_port_count, team->tx_en_port_count - 1); team_queue_override_port_del(team, port); team_adjust_ops(team); team_lower_state_changed(port); @@ -1244,7 +1246,7 @@ static int team_port_add(struct team *team, struct ne= t_device *port_dev, netif_addr_unlock_bh(dev); } =20 - WRITE_ONCE(port->index, -1); + WRITE_ONCE(port->tx_index, -1); list_add_tail_rcu(&port->list, &team->port_list); team_port_enable(team, port); netdev_compute_master_upper_features(dev, true); @@ -1595,7 +1597,7 @@ static int team_init(struct net_device *dev) return -ENOMEM; =20 for (i =3D 0; i < TEAM_PORT_HASHENTRIES; i++) - INIT_HLIST_HEAD(&team->en_port_hlist[i]); + INIT_HLIST_HEAD(&team->tx_en_port_hlist[i]); INIT_LIST_HEAD(&team->port_list); err =3D team_queue_override_init(team); if (err) diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/te= am_mode_loadbalance.c index 840f409d250b..4833fbfe241e 100644 --- a/drivers/net/team/team_mode_loadbalance.c +++ b/drivers/net/team/team_mode_loadbalance.c @@ -120,7 +120,7 @@ static struct team_port *lb_hash_select_tx_port(struct = team *team, { int port_index =3D team_num_to_port_index(team, hash); =20 - return team_get_port_by_index_rcu(team, port_index); + return team_get_port_by_tx_index_rcu(team, port_index); } =20 /* Hash to port mapping select tx port */ diff --git a/drivers/net/team/team_mode_random.c b/drivers/net/team/team_mo= de_random.c index 169a7bc865b2..370e974f3dca 100644 --- a/drivers/net/team/team_mode_random.c +++ b/drivers/net/team/team_mode_random.c @@ -16,8 +16,8 @@ static bool rnd_transmit(struct team *team, struct sk_buf= f *skb) struct team_port *port; int port_index; =20 - port_index =3D get_random_u32_below(READ_ONCE(team->en_port_count)); - port =3D team_get_port_by_index_rcu(team, port_index); + port_index =3D get_random_u32_below(READ_ONCE(team->tx_en_port_count)); + port =3D team_get_port_by_tx_index_rcu(team, port_index); if (unlikely(!port)) goto drop; port =3D team_get_first_port_txable_rcu(team, port); diff --git a/drivers/net/team/team_mode_roundrobin.c b/drivers/net/team/tea= m_mode_roundrobin.c index dd405d82c6ac..ecbeef28c221 100644 --- a/drivers/net/team/team_mode_roundrobin.c +++ b/drivers/net/team/team_mode_roundrobin.c @@ -27,7 +27,7 @@ static bool rr_transmit(struct team *team, struct sk_buff= *skb) =20 port_index =3D team_num_to_port_index(team, rr_priv(team)->sent_packets++); - port =3D team_get_port_by_index_rcu(team, port_index); + port =3D team_get_port_by_tx_index_rcu(team, port_index); if (unlikely(!port)) goto drop; port =3D team_get_first_port_txable_rcu(team, port); diff --git a/include/linux/if_team.h b/include/linux/if_team.h index 740cb3100dfc..c777170ef552 100644 --- a/include/linux/if_team.h +++ b/include/linux/if_team.h @@ -27,10 +27,10 @@ struct team; =20 struct team_port { struct net_device *dev; - struct hlist_node hlist; /* node in enabled ports hash list */ + struct hlist_node tx_hlist; /* node in tx-enabled ports hash list */ struct list_head list; /* node in ordinary list */ struct team *team; - int index; /* index of enabled port. If disabled, it's set to -1 */ + int tx_index; /* index of tx enabled port. If disabled, -1 */ =20 bool linkup; /* either state.linkup or user.linkup */ =20 @@ -77,7 +77,7 @@ static inline struct team_port *team_port_get_rcu(const s= truct net_device *dev) =20 static inline bool team_port_enabled(struct team_port *port) { - return READ_ONCE(port->index) !=3D -1; + return READ_ONCE(port->tx_index) !=3D -1; } =20 static inline bool team_port_txable(struct team_port *port) @@ -190,10 +190,10 @@ struct team { const struct header_ops *header_ops_cache; =20 /* - * List of enabled ports and their count + * List of tx-enabled ports and counts of rx and tx-enabled ports. */ - int en_port_count; - struct hlist_head en_port_hlist[TEAM_PORT_HASHENTRIES]; + int tx_en_port_count; + struct hlist_head tx_en_port_hlist[TEAM_PORT_HASHENTRIES]; =20 struct list_head port_list; /* list of all ports */ =20 @@ -237,41 +237,43 @@ static inline int team_dev_queue_xmit(struct team *te= am, struct team_port *port, return dev_queue_xmit(skb); } =20 -static inline struct hlist_head *team_port_index_hash(struct team *team, - int port_index) +static inline struct hlist_head *team_tx_port_index_hash(struct team *team, + int tx_port_index) { - return &team->en_port_hlist[port_index & (TEAM_PORT_HASHENTRIES - 1)]; + unsigned int list_entry =3D tx_port_index & (TEAM_PORT_HASHENTRIES - 1); + + return &team->tx_en_port_hlist[list_entry]; } =20 -static inline struct team_port *team_get_port_by_index(struct team *team, - int port_index) +static inline struct team_port *team_get_port_by_tx_index(struct team *tea= m, + int tx_port_index) { + struct hlist_head *head =3D team_tx_port_index_hash(team, tx_port_index); struct team_port *port; - struct hlist_head *head =3D team_port_index_hash(team, port_index); =20 - hlist_for_each_entry(port, head, hlist) - if (port->index =3D=3D port_index) + hlist_for_each_entry(port, head, tx_hlist) + if (port->tx_index =3D=3D tx_port_index) return port; return NULL; } =20 static inline int team_num_to_port_index(struct team *team, unsigned int n= um) { - int en_port_count =3D READ_ONCE(team->en_port_count); + int tx_en_port_count =3D READ_ONCE(team->tx_en_port_count); =20 - if (unlikely(!en_port_count)) + if (unlikely(!tx_en_port_count)) return 0; - return num % en_port_count; + return num % tx_en_port_count; } =20 -static inline struct team_port *team_get_port_by_index_rcu(struct team *te= am, - int port_index) +static inline struct team_port *team_get_port_by_tx_index_rcu(struct team = *team, + int tx_port_index) { + struct hlist_head *head =3D team_tx_port_index_hash(team, tx_port_index); struct team_port *port; - struct hlist_head *head =3D team_port_index_hash(team, port_index); =20 - hlist_for_each_entry_rcu(port, head, hlist) - if (READ_ONCE(port->index) =3D=3D port_index) + hlist_for_each_entry_rcu(port, head, tx_hlist) + if (READ_ONCE(port->tx_index) =3D=3D tx_port_index) return port; return NULL; } --=20 2.53.0.1185.g05d4b7b318-goog From nobody Sun Jun 14 20:01:21 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (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 033C6330648 for ; Mon, 6 Apr 2026 03:05:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444703; cv=none; b=MGkw/aOtSS116KHwR/QFoLGN72ruOnLVjRjd0lZLxTlrCxJkA36oxPzixjCBKZTxkWDb+loe5qw5T+SjXyxlN5PHiV49hUfWEO+W5fwue7C1mTUSrVzjowttPogWudZoyTCYnYAV3XzVneGiYelpoiGqS2ozDc60g69tslJKeMI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444703; c=relaxed/simple; bh=uAv87VwCp5wSqehPuzxNCJeD70A4A5yNLbBvxVr+7KQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=u47NxrrUr8ogeGDFHp88uPmAT4X1xRF0eOCffIAIbgO6EfLLuB+sz9Mz0AetjHL8gs+Itls/HInwMuHx06pBj+nwn0/k4oH5oxKKKpT6ZC/ver1RZv13qqXZkzeQy9pnpUeeb5sVV6KPm/qDij4vCGwC+BzGmoY1qJ9JVjvseVY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=WsJfv2ac; arc=none smtp.client-ip=74.125.82.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="WsJfv2ac" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-1275c6fc58aso5588427c88.0 for ; Sun, 05 Apr 2026 20:05:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775444700; x=1776049500; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ZRwQp0TqW5ryVF2jY0Xvn7xyn++qV9su6qauccEV+bw=; b=WsJfv2acikz9xzO/LH28R/ypTYXDacCSR7dLq9+AHPIxjV7366ulTrBIV0GXrcdABR Lj0u6RCsvZPUIjapAhCA7mbw4WPPK3mdgpBUzT6RegE2fiT6LLFxYuwwvnT2UDuiEefJ zGsawM94GB9BInYGbYmRGiQ7DX9WuL0v3AoJ77X6zl2rZZqdlyKKYvMDDfrgr5ViWJpb Ddv8+YgL7mA/5ZkV/cszp/l8YgYRj12pc5AAzZbfqc7U4lczQIpOho2xRbUUsvIChu+n ZL0bBqlHBSKboEoO1yzdrG/W+kSECE27Vpv0KkHDQeEpEL9dutZm23LAGga0dSFK0dLn 4Kuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775444700; x=1776049500; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZRwQp0TqW5ryVF2jY0Xvn7xyn++qV9su6qauccEV+bw=; b=qMB7qRTuYYugJjEUAcBUFZrVq3e+rxvZGPkaWaifEP/nwWgLpOPzvDQHw/vUp0Q4UL 9lj5HG4nR8IvC4eD9WkEfkCmabfi+wCb5kbMbnIJKKcfoNxQ0DAySYcNSeGSc0wtN7RT wNveGbV+NtPguyCk5GSocTG31FGPj+i6yV4bwLF8OViZ5zIk+b3gs7y+hFaXtubTGob4 deLIiIZWKwT3YiP9cqxE0ygWrNpEFMB66b7iHdwNSPb9E4ZVucSUJuxiuFMugtO9tZvF zblW8WyFBcICZ/ckVG/fY+F/ehHyk5GUsyCv9QQ2qFPO1BFEbCGwSb1pU3yFbpZL1LJw /bpw== X-Forwarded-Encrypted: i=1; AJvYcCXXijZiTeHuHi2NspOPPiWJEOfYkyKEmWVZX1klJ32jDpytAFYz+iA9OY28Z+lmIvhMBZndiTi0G9IQWHM=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9HwNFvW8YwG23ZeShSUruF4PI3h9ZcrTKvFhiPBeDnl+yokCI wI/wFVSqsfqIpVKuC/a9I5wWQqeIXsgPz9kjzHrhdwsmYArwIvV5+QlzixW5mDv9ILeRc15shQV CYkt51Zq7pceuveGDTISThA== X-Received: from dlbur5.prod.google.com ([2002:a05:7022:ea45:b0:12a:c5dd:73f9]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:10d:b0:128:d967:4678 with SMTP id a92af1059eb24-12bfb74427cmr4500021c88.23.1775444699944; Sun, 05 Apr 2026 20:04:59 -0700 (PDT) Date: Mon, 06 Apr 2026 03:03:43 +0000 In-Reply-To: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775444686; l=8995; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=uAv87VwCp5wSqehPuzxNCJeD70A4A5yNLbBvxVr+7KQ=; b=kiM/3jF7evfx2LehoEnYMzTVJa0HuZqHzrP2nPWDZYyIPkFXHiFW6ihlpsUByD8WWjl7lCI78 /EwtxuRfebwAFgMawWxWGtP9F7Lp+RgcQ8vTEW6tfkOW8/YMMe7asfo X-Mailer: b4 0.14.3 Message-ID: <20260406-teaming-driver-internal-v5-7-e8a3f348a1c5@google.com> Subject: [PATCH net-next v5 07/10] net: team: Track rx enablement separately from tx enablement From: Marc Harvey To: Jiri Pirko , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Marc Harvey Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Separate the rx and tx enablement/disablement into different functions so that it is easier to interact with them independently later. Although this patch changes receive and transmit paths, the actual behavior of the teaming driver should remain unchanged, since there is no option introduced yet to change rx or tx enablement independently. Those options will be added in follow-up patches. Signed-off-by: Marc Harvey Reviewed-by: Jiri Pirko --- Changes in v5: - Reorder function calls in team_port_enable() to make sure the call order stays the same as before. - Link to v4: https://lore.kernel.org/netdev/20260403-teaming-driver-intern= al-v4-7-d3032f33ca25@google.com/ Changes in v4: - New patch: split from the original monolithic v3 patch "net: team: Decouple rx and tx enablement in the team driver". - Link to v3: https://lore.kernel.org/netdev/20260402-teaming-driver-intern= al-v3-6-e8cfdec3b5c2@google.com/ --- drivers/net/team/team_core.c | 104 ++++++++++++++++++++++++---= ---- drivers/net/team/team_mode_loadbalance.c | 2 +- include/linux/if_team.h | 16 ++++- 3 files changed, 95 insertions(+), 27 deletions(-) diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c index 826769473878..e437099a5a17 100644 --- a/drivers/net/team/team_core.c +++ b/drivers/net/team/team_core.c @@ -87,7 +87,7 @@ static void team_lower_state_changed(struct team_port *po= rt) struct netdev_lag_lower_state_info info; =20 info.link_up =3D port->linkup; - info.tx_enabled =3D team_port_enabled(port); + info.tx_enabled =3D team_port_tx_enabled(port); netdev_lower_state_changed(port->dev, &info); } =20 @@ -538,7 +538,7 @@ static void team_adjust_ops(struct team *team) else team->ops.transmit =3D team->mode->ops->transmit; =20 - if (!team->tx_en_port_count || !team_is_mode_set(team) || + if (!team->rx_en_port_count || !team_is_mode_set(team) || !team->mode->ops->receive) team->ops.receive =3D team_dummy_receive; else @@ -734,7 +734,7 @@ static rx_handler_result_t team_handle_frame(struct sk_= buff **pskb) =20 port =3D team_port_get_rcu(skb->dev); team =3D port->team; - if (!team_port_enabled(port)) { + if (!team_port_rx_enabled(port)) { if (is_link_local_ether_addr(eth_hdr(skb)->h_dest)) /* link-local packets are mostly useful when stack receives them * with the link they arrive on. @@ -876,7 +876,7 @@ static void __team_queue_override_enabled_check(struct = team *team) static void team_queue_override_port_prio_changed(struct team *team, struct team_port *port) { - if (!port->queue_id || !team_port_enabled(port)) + if (!port->queue_id || !team_port_tx_enabled(port)) return; __team_queue_override_port_del(team, port); __team_queue_override_port_add(team, port); @@ -887,7 +887,7 @@ static void team_queue_override_port_change_queue_id(st= ruct team *team, struct team_port *port, u16 new_queue_id) { - if (team_port_enabled(port)) { + if (team_port_tx_enabled(port)) { __team_queue_override_port_del(team, port); port->queue_id =3D new_queue_id; __team_queue_override_port_add(team, port); @@ -927,26 +927,33 @@ static bool team_port_find(const struct team *team, return false; } =20 +static void __team_port_enable_rx(struct team *team, + struct team_port *port) +{ + team->rx_en_port_count++; + WRITE_ONCE(port->rx_enabled, true); +} + +static void __team_port_disable_rx(struct team *team, + struct team_port *port) +{ + team->rx_en_port_count--; + WRITE_ONCE(port->rx_enabled, false); +} + /* - * Enable/disable port by adding to enabled port hashlist and setting - * port->tx_index (Might be racy so reader could see incorrect ifindex when - * processing a flying packet, but that is not a problem). Write guarded - * by RTNL. + * Enable just TX on the port by adding to tx-enabled port hashlist and + * setting port->tx_index (Might be racy so reader could see incorrect + * ifindex when processing a flying packet, but that is not a problem). + * Write guarded by RTNL. */ -static void team_port_enable(struct team *team, - struct team_port *port) +static void __team_port_enable_tx(struct team *team, + struct team_port *port) { - if (team_port_enabled(port)) - return; WRITE_ONCE(port->tx_index, team->tx_en_port_count); WRITE_ONCE(team->tx_en_port_count, team->tx_en_port_count + 1); hlist_add_head_rcu(&port->tx_hlist, team_tx_port_index_hash(team, port->tx_index)); - team_adjust_ops(team); - team_queue_override_port_add(team, port); - team_notify_peers(team); - team_mcast_rejoin(team); - team_lower_state_changed(port); } =20 static void __reconstruct_port_hlist(struct team *team, int rm_index) @@ -965,20 +972,69 @@ static void __reconstruct_port_hlist(struct team *tea= m, int rm_index) } } =20 -static void team_port_disable(struct team *team, - struct team_port *port) +static void __team_port_disable_tx(struct team *team, + struct team_port *port) { - if (!team_port_enabled(port)) - return; if (team->ops.port_tx_disabled) team->ops.port_tx_disabled(team, port); + hlist_del_rcu(&port->tx_hlist); __reconstruct_port_hlist(team, port->tx_index); + WRITE_ONCE(port->tx_index, -1); WRITE_ONCE(team->tx_en_port_count, team->tx_en_port_count - 1); - team_queue_override_port_del(team, port); +} + +/* + * Enable TX AND RX on the port. + */ +static void team_port_enable(struct team *team, + struct team_port *port) +{ + bool rx_was_enabled; + bool tx_was_enabled; + + if (team_port_enabled(port)) + return; + + rx_was_enabled =3D team_port_rx_enabled(port); + tx_was_enabled =3D team_port_tx_enabled(port); + + if (!rx_was_enabled) + __team_port_enable_rx(team, port); + if (!tx_was_enabled) + __team_port_enable_tx(team, port); + + team_adjust_ops(team); + if (!tx_was_enabled) + team_queue_override_port_add(team, port); + team_notify_peers(team); + if (!rx_was_enabled) + team_mcast_rejoin(team); + if (!tx_was_enabled) + team_lower_state_changed(port); +} + +static void team_port_disable(struct team *team, + struct team_port *port) +{ + bool rx_was_enabled =3D team_port_rx_enabled(port); + bool tx_was_enabled =3D team_port_tx_enabled(port); + + if (!tx_was_enabled && !rx_was_enabled) + return; + + if (tx_was_enabled) { + __team_port_disable_tx(team, port); + team_queue_override_port_del(team, port); + } + if (rx_was_enabled) + __team_port_disable_rx(team, port); + team_adjust_ops(team); - team_lower_state_changed(port); + + if (tx_was_enabled) + team_lower_state_changed(port); } =20 static int team_port_enter(struct team *team, struct team_port *port) diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/te= am_mode_loadbalance.c index 4833fbfe241e..38a459649569 100644 --- a/drivers/net/team/team_mode_loadbalance.c +++ b/drivers/net/team/team_mode_loadbalance.c @@ -380,7 +380,7 @@ static int lb_tx_hash_to_port_mapping_set(struct team *= team, =20 list_for_each_entry(port, &team->port_list, list) { if (ctx->data.u32_val =3D=3D port->dev->ifindex && - team_port_enabled(port)) { + team_port_tx_enabled(port)) { rcu_assign_pointer(LB_HTPM_PORT_BY_HASH(lb_priv, hash), port); return 0; diff --git a/include/linux/if_team.h b/include/linux/if_team.h index c777170ef552..3d21e06fda67 100644 --- a/include/linux/if_team.h +++ b/include/linux/if_team.h @@ -31,6 +31,7 @@ struct team_port { struct list_head list; /* node in ordinary list */ struct team *team; int tx_index; /* index of tx enabled port. If disabled, -1 */ + bool rx_enabled; =20 bool linkup; /* either state.linkup or user.linkup */ =20 @@ -75,14 +76,24 @@ static inline struct team_port *team_port_get_rcu(const= struct net_device *dev) return rcu_dereference(dev->rx_handler_data); } =20 -static inline bool team_port_enabled(struct team_port *port) +static inline bool team_port_rx_enabled(struct team_port *port) +{ + return READ_ONCE(port->rx_enabled); +} + +static inline bool team_port_tx_enabled(struct team_port *port) { return READ_ONCE(port->tx_index) !=3D -1; } =20 +static inline bool team_port_enabled(struct team_port *port) +{ + return team_port_rx_enabled(port) && team_port_tx_enabled(port); +} + static inline bool team_port_txable(struct team_port *port) { - return port->linkup && team_port_enabled(port); + return port->linkup && team_port_tx_enabled(port); } =20 static inline bool team_port_dev_txable(const struct net_device *port_dev) @@ -193,6 +204,7 @@ struct team { * List of tx-enabled ports and counts of rx and tx-enabled ports. */ int tx_en_port_count; + int rx_en_port_count; struct hlist_head tx_en_port_hlist[TEAM_PORT_HASHENTRIES]; =20 struct list_head port_list; /* list of all ports */ --=20 2.53.0.1185.g05d4b7b318-goog From nobody Sun Jun 14 20:01:21 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (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 882703321BF for ; Mon, 6 Apr 2026 03:05:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444704; cv=none; b=hUXORdqupewzx203K1WHLTFvdHmoW+aUBdEPyUJfDyA8D2Myn+axC4IFmZjjBbvBzOvXQO2ZPgDoqwgSW71ZbqcccwCJa4SYDcYk6GUTUNQk+vhkDG7t5u2jHWbZUzWDvfeKSrpDXCO+0p3W36POJY6Sz/7mYWDVTKow2mmNhiU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444704; c=relaxed/simple; bh=2rtJWUTXapLA4inY98q2d8R63sOMNqI7U9/VEg93OkQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=SHExlIGyzPWk6uh/Nuz72fRBkt4OgjAfY9UafZ/tuHjJNh+na6uwfTiQFdFdYjNbHkTw18+SA7JxXfy0BEC6Amm2WpOPVeHYEVfgTZQQ+LLMqCLl2h7kq/DdquxLKi+7CF3kRAgCsIpFfhJ43NMiIwY5+dtnQ39+ve/uKpVS3Cw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=OZxsBvKs; arc=none smtp.client-ip=74.125.82.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="OZxsBvKs" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2ce1fe49225so1080234eec.0 for ; Sun, 05 Apr 2026 20:05:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775444702; x=1776049502; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=5ylM4a3PCnVxbY6JaU7231btKbSKhmAN8iSf776QMAk=; b=OZxsBvKsUwybtriZx5P5A4bgjxazVP6pEUCfTCo6udFeOxPDH4Fl0bjzZKPDsBvTIH Ua6JPgCg2TjbcMLv8FTpxAYN+jESMv3cHGA9lYEIDeL1S8thEljITC0vulf3qjdflRSQ DXZfCGWwZrCQVbl/Bq34EwfRpuAro3ckWHvYOJayxZPlW8lVFHF6zIr7nw4cbBqdRwvm gjVaG6dRAYj0I/DMbBRBGn1cX9FcPWMwKA+JSPm0mYRexs+SP38dSQlShFBAKIZ13bj/ 1zFC1YEY5v3zRH01b9gnDomR84yX59NLcsq3oWLK6e+VkxNBe2Qd1TRuNAPpghBYBulF yljg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775444702; x=1776049502; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5ylM4a3PCnVxbY6JaU7231btKbSKhmAN8iSf776QMAk=; b=GvEI3TO23tVWjCk3CxXliZRWqhGh6eNVd7wWxeeeP7+YDN3bGSLqr0rPi4erHUHGhJ zWo6YV27ULK4GlT/wcIAAnfOrU8ztvYZjFsLlkyN7P4V3y6h2OAp4enPFvZBHf7lz0WG N1R4lj+tyc+KR3xxo3aUxMrEWQlo0KMkLHu5U7UXUCobIgqyIOmCWcaU2M9g7ytzS2iD wHgSIcuoeiAzqmKxJbgavVOOIf5VK4aKi7XVhSnbswnVh3RKRq8ntORo7YyzXMjKw0A2 T0F0jLq6UD2R3NS+vQXXkOOZ9iK8i4g9yVdL0h9hmvY4VodJhtcsLAFGxqRAF07J70B6 uV8A== X-Forwarded-Encrypted: i=1; AJvYcCUb/CIVPGrHds7eXAYiP8ibFNWEU7YDnfZedUd9ztyRmGyuSbd4W7aZ6gLtf13hO+fYZXvdgu1+cD8vRK4=@vger.kernel.org X-Gm-Message-State: AOJu0YxMbmczT8MG5oNn2VIdIK+B19+SAk57dkP3mpfNRcMcXeENVy3t sHBF4fBiJjNqFbBfuWEb6NvCYZ8DRgxEh3dIxXLg1va0AXJqnx25/1SUA2J+zsUKSoYUoabWz3M D0q+5xpOw3gg6ghhhIFeWOg== X-Received: from dyek19.prod.google.com ([2002:a05:7300:6413:b0:2ca:f172:3f06]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:4090:b0:2c3:df83:1347 with SMTP id 5a478bee46e88-2cbf99e8c88mr5171878eec.1.1775444701521; Sun, 05 Apr 2026 20:05:01 -0700 (PDT) Date: Mon, 06 Apr 2026 03:03:44 +0000 In-Reply-To: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775444686; l=2909; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=2rtJWUTXapLA4inY98q2d8R63sOMNqI7U9/VEg93OkQ=; b=BxSq+eNr8ZdlXRnHAOHVaohWryZua/Jefdw8xQDuoct4dJ6JFOKrEaBWCcnyXGmSQ3d+9qjHn x+ML9HbTiAGCIqHPUAJ5vfH/eY0FEsGb14Q/2RHkawT52ahl/8eERua X-Mailer: b4 0.14.3 Message-ID: <20260406-teaming-driver-internal-v5-8-e8a3f348a1c5@google.com> Subject: [PATCH net-next v5 08/10] net: team: Add new rx_enabled team port option From: Marc Harvey To: Jiri Pirko , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Marc Harvey Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Allow independent control over rx enablement via the rx_enabled option without affecting tx enablement. This affects the normal enabled option since a port is only considered enabled if both tx and rx are enabled. If this option is not used, then the enabled option will continue to behave exactly as it did before. Tested in a follow-up patch with a new selftest. Signed-off-by: Marc Harvey Reviewed-by: Jiri Pirko --- Changes in v5: - None Changes in v4: - New patch: split from the original monolithic v3 patch "net: team: Decouple rx and tx enablement in the team driver". - Link to v3: https://lore.kernel.org/netdev/20260402-teaming-driver-intern= al-v3-6-e8cfdec3b5c2@google.com/ --- drivers/net/team/team_core.c | 49 ++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 49 insertions(+) diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c index e437099a5a17..67f77de4cf10 100644 --- a/drivers/net/team/team_core.c +++ b/drivers/net/team/team_core.c @@ -941,6 +941,28 @@ static void __team_port_disable_rx(struct team *team, WRITE_ONCE(port->rx_enabled, false); } =20 +static void team_port_enable_rx(struct team *team, + struct team_port *port) +{ + if (team_port_rx_enabled(port)) + return; + + __team_port_enable_rx(team, port); + team_adjust_ops(team); + team_notify_peers(team); + team_mcast_rejoin(team); +} + +static void team_port_disable_rx(struct team *team, + struct team_port *port) +{ + if (!team_port_rx_enabled(port)) + return; + + __team_port_disable_rx(team, port); + team_adjust_ops(team); +} + /* * Enable just TX on the port by adding to tx-enabled port hashlist and * setting port->tx_index (Might be racy so reader could see incorrect @@ -1487,6 +1509,26 @@ static int team_port_en_option_set(struct team *team, return 0; } =20 +static void team_port_rx_en_option_get(struct team *team, + struct team_gsetter_ctx *ctx) +{ + struct team_port *port =3D ctx->info->port; + + ctx->data.bool_val =3D team_port_rx_enabled(port); +} + +static int team_port_rx_en_option_set(struct team *team, + struct team_gsetter_ctx *ctx) +{ + struct team_port *port =3D ctx->info->port; + + if (ctx->data.bool_val) + team_port_enable_rx(team, port); + else + team_port_disable_rx(team, port); + return 0; +} + static void team_user_linkup_option_get(struct team *team, struct team_gsetter_ctx *ctx) { @@ -1608,6 +1650,13 @@ static const struct team_option team_options[] =3D { .getter =3D team_port_en_option_get, .setter =3D team_port_en_option_set, }, + { + .name =3D "rx_enabled", + .type =3D TEAM_OPTION_TYPE_BOOL, + .per_port =3D true, + .getter =3D team_port_rx_en_option_get, + .setter =3D team_port_rx_en_option_set, + }, { .name =3D "user_linkup", .type =3D TEAM_OPTION_TYPE_BOOL, --=20 2.53.0.1185.g05d4b7b318-goog From nobody Sun Jun 14 20:01:21 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (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 3524C3358BF for ; Mon, 6 Apr 2026 03:05:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444705; cv=none; b=XOpRIznwahOhMy468JMDxrnGHXIAunnpsV9OXgz8HbpwN9D3Nd3uKg4kQ2zqRNM8JniuVYyTCiNT4h47qiVlGnGhf+RNsbR0sRjeD262pdrP5tgB2VoCZa8BloaL6IAU+Y16Totphu31uW84VA0M3vsgsL+m0ElzWgIpyFoCMBk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444705; c=relaxed/simple; bh=H/uaajKx1vxdRV09vwrGqxbZzExtD3ya3Un5atGXWk8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Haz6W2Dn1dDBmElJbpLiFhusGswqKoJJwNWGxkUV2iBVvG2J4cud+sQxNOJlFncQpznHVVs6LDRUBZQSaQV6U9SkVP5KxhKBhhp8RJQxeB0CM/QvB1uZO3RbJ44zfgxSIJWPS1437Q6GBs7hn/cmgL60TI3kuk1RPX2qI6K8GDQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=SdRyB2A5; arc=none smtp.client-ip=74.125.82.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="SdRyB2A5" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2cc9118dc2eso9590239eec.0 for ; Sun, 05 Apr 2026 20:05:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775444703; x=1776049503; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=oMtKRElyEZ3OLu3Q3K0AjubNzm6h9+s3y74+ZNAiAAU=; b=SdRyB2A5C4MFBb0W13NLKBq0HGeuECjHVMpkmh6qIBsQ1FX+/5CAPqPM0MmkaRWFCa KtG6agyXPdjjZIIh8XJDgwvHsmsflJ2WiLYL90+JOfzwiggrRbE3d7tG+ZPi0wPPY6eE K3nii3xmR1nVqT+Qe34lc/hJeW93Pyt9uqk3SbqkKEHAwoLC3RsoK0zoudZZBbq8dVdg m3YlbR+HveBwWY+TAwv7k7YQ8XIYsvwLTJZ6dpvEqr2rVFCKp+hGhOqK4t7gNEQqg2AL c1fmz6ywnJiEMHOZG83RuxWfmfdO4vpWQ/wtzpZRMiXGCT49XLIqbxt/6IzdxbHCTNRs +/Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775444703; x=1776049503; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oMtKRElyEZ3OLu3Q3K0AjubNzm6h9+s3y74+ZNAiAAU=; b=Urmnm9oGr9wlcFPxPBMCQW833jqZhpvYvyiT8Q/ziMXGZ1KvWgRuv+Q2n7eSc16h8i wTt74rPlKu6LQlf6w2XhAbYnhNZY+Zdbp0+qhjlDpZlEGzy31bC00KDXF8SstKDnE0t8 i4tbNrbkcgEueP5KDO5O/UA1rtg0UjYVuGRZpAcddfto6v9GnR6sYoxdOU9OrZ7rbrro BhEk0JeZIIpwQfLk7P+wxnfujyw8EY2AZOAXE8sB0Ncf9Fet/esjn/QuPfTWnPXk8jpl co+f1NQWphORz6h8jEzVU5RxRE7ZIK+Ms17lfgJiN84fuQtPIVj6wX5Qd3pf+M4gX3ko Drwg== X-Forwarded-Encrypted: i=1; AJvYcCXpTuym8K0qrwdNzBhfAYs8sd8jYBq9z/AYM1NmxHTTNQSV89gQ63OemMa+9JycYNa/bmTDrZVvoUt1i6o=@vger.kernel.org X-Gm-Message-State: AOJu0YylYWrXg1njRhxS3SgrL2NqWWAGn8++99NQ2mTkJXEaH2VGoItG CbnN6py1Oa1M0IeRS3wx/ikryIQkP1vRqYSeXeAeDjJwXX6dlPgHCVIld7kF0PYjxcvEbvNNLdo BPAR4o3pudtJ1qRsoAiXMCA== X-Received: from dybmx6.prod.google.com ([2002:a05:7300:d406:b0:2cc:a944:fd94]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:371f:b0:2c5:76d1:7f95 with SMTP id 5a478bee46e88-2cbfc763331mr5532479eec.28.1775444703191; Sun, 05 Apr 2026 20:05:03 -0700 (PDT) Date: Mon, 06 Apr 2026 03:03:45 +0000 In-Reply-To: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775444686; l=3253; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=H/uaajKx1vxdRV09vwrGqxbZzExtD3ya3Un5atGXWk8=; b=h5qA5SF9nK/bazgpPfM5lJVbAyXedwzZHVXoheWKPxzNkpTkG8fZC3GXpDYTdQ2auUu8jpOwV rV6SYSND4pTB1DBzZafyh3IkrjpvzQGgEc25MnIK6FOo7HE/4e1lMcg X-Mailer: b4 0.14.3 Message-ID: <20260406-teaming-driver-internal-v5-9-e8a3f348a1c5@google.com> Subject: [PATCH net-next v5 09/10] net: team: Add new tx_enabled team port option From: Marc Harvey To: Jiri Pirko , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Marc Harvey Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This option allows independent control over tx enablement without affecting rx enablement. Like the rx_enabled option, this also implicitly affects the enabled option. If this option is not used, then the enabled option will continue to behave as it did before. Tested in a follow-up patch with a new selftest. Signed-off-by: Marc Harvey Reviewed-by: Jiri Pirko --- Changes in v5: - None Changes in v4: - New patch: split from the original monolithic v3 patch "net: team: Decouple rx and tx enablement in the team driver". - Link to v3: https://lore.kernel.org/netdev/20260402-teaming-driver-intern= al-v3-6-e8cfdec3b5c2@google.com/ --- drivers/net/team/team_core.c | 55 ++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 55 insertions(+) diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c index 67f77de4cf10..0c87f9972457 100644 --- a/drivers/net/team/team_core.c +++ b/drivers/net/team/team_core.c @@ -978,6 +978,21 @@ static void __team_port_enable_tx(struct team *team, team_tx_port_index_hash(team, port->tx_index)); } =20 +static void team_port_enable_tx(struct team *team, + struct team_port *port) +{ + if (team_port_tx_enabled(port)) + return; + + __team_port_enable_tx(team, port); + team_adjust_ops(team); + team_queue_override_port_add(team, port); + + /* Don't rejoin multicast, since this port might not be receiving. */ + team_notify_peers(team); + team_lower_state_changed(port); +} + static void __reconstruct_port_hlist(struct team *team, int rm_index) { struct hlist_head *tx_port_index_hash; @@ -1007,6 +1022,19 @@ static void __team_port_disable_tx(struct team *team, WRITE_ONCE(team->tx_en_port_count, team->tx_en_port_count - 1); } =20 +static void team_port_disable_tx(struct team *team, + struct team_port *port) +{ + if (!team_port_tx_enabled(port)) + return; + + __team_port_disable_tx(team, port); + + team_queue_override_port_del(team, port); + team_adjust_ops(team); + team_lower_state_changed(port); +} + /* * Enable TX AND RX on the port. */ @@ -1529,6 +1557,26 @@ static int team_port_rx_en_option_set(struct team *t= eam, return 0; } =20 +static void team_port_tx_en_option_get(struct team *team, + struct team_gsetter_ctx *ctx) +{ + struct team_port *port =3D ctx->info->port; + + ctx->data.bool_val =3D team_port_tx_enabled(port); +} + +static int team_port_tx_en_option_set(struct team *team, + struct team_gsetter_ctx *ctx) +{ + struct team_port *port =3D ctx->info->port; + + if (ctx->data.bool_val) + team_port_enable_tx(team, port); + else + team_port_disable_tx(team, port); + return 0; +} + static void team_user_linkup_option_get(struct team *team, struct team_gsetter_ctx *ctx) { @@ -1657,6 +1705,13 @@ static const struct team_option team_options[] =3D { .getter =3D team_port_rx_en_option_get, .setter =3D team_port_rx_en_option_set, }, + { + .name =3D "tx_enabled", + .type =3D TEAM_OPTION_TYPE_BOOL, + .per_port =3D true, + .getter =3D team_port_tx_en_option_get, + .setter =3D team_port_tx_en_option_set, + }, { .name =3D "user_linkup", .type =3D TEAM_OPTION_TYPE_BOOL, --=20 2.53.0.1185.g05d4b7b318-goog From nobody Sun Jun 14 20:01:21 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (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 0F22933A032 for ; Mon, 6 Apr 2026 03:05:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444708; cv=none; b=Kd88w+WgmjO0wFiZjK+XdYnrfrorbYJ3RPWZ9gZkfo0uyI9MpNelqtN+IX2xX6FOOroAxNb5Y2084Zmv8zlEgwQeBvjsW9GudQgYvVtZ4HbalgVZO6hrM7G7oTfwerQTgcUPaEiJ73UaYFNhdNdpjkOLsZusmYeaaqgooGCPJHc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775444708; c=relaxed/simple; bh=q0Yz8udoUPHxbxecO84egcHUQy+H7PiHS+4O0pnwq/s=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=TN9lDWCZa+onOAO+agGt6J2Vn+g/m/qAYum1N7kNxbnyjCY9c4xmb8ilCicgE/5+CoFsMQTZJbNLHQYsWbSWqu5Y8fcA5MEzmj0YP4fGXc7D6XstMJyykDLJ7xuQO6QwAJ/mjQfKXaYVeydQ2qjkD4XGfRy0OeevDX6ril5iORc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=MDDQ47yy; arc=none smtp.client-ip=74.125.82.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--marcharvey.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="MDDQ47yy" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-12bf9974587so14777502c88.0 for ; Sun, 05 Apr 2026 20:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775444705; x=1776049505; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=gvzdOTjzZWe7D/OSDG4aALCF3gZbQJ2r6PdiKnSYruc=; b=MDDQ47yy3Y7olIunZMtULStY7sYZ3BW1UU/s9cERvRt2aG6TAFZVmcy2WC2AMPFwYn Kn5TalDPpTUDaq6gseYnDNBEqAJ9Hh/NRsfco4IfdWJai8mYENfs3g+21dKbZ2c206sv a0mSuhWJyUK9vNzk85aiA7hqIZ4fDBUX+0HY/W4CeA2A4W+ysh6odeKQdKL/GHna6k4E F7bFvpVRTlqPsRqWgkKKF3j8NhkWuxmyBwqyB48166rELQ87VjLdcdVTuIgFXBuE1XF2 wq+cqMI1v0dcqT6K8fb7JuU2TMkXVqW5oRDm/4t0d9JPC/IUt/pNh24f04mqE8Nb7fW5 nTwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775444705; x=1776049505; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gvzdOTjzZWe7D/OSDG4aALCF3gZbQJ2r6PdiKnSYruc=; b=k/kGo6oxhBZOlJWSxbtCZAiJWU7v39bXZ9yKVfvjPp5GTP9l9PkP1o1ttZuKkZgr1k ioGEZumlHBuXRHD4Jqgicqli1xnX/tp4JUudL49cUiWRjNv6JhNggQ10tmNnACKvtb1k LUbjkNKpxD9iK/ZQcjZjRGMQcrwrsD7cfUsjHr0h0yardgI9fwdXRlFwwPYopf9KvWLC 9qVCok5q3mojSBC5nKfehgMJ4Zrfn3SlmD9nmDvu57t9RSKUmyvfBqh5FTQP1T82PscT rkYBe3Nqih6cAKUFtaKNdLVANtitRWLYATHBIT36biOhEAo3SliMChFLZ7e4upOhqA0+ agKQ== X-Forwarded-Encrypted: i=1; AJvYcCX5AB2wGb3dZbruMZC4GepRtBfOK69wKm3Qsgr6exL9Zr4NJwz6x5vNczhVSFsv7kKR4xoSzSdqjNdYNRE=@vger.kernel.org X-Gm-Message-State: AOJu0YyPbXm754hMY+FyxsRuyRoD2X9yv8cGU+gjhizu+3QjM5UdUill foKf7hH2hfEDwIksOWIw/bsijckLoScOc5sjVm7BNDZTA24tzIenUTx4LNOD3+lZ2Fmjt7XOHUt /KDTTX5KnwZd1lunz87fd9w== X-Received: from dlbsi13.prod.google.com ([2002:a05:7022:b88d:b0:12a:bf30:d8b6]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:6713:b0:128:ca6f:adf0 with SMTP id a92af1059eb24-12bfb74c93fmr5816754c88.17.1775444704665; Sun, 05 Apr 2026 20:05:04 -0700 (PDT) Date: Mon, 06 Apr 2026 03:03:46 +0000 In-Reply-To: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260406-teaming-driver-internal-v5-0-e8a3f348a1c5@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775444686; l=13058; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=q0Yz8udoUPHxbxecO84egcHUQy+H7PiHS+4O0pnwq/s=; b=QjpY5inSePJ0udwdgjKyKvi20Fl6nk53RIefMk9OCxiB+IZFjDMVzh1BYvr2YtAl6H9+7Dsr1 QLn7NCt2IMXChQKkgfBq7VW7sdU75dlqq6cuC5OMdf9VGChEs1jevr2 X-Mailer: b4 0.14.3 Message-ID: <20260406-teaming-driver-internal-v5-10-e8a3f348a1c5@google.com> Subject: [PATCH net-next v5 10/10] selftests: net: Add tests for team driver decoupled tx and rx control From: Marc Harvey To: Jiri Pirko , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Simon Horman Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Marc Harvey Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Use ping and tcpdump to verify that independent rx and tx enablement of team driver member interfaces works as intended. Signed-off-by: Marc Harvey --- Changes in v5: - Minor typo fixes in both test files. - Link to v4: https://lore.kernel.org/netdev/20260403-teaming-driver-intern= al-v4-10-d3032f33ca25@google.com/ Changes in v4: - None Changes in v3: - None Changes in v2: - Fix shellcheck failures. - Link to v1: https://lore.kernel.org/all/20260331053353.2504254-8-marcharv= ey@google.com/ --- tools/testing/selftests/drivers/net/team/Makefile | 1 + .../drivers/net/team/decoupled_enablement.sh | 249 +++++++++++++++++= ++++ .../testing/selftests/drivers/net/team/options.sh | 99 +++++++- 3 files changed, 348 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/drivers/net/team/Makefile b/tools/test= ing/selftests/drivers/net/team/Makefile index dab922d7f83d..7c58cf82121e 100644 --- a/tools/testing/selftests/drivers/net/team/Makefile +++ b/tools/testing/selftests/drivers/net/team/Makefile @@ -2,6 +2,7 @@ # Makefile for net selftests =20 TEST_PROGS :=3D \ + decoupled_enablement.sh \ dev_addr_lists.sh \ non_ether_header_ops.sh \ options.sh \ diff --git a/tools/testing/selftests/drivers/net/team/decoupled_enablement.= sh b/tools/testing/selftests/drivers/net/team/decoupled_enablement.sh new file mode 100755 index 000000000000..0d3d9c98e9f5 --- /dev/null +++ b/tools/testing/selftests/drivers/net/team/decoupled_enablement.sh @@ -0,0 +1,249 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +# These tests verify the decoupled RX and TX enablement of team driver mem= ber +# interfaces. +# +# Topology +# +# +---------------------+ NS1 +# | test_team1 | +# | | | +# | eth0 | +# | | | +# | | | +# +---------------------+ +# | +# +---------------------+ NS2 +# | | | +# | | | +# | eth0 | +# | | | +# | test_team2 | +# +---------------------+ + +export ALL_TESTS=3D" + team_test_tx_enablement + team_test_rx_enablement +" + +test_dir=3D"$(dirname "$0")" +# shellcheck disable=3DSC1091 +source "${test_dir}/../../../net/lib.sh" +# shellcheck disable=3DSC1091 +source "${test_dir}/team_lib.sh" + +NS1=3D"" +NS2=3D"" +export NODAD=3D"nodad" +PREFIX_LENGTH=3D"64" +NS1_IP=3D"fd00::1" +NS2_IP=3D"fd00::2" +NS1_IP4=3D"192.168.0.1" +NS2_IP4=3D"192.168.0.2" +MEMBERS=3D("eth0") +PING_COUNT=3D5 +PING_TIMEOUT_S=3D1 +PING_INTERVAL=3D0.1 + +while getopts "4" opt; do + case $opt in + 4) + echo "IPv4 mode selected." + export NODAD=3D + PREFIX_LENGTH=3D"24" + NS1_IP=3D"${NS1_IP4}" + NS2_IP=3D"${NS2_IP4}" + ;; + \?) + echo "Invalid option: -$OPTARG" >&2 + exit 1 + ;; + esac +done + +# This has to be sourced after opts are gathered... +export REQUIRE_MZ=3Dno +export NUM_NETIFS=3D0 +# shellcheck disable=3DSC1091 +source "${test_dir}/../../../net/forwarding/lib.sh" + +# Create the network namespaces, veth pair, and team devices in the specif= ied +# mode. +# Globals: +# RET - Used by test infra, set by `check_err` functions. +# Arguments: +# mode - The team driver mode to use for the team devices. +environment_create() +{ + trap cleanup_all_ns EXIT + setup_ns ns1 ns2 + NS1=3D"${NS_LIST[0]}" + NS2=3D"${NS_LIST[1]}" + + # Create the interfaces. + ip -n "${NS1}" link add eth0 type veth peer name eth0 netns "${NS2}" + ip -n "${NS1}" link add test_team1 type team + ip -n "${NS2}" link add test_team2 type team + + # Set up the receiving network namespace's team interface. + setup_team "${NS2}" test_team2 roundrobin "${NS2_IP}" \ + "${PREFIX_LENGTH}" "${MEMBERS[@]}" +} + +# Set a particular option value for team or team port. +# Arguments: +# namespace - The namespace name that has the team. +# option_name - The option name to set. +# option_value - The value to set the option to. +# team_name - The name of team to set the option for. +# member_name - The (optional) optional name of the member port. +set_option_value() +{ + local namespace=3D"$1" + local option_name=3D"$2" + local option_value=3D"$3" + local team_name=3D"$4" + local member_name=3D"$5" + local port_flag=3D"--port=3D${member_name}" + + ip netns exec "${namespace}" teamnl "${team_name}" setoption \ + "${option_name}" "${option_value}" "${port_flag}" + return $? +} + +# Send some pings and return the ping command return value. +try_ping() +{ + ip netns exec "${NS1}" ping -i "${PING_INTERVAL}" -c "${PING_COUNT}" \ + "${NS2_IP}" -W "${PING_TIMEOUT_S}" +} + +# Checks tcpdump output from net/forwarding lib, and checks if there are a= ny +# ICMP(4 or 6) packets. +# Arguments: +# interface - The interface name to search for. +# ip_address - The destination IP address (4 or 6) to search for. +did_interface_receive_icmp() +{ + local interface=3D"$1" + local ip_address=3D"$2" + local packet_count + + packet_count=3D$(tcpdump_show "$interface" | grep -c \ + "> ${ip_address}: ICMP") + echo "Packet count for ${interface} was ${packet_count}" + + if [[ "$packet_count" -gt 0 ]]; then + true + else + false + fi +} + +# Test JUST tx enablement with a given mode. +# Globals: +# RET - Used by test infra, set by `check_err` functions. +# Arguments: +# mode - The mode to set the team interfaces to. +team_test_mode_tx_enablement() +{ + local mode=3D"$1" + export RET=3D0 + + # Set up the sender team with the correct mode. + setup_team "${NS1}" test_team1 "${mode}" "${NS1_IP}" \ + "${PREFIX_LENGTH}" "${MEMBERS[@]}" + check_err $? "Failed to set up sender team" + + ### Scenario 1: Member interface initially enabled. + # Expect ping to pass + try_ping + check_err $? "Ping failed when TX enabled" + + ### Scenario 2: One tx-side interface disabled. + # Expect ping to fail. + set_option_value "${NS1}" tx_enabled false test_team1 eth0 + check_err $? "Failed to disable TX" + tcpdump_start eth0 "${NS2}" + try_ping + check_fail $? "Ping succeeded when TX disabled" + tcpdump_stop eth0 + # Expect no packets to be transmitted, since TX is disabled. + did_interface_receive_icmp eth0 "${NS2_IP}" + check_fail $? "eth0 IS transmitting when TX disabled" + tcpdump_cleanup eth0 + + ### Scenario 3: The interface has tx re-enabled. + # Expect ping to pass. + set_option_value "${NS1}" tx_enabled true test_team1 eth0 + check_err $? "Failed to reenable TX" + try_ping + check_err $? "Ping failed when TX reenabled" + + log_test "TX failover of '${mode}' test" +} + +# Test JUST rx enablement with a given mode. +# Globals: +# RET - Used by test infra, set by `check_err` functions. +# Arguments: +# mode - The mode to set the team interfaces to. +team_test_mode_rx_enablement() +{ + local mode=3D"$1" + export RET=3D0 + + # Set up the sender team with the correct mode. + setup_team "${NS1}" test_team1 "${mode}" "${NS1_IP}" \ + "${PREFIX_LENGTH}" "${MEMBERS[@]}" + check_err $? "Failed to set up sender team" + + ### Scenario 1: Member interface initially enabled. + # Expect ping to pass + try_ping + check_err $? "Ping failed when RX enabled" + + ### Scenario 2: One rx-side interface disabled. + # Expect ping to fail. + set_option_value "${NS1}" rx_enabled false test_team1 eth0 + check_err $? "Failed to disable RX" + tcpdump_start eth0 "${NS2}" + try_ping + check_fail $? "Ping succeeded when RX disabled" + tcpdump_stop eth0 + # Expect packets to be transmitted, since only RX is disabled. + did_interface_receive_icmp eth0 "${NS2_IP}" + check_err $? "eth0 not transmitting when RX disabled" + tcpdump_cleanup eth0 + + ### Scenario 3: The interface has rx re-enabled. + # Expect ping to pass. + set_option_value "${NS1}" rx_enabled true test_team1 eth0 + check_err $? "Failed to reenable RX" + try_ping + check_err $? "Ping failed when RX reenabled" + + log_test "RX failover of '${mode}' test" +} + +team_test_tx_enablement() +{ + team_test_mode_tx_enablement broadcast + team_test_mode_tx_enablement roundrobin + team_test_mode_tx_enablement random +} + +team_test_rx_enablement() +{ + team_test_mode_rx_enablement broadcast + team_test_mode_rx_enablement roundrobin + team_test_mode_rx_enablement random +} + +require_command teamnl +require_command tcpdump +require_command ping +environment_create +tests_run +exit "${EXIT_STATUS}" diff --git a/tools/testing/selftests/drivers/net/team/options.sh b/tools/te= sting/selftests/drivers/net/team/options.sh index 44888f32b513..66c0cb896dad 100755 --- a/tools/testing/selftests/drivers/net/team/options.sh +++ b/tools/testing/selftests/drivers/net/team/options.sh @@ -11,10 +11,14 @@ if [[ $# -eq 0 ]]; then exit $? fi =20 -ALL_TESTS=3D" +export ALL_TESTS=3D" team_test_options + team_test_enabled_implicit_changes + team_test_rx_enabled_implicit_changes + team_test_tx_enabled_implicit_changes " =20 +# shellcheck disable=3DSC1091 source "${test_dir}/../../../net/lib.sh" =20 TEAM_PORT=3D"team0" @@ -176,12 +180,105 @@ team_test_options() team_test_option mcast_rejoin_count 0 5 team_test_option mcast_rejoin_interval 0 5 team_test_option enabled true false "${MEMBER_PORT}" + team_test_option rx_enabled true false "${MEMBER_PORT}" + team_test_option tx_enabled true false "${MEMBER_PORT}" team_test_option user_linkup true false "${MEMBER_PORT}" team_test_option user_linkup_enabled true false "${MEMBER_PORT}" team_test_option priority 10 20 "${MEMBER_PORT}" team_test_option queue_id 0 1 "${MEMBER_PORT}" } =20 +team_test_enabled_implicit_changes() +{ + export RET=3D0 + + attach_port_if_specified "${MEMBER_PORT}" + check_err $? "Couldn't attach ${MEMBER_PORT} to master" + + # Set enabled to true. + set_and_check_get enabled true "--port=3D${MEMBER_PORT}" + check_err $? "Failed to set 'enabled' to true" + + # Show that both rx enabled and tx enabled are true. + get_and_check_value rx_enabled true "--port=3D${MEMBER_PORT}" + check_err $? "'Rx_enabled' wasn't implicitly set to true" + get_and_check_value tx_enabled true "--port=3D${MEMBER_PORT}" + check_err $? "'Tx_enabled' wasn't implicitly set to true" + + # Set enabled to false. + set_and_check_get enabled false "--port=3D${MEMBER_PORT}" + check_err $? "Failed to set 'enabled' to false" + + # Show that both rx enabled and tx enabled are false. + get_and_check_value rx_enabled false "--port=3D${MEMBER_PORT}" + check_err $? "'Rx_enabled' wasn't implicitly set to false" + get_and_check_value tx_enabled false "--port=3D${MEMBER_PORT}" + check_err $? "'Tx_enabled' wasn't implicitly set to false" + + log_test "'Enabled' implicit changes" +} + +team_test_rx_enabled_implicit_changes() +{ + export RET=3D0 + + attach_port_if_specified "${MEMBER_PORT}" + check_err $? "Couldn't attach ${MEMBER_PORT} to master" + + # Set enabled to true. + set_and_check_get enabled true "--port=3D${MEMBER_PORT}" + check_err $? "Failed to set 'enabled' to true" + + # Set rx_enabled to false. + set_and_check_get rx_enabled false "--port=3D${MEMBER_PORT}" + check_err $? "Failed to set 'rx_enabled' to false" + + # Show that enabled is false. + get_and_check_value enabled false "--port=3D${MEMBER_PORT}" + check_err $? "'enabled' wasn't implicitly set to false" + + # Set rx_enabled to true. + set_and_check_get rx_enabled true "--port=3D${MEMBER_PORT}" + check_err $? "Failed to set 'rx_enabled' to true" + + # Show that enabled is true. + get_and_check_value enabled true "--port=3D${MEMBER_PORT}" + check_err $? "'enabled' wasn't implicitly set to true" + + log_test "'Rx_enabled' implicit changes" +} + +team_test_tx_enabled_implicit_changes() +{ + export RET=3D0 + + attach_port_if_specified "${MEMBER_PORT}" + check_err $? "Couldn't attach ${MEMBER_PORT} to master" + + # Set enabled to true. + set_and_check_get enabled true "--port=3D${MEMBER_PORT}" + check_err $? "Failed to set 'enabled' to true" + + # Set tx_enabled to false. + set_and_check_get tx_enabled false "--port=3D${MEMBER_PORT}" + check_err $? "Failed to set 'tx_enabled' to false" + + # Show that enabled is false. + get_and_check_value enabled false "--port=3D${MEMBER_PORT}" + check_err $? "'enabled' wasn't implicitly set to false" + + # Set tx_enabled to true. + set_and_check_get tx_enabled true "--port=3D${MEMBER_PORT}" + check_err $? "Failed to set 'tx_enabled' to true" + + # Show that enabled is true. + get_and_check_value enabled true "--port=3D${MEMBER_PORT}" + check_err $? "'enabled' wasn't implicitly set to true" + + log_test "'Tx_enabled' implicit changes" +} + + require_command teamnl setup tests_run --=20 2.53.0.1185.g05d4b7b318-goog