From nobody Wed Apr 1 22:20:02 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 863672E8E09 for ; Wed, 1 Apr 2026 06:05:42 +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=1775023544; cv=none; b=DSFL06kcWCnPiqJ5aKl1R6WXNk4LNmnPcgdLue687NOm4U9YvN12aAqEbs/9ySCZI2hoicXZ8CORpQ8T+zQUalt8QufsnN2CxJgu0N/ArR/1UxA6qnhPCVDL1XDQ1IsYk1+IqXaZOSRVUspWQxlET5zx61x3b8trvuTvwB3So0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775023544; c=relaxed/simple; bh=riyU8vHNfE+1WJo560BCnv4d01q2x8dxI6Sfshs/X8I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BUEyGQ7X7q0jhKBnyXybg40SVAmyh69MyVtNBVTiZUeGoZKFW5JeGMqJbuJNm9yMMdIQg9FflnFy5+gnRwvXgvtAn1vYVlFDucoTPn3VUIdb7ryOdm3XYN7s+dxga0sbdY0z2w9W5jZ1uCJWzKrB60jUw32AxBLJK/rLgIiVK7Y= 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=rLLJ5WXi; 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="rLLJ5WXi" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-128d59030d0so26270708c88.0 for ; Tue, 31 Mar 2026 23:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775023542; x=1775628342; 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=9ankry/lV9AonDaqBDI1RKEvyyWLrtwB+yzkL/8QxFk=; b=rLLJ5WXiDy2sUQhI1Px8GzwBkmfZZrpK5yQhHR2I60Rel13DArIDTetWhagkYXA1Ct GnF902c3YmJE89X5JH9kgJ0Eic48jUBZhPWCt7aw1DOlTOGd1PpaxjCw/0Qnri6I76iR yXG6OySPVT5uo6LBdOyI6ao1exIUQFnzO5VTgQUSuXPh57iqoTw2fGIQS+iSq3DOaGom kvr2XFc7Fh45HMah+H58MTDkuGVBrHmo+11TD5Y8wLhMyQFJtcl2XlsLep1y6nUAQOx/ xRMVrv0bDmPO3K2AhFdrUxX6ZKrDibrCRVuY21SO/AB2pn8zub8SJxYM8AdYi43c4Pcb dmwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775023542; x=1775628342; 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=9ankry/lV9AonDaqBDI1RKEvyyWLrtwB+yzkL/8QxFk=; b=iA+XNEME8VZ4QRF17+FOji5hMyctrHKUiqbQqJwJlmNL71Wz9WLVaAJkUUdRsyxjJZ AT2VoUr0B2SlV5bAW0Ect0G7VLsRbtb24fP/qlQGMzmEzm9BW5GRZ5idllCvbRrrj6gU YFzpDUYNg9ZNnJz0xCV/tMVNFEKQWLaNNi5hCopN9oBGtIS1f4s/naaxfCCjw1fqPf2C Gai7gTmH2bh7ITrBp4EdGW9WVrxgvnd6sPbzJtDtUJa9j4hsv92WhXVxmlHOlPTe+Uov 5Cl0nzdRroYjuDCoMcM9MvcbpyMibZ+LSeWZ07WvErGfXAFFRIzdOCH7eAW3qBle+kay mkDw== X-Forwarded-Encrypted: i=1; AJvYcCWFoiVqy+zb/DJ7zku7deDY2Iy/thpw714tIWuF5+1or2UZdKDh25M8EwRM3TloBcUOSDU6Ylm2wXZEqnk=@vger.kernel.org X-Gm-Message-State: AOJu0YwDEwDWdVa8FieK+D6Z5Bj+eYZ055+4uyg7b6u1BA3vJnub5kC8 TA96xmF23ck13dKvSdVRjrve8FhyT7CW5+aiFMzedrz2mFkkiPTkBPaluwnTiCLkKdVbvXXdaTa vWxSEaopcvgSTqhyndQZ7Gg== X-Received: from dlea18-n2.prod.google.com ([2002:a05:701b:4212:20b0:128:dd22:12cd]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:670f:b0:128:bae9:c069 with SMTP id a92af1059eb24-12be654bc86mr1474279c88.33.1775023541385; Tue, 31 Mar 2026 23:05:41 -0700 (PDT) Date: Wed, 01 Apr 2026 06:05:25 +0000 In-Reply-To: <20260401-teaming-driver-internal-v2-0-f80c1291727b@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260401-teaming-driver-internal-v2-0-f80c1291727b@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775023538; l=3665; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=riyU8vHNfE+1WJo560BCnv4d01q2x8dxI6Sfshs/X8I=; b=e2Y6yARA2z8bZQKESrRpOLOxdHQcqYmWWB5p0Dl3ZHngh6oIVov5Cz5wfvs7aXHGgx5lkyvNl WgKwxdB3BopAAqgA0zp8YZW9xuE3SQQiiSUfDCEamE0S4NCwjkNhtjA X-Mailer: b4 0.14.3 Message-ID: <20260401-teaming-driver-internal-v2-1-f80c1291727b@google.com> Subject: [PATCH net-next v2 1/7] 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 --- 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.1118.gaef5881109-goog From nobody Wed Apr 1 22:20:02 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 CF5E032D7FA for ; Wed, 1 Apr 2026 06:05:43 +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=1775023546; cv=none; b=f4gb3wAkPDjKrFtNIDaxn/hn0C3S1gKB5CQMn4ZhuXEN8zWySXVlVQQEQP6puli1F2JSyydCtKZrgskge0li9sNx2RZygXgE9qcCJkWWyaF/x/ztpadRE5MoYdYgTcIgUiAk3GdUuacLsZOhGhtc3+NCFTFz2/DWxu7nQPrDpxs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775023546; c=relaxed/simple; bh=Hm9mnvA6yzszUb9UPKy4/znjWQa9nsZzvg20i+LSm88=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fzCKA4EWL2J4w+ttMbJGJyyrBjQyiEjy50ekyGT+SRiM3XoZPGpmVNvOrr+46QVh9evSgUvQ5zXLIkHS9x4DeWEqKP+njY4bruQZGhMf5VygikeyIjaoaZHsGu9xSJQdvwS5YC7auA3gdp49eumw9H/rKdZB6wpkEIt/XE3p2sI= 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=VELglNZW; 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="VELglNZW" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2bdf6fe90a9so6392598eec.1 for ; Tue, 31 Mar 2026 23:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775023543; x=1775628343; 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=E8f3bpIAlrLMkYfB3Cdp7u2bS9D/CifmKNaY3dz1IRE=; b=VELglNZWfDoEmVabndzq3FaZxzz2+uDt6Vm2ijfrdTyjQ53e1x1yUpDJCXxzvg6Fgm DPRbYnOnzNMPUhqCQq40M0pZB64JW0DElKt7WlqGZtDZO2W/ZN/JZxNsLiY/mmM//IN5 f2bk4oqwFEKTMi9Cosg9MRlgs4cSZhqJGpCUMsq3dKJJ3+0kKbAB9HehkcaNRIUenE8e zJHzr99hgDVujIfJB+SD+m6OY0Ze11i1f2FPYtRDwbcq/y9BL6CmrPoH+IdEEIbBX+ru 7aW4Op8lYaewUJu4nfCsMBUlqHPSbgrbSdN7sHesv4M6OBOmThdTWOxUMjwYGoLhSDzB Ek2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775023543; x=1775628343; 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=E8f3bpIAlrLMkYfB3Cdp7u2bS9D/CifmKNaY3dz1IRE=; b=g+VDeGmOnzOkrvuL/g1FhsEqge0vrIBZxBnz1SmwJ0qm2R/75Bt+a0d/MCTZ+0UZl9 geOtQc9pBEdgYJu+/LDz0/6jju6aT2rgxtSknQc8+G0/jGqR85Oi6C1M8XR4flBWXdRN ct29vPx5IZdSraXuu2+NPeTkVPrdDS21QN1qohG5e7UZt8Rh0y9N1gi4/tkZ84qsbQ7P qjnjfLtIJLNICDwvggaqizNAczAWLVxzuDg5JXBCzokufpzxN6EsIp3hcroTG9dEiJ+w 9b8VaQx47tYYXvsR+cXxyUPC+8TrFuBWMYGey9oBFCOsCwBL/PRhQsC7/PzojYOHO4RN dufg== X-Forwarded-Encrypted: i=1; AJvYcCX5rSTdtjvUbc0Tw4yRmG+HGmQTLHLzIsuJlOq7B7ng9au08MGDG3H0xPy/lzx7jm959cr4EA3pYbZObNg=@vger.kernel.org X-Gm-Message-State: AOJu0YzAStXHTCCGmhUFCR6nYx8k5j4g5oiRbYcx1EZIya68+bvADdCw Bege/ed6djaSwf6YF0qFLKO1k6H6/nHexlv1JMN+GGqyZyqnla5QTTpY4gXs11+P2JJZYesDzcl LILM8T3NUd9oZ5kdsYOtfeQ== X-Received: from dyz19.prod.google.com ([2002:a05:693c:4093:b0:2c0:d207:5bbf]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:aa8c:b0:2c1:60fa:ec48 with SMTP id 5a478bee46e88-2c9333bb027mr1286180eec.31.1775023542808; Tue, 31 Mar 2026 23:05:42 -0700 (PDT) Date: Wed, 01 Apr 2026 06:05:26 +0000 In-Reply-To: <20260401-teaming-driver-internal-v2-0-f80c1291727b@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260401-teaming-driver-internal-v2-0-f80c1291727b@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775023538; l=1409; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=Hm9mnvA6yzszUb9UPKy4/znjWQa9nsZzvg20i+LSm88=; b=9Z692FgipJSllZ9p+NhMxC92vUYcczJe6jzeJD1OyRrO0Ex7dhfwstKEVwSsB+4PIIyxzSLSO bMCxJtBVRxIAO+1XP294H7yeO1MQCbvA1PIyK819e9diBlkrt2uLEbe X-Mailer: b4 0.14.3 Message-ID: <20260401-teaming-driver-internal-v2-2-f80c1291727b@google.com> Subject: [PATCH net-next v2 2/7] 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 --- 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.1118.gaef5881109-goog From nobody Wed Apr 1 22:20:02 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 A2798331221 for ; Wed, 1 Apr 2026 06:05:45 +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=1775023547; cv=none; b=C74nMFuhq4ZNbRCzLaXPY+qfJqUxJ6+gdiTpDqzZVuMeMYG7Bkzjj2XWCD6DO+IeSwzF4MqhdDlNJMukTJWgVO4yygIjPg3xhYU09Vqq6gNMleKmg3n6huF5P/HaQDrFeUpYAvI+aQwmG0VDPDgEMnc/vHlVLwnlyr7ryKb3mto= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775023547; c=relaxed/simple; bh=YS3YiatLBj7qZwctFvA+P73cI4VV70CVdOZYZZPriYs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=lbAPu+9YjNKu4blK/A4mscU4hoho9wg/SwhftE7XUqv0El/eGdpSvTJYi4sNK3wiIFBzyuTSFHPFWuD9YN2s5k32y8Hqti8kTXGJj+qRlNQ1g8HSztC0rEHpXV1WC71d837UMK8CCQNY/jcQEPV8yylWVFXRnNiQsSSa+ZOwCE8= 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=U2VbRUg0; 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="U2VbRUg0" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2bdf6fe90a9so6392629eec.1 for ; Tue, 31 Mar 2026 23:05:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775023545; x=1775628345; 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=xA8gFrLqFTd0mUoJLyKqA0q3Ee0rtvXH48v8ujy7q5g=; b=U2VbRUg0sINu9P+I0+pGKCbPIWm3dn1KcrN4wu99zyihNj/UhmQNT3kK1pRpN0b2m2 J7RQJ0I4oA6fXtyVuDNa/NQ2kpQad/HfIXRYYjatOy9Sy2PeSvnYnpHH4Z7XhM5DGBW+ EOJH4j68URMOlq0Eqkt/IRi2s/WAdLaIy0Vrl/wJgwOA5PyLWylOcOMnwh71wCsE/E1k DRgsBq6NDW6dOfFCnMaj/3AEqOwgB0KHQNd9aGcIcBvPQQU1wn7yLkVnv1sZb8VilwA3 uaeXBtEMKLU2H+2xYqpq5cl5eQ+vW4XJre/nTAkBhOtfe/ACKeCPKq08qhuf9xDjSd7h tOlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775023545; x=1775628345; 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=xA8gFrLqFTd0mUoJLyKqA0q3Ee0rtvXH48v8ujy7q5g=; b=U6icbNLRIbnfiQ5tYBZE/cYR/8pwj+fhRa7EMp7TjiHLsySyIyKqBG0k+9gCsaPcvH gUtzrf8yoj2fp04I9WDBXI7MnF55zl2qAKt8sl3YTx2ckkY7OnB21lwpwextaNOTFVHw a6XJTBJoyP/N6/epuCjvdc5s8GdzCCRGcDEYd+AZ/bhV3f7cnXaTXIwytdk6BMMtdRPf wP5v3IfesJDsilQrVER4RoysZ4K4IMdqjS1LtsVJBN6+NEjRJ9QH8QL0oFkXH//9MUgh Pr88LhoHXBqXMiF0wMre2Gw+IBf6fd+KKexWVfQiBQP7qHD51b3yTJjTwi3zeMPT1Dnh vR4w== X-Forwarded-Encrypted: i=1; AJvYcCVpufK+YrgbXXyULZ5dgqeyiYpq3osV0Ex2ojEx0b1+waNViXKIWSb5u4KBZm+qJa7Cw5BwiwXGh/NQI0E=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6uVfaDYgvk2PpLHyBHHXqmoGIdFyzgCWPnR5P4eShoEQyCOdd pQaHomFEj2cMBig3kiPkFXwcFaIlQvKNwC58F/BgKI0w18IxfiV9CEL1HhPyn8X4y0PxTTkXvTv p22o70f667Css/TbIBpH4fw== X-Received: from dybbp18.prod.google.com ([2002:a05:7300:a892:b0:2c8:7753:33ac]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:80cb:b0:2c7:2c0b:f33f with SMTP id 5a478bee46e88-2c9325b0162mr1371078eec.21.1775023544546; Tue, 31 Mar 2026 23:05:44 -0700 (PDT) Date: Wed, 01 Apr 2026 06:05:27 +0000 In-Reply-To: <20260401-teaming-driver-internal-v2-0-f80c1291727b@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260401-teaming-driver-internal-v2-0-f80c1291727b@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775023538; l=2533; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=YS3YiatLBj7qZwctFvA+P73cI4VV70CVdOZYZZPriYs=; b=CbIq+Ggm9PWPjSCVHiBf4TlPgoy7zSsGtrHeaWJ1Xtuiw0yEyFjDVqJzUY4UA3VG6x8C1Tu9N dGuLh4TZbQMAUKGvK9wVExy2ZjxaNXaim0VUFnfxcQMJ//GvcDdZHUm X-Mailer: b4 0.14.3 Message-ID: <20260401-teaming-driver-internal-v2-3-f80c1291727b@google.com> Subject: [PATCH net-next v2 3/7] 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 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.1118.gaef5881109-goog From nobody Wed Apr 1 22:20:02 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 4088433689E for ; Wed, 1 Apr 2026 06:05:47 +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=1775023549; cv=none; b=krDccQ8EMBTCzuReCY9KCBZI/T53Cf3iukkai5auLPHMVnBvkZ2ZAxLv0CyUuOiu20C/ttBfBMQ3vjdrCVlL4FZKwuzdUZJOW99jqhVObXqz+Re3aLJf6xuAdETzktYIunu5i0k2kgUaqKk9Z7SoId9xIkEqjOuR45ryicatZhY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775023549; c=relaxed/simple; bh=q3Rjg5FnuL/XPNFBsh4g6OoUrVXdKJT4qpHChXcQJtQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=RdkBciaG32RDtwer1bP1yBQnTluy9lE/rmaB7xL3X6HTYoU6LWqFfB6D6RhTrooDgp1HymbT+QBlSAFf8HOgVCxnbrK+P+CfELip+dqAuksHBjyLfMhYl6K55gytvIH+lWZEiytbO22s6Qeq7XGvS+wRLf2PG+aSnN6+YD6l9SI= 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=kL7hFonH; 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="kL7hFonH" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-127337c8e52so11471144c88.1 for ; Tue, 31 Mar 2026 23:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775023546; x=1775628346; 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=AKEe8FlFAxPeK2qPH85mpmZZrVVgyL8G6hd2F46gpNo=; b=kL7hFonHp/dJng9tQxbOs/HsoDTHsk+Mne229bkodmljKR+ffN0D/0UG/G5r6Vxht8 377Vs7uyV1hsw0ZdxL6eSeGbXsGAy0YWU7gUFLqd19Zr8NPETiyoNfYzx0Xu2SZtE0Mx KSE8S6jcC8/YaSso6ui3lV637WYujQKrJ/WoDYnT1zEZA98fYi8B12INTZPepqb57eEk +XVPO3fRb8qTm6AENjgaOVVzMlMASNKmF+JiwgJ8cYxymWI+VFUONQm7+XO1yKQKyrxM B6+fSUyuZdiZxz4TXevJvglMr2FqO0mUriWMZoEvr4i6S8fs5E8fI0NwBRQaYjhXLsku 6Cfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775023546; x=1775628346; 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=AKEe8FlFAxPeK2qPH85mpmZZrVVgyL8G6hd2F46gpNo=; b=fPgEAIvK5v0X/hB6DDcgOcTCJzVOEopp8LQJEXVBX4DYEvOnTzASHa8hM8CvEW3zJR /H9prD7GwR5/Et7x7NsksK66gMX1fFE8NPhgfaJh1b+POyXAXECCqWYwke3xN16tr42G uUY76Iw8RrTkr4272GGFpjnAvvFBTJN2dr04tMJjLOVdANTGpH9xBNbufctlZLTV46Gi gxGID8od4A2yiUPyUcjCrUUm6Cs6lHiqvk8UxE5VDPWodwm/HLgEbSPqJUGiwfWKj4bE A0K1lqWEvx8mKq17X6MqEvbhrMgfUiGihL/GwfA4WMY7e1SX1IDw51uMu4U+40FTnPf9 mFXg== X-Forwarded-Encrypted: i=1; AJvYcCUbx4O2tHeFGt4CPEba7YirFfFFh3LS8QSjNBChRAZQMN1uURoFueTJApakSlRNl6bADwLRSx4QqHz7FWk=@vger.kernel.org X-Gm-Message-State: AOJu0YxqSE2GqmOfelvgR5fb5K7EeenlpxblPoH9Z87DgTysiS7aBn8V zq6OJEqQE36ldNsxBebg9tUtc1fqxNjuwICY9r27sEdl/GKnXniuyl3UjNdjWpwKwKXn/2rZ0vR 2utmyWHAqhEKyeMqTtzflRQ== X-Received: from dly16-n2.prod.google.com ([2002:a05:701b:2050:20b0:12a:bf30:d8b6]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:123:b0:128:ca6f:adf0 with SMTP id a92af1059eb24-12be6557593mr1441467c88.17.1775023546088; Tue, 31 Mar 2026 23:05:46 -0700 (PDT) Date: Wed, 01 Apr 2026 06:05:28 +0000 In-Reply-To: <20260401-teaming-driver-internal-v2-0-f80c1291727b@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260401-teaming-driver-internal-v2-0-f80c1291727b@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775023538; l=10767; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=q3Rjg5FnuL/XPNFBsh4g6OoUrVXdKJT4qpHChXcQJtQ=; b=9OOeyvtbJlg2ttEcBURV56VEU6Q9luWGXjZ3W2ESxm0oyX8MKhkI1D6DKC4ijtBuSrUj3WraQ Y+GqZJ4mndcCGqSx+U4ky4hnbHPV/Be5m6Zd2siHgeYSzJXC7oLoyAx X-Mailer: b4 0.14.3 Message-ID: <20260401-teaming-driver-internal-v2-4-f80c1291727b@google.com> Subject: [PATCH net-next v2 4/7] 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 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-marcha= rvey@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 | 115 ++++++++++++++++ .../drivers/net/team/transmit_failover.sh | 151 +++++++++++++++++= ++++ 4 files changed, 272 insertions(+) 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..fce421869381 --- /dev/null +++ b/tools/testing/selftests/drivers/net/team/team_lib.sh @@ -0,0 +1,115 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +# 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 IF of the iperf3 sender process. +stop_sending_and_listening() +{ + kill "${sender_pid}" && wait "${sender_pid}" 2>/dev/null || true +} + +# Read RX packet counters to determine if interface received traffic. +# Arguments: +# interface - The name of the interface to count packets for. +# namespace - The name of the namespace that the interface is in. +did_interface_receive() +{ + local interface=3D"$1" + local namespace=3D"$2" + local count1 count2 diff + + count1=3D$(ip netns exec "${namespace}" cat \ + "/sys/class/net/${interface}/statistics/rx_packets") + sleep 1 + count2=3D$(ip netns exec "${namespace}" cat \ + "/sys/class/net/${interface}/statistics/rx_packets") + diff=3D$((count2 - count1)) + + echo "Packet count for ${interface} was ${diff}" + + if [[ "${diff}" -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..212d650caf66 --- /dev/null +++ b/tools/testing/selftests/drivers/net/team/transmit_failover.sh @@ -0,0 +1,151 @@ +#!/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. + did_interface_receive eth0 "${NS2}" + check_err $? "eth0 not transmitting when both links enabled" + did_interface_receive eth1 "${NS2}" + check_err $? "eth1 not transmitting when both links enabled" + + ### 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" + + did_interface_receive eth0 "${NS2}" + check_err $? "eth0 not transmitting when enabled" + did_interface_receive eth1 "${NS2}" + check_fail $? "eth1 IS transmitting when disabled" + + ### 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" + + did_interface_receive eth0 "${NS2}" + check_err $? "eth0 not transmitting when both links enabled" + did_interface_receive eth1 "${NS2}" + check_err $? "eth1 not transmitting when both links enabled" + + 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 +environment_create +tests_run +exit "${EXIT_STATUS}" --=20 2.53.0.1118.gaef5881109-goog From nobody Wed Apr 1 22:20:02 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 99B923370E3 for ; Wed, 1 Apr 2026 06:05:48 +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=1775023551; cv=none; b=H5q0j+PBKcce/TZBIGyLqKCRD5I30tZCoiYRxEd4gEqmIV6fo7eEz1pt5SMg/LwWG8MBPxD+fXARNyJay3b8mab49o5tfFZViIknUkM1Om/yal9MJKPgADqNA3DbaP0tXo9BkxfjzsoaSvz7W0vSpRjMi4n9yHC0fc0g3Q52VFY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775023551; c=relaxed/simple; bh=64Oai3ivdgSUBHEtLHjbPwgulNCJ4ZUE1a6YJU3wXrQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ucb6mHuavN923RDUPo6EJY9z61YeW0XVWmHoUi8G1mhNqBTh8F7o9LJv+XghZV5O9neTgm6ffvljQGxTW7Kv12nqDCmC/7POKuez+BBFjLVYXHEm6IgdeOAadakZSeov4XcMzpu0Zv/qklzGqqePp1jv1sPBCZgkwRXUHz5Hwhs= 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=B8zixO0b; 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="B8zixO0b" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2c895e7de52so6521000eec.0 for ; Tue, 31 Mar 2026 23:05:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775023548; x=1775628348; 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=5HZ86mxT7F0eSXefFjWdsBrIU0A3WEekP24/qyqSzIk=; b=B8zixO0bpZL5nI0OPumUkqiNry40yhwgbIgfmP1DVPD156YgZw2JGjLv3mLS41cwZ7 E5Lq+bR29oS2coRbU+qQaQWm1MICGBP2lBdUtC59YRvPu/W3ETcYCAPzi8ge4JKPeaDP HIP2sTHeqq0h2YZXNiNXC7dI2BIOE1mL6Xanh4EmrQnEmeeMkdS21fXINORUHNTyb1YQ bSaj87ttExsHoJI6xt+TmFz3VRB/9jGY5cGbD19/foWRJ/7uHeX7O3frlmJZKqN5QZNV HWXt3TORt2hJxbXXMtpIxWoIllM+8BhLyQ2hoe5FYFfEYsYOSnRwLnYOOj7/U5xWWQsC eLRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775023548; x=1775628348; 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=5HZ86mxT7F0eSXefFjWdsBrIU0A3WEekP24/qyqSzIk=; b=T9TU3bs8ykvsQQ9Hv+cgNidL2dahnZcRkCTwYzaBwgV7poxkcE9TvuQp3msMqOoTva sKOL2iqa/aErbiOm5oi8bXmRZrB0W2z5cMjxDK2d792+9ouyNRc6UfBq4Wc1Ntt/T1pQ WCDWoQs1TWP1LD5fX3K5/di/WoigCLILvvSbMIdvIFD5/yZ3HI4XFU3RJWtXWCS1ZQ1M 5iGV4X3QMI4h/pGuAn2POS05oWOjKekCHaSiUPWAmU7v6scCY6VFwpBPBTNrHzo6Mlzp J2FPK/YNNii+DiEUrOfLkAwMojqnItfBGGHiRuRdUPtAJ/PWeAeKBS55p8LNaNTjc4I3 5xXw== X-Forwarded-Encrypted: i=1; AJvYcCWX1lkCuJgVxeKpoVW/b9KFOil9L7njHjsTXondgrgfl7U/WF0j9t/f4eQQZ6iJwgTKvm2gIYYdnUP0iDo=@vger.kernel.org X-Gm-Message-State: AOJu0YxjG9gNkfm8nFUe7AJJ5jRY7Hto/6CcBdmEHbxvGdi6LiFl9UKk QpbkzLeXyydDv7oukzfEcb2bY2x+J02Yrt8RU4glMaITb+NJezmwVL2fbFNFj6Y0ZDdkNJPqAwn 3NgU9lk5tLPqAC1dr23XsWA== X-Received: from dyctb12.prod.google.com ([2002:a05:693c:39cc:b0:2c9:8fa0:f7a0]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:d51b:b0:2c7:2cac:8153 with SMTP id 5a478bee46e88-2c9333adfadmr1423000eec.31.1775023547743; Tue, 31 Mar 2026 23:05:47 -0700 (PDT) Date: Wed, 01 Apr 2026 06:05:29 +0000 In-Reply-To: <20260401-teaming-driver-internal-v2-0-f80c1291727b@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260401-teaming-driver-internal-v2-0-f80c1291727b@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775023538; l=7939; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=64Oai3ivdgSUBHEtLHjbPwgulNCJ4ZUE1a6YJU3wXrQ=; b=mgR9e8qpLc2fZ93b9n5MCf6dELD1RiN2NdukZ/M8yM9N3gprwHBoV7yjEtJyz1O57IM4E9bd3 Ix+NXBJejbWC/d9AobhQ+KBBjIzlYviIEiLUoIRkgJ2JrovtWegEIaQ X-Mailer: b4 0.14.3 Message-ID: <20260401-teaming-driver-internal-v2-5-f80c1291727b@google.com> Subject: [PATCH net-next v2 5/7] 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 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-marcha= rvey@google.com/ --- tools/testing/selftests/drivers/net/team/Makefile | 1 + .../drivers/net/team/teamd_activebackup.sh | 207 +++++++++++++++++= ++++ tools/testing/selftests/net/lib.sh | 13 ++ 3 files changed, 221 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/teamd_activebackup.sh= b/tools/testing/selftests/drivers/net/team/teamd_activebackup.sh new file mode 100755 index 000000000000..cf576a57b2c4 --- /dev/null +++ b/tools/testing/selftests/drivers/net/team/teamd_activebackup.sh @@ -0,0 +1,207 @@ +#!/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"" + +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}" + 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}" + ip netns exec "${NS2}" teamd -d -f "${NS2_TEAMD_CONF}" + check_err $? "Failed to create team device in ${NS2}" + echo "Created team devices" + + rm "${NS1_TEAMD_CONF}" + rm "${NS2_TEAMD_CONF}" + NS1_TEAMD_CONF=3D"" + NS2_TEAMD_CONF=3D"" + + 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" + ip netns exec "${NS1}" teamd -k -t test_team1 + ip netns exec "${NS2}" teamd -k -t test_team2 + 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}" +} + +# 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. + did_interface_receive test_team2 "${NS2}" + check_err $? "Traffic did not reach team interface in NS2." + + ### Scenario 2: Choose active port. + set_active_port "${NS1}" test_team1 eth1 + set_active_port "${NS2}" test_team2 eth1 + + did_interface_receive eth0 "${NS2}" + check_fail $? "eth0 IS transmitting when disabled" + did_interface_receive eth1 "${NS2}" + check_err $? "eth1 not transmitting when enabled" + + ### Scenario 3: Change active port. + set_active_port "${NS1}" test_team1 eth0 + set_active_port "${NS2}" test_team2 eth0 + + did_interface_receive eth0 "${NS2}" + check_err $? "eth0 not transmitting when enabled" + did_interface_receive eth1 "${NS2}" + check_fail $? "eth1 IS transmitting when disabled" + + log_test "teamd active backup runner test" + + stop_sending_and_listening +} + +require_command teamd +require_command teamdctl +require_command iperf3 +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 b40694573f4c..992342b1dd7c 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}" bash -c "$@" + (( ret =3D ret || $? )) + done + + return "${ret}" +} + # Create netdevsim with given id and net namespace. create_netdevsim() { local id=3D"$1" --=20 2.53.0.1118.gaef5881109-goog From nobody Wed Apr 1 22:20:02 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 C84C42FC00D for ; Wed, 1 Apr 2026 06:05:50 +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=1775023552; cv=none; b=P9tklFA4QGOrbJ7Lv4grggIShRa7Y5zvKMEgrFASNNu1VW5aDpI+ii+J638zDEdTVtgfwmaMZT2jbTGPe9Zn+96swuGwK9hXSAi15qR8OnJhZjAQtocNJ1zdiRRRSEXOSBmBjYtPRZ/hW5I2zI3BALoTWQuIR3StU8cLgr/OENI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775023552; c=relaxed/simple; bh=cz1UQUY9YQJLilTEJn4TLXI+9W35mi+oIsWZFttvuns=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=rHB9O/FiYW4HWaNRUCp3zpIsZPD651aYhsjGwc90NuSJyXqt3CESwJYV9Ro/ZiQ3omsmAP1qNGi5hWPKAiTyqx5qsaLsZWhZoowup1eLA3cIut9S+aiT82wFyQjUAiKlWTXAZ2unVdNC+GN4eZwsPXV+n981BHpx6aeptFQnGnc= 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=jlZlwc+3; 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="jlZlwc+3" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2c7f2b72c91so13238830eec.1 for ; Tue, 31 Mar 2026 23:05:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775023550; x=1775628350; 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=cuYgE2YbSvQcBffd2lsPUBv8j5gtRNwWojLcek0U8ig=; b=jlZlwc+3td/pd+Ba79/PbsRKW0KL47/JjTJEKt/AdyQ6e2/CKwbKf6ijyfkKgyQffp 1mg+3CIqmMo0MCDV9NkIsmBRzmRO1hhS9csT0sh4mIbwW9OSd4+50LjsZIVc1DZQKpbd umqn7vYB3U9AHpi85hkreVrxZi/ypDBLfRsgQzok9eqLylpCavRzhUYTxYbry/83qcBf 5robvEy9e+aKCfnWwpUmQ5Dxb8kHwNc1SFr1cINO86A0JbAYBgzO71ZRwyiBzRRmz3CQ zmyUWmkjy2XRBvXeWc5fPPM8m4HhnDKHowU2mZziTiYQ2SlgEbR2gwurbq180cWvUkp1 AYuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775023550; x=1775628350; 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=cuYgE2YbSvQcBffd2lsPUBv8j5gtRNwWojLcek0U8ig=; b=Q0+QrN0Se6B+bCj7tNYItGdT9gcKP5yrpGMHUgZbXASvMSJwPLxrijo2Bn5lFY6PRt zS4C7Kfj3ro1ujr2DfziuHrujS8dfKqTX8fgroe505DDiXYrMhhNUF3dA5bLLcRW4jHd ijxhD3HNBfgbS3P59F5boQDFYysmAXOmV5Q9vD0Ic2MSAO7OH5XefV43e/C6iADxY8mk EVaMKjFcyJaiXFOUnujAVF9LeQqs214eOv98fCoNMYCENQnv5zERlDBqe6sxLeqg5Qz7 lSBD/A3XwnqtooSdGvoZwziiVcD6/0CBWu54D0YCsXdEpQjeStDJX+dRfWxEtxlMjE5u 4qcQ== X-Forwarded-Encrypted: i=1; AJvYcCVLkqqGpD5fLOiz81wqoBs1jaWNfyfUhBhLf2N0w5DoArtBZhOLOgKXl9ZC8PiQAb1t3edyrD0vE5KBre8=@vger.kernel.org X-Gm-Message-State: AOJu0YwKy3O/GQEQmeSprTrhd5Rd8uzsWP+OlSxuv3SK4zymMlNNeNC3 bMRc8Ac9z2dZIYqu/nB65TrGXGDbwuaOPE+gQf0CJcOHVPZj3QOUgcExJMCXihhdcstl8dfq5F3 fgZ9YRJGqd2AI0bChpR7T3A== X-Received: from dycag12.prod.google.com ([2002:a05:7300:fa0c:b0:2c8:8992:d026]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:a498:b0:2be:6f30:f2f9 with SMTP id 5a478bee46e88-2c9328ac279mr1186570eec.26.1775023549872; Tue, 31 Mar 2026 23:05:49 -0700 (PDT) Date: Wed, 01 Apr 2026 06:05:30 +0000 In-Reply-To: <20260401-teaming-driver-internal-v2-0-f80c1291727b@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260401-teaming-driver-internal-v2-0-f80c1291727b@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775023538; l=18316; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=cz1UQUY9YQJLilTEJn4TLXI+9W35mi+oIsWZFttvuns=; b=zqJHtFEXpRyKG9qwhNl/W0hO82YNsXrr4pMnhNd6U7ns5xKYzJY2wZfyhEfG2/eaPnDWylBfn l/LFN0+5ZQaApW0cY74t7yxVPepD5I0xlraiQq42oHe3ZJznmEaGWvV X-Mailer: b4 0.14.3 Message-ID: <20260401-teaming-driver-internal-v2-6-f80c1291727b@google.com> Subject: [PATCH net-next v2 6/7] net: team: Decouple rx and tx enablement in the team driver 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 use cases where an aggregated port should send traffic, but not receive traffic, and vice versa. For example, in the IEEE 802.3ad-2000 specification, there is an optional "Independent Control" version of the mux machine. Currently there is no way create implementations like this for the team driver. Separate the existing "enabled" per-port option into tx and rx specific enablement options, but do so without breaking the existing "enabled" option. The existing "enabled" option is now defined as (rx_enabled AND tx_enabled), so if one is independently disabled, then the old "enabled" option will also not be enabled. However, setting the old "enabled" option affects both the rx_enabled and tx_enabled options. This is the first case where setting an option can affect another option. Note that teamd and any other software that exclusively uses "coupled" enablement will continue to work without any changes. Signed-off-by: Marc Harvey --- Changes in v2: - None --- drivers/net/team/team_core.c | 238 ++++++++++++++++++++++++++-= ---- drivers/net/team/team_mode_loadbalance.c | 4 +- drivers/net/team/team_mode_random.c | 4 +- drivers/net/team/team_mode_roundrobin.c | 2 +- include/linux/if_team.h | 60 +++++--- 5 files changed, 245 insertions(+), 63 deletions(-) diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c index 2ce31999c99f..308ff7cd4b15 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 @@ -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->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. @@ -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; } @@ -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,58 +927,172 @@ 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); +} + +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 + * ifindex when processing a flying packet, but that is not a problem). + * Write guarded by RTNL. + */ +static void __team_port_enable_tx(struct team *team, + struct team_port *port) +{ + 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)); +} + +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); +} + /* - * Enable/disable port by adding to enabled port hashlist and setting - * port->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 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; - 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)); + + 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_queue_override_port_add(team, port); + } + team_adjust_ops(team); - team_queue_override_port_add(team, port); team_notify_peers(team); - team_mcast_rejoin(team); - team_lower_state_changed(port); + + if (!rx_was_enabled) + team_mcast_rejoin(team); + if (!tx_was_enabled) + team_lower_state_changed(port); } =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 -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->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); +} + +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); } =20 +static void team_port_disable(struct team *team, + struct team_port *port) +{ + bool rx_was_enabled; + bool tx_was_enabled; + + if (!team_port_tx_enabled(port) && !team_port_rx_enabled(port)) + return; + + rx_was_enabled =3D team_port_rx_enabled(port); + tx_was_enabled =3D team_port_tx_enabled(port); + + 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); + + if (tx_was_enabled) + team_lower_state_changed(port); +} + static int team_port_enter(struct team *team, struct team_port *port) { int err =3D 0; @@ -1244,7 +1358,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); @@ -1429,6 +1543,46 @@ static int team_port_en_option_set(struct team *team, 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_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) { @@ -1550,6 +1704,20 @@ static const struct team_option team_options[] =3D { .getter =3D team_port_en_option_get, .setter =3D team_port_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 "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, @@ -1595,7 +1763,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..38a459649569 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 */ @@ -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/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..3d21e06fda67 100644 --- a/include/linux/if_team.h +++ b/include/linux/if_team.h @@ -27,10 +27,11 @@ 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 */ + 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_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; +} + static inline bool team_port_enabled(struct team_port *port) { - return READ_ONCE(port->index) !=3D -1; + return team_port_rx_enabled(port) && team_port_tx_enabled(port); } =20 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) @@ -190,10 +201,11 @@ 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; + 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 @@ -237,41 +249,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.1118.gaef5881109-goog From nobody Wed Apr 1 22:20:02 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 70BF033CE86 for ; Wed, 1 Apr 2026 06:05:52 +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=1775023574; cv=none; b=rQLRb/m/aEkkp8qiz+UxqBOfNJVseeNG4vII6d7ALW7SrUVzANNzls6kNxJYQZUPeHbwV2vP7+JWRHwzsw9Uht8pFslDgssw3gUaQ8eCkU0upc+PotMcQ8ejQ76rI+vTvAe3a4aG4dUubcXjANsFSDZhMIJnTyCfWpPn1hKYzo4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775023574; c=relaxed/simple; bh=SNQ1cmqwfV4BJUqdUAYMRXrGB4q7HaXoF31Jr1PbFFg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=poQWXId2CMlcZkIpU8mYkhF2+pqxP90fjf2W9TA/2WI6LpO8nMRZ2gY8s6na95iU9SZ7GrQF3MqYUbZv0pSa/Z77Sa3yEtka5r2MuGUcv78vK7tKejy3rGMzCuBPse8UZQOcg+ELeJbYzjmf0Yb5v/yNh0zpCqbtlgpPalllw9U= 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=P4KbVmhZ; 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="P4KbVmhZ" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-1273dfdaf5dso734221c88.0 for ; Tue, 31 Mar 2026 23:05:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775023552; x=1775628352; 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=9rAh4dSy2ASJ+eS7NIHZm1n3v2Lo++pBg2O5GJueRGQ=; b=P4KbVmhZZ4geQcU9MeKts/7NBJBYZquMiGrNbczYNokj0LyVJI8BCbJ1q9j4RWWbt/ 0HowFlEeqaR+2nLgaCY74N2NC1Ot3rGhKNME1mazDMpt0AfEH9K9ndZGaryQw/RIfnoJ e+LnavskaLjo7i9vHVOYdN6W3HF3OUOErDYP+2m/4HFf6uRNY1RWWgN/uDlHeBAzLJQ/ 78CG3dffbFzogz4LnY4pZ04/LFDH8/T6d2eE6RaEhVaLlI9v39zyGcbjmvlSes6e2f7I JGChMw/DjMhnxdk9umM37GI9ohk3Km6zJz60cIKxEBt4d5xyXtdTSSfdjuKHsf6V4fYc oC1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775023552; x=1775628352; 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=9rAh4dSy2ASJ+eS7NIHZm1n3v2Lo++pBg2O5GJueRGQ=; b=ffsvG5caGXmBVtz4ipUX8oL0qFwgSJXtQAQI4+4U1fG1BsZxC+/EEf1jABIPQsAc9A S9790hTjsYc6WHKQHdGToyNqMOo+p0+2Mdomd90v4nTmQb18RMkKTkMZ37d++WjTnddU wvF1SSHwcwODv0Cb1AuQRYqLS3pmtPyKpX646uWw/1Em9c/j+7wkiSkBus+aYXtb0eUA +YMgeJqc9WTLlUi6qb3MOQIuwpl46USxpCeGHCRPrVocu6pMd6qwKLDEw4kiHdZsGQ7g 2v9ft1rsreI5ewBxGcibn3a2fUAQy7Oh2GxxbsyGzQCZwESs3D+RAHNQ1LcY8bZDz5KF B//A== X-Forwarded-Encrypted: i=1; AJvYcCWW1xLmdcwzb6bT4LDCEeyZFjuJl/S0toUExsmb0Jz5n80qdPta9FO6me6jM+15LXRAOpDqWnuBSMUp4/c=@vger.kernel.org X-Gm-Message-State: AOJu0Ywotwo+bBPcB8h809lyPn8djq+8h8bPH3ASKVRCuIDn7QBX4J6W ZKMrd4L51IdiBKHTyFDmDL8pain0wffw/MnisqM4b5367ENrVYKD1UmUrTGGJLbNRMnC0nkPisQ wPKf0N3rF3xbcCatR+zWUOw== X-Received: from dycoi4.prod.google.com ([2002:a05:7301:da84:b0:2be:7cd3:c97c]) (user=marcharvey job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:3885:b0:123:331f:978f with SMTP id a92af1059eb24-12bdde380b8mr2708266c88.7.1775023551371; Tue, 31 Mar 2026 23:05:51 -0700 (PDT) Date: Wed, 01 Apr 2026 06:05:31 +0000 In-Reply-To: <20260401-teaming-driver-internal-v2-0-f80c1291727b@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260401-teaming-driver-internal-v2-0-f80c1291727b@google.com> X-Developer-Key: i=marcharvey@google.com; a=ed25519; pk=OzOeciadbfF5Bug/4/hyEAwfrruSY4tn0Q0LocyYUL0= X-Developer-Signature: v=1; a=ed25519-sha256; t=1775023538; l=12844; i=marcharvey@google.com; s=20260401; h=from:subject:message-id; bh=SNQ1cmqwfV4BJUqdUAYMRXrGB4q7HaXoF31Jr1PbFFg=; b=LlIkWEeKp5MFyuL3jbSSN/YEWhINfulOKg4sOZ2Dmg2sc7A+NyjxOyCnKcTm/8AGvyGdJ8pR2 YhTpwast84BDHC6RNwEgO5hJYFJFkxOfMmguheLPwcUMuncckTpwcXo X-Mailer: b4 0.14.3 Message-ID: <20260401-teaming-driver-internal-v2-7-f80c1291727b@google.com> Subject: [PATCH net-next v2 7/7] 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 v2: - Fixe shellcheck failures. - Link to v1: https://lore.kernel.org/all/20260331053353.2504254-8-marcha= rvey@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..e2944af02d57 --- /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: Once 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: Once 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..c87cf998a427 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 true" + + # 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.1118.gaef5881109-goog