Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     Florian Fainelli <f.fainelli@gmail.com>
CC:     "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        Andrew Lunn <andrew@lunn.ch>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        open list <linux-kernel@vger.kernel.org>,
        "olteanv@gmail.com" <olteanv@gmail.com>
Subject: Re: [PATCH net-next 4/4] net: dsa: Utilize __vlan_find_dev_deep_rcu()
Thread-Topic: [PATCH net-next 4/4] net: dsa: Utilize
 __vlan_find_dev_deep_rcu()
Thread-Index: AQHWmGW4wzwMq4u/PEuSLyFs6DyMXKmD/xSA
Date:   Fri, 2 Oct 2020 08:42:20 +0000
Message-ID: <20201002084219.w54cgkivclwzuy44@skbuf>
References: <20201002024215.660240-1-f.fainelli@gmail.com>
 <20201002024215.660240-5-f.fainelli@gmail.com>
In-Reply-To: <20201002024215.660240-5-f.fainelli@gmail.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-ID: <50818BC761B7E745A3FFF2716E1EF5A3@eurprd04.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: fba67a77-770f-481b-23f1-08d866af1362
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Oct 2020 08:42:20.2094
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: kkAX6cHPSy0bQWnemeaW9wMsn4s4JVD7fLgwnd3GcLrkZeRkdT4uCUnt6fCVK9OAD1qwFFy0YWoNP5OsXbCK5w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2800
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Oct 01, 2020 at 07:42:15PM -0700, Florian Fainelli wrote:
> Now that we are guaranteed that dsa_untag_bridge_pvid() is called after
> eth_type_trans() we can utilize __vlan_find_dev_deep_rcu() which will
> take care of finding an 802.1Q upper on top of a bridge master.
>=20
> A common use case, prior to 12a1526d067 ("net: dsa: untag the bridge
> pvid from rx skbs") was to configure a bridge 802.1Q upper like this:
>=20
> ip link add name br0 type bridge vlan_filtering 0
> ip link add link br0 name br0.1 type vlan id 1
>=20
> in order to pop the default_pvid VLAN tag.
>=20
> With this change we restore that behavior while still allowing the DSA
> receive path to automatically pop the VLAN tag.
>=20
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---

Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>

>  net/dsa/dsa_priv.h | 11 +++--------
>  1 file changed, 3 insertions(+), 8 deletions(-)
>=20
> diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
> index d6ce8c2a2590..12998bf04e55 100644
> --- a/net/dsa/dsa_priv.h
> +++ b/net/dsa/dsa_priv.h
> @@ -204,7 +204,6 @@ static inline struct sk_buff *dsa_untag_bridge_pvid(s=
truct sk_buff *skb)
>  	struct net_device *br =3D dp->bridge_dev;
>  	struct net_device *dev =3D skb->dev;
>  	struct net_device *upper_dev;
> -	struct list_head *iter;
>  	u16 vid, pvid, proto;
>  	int err;
> =20
> @@ -246,13 +245,9 @@ static inline struct sk_buff *dsa_untag_bridge_pvid(=
struct sk_buff *skb)
>  	 * supports because vlan_filtering is 0. In that case, we should
>  	 * definitely keep the tag, to make sure it keeps working.
>  	 */
> -	netdev_for_each_upper_dev_rcu(dev, upper_dev, iter) {
> -		if (!is_vlan_dev(upper_dev))
> -			continue;
> -
> -		if (vid =3D=3D vlan_dev_vlan_id(upper_dev))
> -			return skb;
> -	}
> +	upper_dev =3D __vlan_find_dev_deep_rcu(br, htons(proto), vid);
> +	if (upper_dev)
> +		return skb;
> =20
>  	__vlan_hwaccel_clear_tag(skb);
> =20
> --=20
> 2.25.1
> =