From nobody Mon Dec 1 22:03:42 2025 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 08A25303C9F for ; Mon, 1 Dec 2025 10:28:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764584932; cv=none; b=sdVuVhwBOYpCqyEdNFPRB5xYyU1OfKqzV1WnaSC+B7j7eZqiB/kEOPzccqHyncGKMtQOeJwmt2sW9xVvWj5D7UwSxZo/EgnFsmfZo9StWfUHSGA4BRQxzj07oN1hbnTbhhHrWnMX5/nq7rrTdEx7Cgl6Jc1HG3g/RsfTw8RVsaU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764584932; c=relaxed/simple; bh=wWdXTf3PWwMEgee4xvskzWMHbq0aF33vkNM3dtLaIL8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HXLJlLnmckw3t8I638FU2WOXhAOOWL+aFqBnWTadqx0XYEUPuAUCdGKhvRNEP+ghEl6OQcDcPIqr17g5D8xWxFgC++lfelUlc6ynsjqS8+joSuY88qK43YDts0fcAAIggfcZEbXo016PJKKK2dwnsb6jErMa/9lJFAPtZFj3v50= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ALzwo/A/; arc=none smtp.client-ip=209.85.218.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ALzwo/A/" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-b735e278fa1so48270666b.0 for ; Mon, 01 Dec 2025 02:28:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764584929; x=1765189729; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FIzSKOpGNcki0F1mAxWBRjW2MjoQZLx/rLT/pH+h1/4=; b=ALzwo/A/1oONJ4pDgmgfJxKYk+/KbSMZ47exwPvEuMdzn+gIuxGLa8Ox0DkRG19zn5 IiavKdToIAEapOcOWnvFJEx5yt4uTtIC4sJwtyYC5PghA3GN3d3phCRrsZQOlAuoaX6f LJfsv2Pm/R8e9Jxk9lJYC6ofSg1jEI/xWK6KTyN5Btk9Z94yhoXmvN4PxI+TEvluSVW5 a6Kad/EHKguuzwH5bVWtPcMERw3vbst2wmHySu/2OBYZ50KeyFhwK4XvrMfRR8R+4uUJ 1irBPnCRVdLr/AmO8MInFJf977t4AyaerDIiZfJHOVC1POOCidwabNKpMlbRDEXswyxm Hy6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764584929; x=1765189729; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FIzSKOpGNcki0F1mAxWBRjW2MjoQZLx/rLT/pH+h1/4=; b=a9BuSXB67ybB27XpA//j+ef8ebRpUrSz3kg2SjUkWHM+cY4mb4ZA0rnQpUhsSq3PJT xj0GgKbccqpbZeKl/2nGh0NCpkORNBHKNHSNwvENqjCsR7rcfueQCkJuhGQGlaWDsWY+ 4BU8adWkOblHDekJx76iazXg1h7mWFFYDlKMvcuhR0epT+zhh6UxEAEoXleOm9ntKK2V KRLxsP6VkWNUMt4RxAmKylpevkbxc4BVI9YeqSPKm/ic9VZ/eK//O7SrtREyKJ9P3eT5 JmHR/gOZHCnGqXcwDVPzbyUJJbcFbxYE3nEOaOPoYIUhnhZwNwiRhmVV3ygSGu1vyEG1 SnIQ== X-Forwarded-Encrypted: i=1; AJvYcCWUucEh9CJK1PtnBrSRMMBC8lL4Bh9FaZnUmlyn9WXBWZUWJqkCwNat1vzbDlVUeYFXVVR7XnDdMS5I6rM=@vger.kernel.org X-Gm-Message-State: AOJu0Yw3UQnTPFmFVMNzEueGHaJTFiHBhfPybQRzq2AwH0FbCNaCZmxQ 1ufQSXf195sW94YDoWr8A0RRnZRrUF5vtdVTxYRpsHVcddUNUPRSY59d X-Gm-Gg: ASbGncsaCfpvI75nukjJwZ7ywiiqb3JwTrrIkFSYYelwhOK1SwHjjBLGtIFLRSPnCn9 oAZNJRWFEom5QzUZOP+lqcUXvLd53wvErtUG2idPANvBaTceDDTyvT83vZJQtt8YU4TEhCv8fso 4n9En79HD0XGdeNAmYeYCmxwcp7D7hhy2j7DTNv+BB/3T0ztdHaaShUrC/w6gW4+8ZL9Z1uVOl0 7rEci+50wX4s2qHbBYyLPgsCx5VT6F87GGnB6BFVOkYVAO/+OyhBXO+DcnAJnLUcrI4p8ysw0R6 4m8tq0wYm881xJ0TWSjCF+LWehCoQx8WwllpfluSk6Q0lrxG+ygx4HvYWMct5VsbDzifSgnTY7n DsXoC057wZFp1JSfTpW4zt0o6PFzRaJoEpSjaV/l0gp10qaXoGiHSM95rg9/7JnIvyI2gQffHoT Y5PPD8fOLYinrQiCcP/lQef9ve5OQYbQAEAMqD1cVGVZ2xcKAToLN3AAZcEUrmyz2C3Ak= X-Google-Smtp-Source: AGHT+IG/MbOrMoxloIMO1QZgU+rp0yNg3TPBATPkNx5UeifGWcK6FmSaWpWZL8LEhuVo0rEEYcPgGg== X-Received: by 2002:a17:906:f5a5:b0:b3f:f207:b748 with SMTP id a640c23a62f3a-b76c547167bmr2736230066b.10.1764584929180; Mon, 01 Dec 2025 02:28:49 -0800 (PST) Received: from localhost (dslb-002-205-018-238.002.205.pools.vodafone-ip.de. [2.205.18.238]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f5a3a4ebsm1178101966b.62.2025.12.01.02.28.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 02:28:48 -0800 (PST) From: Jonas Gorski To: Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , Florian Fainelli Cc: Vladimir Oltean , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH RFC/RFT net-next v2 2/5] net: dsa: deny multiple 8021q uppers on bridged ports for the same VLAN Date: Mon, 1 Dec 2025 11:28:14 +0100 Message-ID: <20251201102817.301552-3-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251201102817.301552-1-jonas.gorski@gmail.com> References: <20251201102817.301552-1-jonas.gorski@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When creating 8021q uppers on bridged ports on a vlan filtering bridge, we will configure the VLAN on the ports. For the dsa driver, there is no difference between a 8021q upper on bridged port and a port vlan configured within the bridge. For that reason, if we configure a second 8021q upper for the same VLAN on a different port of the bridge, we implicitly enable forwarding between these ports on that VLAN. This breaks the requirement for 8021q uppers for the VLAN to be consumed, so we need to reject these configurations. Reuse dsa_user_vlan_check_for_8021q_uppers() and change its argument to just the vlan id. Before: $ ip link add br0 type bridge vlan_filtering 1 $ ip link set swp1 master br0 $ ip link set swp2 master br0 $ ip link add swp1.100 link GbE1 type vlan id 100 $ ip link add swp2.100 link GbE2 type vlan id 100 $ After: $ ip link add br0 type bridge vlan_filtering 1 $ ip link set swp1 master br0 $ ip link set swp2 master br0 $ ip link add swp1.100 link GbE1 type vlan id 100 $ ip link add swp2.100 link GbE2 type vlan id 100 RTNETLINK answers: Resource busy Signed-off-by: Jonas Gorski --- v1 -> v2: * no changes net/dsa/user.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/net/dsa/user.c b/net/dsa/user.c index fa1fe0f1493a..e8c6452780b0 100644 --- a/net/dsa/user.c +++ b/net/dsa/user.c @@ -653,8 +653,7 @@ static int dsa_user_port_attr_set(struct net_device *de= v, const void *ctx, =20 /* Must be called under rcu_read_lock() */ static int -dsa_user_vlan_check_for_8021q_uppers(struct dsa_port *dp, - const struct switchdev_obj_port_vlan *vlan) +dsa_user_vlan_check_for_8021q_uppers(struct dsa_port *dp, u16 other_vid) { struct dsa_switch *ds =3D dp->ds; struct dsa_port *other_dp; @@ -674,7 +673,7 @@ dsa_user_vlan_check_for_8021q_uppers(struct dsa_port *d= p, continue; =20 vid =3D vlan_dev_vlan_id(upper_dev); - if (vid =3D=3D vlan->vid) + if (vid =3D=3D other_vid) return -EBUSY; } } @@ -702,7 +701,7 @@ static int dsa_user_vlan_add(struct net_device *dev, */ if (br_vlan_enabled(dsa_port_bridge_dev_get(dp))) { rcu_read_lock(); - err =3D dsa_user_vlan_check_for_8021q_uppers(dp, vlan); + err =3D dsa_user_vlan_check_for_8021q_uppers(dp, vlan->vid); rcu_read_unlock(); if (err) { NL_SET_ERR_MSG_MOD(extack, @@ -3185,6 +3184,16 @@ dsa_user_check_8021q_upper(struct net_device *dev, return notifier_from_errno(-EBUSY); } =20 + rcu_read_lock(); + err =3D dsa_user_vlan_check_for_8021q_uppers(dp, vid); + rcu_read_unlock(); + + if (err) { + NL_SET_ERR_MSG_MOD(extack, + "This VLAN already has an upper configured on a bridge port"); + return notifier_from_errno(err); + } + return NOTIFY_DONE; } =20 --=20 2.43.0