From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (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 1F6EB2144A1; Tue, 8 Apr 2025 14:28:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744122502; cv=none; b=PUEXQDv3M95b+f8P+UXOEIufxg4QfJY/zbQjOjTzm0VrZOVmGRwrjmPkVABHTtPuECAVK+r1H+ZkBPi3BU1GGs9edN//StHeovgYfSq5AL9eDgRRpIP3/9IeKzOEj8JYbt7P8Zrvy4mCea6mXv/C3/vUpXV3Go6S8e0ZIX3RRDQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744122502; c=relaxed/simple; bh=fKU1hIH5wftor3HXv18Lb+SFJQaConszUIcYBY/OipQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YejoKXRZaLZWwbG3de0iKD4JYgBe43M3OIG4JASSNwWMYH2J1cNJhUZ0I+2svbxbyQqUJWHmombwc4ioPlu0nJsOsZPLZAIMbR+H7Ww7LiSCEwt/pu0uZ3F5i3UQzYGVdGj8dydUbSm1LH0YauywHyKOOZwO/fhf9ZBek2XXN0U= 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=bl12romM; arc=none smtp.client-ip=209.85.208.41 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="bl12romM" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-5e8be1c6ff8so10454243a12.1; Tue, 08 Apr 2025 07:28:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744122499; x=1744727299; 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=UeDS1VbMS/qQi1KzpWyfGQyJc3UTd7ZY/9sMRmL0bYY=; b=bl12romMaorySzlVaBHQ6oD33lmeX89okVBtCd+gTSV66yvSQl+DTeBR0yQ/kXHacx ntuRGSrW5GRg0p+bMyDGdff1haSI7UFPsiPdjsvnJ/gEGajst+axDzYrG0ioReVAbG1C e5jwmRTc/khE1qpNbZ4KqLgqjXlBe3AjGiZwGBvUIegcPlOgQbTZoNErizcifDKNbIcs LWTlc+KhBY+OrrV6WtwiBvSLfDYsgk8chjxL1AZqRAYLjKWJkSMsy/hDV2M6+C2X9ttK 5iKL9b1dWwEVo3eSxordMza9pqC+vG3XWnkPKxVE2sXSkLSppactz3Ye9Lq5YfjYqpLV ohpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744122499; x=1744727299; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UeDS1VbMS/qQi1KzpWyfGQyJc3UTd7ZY/9sMRmL0bYY=; b=dY+MhPp3yFgRf2T7kt2ll6gOe4kr5wuaVNijTWQSwaTHoquv2Zu77BgAd2qFqMmck2 N08qQZIRbxzOzZ76hbxbzRFOFZvMkNZXHpNXJOH0M16+Etu+0z+Hc7vCvsuZ3iVNt+l9 KvBDFjxXEq/mnDAIc5R5NM/57VWFMvBhfPEhN7ReFWcJBHRlPd3AXvSySstaXKXOLfCp ihJET2ciyuT5rdbpJx5K/UEkjqgjV61KX5SX//sgQSPh1m56KA/dQ1Vq5kZbm3cUa+K5 IuB+v/nIHlQjow3Iw7Milf+jFTw9MIBo5LkDHzOByba5V9wgTEJyc5RBu7oarJGbS/4Z ydVA== X-Forwarded-Encrypted: i=1; AJvYcCXNJEjfBqw7dPvuLGtgEXX4jTRKsSgUWxo7jnd8z1q5M6gc60u0Y797Y9l8PPp4Rjph501YsOaeTdTR5z2qi4Q=@vger.kernel.org X-Gm-Message-State: AOJu0YyqbFjajDcx1ivZLiGmNXV4I8nkCv/xaxk4dHQDKETk5TCFTH4q emyWWghENeGUiqLX5J2xTY8rwZYp2Pp/5X2gwwIi82JVIRZZWqDJ X-Gm-Gg: ASbGnctc5RXtHK0qBHro6F2NNdT6o4QGIvd2vP6+bGOC2ONsBCvZliVhR2mSgYK14Gf vytQ9AyiS8jkA5uXl2QZGyDmt6nQDb6CF68CPRfVDBQWExIPpnL6Kg4w2IrkyDUkSt6vf1AvUMD kVuMtPi14QjqtHQpVUBz9fbYfPw5PiJbT/CxWZ+uIdUy8xomY1thAccBLVF/hRxIRZAMWVub0Bf Z0BPhgf8M9O7u+cxeaL1OVQlhIwY55mDmcsV7Hivt5o5Ek0L4skMRu4UX0ewpQiBo+Mm+mDXWah K8n3SdOhfpZx8cX7auCuO4fu4HnNBLLawANK5V6z9rrybVQ9WALM6bqouhC4IHk7Mro5f1q3AEg Q6z6pOt+/Bv++A2GDFvDDq4b3GoCfoAA7gKXplKsneLC+x0Fd72p31dxp2d8nTpc= X-Google-Smtp-Source: AGHT+IEl+CsynwKhg/C8laNeWOqrJPLM0lP2g3t+A5AzCwJFmzaSaDDJ8quEoE1W8x7sYVBQ93t3YQ== X-Received: by 2002:a05:6402:35d6:b0:5ed:3228:cfee with SMTP id 4fb4d7f45d1cf-5f0b5c3e38emr14099103a12.0.1744122499142; Tue, 08 Apr 2025 07:28:19 -0700 (PDT) Received: from localhost.localdomain (2001-1c00-020d-1300-1b1c-4449-176a-89ea.cable.dynamic.v6.ziggo.nl. [2001:1c00:20d:1300:1b1c:4449:176a:89ea]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f1549b3fd0sm2236164a12.35.2025.04.08.07.28.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 07:28:16 -0700 (PDT) From: Eric Woudstra To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrew Lunn , Pablo Neira Ayuso , Jozsef Kadlecsik , Nikolay Aleksandrov , Ido Schimmel , Kuniyuki Iwashima , Stanislav Fomichev , Ahmed Zaki , Alexander Lobakin Cc: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, bridge@lists.linux.dev, Eric Woudstra Subject: [PATCH v11 nf-next 1/6] bridge: Add filling forward path from port to port Date: Tue, 8 Apr 2025 16:27:57 +0200 Message-ID: <20250408142802.96101-2-ericwouds@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250408142802.96101-1-ericwouds@gmail.com> References: <20250408142802.96101-1-ericwouds@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit If a port is passed as argument instead of the master, then: At br_fill_forward_path(): find the master and use it to fill the forward path. At br_vlan_fill_forward_path_pvid(): lookup vlan group from port instead. Changed call to br_vlan_group() into br_vlan_group_rcu() while at it. Acked-by: Nikolay Aleksandrov Signed-off-by: Eric Woudstra --- net/bridge/br_device.c | 19 ++++++++++++++----- net/bridge/br_private.h | 2 ++ net/bridge/br_vlan.c | 6 +++++- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 80b75c2e229b..b4746a239b88 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -385,16 +385,25 @@ static int br_del_slave(struct net_device *dev, struct net_device *slave_dev) static int br_fill_forward_path(struct net_device_path_ctx *ctx, struct net_device_path *path) { + struct net_bridge_port *src, *dst; struct net_bridge_fdb_entry *f; - struct net_bridge_port *dst; struct net_bridge *br; - if (netif_is_bridge_port(ctx->dev)) - return -1; + if (netif_is_bridge_port(ctx->dev)) { + struct net_device *br_dev; + + br_dev = netdev_master_upper_dev_get_rcu((struct net_device *)ctx->dev); + if (!br_dev) + return -1; - br = netdev_priv(ctx->dev); + src = br_port_get_rcu(ctx->dev); + br = netdev_priv(br_dev); + } else { + src = NULL; + br = netdev_priv(ctx->dev); + } - br_vlan_fill_forward_path_pvid(br, ctx, path); + br_vlan_fill_forward_path_pvid(br, src, ctx, path); f = br_fdb_find_rcu(br, ctx->daddr, path->bridge.vlan_id); if (!f) diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index c3395320a4f3..759e7685de9b 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -1584,6 +1584,7 @@ bool br_vlan_can_enter_range(const struct net_bridge_vlan *v_curr, const struct net_bridge_vlan *range_end); void br_vlan_fill_forward_path_pvid(struct net_bridge *br, + struct net_bridge_port *p, struct net_device_path_ctx *ctx, struct net_device_path *path); int br_vlan_fill_forward_path_mode(struct net_bridge *br, @@ -1753,6 +1754,7 @@ static inline int nbp_get_num_vlan_infos(struct net_bridge_port *p, } static inline void br_vlan_fill_forward_path_pvid(struct net_bridge *br, + struct net_bridge_port *p, struct net_device_path_ctx *ctx, struct net_device_path *path) { diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index 0f714df92118..114d47d5f90f 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -1446,6 +1446,7 @@ int br_vlan_get_pvid_rcu(const struct net_device *dev, u16 *p_pvid) EXPORT_SYMBOL_GPL(br_vlan_get_pvid_rcu); void br_vlan_fill_forward_path_pvid(struct net_bridge *br, + struct net_bridge_port *p, struct net_device_path_ctx *ctx, struct net_device_path *path) { @@ -1458,7 +1459,10 @@ void br_vlan_fill_forward_path_pvid(struct net_bridge *br, if (!br_opt_get(br, BROPT_VLAN_ENABLED)) return; - vg = br_vlan_group(br); + if (p) + vg = nbp_vlan_group_rcu(p); + else + vg = br_vlan_group_rcu(br); if (idx >= 0 && ctx->vlan[idx].proto == br->vlan_proto) { -- 2.47.1