From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (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 0A7EE76034 for ; Mon, 14 Oct 2024 06:30:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728887417; cv=none; b=K95/Hn7NBxEfFzI6P1zPz3fUmxEIqbXbVEZR25RuoMV5o2wP1GHldYQZTTibsdYDSYDPuIyjAy96+JHCnAN4v71cbXa3e4pPs8UHRASGGvVSp+3qDMA2qZ1WKNc6/S25nHMS2l6rof0l4cj1GrkbUTMn6l1efwHQHAu0KWmQKyk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728887417; c=relaxed/simple; bh=FoZ1WDbxnUEwmUw8PHXl/qZbVhSzDOxKuZzVtGA2gb4=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=brA5nWoZDbcjf5/kTkc3H7vU84Qq1iLoZK93gARKD9I8zIhBnDEuFAXkELlB7+d8oItOvjV2KikdDVSU/LwgCswfyjBu7mDOx9075jqS/pXH5bfu2AcPAVOBC5T6m4QDQYoA/Jon93hrv1yFIi6mITPq0hYkpLlKFsxcDqf6jec= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=blackwall.org; spf=none smtp.mailfrom=blackwall.org; dkim=pass (2048-bit key) header.d=blackwall-org.20230601.gappssmtp.com header.i=@blackwall-org.20230601.gappssmtp.com header.b=UZRU4WTg; arc=none smtp.client-ip=209.85.208.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=blackwall.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=blackwall.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=blackwall-org.20230601.gappssmtp.com header.i=@blackwall-org.20230601.gappssmtp.com header.b="UZRU4WTg" Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5c96b2a11e7so1746950a12.3 for ; Sun, 13 Oct 2024 23:30:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=blackwall-org.20230601.gappssmtp.com; s=20230601; t=1728887414; x=1729492214; darn=lists.linux.dev; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=MJyb8Bc81miKQbLjUTUq/NpdzgBcv4rRrfPYMdCJ8WE=; b=UZRU4WTgV2J+gR/epLKtwz5VOxIiAtzqImlfEXMLedhdayVK0HD1G2Ioe11ZghMCL9 lDNSqwlTYy5vIQouPrGpB3Sedf9a/PWoQzy1+sN/wHW77LhbwrB3gnP6HBVaFEcHEMuq 6n23OB/OMQa9ZWWMyh6RVSTSpZm+t7nWbrtkL58Gi97ptGwHRdp8LZom1LJttR0S24VP 5sU83hrj9KWrHwR6vCuCCmziteOtXdblrWONpjXG8Ta3LbMx/Y+DP+wJLpfZIO5oMC71 KF7CQI07KWhz0sTAQirSuqg/aiUimeF3/tyzncDuGMwxw9cjyrVFClBbFPWgeui9NKlt cyUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728887414; x=1729492214; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MJyb8Bc81miKQbLjUTUq/NpdzgBcv4rRrfPYMdCJ8WE=; b=OH0cBZtH8jqY5Jl6RhZBd4ugtCBobg/UcZ404nKQpJYgae3Kf9nfk1I9ZpBe2R0/Sw qyuMtw6PAE/Pq/KeLrBRGS1/SdZb3fSP5CJJkXLx8YgwHhDiDZcG4G8jNdfNKfjgrFxu TK9mMejyDat4tESaHJwkKQmgdruT7Jb2yUoDxena1Elyl0ubImUNM9Rm9T1MXpkrlhYn 33+iyAPOBw7hH3B7KdaeJEi79o0dt5Mb7oI4Qf6a4mzmvXP1HoOOG8HdewiZrmRRnDMG ixVlIlFAZu9JmHDSSna2tci74adj9XPLKY9akLBxJMihTkJUiydhGeXy0Pfx8QCj/RYS 43Pg== X-Forwarded-Encrypted: i=1; AJvYcCUek/cbhwcGMXDGwTanr12xoAe5AsdXn1seY3fUlxNJzrzhU8o6Vu1WkyMC3AKBGhgLQQTwJx0=@lists.linux.dev X-Gm-Message-State: AOJu0Yygd863ENjKor/sJvrRa9e5GokT8dsUs9yeDFhmoEUeIZXqCXTi MJRMTzXyPbYY34Px0seZQwu+A7AxtffDlHdRy6IyBVBxXCjkoIKcXXjXYYF1ojc= X-Google-Smtp-Source: AGHT+IFIRcBU0W5yzI+xWDzvWEmzUxkcMqg4gm1s6fiPZ1qxh06hlXKcpE9+hLiy8wzVE/ywprsQkw== X-Received: by 2002:a05:6402:4409:b0:5c9:85ce:d9e3 with SMTP id 4fb4d7f45d1cf-5c985cedd76mr14840a12.16.1728887414349; Sun, 13 Oct 2024 23:30:14 -0700 (PDT) Received: from [192.168.0.245] ([62.73.69.208]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c93711bdbasm4517929a12.38.2024.10.13.23.30.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 13 Oct 2024 23:30:13 -0700 (PDT) Message-ID: <524ff98e-a7d2-4228-b1cf-4465b6ac1ce8@blackwall.org> Date: Mon, 14 Oct 2024 09:30:12 +0300 Precedence: bulk X-Mailing-List: bridge@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH RFC v1 net-next 05/12] bridge: br_fill_forward_path add port to port To: Eric Woudstra , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Pablo Neira Ayuso , Jozsef Kadlecsik , Roopa Prabhu , Matthias Brugger , AngeloGioacchino Del Regno , Jiri Pirko , Sebastian Andrzej Siewior , Lorenzo Bianconi , 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 References: <20241013185509.4430-1-ericwouds@gmail.com> <20241013185509.4430-6-ericwouds@gmail.com> Content-Language: en-US From: Nikolay Aleksandrov In-Reply-To: <20241013185509.4430-6-ericwouds@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 13/10/2024 21:55, Eric Woudstra wrote: > If handed a bridge port, use the bridge master to fill the forward path. > > Signed-off-by: Eric Woudstra > --- > net/bridge/br_device.c | 20 +++++++++++++++----- > 1 file changed, 15 insertions(+), 5 deletions(-) > > diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c > index 26b79feb385d..e242e091b4a6 100644 > --- a/net/bridge/br_device.c > +++ b/net/bridge/br_device.c > @@ -384,15 +384,25 @@ static int br_fill_forward_path(struct net_device_path_ctx *ctx, > struct net_device_path *path) > { > struct net_bridge_fdb_entry *f; > - struct net_bridge_port *dst; > + struct net_bridge_port *src, *dst; > + struct net_device *br_dev; reverse xmas tree order > struct net_bridge *br; > > - if (netif_is_bridge_port(ctx->dev)) > - return -1; > + if (netif_is_bridge_port(ctx->dev)) { > + br_dev = netdev_master_upper_dev_get_rcu((struct net_device *)ctx->dev); > + if (!br_dev) > + return -1; > + > + br = netdev_priv(br_dev); > > - br = netdev_priv(ctx->dev); > + src = br_port_get_rcu(ctx->dev); > > - br_vlan_fill_forward_path_pvid(br, ctx, path); > + br_vlan_fill_forward_path_pvid(br, src, ctx, path); > + } else { > + br = netdev_priv(ctx->dev); > + > + br_vlan_fill_forward_path_pvid(br, NULL, ctx, path); > + } > > f = br_fdb_find_rcu(br, ctx->daddr, path->bridge.vlan_id); > if (!f)