From patchwork Tue Dec 10 09:44:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Woudstra X-Patchwork-Id: 13901158 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (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 BD8C7212D93; Tue, 10 Dec 2024 09:46:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733823981; cv=none; b=KkQzdr5w9DklLnY9McecsMbpa1uIWs//bu+U5gqjfhz0lU8WicNL1Q8L3blggWRcWIsDxKazst4GfVG1k7NW7MCnm78KRecQ7StmQ0tK3U/3NzdgC8dw02cJpX66Eexi5TkyF8diWDWZcf8eMd/9kJ2hu85rWgyvALH+t0w/SxA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733823981; c=relaxed/simple; bh=8FDg8XDgxLrQXtngh8SnXV87g84Jre2hDTtrxRNL4i8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xwf0txwKE/srst60oilS2zV+fxLgE4fy0FmG02k3fPM42NRKkpX43YOr7GaKUAOx9RI8KSz77YiPGyrjRMj6Eg9gaIXRFbx9k91LNBbVHNfj7mPedvdhPfcVPioQsNnKHS0Ma54otwsohw2SalK8XqyQU8uEbUJnKgBFyp3+kwE= 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=XIBzcml8; arc=none smtp.client-ip=209.85.218.50 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="XIBzcml8" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-aa67333f7d2so369349266b.0; Tue, 10 Dec 2024 01:46:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733823978; x=1734428778; 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=uFNROVzPiBTZyVVUJmIxiKujmgCuTGia69D/U8CcyUs=; b=XIBzcml8NsTi+aYDbssj33oTe9pqQDJKdbFRPgD//eJOVpOgH40sHApS51RYhzi/IP nhKtZKgU8Mue0e+ytdzdftkQ+p+yFT5Q34a25XOIhW+lq5Pllb1CKuv485aDOrqa7gqO T8nrfn4ahOv0llUFLnA4rCEfeVPYeWVEzLLscUoof0etosVntxV9E9B3OfBUYXBdI6eh mZVXpH4i6Qpi1YH9oF2UaQYkgv2/fcaktzuJqpgsHhHV2y7MuxzAcr7YStGAvykh7QWQ LT2syv+AGKzAGzidnbaiLZmv1uBcLxjggeSbX+eBmCIJ/ZxA0AYJK+x4epwg2HzUTUy3 ocfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733823978; x=1734428778; 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=uFNROVzPiBTZyVVUJmIxiKujmgCuTGia69D/U8CcyUs=; b=bORWXGPSPXIquvq23sShmMRZSeSsZ5N5Ggw332eDwK4d8/2tbdERHRbXoQ2IVPetmG 0orKzfbU1pbfi2cmgC2NSf/YTHamn8S7Fd+W84t0NIg7u5pnv3YjAS+rQ3oLx8/pXRB+ shRT+rEMmOYBbLF4bPdpfKOWgtoBLP9oaIyxuhDgH81+BhxUw0od7OUCozwo22JSuFxE mGlUCprdaJuNLAbTLhqNSqhztkz2uRlI/QU74CVQIlAaL1wxwh8Albj9KaKyWWWU+EWH +u//Q2sijFrSze3Rp0vk8h/xVoeMuTmQQwVIyB5N6LJMkGO4H8KKj+K9PSSWRu1prpSU WqTA== X-Forwarded-Encrypted: i=1; AJvYcCUQzeC91cLrQRkbEA4ZNT8JT03c4+BZDYMBM3NxBMrZnKhYJBZuqVOOItfvXaBpuqRlMY6i4G19k23iHgBuPpfU@vger.kernel.org, AJvYcCXxNEbBuGYoj/uMFdfSK4q3KtBuJcW4VjY61wTq3OxWWU1Zv0k5jFv1pGt3L9RLQQb+w31Kz9LXSZEG1JM=@vger.kernel.org X-Gm-Message-State: AOJu0YzVtTXY2Wnjxi0vyD3k+wK7d+YZh8F3VFbNHlQhiI+Lghp4ulrg /DF3yE227yql6JinAumfzCF+GdYElTNl2/vv9mPIZp4JT6Zshu8s X-Gm-Gg: ASbGncuppZ1Hir9YBcb8TWM68at2nvcMZbX2yCQy67WHyxaxdU747aQ02Ds8ORbdpd9 roQVOpRnoLmsqW0i3RJ7bu8RZF/fE/zLcfuu+bguIPTlGWJzVYCqoV4a2+WxJgLmjQxrAViH9tN 43Sv4UrUOtYRUw3dfLvp3PqmjTHpXqUx81EU1/yHiuC0P/06BfVtqnwhzmcAiuOTgds//bMLtT8 ydYqJ82+hEXF1JRTlif+4goUhfhaH90C5Zliy924dZvT/Z3xBZoB+wH8sxSlH78J1QXVC1O3GBj kd12eFG4p/EapsLY7/K8a8hi1rAq4bO24ZOeNV3ZJ0ZW9VXQPmUT0J2EzZMRzfssKgblJSw= X-Google-Smtp-Source: AGHT+IFck8FUe0I7ZA5vL7ViiiUaUyfpC35SDzrKqWUIlH6m1Fs13klQNmleCULSsIKK4sGjlxJe1g== X-Received: by 2002:a17:906:3292:b0:aa6:967c:9aaf with SMTP id a640c23a62f3a-aa69ce44445mr361784266b.50.1733823977712; Tue, 10 Dec 2024 01:46:17 -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 4fb4d7f45d1cf-5d14b609e56sm7313936a12.40.2024.12.10.01.46.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2024 01:46:17 -0800 (PST) From: Eric Woudstra To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrew Lunn , Pablo Neira Ayuso , Jozsef Kadlecsik , Jiri Pirko , Ivan Vecera , Roopa Prabhu , Nikolay Aleksandrov , Matthias Brugger , AngeloGioacchino Del Regno , David Ahern , 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 RFC v3 net-next 04/13] bridge: Add filling forward path from port to port Date: Tue, 10 Dec 2024 10:44:52 +0100 Message-ID: <20241210094501.3069-5-ericwouds@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241210094501.3069-1-ericwouds@gmail.com> References: <20241210094501.3069-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 X-Patchwork-State: RFC 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 9853cfbb9d14..046d7b04771f 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -1581,6 +1581,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, @@ -1750,6 +1751,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 89f51ea4cabe..2ea1e2ff4676 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) {