From patchwork Tue Feb 25 20:16:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Woudstra X-Patchwork-Id: 13990746 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (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 6C852211A20; Tue, 25 Feb 2025 20:16:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740514596; cv=none; b=Th+jPc78TvSz3yzQVURNgrQdFKL7bvdfehBNcheraoGJyb2LtiiOe5GXpZXcE6wraao/fhfJGrw+34DIH2FUzaJH/d51ygX/XAs33PhvKxmcUcr38Gz7GqPNNEfb81mdBvEVmMMxhKNBH1CSyy1p+ytJs4JASLFnRGH+2CQtt8s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740514596; c=relaxed/simple; bh=sq5lC5Lgg2lgUcbphMYliAhopUKVFEXA0PcFARtTXys=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O8yxNkESyTyIU7AHD93u9FDL0RM+RL99gY6+HW1PNcVe8D8CkxyXTIcXOZw+0OIZ7p8+v5D+MwemHAE3u/v8CAAIQdJu+tx16vREX7wW8Y8GHkYTwBC1QXQFhHavXCuV78zL8QQjesSefgxeVXK5yTOnvjA+EMpOPlSuWz+QwYE= 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=a7LniAQI; arc=none smtp.client-ip=209.85.218.51 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="a7LniAQI" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-abbec6a0bfeso943884466b.2; Tue, 25 Feb 2025 12:16:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740514592; x=1741119392; 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=glD7coNk2GO9/l1adKLN+uo1Xfh2D3YWudU7CjoMsSA=; b=a7LniAQIIErUHfo75Vh2GH0GOCy+lZe73c/HsxGDO6TOTUegqzm2cqU2BOwN3UwbU1 lVJbTnlGD+edpal7mO8rC5nICggD2m9sfrTMgWG2pxqnsRc8OaY+6GpaKAVk2EreH33N K0pHZLOSMizQuTHauxOz91nMkGEC41Hg+MLGCkN86UXma/0f1rTG324uzcbhKFQ88IZx cCpDCsFbQG1bM1OBalMByWLtU49Z2tIIDyLb+6cKQrPsf3yKijE81KeMajJn4rcQqDkE paQpfYeiG7yormEb2P6cC0ciyXOJxFAcIeF/UP5jkKT95odXbmiPF/nTUjX97jdkdGbp Q5ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740514592; x=1741119392; 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=glD7coNk2GO9/l1adKLN+uo1Xfh2D3YWudU7CjoMsSA=; b=C5fz6AEfiCNJbQ4vB/BzB88L54Ysu3dJOlhQPZVdlmeyef9qTMIo4t09aCpy2wOaFH B4S1OyBWgUznObQePD5yMr7dSnG+tEM0yADPLwvKM3nJX2UvOqUNW8EKHnR9RzqM2cKc dk+3R//RCFcypFDpzDnLZZjvTsK/3qPJNGrO9WdDslzt4QBwYR4KBu6ZZZWTS9UJHi7a QrIZt/Jpq4kgOrb1l8mkbpvi3kwsXEWuxF0Jy7i8+WImR6pOo860LaIZhVW2dOs/sUkP JMjyxvB2nBbQyapaVP7pu0LhtMnZ7TJQ3gMCIohJbdQ4/lqmPN24y1Fd1BQ2BvypCw+n ++6g== X-Forwarded-Encrypted: i=1; AJvYcCW4eQsFfnyb25QwHwiiFmZLa6Us6h+39W45OahFIvvlzjTLqwhhpHvKjVh5NT8fTjnGa+wea7GCm+XJXfk=@vger.kernel.org, AJvYcCXDp5aP6lQ41I+laz3YckvRZ+b+ggJMxCP48pMzvuHrwqzzhASqQ3FrBNltPqMiorC/GfQrPUDxbiF6NzaJinNw@vger.kernel.org X-Gm-Message-State: AOJu0YxJhONtj3XU1a8kTf1MtV6terqjEmZK/1V+lqCDOJ1lz58Nvd96 cvAbMcwxknYAHpyR8RaiFfYcTantr6d4BJ2yXn2k4v24YX5x8pzU X-Gm-Gg: ASbGncvjL7w2D2CyB0P8gfxZk8d4Gy7XSaYQkZDDqtLR0rfSdeURyAIY/mboU3qGgi/ cs/Pgr1XIMU5V8q+XgD9BPQZRO0A+wVOTBQprF5NcASXnjIa+14GLR8GJkTWdkRpmr+icd+YPgH Tft4YHkQJuNoilnwIO/+1z25Sb8JcGaixDg3cZBMX5dvclkxTt+ZVPU7TLPT/sm3HfsdYZ9pkPW d4fK1H5w9L7Gkw1Vu3fTIaxkudaRkABSGB9Q72WitSTWgb5HsfuZulZqwugd44tkFioW1AzVLCF mA2Ty2zViVBPrlI0YbJPfR98Nq5TDsbkQ9ZEMxhm0P9PpTbb/ooal7n7cSRJeBPM7YnFV2Qy8nS MJIItqZ6GAGw/Q22F6zRhiBOW2GinEtd5EGLzUA6i2yk= X-Google-Smtp-Source: AGHT+IEjvw2ycbh6O1a2xVehSVYNCqn405b5ejvhuSsYBKJJvxe4gk715VpktRuefN5csP8lyNYY2Q== X-Received: by 2002:a17:907:3da7:b0:ab7:98e8:dcd4 with SMTP id a640c23a62f3a-abc09a097c7mr1694058566b.20.1740514591509; Tue, 25 Feb 2025 12:16:31 -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-abed201218fsm194319666b.104.2025.02.25.12.16.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 12:16:31 -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 , 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 v7 net-next 05/14] bridge: Add filling forward path from port to port Date: Tue, 25 Feb 2025 21:16:07 +0100 Message-ID: <20250225201616.21114-6-ericwouds@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250225201616.21114-1-ericwouds@gmail.com> References: <20250225201616.21114-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. 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 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..a18c7da12ebd 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_rcu(p); + else + vg = br_vlan_group_rcu(br); if (idx >= 0 && ctx->vlan[idx].proto == br->vlan_proto) {