From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 26CE913B7A3 for ; Mon, 14 Oct 2024 06:22:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728886934; cv=none; b=JJp1je11MEstupnZKGZzvL+hZMzWZBW4ypDgkfaYdenWHK/ngru/XzzGMvyHgWbh4GHMGYKDSIapxltSYY14FUudGTnfQH2Of33j9MszS/SrERCAIxaLwj+MJSGvujPhkMDaK048gOYMaCiicwMcA2BBDgW/a9dtUnyvuBx7X/w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728886934; c=relaxed/simple; bh=nK0LzvmwgliCXQsEMTkAl3C+q8LITusoWA60LSfPQtg=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=A7gUb/xUeijVLgAjyjOqqAzlVEPmIoexircKwssXrkwYfC0ZJOqsmjxDmYve0/egSrvcnG1gkEizRcW6OJT06FuZfyMK7O2qXP+V5oV/q903YG0sX9EIQHjUHZJqchO0hYu7ygjbeNAiYcc652wUlaUrZLwyNq1OFox84W1GBoU= 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=Lu53X58m; arc=none smtp.client-ip=209.85.218.43 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="Lu53X58m" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-a9a01810fffso140293666b.3 for ; Sun, 13 Oct 2024 23:22:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=blackwall-org.20230601.gappssmtp.com; s=20230601; t=1728886929; x=1729491729; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=LGGL1J/PYpfVQt9U8v/NWEtE6h5sWLzedGtSBPsspeY=; b=Lu53X58m46y3w3sJshuPm4ErLGZ/OgmFDgU0I6ueJA7ghqKIpenvHqkdJ4UpUNxMrf lq1ymgVg7qAsZANM9vb4X7necP8z2YktVkuPrrAyP9frKOTryjJ9vcnmjFUyK2OwyUbD FUmQzry/8UryZmvurgw+IAlFrEfKqBNw+nEqr6cCjikYL7Rqxfm7gbrP+cHykhRsFcN2 O+zTbB+jWckfWjlPTOTE/bBIMXHOf2dLhjOu6UVbeW/lIeiFSPYeG5Q1JKkS8BU5+7L3 qKim4icYU1ctpvqX+4eUDTEfgRmhuNcRGOMDp0ikHPkqsbweqBnauoBPFAn+lC927v5l a16g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728886929; x=1729491729; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LGGL1J/PYpfVQt9U8v/NWEtE6h5sWLzedGtSBPsspeY=; b=X0Tup+GE1MdwmnlkdumB6pX9Ac17iDJ3cCBXoYPN1mtqOfE+3umPeLc+hnUFFlCNlJ +wACHqEa/VvPtrwpTOMclX0NZJWgbN7wECVu12iEip6m+vw99MLbUPjySReFMZXGbgk1 DVIC6usC4g1A94itvGBoXfFLMB/Y2W0u1TNAcS3TaDHs+dVvYQOK5QutaA7RzdDemaa3 YmtQTuuuJl6RrarOWXzEbxaC3nMsrtG5H6/5S7GwJrRh8N7tZ4W/uMHbDeRV9HG5Q5jJ BKRsSE+tvcmi2iNsNYXWUB6XAFczS9wPgjcWJm6WU//cfV56eK9QeXiXwIUHJu/s30hT cmUg== X-Gm-Message-State: AOJu0YxsbfmxgULkSmAXHdO+cxqMHW3nGG8dxa/c2ZlRUlNrHLeb7RR7 IuRAnJ6/LFKVIgH+LmgtLhBtiX2TRVJHC+2lUj2S4xjuEEGPLbiuN9UAyXUpfYE= X-Google-Smtp-Source: AGHT+IHVur/aV2xDIG/Y4Ciomygy3p/dpFh9piHKROvSG20M9nxSRBAcVlry/ihfS/LPn7d/B70JrQ== X-Received: by 2002:a17:907:7296:b0:a91:158f:6693 with SMTP id a640c23a62f3a-a99e39cfc56mr689668266b.9.1728886929350; Sun, 13 Oct 2024 23:22:09 -0700 (PDT) Received: from [192.168.0.245] ([62.73.69.208]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a99f085fb70sm264862666b.7.2024.10.13.23.22.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 13 Oct 2024 23:22:08 -0700 (PDT) Message-ID: <6209405e-7100-43f9-b415-3be8fbcc6352@blackwall.org> Date: Mon, 14 Oct 2024 09:22:07 +0300 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH RFC v1 net-next 11/12] bridge: br_vlan_fill_forward_path_mode no _UNTAG_HW for dsa From: Nikolay Aleksandrov 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-12-ericwouds@gmail.com> <281cce27-c832-41c8-87d0-fbac05b8e802@blackwall.org> Content-Language: en-US In-Reply-To: <281cce27-c832-41c8-87d0-fbac05b8e802@blackwall.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 14/10/2024 09:18, Nikolay Aleksandrov wrote: > On 13/10/2024 21:55, Eric Woudstra wrote: >> In network setup as below: >> >> fastpath bypass >> .----------------------------------------. >> / \ >> | IP - forwarding | >> | / \ v >> | / wan ... >> | / >> | | >> | | >> | brlan.1 >> | | >> | +-------------------------------+ >> | | vlan 1 | >> | | | >> | | brlan (vlan-filtering) | >> | | +---------------+ >> | | | DSA-SWITCH | >> | | vlan 1 | | >> | | to | | >> | | untagged 1 vlan 1 | >> | +---------------+---------------+ >> . / \ >> ----->wlan1 lan0 >> . . >> . ^ >> ^ vlan 1 tagged packets >> untagged packets >> >> Now that DEV_PATH_MTK_WDMA is added to nft_dev_path_info() the forward >> path is filled also when ending with the mediatek wlan1, info.indev not >> NULL now in nft_dev_forward_path(). This results in a direct transmit >> instead of a neighbor transmit. This is how it should be, But this fails. >> >> br_vlan_fill_forward_path_mode() sets DEV_PATH_BR_VLAN_UNTAG_HW when >> filling in from brlan.1 towards wlan1. But it should be set to >> DEV_PATH_BR_VLAN_UNTAG in this case. Using BR_VLFLAG_ADDED_BY_SWITCHDEV >> is not correct. The dsa switchdev adds it as a foreign port. >> >> Use BR_VLFLAG_TAGGING_BY_SWITCHDEV to make sure DEV_PATH_BR_VLAN_UNTAG is >> set when there is a dsa-switch inside the bridge. >> >> Signed-off-by: Eric Woudstra >> --- >> net/bridge/br_private.h | 1 + >> net/bridge/br_vlan.c | 18 +++++++++++++++++- >> 2 files changed, 18 insertions(+), 1 deletion(-) >> >> diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h >> index 8da7798f9368..7d427214cc7c 100644 >> --- a/net/bridge/br_private.h >> +++ b/net/bridge/br_private.h >> @@ -180,6 +180,7 @@ enum { >> BR_VLFLAG_MCAST_ENABLED = BIT(2), >> BR_VLFLAG_GLOBAL_MCAST_ENABLED = BIT(3), >> BR_VLFLAG_NEIGH_SUPPRESS_ENABLED = BIT(4), >> + BR_VLFLAG_TAGGING_BY_SWITCHDEV = BIT(5), >> }; >> >> /** >> diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c >> index 1830d7d617cd..b7877724b969 100644 >> --- a/net/bridge/br_vlan.c >> +++ b/net/bridge/br_vlan.c >> @@ -3,6 +3,7 @@ >> #include >> #include >> #include >> +#include >> #include >> >> #include "br_private.h" >> @@ -100,6 +101,19 @@ static void __vlan_flags_commit(struct net_bridge_vlan *v, u16 flags) >> __vlan_flags_update(v, flags, true); >> } >> >> +static inline bool br_vlan_tagging_by_switchdev(struct net_bridge *br) > > no inline in .c files and also constify br > >> +{ >> +#if IS_ENABLED(CONFIG_NET_DSA) >> + struct net_bridge_port *p; >> + >> + list_for_each_entry(p, &br->port_list, list) { >> + if (dsa_user_dev_check(p->dev)) > > I don't think this can change at runtime, so please keep a counter in > the bridge and don't walk the port list on every vlan add. > you can use an internal bridge opt (check br_private.h) with a private opt that's set when such device is added as a port, no need for a full counter obviously >> + return false; >> + } >> +#endif >> + return true; >> +} >> + >> static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br, >> struct net_bridge_vlan *v, u16 flags, >> struct netlink_ext_ack *extack) >> @@ -113,6 +127,8 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br, >> if (err == -EOPNOTSUPP) >> return vlan_vid_add(dev, br->vlan_proto, v->vid); >> v->priv_flags |= BR_VLFLAG_ADDED_BY_SWITCHDEV; >> + if (br_vlan_tagging_by_switchdev(br)) >> + v->priv_flags |= BR_VLFLAG_TAGGING_BY_SWITCHDEV; >> return err; >> } >> >> @@ -1491,7 +1507,7 @@ int br_vlan_fill_forward_path_mode(struct net_bridge *br, >> >> if (path->bridge.vlan_mode == DEV_PATH_BR_VLAN_TAG) >> path->bridge.vlan_mode = DEV_PATH_BR_VLAN_KEEP; >> - else if (v->priv_flags & BR_VLFLAG_ADDED_BY_SWITCHDEV) >> + else if (v->priv_flags & BR_VLFLAG_TAGGING_BY_SWITCHDEV) >> path->bridge.vlan_mode = DEV_PATH_BR_VLAN_UNTAG_HW; >> else >> path->bridge.vlan_mode = DEV_PATH_BR_VLAN_UNTAG; >