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=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 B194BC04AB6 for ; Tue, 28 May 2019 22:50:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84E0220B1F for ; Tue, 28 May 2019 22:50:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QcbFeV08" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727529AbfE1WuQ (ORCPT ); Tue, 28 May 2019 18:50:16 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:35126 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726600AbfE1WuP (ORCPT ); Tue, 28 May 2019 18:50:15 -0400 Received: by mail-wm1-f68.google.com with SMTP id w9so220686wmi.0 for ; Tue, 28 May 2019 15:50:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RiDQ9CNES6CwCHlKok45HmAa5anJ9F0Gd3not8Fx9IM=; b=QcbFeV08Nq5pa9Wspsi0u4pCLE8Sq8xi3KHX5sBDkDJMRiIF7ep9SZgf443VTkRIZ0 2eTDLbQ+3PXO4H+Zf+KZDBPP+BAJfFNdq7UJRFyhxdteREjiJ4BPmw4kbWy1wCybl+wl VKQrSM7hAGh7dE4zwxHvJY8mgwYxEYMrC42m/EgaHLEhsvgABxtMGu8Z5YZOPBo5vqwZ awbPYqWrQ5ubhAZxlPpOWCqMc62IoizCAT3pzQmeVF/oSmcEcESOpFbn7ncYPQULe+3T VjtlYLRyd/sK3GYyAm5RoXQZYwyM+HndRDVbFj1QSkztsz+80E6piGXMXv9r5ghBVGCJ WK+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RiDQ9CNES6CwCHlKok45HmAa5anJ9F0Gd3not8Fx9IM=; b=Sf6kwW3tNujzKn9/cSYiHAMdRKKdrW67GAbcAamQrQtj0r3pRXNbVX55LixK9g/cVb oS/FAHZWN6OAeQgZNPwy++EqeyfsNbW8ay3KR4GC/HhnQVc8FTb6ffCqYdtHMLnJdRzi Afbq+wUekDw/ozqMwJeO6JreFOBk+3WO+DlJpIse5Sm6WmfIoBiLWFxv3HeK/xHPTq8a /mIZ442P4tZ9oitxGg2EXkNM6JrRyaihnxjo1UJLLfO+aBbyzskKW0qGBG6EVejCVC6+ eoQdrQcnjaBBhWfpFPk+X1QWRkwogPDXm/ZOTR+rp8JssSovSuOoGzcweJO+9ODm8XfW /1Jw== X-Gm-Message-State: APjAAAWYCyHXVLCMpZdGa7DRf1pFp4xabqTKZx9iO0SCVZK0wqpuR9cC YMBj8djhbDpQ+1+QlZEuzzY= X-Google-Smtp-Source: APXvYqx9Egs7JCLMj5HPW61fmnEQj+20h9EewM38zIVG20AXGuD2NXIIITzQK/Xc7henYvgvRwMb3A== X-Received: by 2002:a7b:c549:: with SMTP id j9mr4427806wmk.122.1559083813418; Tue, 28 May 2019 15:50:13 -0700 (PDT) Received: from localhost.localdomain ([86.121.27.188]) by smtp.gmail.com with ESMTPSA id f2sm6623658wrq.48.2019.05.28.15.50.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 May 2019 15:50:12 -0700 (PDT) From: Vladimir Oltean To: f.fainelli@gmail.com, vivien.didelot@gmail.com, andrew@lunn.ch, davem@davemloft.net Cc: ioana.ciornei@nxp.com, netdev@vger.kernel.org, Vladimir Oltean Subject: [PATCH net 1/2] net: dsa: tag_8021q: Change order of rx_vid setup Date: Wed, 29 May 2019 01:50:04 +0300 Message-Id: <20190528225005.10628-2-olteanv@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190528225005.10628-1-olteanv@gmail.com> References: <20190528225005.10628-1-olteanv@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ioana Ciornei The 802.1Q tagging performs an unbalanced setup in terms of RX VIDs on the CPU port. For the ingress path of a 802.1Q switch to work, the RX VID of a port needs to be seen as tagged egress on the CPU port. While configuring the other front-panel ports to be part of this VID, for bridge scenarios, the untagged flag is applied even on the CPU port in dsa_switch_vlan_add. This happens because DSA applies the same flags on the CPU port as on the (bridge-controlled) slave ports, and the effect in this case is that the CPU port tagged settings get deleted. Instead of fixing DSA by introducing a way to control VLAN flags on the CPU port (and hence stop inheriting from the slave ports) - a hard, perhaps intractable problem - avoid this situation by moving the setup part of the RX VID on the CPU port after all the other front-panel ports have been added to the VID. Signed-off-by: Ioana Ciornei Signed-off-by: Vladimir Oltean Fixes: f9bbe4477c30 ("net: dsa: Optional VLAN-based port separation for switches without tagging") --- net/dsa/tag_8021q.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/net/dsa/tag_8021q.c b/net/dsa/tag_8021q.c index 8ae48c7e1e76..4adec6bbfe59 100644 --- a/net/dsa/tag_8021q.c +++ b/net/dsa/tag_8021q.c @@ -128,10 +128,7 @@ int dsa_port_setup_8021q_tagging(struct dsa_switch *ds, int port, bool enabled) u16 flags; if (i == upstream) - /* CPU port needs to see this port's RX VID - * as tagged egress. - */ - flags = 0; + continue; else if (i == port) /* The RX VID is pvid on this port */ flags = BRIDGE_VLAN_INFO_UNTAGGED | @@ -150,6 +147,20 @@ int dsa_port_setup_8021q_tagging(struct dsa_switch *ds, int port, bool enabled) return err; } } + + /* CPU port needs to see this port's RX VID + * as tagged egress. + */ + if (enabled) + err = dsa_port_vid_add(upstream_dp, rx_vid, 0); + else + err = dsa_port_vid_del(upstream_dp, rx_vid); + if (err) { + dev_err(ds->dev, "Failed to apply RX VID %d to port %d: %d\n", + rx_vid, port, err); + return err; + } + /* Finally apply the TX VID on this port and on the CPU port */ if (enabled) err = dsa_port_vid_add(dp, tx_vid, BRIDGE_VLAN_INFO_UNTAGGED); -- 2.17.1