From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7EB5EC43461 for ; Fri, 11 Sep 2020 19:48:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3B59A2075B for ; Fri, 11 Sep 2020 19:48:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ikBrQeRk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725803AbgIKTsp (ORCPT ); Fri, 11 Sep 2020 15:48:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725779AbgIKTsm (ORCPT ); Fri, 11 Sep 2020 15:48:42 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3720C061573 for ; Fri, 11 Sep 2020 12:48:41 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id j7so1354325plk.11 for ; Fri, 11 Sep 2020 12:48:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Z6UbwslNOpgIDItVJyEffiMiodZEDVdV0RX0H4jfSl4=; b=ikBrQeRkZ8Sl8PEK/EQnVxeyrN/KjAxB5d6ASf393Cr7b6+UgwS0HbY34efBOnxvSV 1WLGUvFIffULmTOnZL8/JAHd7PTWP8XeKGVxev0d8pISlgo7x/GBXneY0IUAh2TvIqLu 8aIEaOWvQSBE/dYFseZaF8yx8xotmvOXBa1tRNe/IkWUbmAig2invvdyULAU54M8Db32 o9F0Z5fYRv9LcCq+3mrsd6NPMB+juzVY6KRVLKtF4U0sLtE6oFLFbclSvn2pfnvARNZE IvD5qbCyA2QJnEbk5x29Uo5Zspqooat8Hu04EJCfQ1iFX3Sd2lSCqhmOBLUuLXKjud9l u3Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Z6UbwslNOpgIDItVJyEffiMiodZEDVdV0RX0H4jfSl4=; b=fc3l9pCwJIDf+tTVL7F9ghn2ciJlDITK+qlEk0WBQfBh26G20pJP+W+0Pwgpf1k9xd RiSTrh05hv5AhSV0hyBW0VNJwJiblFGvBKok5LBr+7iRFJr21VY+CCR6O2/d3t/KUNlK bw2wjTfdTfcuKRsfO0loIw+weOEU9uL3JhjXhbifxVVVq+VByKeBickJYSRzuZXWYgAO Rt8ifZkXgza9Y0/mjitvTDMEFy7WVounPGguVJYpj6cJEUfW1Jpy3EHBtUbSVPXjk7lB 3Z/YFP7sehlOQd9URPJguHQ44aLivoEh6ULTYZj1kUgpeCKLukMPK6aoDlCH1V7cSfYD c4fw== X-Gm-Message-State: AOAM533Tos7m+flQaoZ8/VwlOx76H98EiKchUQP1a6jCIIl57w5FViyp u5DKYYV0Qm7G3HGOQR4EmBKtvVGn6XI= X-Google-Smtp-Source: ABdhPJzDCEOKBfsBUunJH5zjkA4W1FWXTfyG3d7TP6aNg+0/RK5yvpv1VeJGqjUR3oBeImyf8nHp/w== X-Received: by 2002:a17:90a:d488:: with SMTP id s8mr3762809pju.176.1599853720128; Fri, 11 Sep 2020 12:48:40 -0700 (PDT) Received: from [10.230.30.107] ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id h9sm2979298pfc.28.2020.09.11.12.48.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 11 Sep 2020 12:48:39 -0700 (PDT) Subject: Re: [PATCH net-next 4/4] net: dsa: set configure_vlan_while_not_filtering to true by default From: Florian Fainelli To: Vladimir Oltean Cc: davem@davemloft.net, vivien.didelot@gmail.com, andrew@lunn.ch, netdev@vger.kernel.org References: <20200909163105.nynkw5jvwqapzx2z@skbuf> <11268219-286d-7daf-9f4e-50bdc6466469@gmail.com> <20200909175325.bshts3hl537xtz2q@skbuf> <5edf3aa2-c417-e708-b259-7235de7bc8d2@gmail.com> <7e45b733-de6a-67c8-2e28-30a5ba84f544@gmail.com> <20200911000337.htwr366ng3nc3a7d@skbuf> <04823ca9-728f-cd06-a4b2-bb943d04321b@gmail.com> <20200911154340.mfe7lwtklfepd5go@skbuf> <20200911183556.l3cazdcwkosyw45v@skbuf> Message-ID: <7cbe45bd-efb0-ec3e-cc37-4d3154e91fd5@gmail.com> Date: Fri, 11 Sep 2020 12:48:37 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/78.0 Thunderbird/78.2.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 9/11/2020 12:39 PM, Florian Fainelli wrote: > > > On 9/11/2020 11:35 AM, Vladimir Oltean wrote: >> On Fri, Sep 11, 2020 at 11:23:28AM -0700, Florian Fainelli wrote: >>> On 9/11/2020 8:43 AM, Vladimir Oltean wrote: >>>>> The slightly confusing part is that a vlan_filtering=1 bridge >>>>> accepts the >>>>> default_pvid either tagged or untagged whereas a vlan_filtering=0 >>>>> bridge >>>>> does not, except for DHCP for instance. I would have to add a br0.1 >>>>> 802.1Q >>>>> upper to take care of the default_pvid being egress tagged on the >>>>> CPU port. >>>>> >>>>> We could solve this in the DSA receive path, or the Broadcom tag >>>>> receive >>>>> path as you say since that is dependent on the tagging format and >>>>> switch >>>>> properties. >>>>> >>>>> With Broadcom tags enabled now, all is well since we can differentiate >>>>> traffic from different source ports using that 4 bytes tag. >>>>> >>>>> Where this broke was when using a 802.1Q separation because all >>>>> frames that >>>>> egressed the CPU were egress tagged and it was no longer possible to >>>>> differentiate whether they came from the LAN group in VID 1 or the >>>>> WAN group >>>>> in VID 2. But all of this should be a thing of the past now, ok, >>>>> all is >>>>> clear again now. >>>> >>>> Or we could do this, what do you think? >>> >>> Yes, this would be working, and I just tested it with the following >>> delta on >>> top of my b53 patch: >>> >>> diff --git a/drivers/net/dsa/b53/b53_common.c >>> b/drivers/net/dsa/b53/b53_common.c >>> index 46ac8875f870..73507cff3bc4 100644 >>> --- a/drivers/net/dsa/b53/b53_common.c >>> +++ b/drivers/net/dsa/b53/b53_common.c >>> @@ -1427,7 +1427,7 @@ void b53_vlan_add(struct dsa_switch *ds, int port, >>>                          untagged = true; >>> >>>                  vl->members |= BIT(port); >>> -               if (untagged) >>> +               if (untagged && !dsa_is_cpu_port(ds, port)) >>>                          vl->untag |= BIT(port); >>>                  else >>>                          vl->untag &= ~BIT(port); >>> @@ -1465,7 +1465,7 @@ int b53_vlan_del(struct dsa_switch *ds, int port, >>>                  if (pvid == vid) >>>                          pvid = b53_default_pvid(dev); >>> >>> -               if (untagged) >>> +               if (untagged && !dsa_is_cpu_port(ds, port)) >>>                          vl->untag &= ~(BIT(port)); >>> >>>                  b53_set_vlan_entry(dev, vid, vl); >>> >>> and it works, thanks! >>> >> >> I'm conflicted. So you prefer having the CPU port as egress-tagged? > > I do, because I realized that some of the switches we support are still > configured in DSA_TAG_NONE mode because the CPU port they chose is not > Broadcom tag capable and there is an user out there who cares a lot > about that case not to "break". > >> >> Also, I think I'll also experiment with a version of this patch that is >> local to the DSA RX path. The bridge people may not like it, and as far >> as I understand, only DSA has this situation where pvid-tagged traffic >> may end up with a vlan tag on ingress. > > OK so something along the lines of: port is bridged, and bridge has > vlan_filtering=0 and switch does egress tagging and VID is bridge's > default_pvid then pop the tag? > > Should this be a helper function that is utilized by the relevant tagger > drivers or do you want this in dsa_switch_rcv()? The two drivers that appear to be untagging the CPU port unconditionally are b53 and kzs9477. -- Florian