From patchwork Tue Feb 4 19:49:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Woudstra X-Patchwork-Id: 13959727 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) (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 6C36C21ADB9; Tue, 4 Feb 2025 19:49:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738698601; cv=none; b=Jw/hd1o0a7PwW+tKLEoRu1k7vuO+y0/24XLZKcN1inv9HW0jY/i22MZ6TkkJVamF/qR4c42fJccWYtjw1897PWXJzdVXLma7+29V9l0WYPuopOTI7y4RQWmwW05gtLkzfSopDzygurqf9lkuh9WgWM6UcdnUsZ+opbUe+1hVC5A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738698601; c=relaxed/simple; bh=7hjVfCkns+vqQFnGF8Q7jWozdhbMtX7RB8eHdAqvruU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YOb+wA1o51lEOi8ATRUEV1yJ8Epned6qad/IPD6apeF2f6dKpHPvHsK3RSEjJtwRI3B5AqQ6FYLlouEM3lphnUD+wT10F0MGIQgLEUsRKmc1dHSn55DTfuWNVLI4+i62K4f+9sckn3Q3qWDPjhRQzArtGDzFiydXb/biGrM2c9k= 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=XrN15Fe7; arc=none smtp.client-ip=209.85.208.45 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="XrN15Fe7" Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-5dcdb56c9d3so164728a12.0; Tue, 04 Feb 2025 11:49:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738698598; x=1739303398; 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=nsPCevqpueBx6GSFI4rD1h7XgDDvXf62bnEByGQFocw=; b=XrN15Fe75cGf6RaTyO+9GoRkdSz2HqqzZ/3DGfYBb+G2y/pnye/J6RKf8QhkI5DpZD zj2Q/lwXvQ2UAqHAaQsl59bc4fubcZsgTK5BTIyCSWEdJL2BOcIil8N/0P20JPmzzROU eVpQTAFTTPCYvBFyi2viahuw8nc6s0z4GX6jM/FR2nfrg5Hf8LPwJ8Jm7cvvhV6szmUE DLhuKMeXU7K6kYKjbPSESvTuVCMlKFVXN96W4yML4kWwKt+HvllnbT5+MXqZFbdib5uv donrNvYjJdTcNcVN3vAlp46cx4mKpMQ20L4dNacnfTJKiuCJp3i3peR60Zk1mHFD5J4s NG7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738698598; x=1739303398; 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=nsPCevqpueBx6GSFI4rD1h7XgDDvXf62bnEByGQFocw=; b=P7T2NyeXLpbIGuCSa/imfTwKXjQmERxqJnZFF+4u0rJPGDDP1qeyy6wh31ig9TG8wc EFiP9PozW2Ozkh95aJciAxjaIeRnjlvFK28dyljRq0BIcA5/TbwPUdI7FhhOHxRqjZuZ brkl+UW7xKkay+o47jrD4r6YOEvT+ShcgE1Wl4fleZkx1NC7RSNMl3xcGOQMBlu8Y5qs wkNVS00MxWyMpWFF1RsZVNAb+9ztWmB9FFKIpSdSZRu++prOMbz8+Kiujm8Zfzjn4bak jmTZ5jKBxjHXXsXkOibL0UgKDQ4oz46FzbIKx5fnqbSLduJ7vGKgnWp9PVYw2sgJU0bo IkGQ== X-Forwarded-Encrypted: i=1; AJvYcCUQ+y70DxCQFJxRyQ9FmAay4VA8ift3IQUdQRCqTOLPim4caYd/HWZ7FaKNssIVHqVBlQYlfyLj8VzA+ec=@vger.kernel.org, AJvYcCX4oKqEiPDILu0vG0oE0MMervFEQcw+4crkc3uNVi+N3NImuvChSzMPL3G3LtDSmd6wYNLgTQiVMKXJeuw2HwgM@vger.kernel.org X-Gm-Message-State: AOJu0Yxns3ZdO9opcDhYlgF4t2CobGNgCXUV6PXvFN4rZunPkHyrRjrH Tn5CfnhunN+yF9Sxkl5jTnuh7ksmxhPRTlr6PtQwiDhj0/KvPqLD X-Gm-Gg: ASbGncuWI4q+trfVWuIWx9/0WC8ONNU0fBlvNOPmeCVHdJhw1x+ULuEKlaDbv0qmFhW 2Nqu0BUbVz8Iq1U4XQKxSRLKqTUAFsRxCX8MBg1mKAKaegC/IGZOMH55NxMB7n73kz+zCITy9gK 4DmzsDKEqAidUDlyEm8Pg3FAz3uko01M26jGV++SrIWlJFBKaW+DiKATmqRa133v+3foKqppyTE nH5znZTsOAsSnWWYxN1C+SF2DxEWAb/QLlBjeRL1z5NZx4qztilmAbMEtpWo29g3dNSOOPS4q1K mjXjgJvNmNxTV+hbD+wAfyPrEvm2EGAWtjv6xAubf9X85Y+GZq8STZ7LR8IJO3yoX+YLYnTQwsS qpqXX2YSg/oMjYN0zB+/7FPnnUrW0yUeH X-Google-Smtp-Source: AGHT+IGsvAO6yB125nXkOzzJQ5/yZRvVQfJ0zTUKb3SHTgAx94hlT9r32V6YfG08Gq0AwS0+7SB3aw== X-Received: by 2002:a05:6402:42ca:b0:5dc:caab:9447 with SMTP id 4fb4d7f45d1cf-5dcdb7297ffmr798822a12.18.1738698597522; Tue, 04 Feb 2025 11:49:57 -0800 (PST) Received: from corebook.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 a640c23a62f3a-ab6e4a5635bsm964684466b.164.2025.02.04.11.49.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 11:49:57 -0800 (PST) From: Eric Woudstra To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Pablo Neira Ayuso , Jozsef Kadlecsik , Jiri Pirko , Ivan Vecera , Roopa Prabhu , Nikolay Aleksandrov , Matthias Brugger , AngeloGioacchino Del Regno , Kuniyuki Iwashima , Sebastian Andrzej Siewior , Lorenzo Bianconi , Joe Damato , Alexander Lobakin , Vladimir Oltean , "Frank Wunderlich" , Daniel Golle Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, bridge@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Eric Woudstra Subject: [PATCH v5 net-next 05/14] bridge: Add filling forward path from port to port Date: Tue, 4 Feb 2025 20:49:12 +0100 Message-ID: <20250204194921.46692-6-ericwouds@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250204194921.46692-1-ericwouds@gmail.com> References: <20250204194921.46692-1-ericwouds@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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. 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 0ab4613aa07a..c7646afc8b96 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -383,16 +383,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 1054b8a88edc..a0b950390a16 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 d9a69ec9affe..07dae3655c26 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -1441,6 +1441,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) { @@ -1453,7 +1454,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(p); + else + vg = br_vlan_group(br); if (idx >= 0 && ctx->vlan[idx].proto == br->vlan_proto) {