From patchwork Wed Jan 16 20:00:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026163 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TpReQuv/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fynV34sjz9sCh for ; Thu, 17 Jan 2019 07:03:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732111AbfAPUDX (ORCPT ); Wed, 16 Jan 2019 15:03:23 -0500 Received: from mail-yw1-f66.google.com ([209.85.161.66]:40094 "EHLO mail-yw1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732082AbfAPUDV (ORCPT ); Wed, 16 Jan 2019 15:03:21 -0500 Received: by mail-yw1-f66.google.com with SMTP id g194so2910488ywe.7 for ; Wed, 16 Jan 2019 12:03:21 -0800 (PST) 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=Di0uk7ChLXqoTDr/qz8RwiDRfIdXYC9TpTLQhiz/VoY=; b=TpReQuv/UR4YXDSq4br54XAYWtc2h431YcwZZWEPFpMRy2cCjG62CLtTJDZDdRpupD /R1X8H64yrkdL73LWw7AtRLrXo8Xh8LHeXeVRSVDK+JUc+l8ZHXhLyy77NI3u4yNZFEX t1PH2Vs/oK+krbAqRqr66So1lRWK+eDlYsc0t1LwhtbTyxmqBlaetxh5mTLk5yvoYdnL A7T20lek0UFkXDzDYLVWHVxTiL/SifIiRZBM9JkSpBLv3PVzqv/Gfy5yMxAe7jamaEW8 mYVjBtkL12ynqAet4l96KOFmpXvgaQdJXOGU2N2Zev9EUzQhJVWtAFSQjGkBmDMqspRy 6ztw== 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=Di0uk7ChLXqoTDr/qz8RwiDRfIdXYC9TpTLQhiz/VoY=; b=FjuRuUDgWxhvC//IiNoqbx/FMmE9XbCSbC7RatnDuaREbm0MFit1EzyprPDwM4al/t CjGPxOtmISFiJCKLh5tu2oBdjmeYY+G8EvQBmh0IOaBHdBZ3+DpRKexh0Q/SvUdbgt5X Fj1M8aZhgT5hS6cE+61sig4wynxRYM0Wd6pZb+QCkL9b0KI4SPH+vOJ7pcjl8Y4HF6wA eoFLJEy8i8kXgJVVxAr1dZo0MY4rDkDBMCvFqC80YLIBZxAyFPnQdUkeqSLq/8swOwTM u0l2lxd1Z+zsA10iDdfJZXLeNsUFM0uMGZy0PtuR4CQNynGlZ54G5rzGEj+wlZw1JSwn y46Q== X-Gm-Message-State: AJcUukd0Yin+YqpBiBuZfDRb1tUt1DZJtUFOeVsZ35YEtynBAif5MAYt 21QxYOsnnNAV4W6RKydk/ySelaJj X-Google-Smtp-Source: ALg8bN5xRpxn3NqM+8nPbZ/STMKBdCTX7B+Tn3Qz4l5kocQD8sWs/jsG7P6lzf7fQ8T5fXrSEVlgAg== X-Received: by 2002:a81:b54f:: with SMTP id c15mr9508557ywk.274.1547669000385; Wed, 16 Jan 2019 12:03:20 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:19 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 01/14] net: bridge: multicast: Propagate br_mc_disabled_update() return Date: Wed, 16 Jan 2019 12:00:49 -0800 Message-Id: <20190116200102.2749-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Some Ethernet switches might not be able to support disabling multicast flooding globally when e.g: several bridges span the same physical device, propagate the return value of br_mc_disabled_update() such that this propagates correctly to user-space. Signed-off-by: Florian Fainelli --- net/bridge/br_multicast.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 3aeff0895669..09fc92541873 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -813,7 +813,7 @@ static void br_ip6_multicast_port_query_expired(struct timer_list *t) } #endif -static void br_mc_disabled_update(struct net_device *dev, bool value) +static int br_mc_disabled_update(struct net_device *dev, bool value) { struct switchdev_attr attr = { .orig_dev = dev, @@ -822,11 +822,13 @@ static void br_mc_disabled_update(struct net_device *dev, bool value) .u.mc_disabled = !value, }; - switchdev_port_attr_set(dev, &attr); + return switchdev_port_attr_set(dev, &attr); } int br_multicast_add_port(struct net_bridge_port *port) { + int ret; + port->multicast_router = MDB_RTR_TYPE_TEMP_QUERY; timer_setup(&port->multicast_router_timer, @@ -837,8 +839,11 @@ int br_multicast_add_port(struct net_bridge_port *port) timer_setup(&port->ip6_own_query.timer, br_ip6_multicast_port_query_expired, 0); #endif - br_mc_disabled_update(port->dev, - br_opt_get(port->br, BROPT_MULTICAST_ENABLED)); + ret = br_mc_disabled_update(port->dev, + br_opt_get(port->br, + BROPT_MULTICAST_ENABLED)); + if (ret) + return ret; port->mcast_stats = netdev_alloc_pcpu_stats(struct bridge_mcast_stats); if (!port->mcast_stats) @@ -1937,12 +1942,16 @@ static void br_multicast_start_querier(struct net_bridge *br, int br_multicast_toggle(struct net_bridge *br, unsigned long val) { struct net_bridge_port *port; + int err; spin_lock_bh(&br->multicast_lock); if (!!br_opt_get(br, BROPT_MULTICAST_ENABLED) == !!val) goto unlock; - br_mc_disabled_update(br->dev, val); + err = br_mc_disabled_update(br->dev, val); + if (err) + goto unlock; + br_opt_toggle(br, BROPT_MULTICAST_ENABLED, !!val); if (!br_opt_get(br, BROPT_MULTICAST_ENABLED)) goto unlock; From patchwork Wed Jan 16 20:00:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026164 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eeDLXBvz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fynW2St6z9sMM for ; Thu, 17 Jan 2019 07:03:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732128AbfAPUDY (ORCPT ); Wed, 16 Jan 2019 15:03:24 -0500 Received: from mail-yw1-f67.google.com ([209.85.161.67]:33478 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732104AbfAPUDX (ORCPT ); Wed, 16 Jan 2019 15:03:23 -0500 Received: by mail-yw1-f67.google.com with SMTP id p65so2934054ywe.0 for ; Wed, 16 Jan 2019 12:03:23 -0800 (PST) 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=y2qm7A+/CCgrfTstiWJF722XPuBVch01JWCyDALceMo=; b=eeDLXBvzvBkCWtSlZkpagZuSb4tu/NVfqhUuqX9MH5L+oIg2xevh5OB+3CDEhtMory WeopdLucrpZTJl53b0q2hFVdVOM9r4oK5Y4u6p3aMI7Dx9R8YmA1gkpAzvNyJco81orR M0oOcEgN9MRUbFAJbC5PMgGV/+R0uNChzSyaVs2t+MX1dAiJoXR7o+qvdP9zsknT2dea Ki3aVhEzMDZTpe4jViVucD0A3op85hz4dBOaiu5B97IeLMEWXkBLYqdgqee/fb13hzQj OcR+1mHXbZBrR8Q1APvhAhmBMNFVlbt0eZRnFTIoOFcWcn0LlU45WrGJwkjhfpRPyVnN lfaA== 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=y2qm7A+/CCgrfTstiWJF722XPuBVch01JWCyDALceMo=; b=KwF1Ly0dw79D8mUDrsjPXrVhyFB5pyRnOwv79bYQ3gw0KjHj4pDGpV2EGS/t3dK2Iz krIXIDxNNb3HFlyhjjAB2WCffmtwIQKY/XEc7ZpbDQdZDRtn7SyBPnMnuSTEOFXkBILr suZ2R7HciaGzWna3XV+kEshKKo4mpBjNgsoGKiitajqif4IjHDPWsK0meLde3NT+j7QQ 0pc1TesnnHQFieSVFZ6iFzftM4hPmn1DxeTcIZ23uhRqMocU73UDSZkri21DOWruHmoi EFot00Ke0QJpLnipsgIFud0x3SxzQ06BG7KuvHDhGWXACV1D2CIvrxIH48e+uQnzLoPP JmYA== X-Gm-Message-State: AJcUukfmoCr4B0eHgA7L0L3OGxo6Yo1qIEa+g2vjQtraWaTl2xOdnJt9 kwGoU/L6h/M85nFmuda1dI76XDHK X-Google-Smtp-Source: ALg8bN7JLHew+OJq3hBUapnHUZQ/KEWWKioRVObrq6GPhOAGEmN11noSwLoYN81HlZ7F4Ew4YGANag== X-Received: by 2002:a81:a887:: with SMTP id f129mr9339779ywh.221.1547669002166; Wed, 16 Jan 2019 12:03:22 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:21 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 02/14] net: dsa: b53: Fix default VLAN ID Date: Wed, 16 Jan 2019 12:00:50 -0800 Message-Id: <20190116200102.2749-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We were not consistent in how the default VID of a given port was defined, b53_br_leave() would make sure the VLAN ID would be either 0/1 depending on the switch generation, but b53_configure_vlan(), which is the default configuration would unconditionally set it to 1. The correct value is 1 for 5325/5365 series and 0 otherwise. To avoid repeating that mistake ever again, introduce a helper function: b53_default_pvid() to factor that out. Fixes: 967dd82ffc52 ("net: dsa: b53: Add support for Broadcom RoboSwitch") Signed-off-by: Florian Fainelli --- drivers/net/dsa/b53/b53_common.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 0e4bbdcc614f..964a9ec4652a 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -632,15 +632,25 @@ static void b53_enable_mib(struct b53_device *dev) b53_write8(dev, B53_MGMT_PAGE, B53_GLOBAL_CONFIG, gc); } +static u16 b53_default_pvid(struct b53_device *dev) +{ + if (is5325(dev) || is5365(dev)) + return 1; + else + return 0; +} + int b53_configure_vlan(struct dsa_switch *ds) { struct b53_device *dev = ds->priv; struct b53_vlan vl = { 0 }; - int i; + int i, def_vid; + + def_vid = b53_default_pvid(dev); /* clear all vlan entries */ if (is5325(dev) || is5365(dev)) { - for (i = 1; i < dev->num_vlans; i++) + for (i = def_vid; i < dev->num_vlans; i++) b53_set_vlan_entry(dev, i, &vl); } else { b53_do_vlan_op(dev, VTA_CMD_CLEAR); @@ -650,7 +660,7 @@ int b53_configure_vlan(struct dsa_switch *ds) b53_for_each_port(dev, i) b53_write16(dev, B53_VLAN_PAGE, - B53_VLAN_PORT_DEF_TAG(i), 1); + B53_VLAN_PORT_DEF_TAG(i), def_vid); if (!is5325(dev) && !is5365(dev)) b53_set_jumbo(dev, dev->enable_jumbo, false); @@ -1326,12 +1336,8 @@ int b53_vlan_del(struct dsa_switch *ds, int port, vl->members &= ~BIT(port); - if (pvid == vid) { - if (is5325(dev) || is5365(dev)) - pvid = 1; - else - pvid = 0; - } + if (pvid == vid) + pvid = b53_default_pvid(dev); if (untagged && !dsa_is_cpu_port(ds, port)) vl->untag &= ~(BIT(port)); @@ -1644,10 +1650,7 @@ void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *br) b53_write16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(port), pvlan); dev->ports[port].vlan_ctl_mask = pvlan; - if (is5325(dev) || is5365(dev)) - pvid = 1; - else - pvid = 0; + pvid = b53_default_pvid(dev); /* Make this port join all VLANs without VLAN entries */ if (is58xx(dev)) { From patchwork Wed Jan 16 20:00:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026165 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZhddBt0R"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fynZ6ZM3z9sDr for ; Thu, 17 Jan 2019 07:03:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732149AbfAPUD1 (ORCPT ); Wed, 16 Jan 2019 15:03:27 -0500 Received: from mail-yw1-f67.google.com ([209.85.161.67]:45573 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732104AbfAPUDZ (ORCPT ); Wed, 16 Jan 2019 15:03:25 -0500 Received: by mail-yw1-f67.google.com with SMTP id d190so2894766ywd.12 for ; Wed, 16 Jan 2019 12:03:24 -0800 (PST) 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=Dn5Xrka7oPpFXUszSqf04vJKMymjYDaq2zGfoUQHWCo=; b=ZhddBt0R+Aj80BaglEqP8vDk2/QO5Xy6U58mWNKwvsKPDcrFCkhgurfQHeBt/mHvX8 DAJxQJ3mWggKjIppAVNopMF284H/YFm7foa7paZwMTdisYXkadLYv18KCzFUdLE0t2Lv dlWCPvP2kd7h4OB7xir08zHIQB/92kbNRTl2pard5yT4GPyH8k/4krrDUkghZhz4yboj 1ym7QWnT05hXmaYmWqUmfBJlU8biGSW84zNybvsehRZKFqumWxE/BLZt7JUVYMuIr131 6jGPevnxNmUHczLf+lJ4pGB2GFnXhdOCW+lCHTQ2b2SiZRtgbEc06PDmwAkGFab2rijw TJSQ== 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=Dn5Xrka7oPpFXUszSqf04vJKMymjYDaq2zGfoUQHWCo=; b=FuVacgzGOb5l1HTqi9rmYbXFYoOu3KJ/kWHKp2J0qHzPvHEarqiu3XdW4SKqOSlXR7 f/GYbd12PuS0efXGar4PWM6MzL1wvJt9akDPRqF4GKFSCE2ofpthfvxuHTobNGwnybEW yneyhuw72BOl4NMjy9/KSMu5OnEzz4Zk1/NZI06MnzqmHe0nZtNb/E81vgN4Uph4UZSd eYP7f0Y9iY9wEgTrV7De+q71RF0tCNSoL9oXR45P4PEHckeJWA9GI7n3t66sWtFF2pqs X238K9yKVI5wsof4zTkAPSM4nx97ljWiJ2coi9LKGwHqLsjuzg94XHY98i+xtsqy3jAg bhNQ== X-Gm-Message-State: AJcUukd5+7KXk4jp2oNf+f3gtxfok+E9icJ7DIAy5oERG9/o7+NlC45S CxFsCuWrydj7PcQpQtmKmlXNSttd X-Google-Smtp-Source: ALg8bN40qHOlBnQBUYrzU9DakHhxieSi3b3vgKeyUmFYC83yKKb/OsauQnbF7ZAzowQY1V98mEDzTA== X-Received: by 2002:a81:38d6:: with SMTP id f205mr9548716ywa.355.1547669004052; Wed, 16 Jan 2019 12:03:24 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:23 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 03/14] net: dsa: b53: Properly account for VLAN filtering Date: Wed, 16 Jan 2019 12:00:51 -0800 Message-Id: <20190116200102.2749-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org VLAN filtering can be built into the kernel, and also dynamically turned on/off through the bridge master device. Allow re-configuring the switch appropriately to account for that by deciding whether VLAN table (v_table) misses should lead to a drop or forward. Fixes: a2482d2ce349 ("net: dsa: b53: Plug in VLAN support") Signed-off-by: Florian Fainelli --- drivers/net/dsa/b53/b53_common.c | 59 +++++++++++++++++++++++++++++--- drivers/net/dsa/b53/b53_priv.h | 3 ++ 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 964a9ec4652a..2fef4c564420 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -344,7 +344,8 @@ static void b53_set_forwarding(struct b53_device *dev, int enable) b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, mgmt); } -static void b53_enable_vlan(struct b53_device *dev, bool enable) +static void b53_enable_vlan(struct b53_device *dev, bool enable, + bool enable_filtering) { u8 mgmt, vc0, vc1, vc4 = 0, vc5; @@ -369,8 +370,13 @@ static void b53_enable_vlan(struct b53_device *dev, bool enable) vc0 |= VC0_VLAN_EN | VC0_VID_CHK_EN | VC0_VID_HASH_VID; vc1 |= VC1_RX_MCST_UNTAG_EN | VC1_RX_MCST_FWD_EN; vc4 &= ~VC4_ING_VID_CHECK_MASK; - vc4 |= VC4_ING_VID_VIO_DROP << VC4_ING_VID_CHECK_S; - vc5 |= VC5_DROP_VTABLE_MISS; + if (enable_filtering) { + vc4 |= VC4_ING_VID_VIO_DROP << VC4_ING_VID_CHECK_S; + vc5 |= VC5_DROP_VTABLE_MISS; + } else { + vc4 |= VC4_ING_VID_VIO_FWD << VC4_ING_VID_CHECK_S; + vc5 &= ~VC5_DROP_VTABLE_MISS; + } if (is5325(dev)) vc0 &= ~VC0_RESERVED_1; @@ -420,6 +426,9 @@ static void b53_enable_vlan(struct b53_device *dev, bool enable) } b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt); + + dev->vlan_enabled = enable; + dev->vlan_filtering_enabled = enable_filtering; } static int b53_set_jumbo(struct b53_device *dev, bool enable, bool allow_10_100) @@ -656,7 +665,7 @@ int b53_configure_vlan(struct dsa_switch *ds) b53_do_vlan_op(dev, VTA_CMD_CLEAR); } - b53_enable_vlan(dev, false); + b53_enable_vlan(dev, false, dev->vlan_filtering_enabled); b53_for_each_port(dev, i) b53_write16(dev, B53_VLAN_PAGE, @@ -1265,6 +1274,46 @@ EXPORT_SYMBOL(b53_phylink_mac_link_up); int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering) { + struct b53_device *dev = ds->priv; + struct net_device *bridge_dev; + unsigned int i; + u16 pvid, new_pvid; + + /* Handle the case were multiple bridges span the same switch device + * and one of them has a different setting than what is being requested + * which would be breaking filtering semantics for any of the other + * bridge devices. + */ + b53_for_each_port(dev, i) { + bridge_dev = dsa_to_port(ds, i)->bridge_dev; + if (bridge_dev && + bridge_dev != dsa_to_port(ds, port)->bridge_dev && + br_vlan_enabled(bridge_dev) != vlan_filtering) { + netdev_err(bridge_dev, + "VLAN filtering is global to the switch!\n"); + return -EINVAL; + } + } + + b53_read16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), &pvid); + new_pvid = pvid; + if (dev->vlan_filtering_enabled && !vlan_filtering) { + /* Filtering is currently enabled, use the default PVID since + * the bridge does not expect tagging anymore + */ + dev->ports[port].pvid = pvid; + new_pvid = b53_default_pvid(dev); + } else if (!dev->vlan_filtering_enabled && vlan_filtering) { + /* Filtering is currently disabled, restore the previous PVID */ + new_pvid = dev->ports[port].pvid; + } + + if (pvid != new_pvid) + b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), + new_pvid); + + b53_enable_vlan(dev, dev->vlan_enabled, vlan_filtering); + return 0; } EXPORT_SYMBOL(b53_vlan_filtering); @@ -1280,7 +1329,7 @@ int b53_vlan_prepare(struct dsa_switch *ds, int port, if (vlan->vid_end > dev->num_vlans) return -ERANGE; - b53_enable_vlan(dev, true); + b53_enable_vlan(dev, true, dev->vlan_filtering_enabled); return 0; } diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h index ec796482792d..4dc7ee38b258 100644 --- a/drivers/net/dsa/b53/b53_priv.h +++ b/drivers/net/dsa/b53/b53_priv.h @@ -91,6 +91,7 @@ enum { struct b53_port { u16 vlan_ctl_mask; struct ethtool_eee eee; + u16 pvid; }; struct b53_vlan { @@ -137,6 +138,8 @@ struct b53_device { unsigned int num_vlans; struct b53_vlan *vlans; + bool vlan_enabled; + bool vlan_filtering_enabled; unsigned int num_ports; struct b53_port *ports; }; From patchwork Wed Jan 16 20:00:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026166 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LHGTSbxH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fynd4pLQz9sDX for ; Thu, 17 Jan 2019 07:03:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732158AbfAPUDa (ORCPT ); Wed, 16 Jan 2019 15:03:30 -0500 Received: from mail-yw1-f67.google.com ([209.85.161.67]:36325 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732142AbfAPUD1 (ORCPT ); Wed, 16 Jan 2019 15:03:27 -0500 Received: by mail-yw1-f67.google.com with SMTP id i73so2922587ywg.3 for ; Wed, 16 Jan 2019 12:03:26 -0800 (PST) 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=HsO5n9L+refplPrRxaqotuOTnOW7UOzseqSjzGqsugI=; b=LHGTSbxHfbTk80lzH4RkTcDyBJB538z996S89BKmuBzIxSMHL4KnxwpdmPvE6y4SzE 2jQaVefGAFxahv1l7v4IaKJHNige8D0ecv6YtjYu+2wYmBUUclEEyE3KDhKJJSSiDoHN x5m80hR6AnpCFDxwgu4VNez+WAhNWIQgue3voLBVAvdI63MCxzZWadQ3D4AwvJXU1Prk 3eSohRWzfRSLVaxx/Dlo984ObT9MVFHn3naZJuD4gx9tJLMTrF1yVbZW/IUo+e/Vg/+L +JZn00GeadX3VDq+0kAriR1ocU8fO3sfrmXiqXwHmxV6sN3xlwPzqLHwhfLoeIgVhEwj mawg== 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=HsO5n9L+refplPrRxaqotuOTnOW7UOzseqSjzGqsugI=; b=M894yShMlPzOZOAIGwd2+8D6xVdYkGSuSXUY2f1gteo+RMOaw7TKehK4ZpCvosdwWy b9tNG/qxmXGibQID3J0UVmh8z1tqccPt7UNyCL7LrmI7DagN/JlWEA+y4D684gpAWfZF S/fAFzJ0CXrBswZHlhJLKY5oAUL30ww+Yv+CN61yW+tismR8HLezeH6vt5AC7qtEukEk 1dbfUYU7DPqvAUaYU8zXAH9paX2gQ7SX/Z1J1tW+aZrYmawvLyVDQID+gplJAUkN5528 /foLr1jZR81UghS/GHu/TTGh1WY3Iazk0hNV3+6H45NLob6D1KNwQ1ou9mbXs6CONj4y nuOw== X-Gm-Message-State: AJcUukez6pmlnbLZcU9PMHwmf4Da6y9FGYclLiHZAKqb8+n+giddHchH 2ucyPWaFZysh40Aw2CJbsCVRG0bL X-Google-Smtp-Source: ALg8bN6mFNRivaFMtfMuGJ4Tk16Eqxarrd9zfa0EdA9U2/hR0Eu2dkVwfGzoijdNT/biS8QEktMzWw== X-Received: by 2002:a81:67d6:: with SMTP id b205mr9321231ywc.94.1547669006103; Wed, 16 Jan 2019 12:03:26 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:25 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 04/14] net: systemport: Fix reception of BPDUs Date: Wed, 16 Jan 2019 12:00:52 -0800 Message-Id: <20190116200102.2749-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org SYSTEMPORT has its RXCHK parser block that attempts to validate the packet structures, unfortunately setting the L2 header check bit will cause Bridge PDUs (BPDUs) to be incorrectly rejected because they look like LLC/SNAP packets with a non-IPv4 or non-IPv6 Ethernet Type. Fixes: 4e8aedfe78c7 ("net: systemport: Turn on offloads by default") Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/bcmsysport.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index f9521d0274b7..f374c8ddf719 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -134,6 +134,10 @@ static void bcm_sysport_set_rx_csum(struct net_device *dev, priv->rx_chk_en = !!(wanted & NETIF_F_RXCSUM); reg = rxchk_readl(priv, RXCHK_CONTROL); + /* Clear L2 header checks, which would prevent BPDUs + * from being received. + */ + reg &= ~RXCHK_L2_HDR_DIS; if (priv->rx_chk_en) reg |= RXCHK_EN; else From patchwork Wed Jan 16 20:00:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026167 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FutXqxjB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fynf3BBPz9sDr for ; Thu, 17 Jan 2019 07:03:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732177AbfAPUDc (ORCPT ); Wed, 16 Jan 2019 15:03:32 -0500 Received: from mail-yw1-f67.google.com ([209.85.161.67]:36329 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732154AbfAPUD3 (ORCPT ); Wed, 16 Jan 2019 15:03:29 -0500 Received: by mail-yw1-f67.google.com with SMTP id i73so2922640ywg.3 for ; Wed, 16 Jan 2019 12:03:29 -0800 (PST) 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=5fH5gr9sNUrm8VK7d4y4RBnmbuL7cLAznMFlqfUMim4=; b=FutXqxjB4aVk6sdkyZImvd1mdXYLB6hj9wcHuPISm9QcF2XSZ7DjXMRz3Z+T0+SiAS yAtw+cNzOOrpJkks0fm7A1X74BYO5/38yLUFw+i5K72Qs/W0qb6V6yppRT61Pm55p3Xj nE7Y37xo0DjIDHPI/SmI5trBu/O5ro4oE7jzg8uwoUcJUdaP6U8PBm/5rFem+zKjsK/q KZPMYiU3ZYDn7MeTd8ZUWcwNParXRuXnvShgej88HUZqNPwUMkv3bNIhNZiS9gv4LtSv xS7twW2ndY5Jpaf8f8aK/DKdOLPbY9td+tNbmn7d4yfW3ABXEZw8bYNCSLiAR8v4PMUL 0bxw== 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=5fH5gr9sNUrm8VK7d4y4RBnmbuL7cLAznMFlqfUMim4=; b=e3Ch0z+Kp/ANDLY6fd26n5JfJq905n0oWY6VZ78+3kToESPMF82HiRXcc4b+CUzz+b YWW4RlYlYca2FuurEPuoOYTCRm3R0RAEVPCX83k+fZFEvka6zNBPOe8mhiHGvYzn+NUE cSHC1S0jtpP4jFUwEq40Ge5ApOvIyE01nQu8oNn9wzvcaqAScNA9IAakHDZdF0atzkq6 K2hoeSeEUBVxgDXQozRgBw6D8i4HoN2qONRPY4e1u6CNDZzEmNM6y+ASxvBryA9siDNG 1XhwBmLplrzLsFLHJUM6gk52aYR9IshFsjo17Kta8PFcN0TqGe4R7+yAtn59T4SyZEj4 Smcg== X-Gm-Message-State: AJcUukc4tORIrmWoKJ7DKhAVo5ToHIEu9iQkndhrD9Syr6iE857OUd2Y Oz/JLifHMQHaaxcxMMVv9JxKhqjT X-Google-Smtp-Source: ALg8bN5FdnK+quRiNZ09Sn/LbYBUtjhrZrPGWsjU4H4GWSld03bSNVoZNs4pQEDUCZhSAEFSruXmgw== X-Received: by 2002:a81:7342:: with SMTP id o63mr9670464ywc.131.1547669007990; Wed, 16 Jan 2019 12:03:27 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:27 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 05/14] net: dsa: b53: Define registers for IGMP snooping Date: Wed, 16 Jan 2019 12:00:53 -0800 Message-Id: <20190116200102.2749-6-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Define all necessary registers in order to implement IGMP snooping later on, which are mostly comprised of the high-level protocol register control definitions. Signed-off-by: Florian Fainelli --- drivers/net/dsa/b53/b53_regs.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/net/dsa/b53/b53_regs.h b/drivers/net/dsa/b53/b53_regs.h index 2a9f421680aa..b4aecd4552b6 100644 --- a/drivers/net/dsa/b53/b53_regs.h +++ b/drivers/net/dsa/b53/b53_regs.h @@ -115,6 +115,8 @@ #define B53_UC_FLOOD_MASK 0x32 #define B53_MC_FLOOD_MASK 0x34 #define B53_IPMC_FLOOD_MASK 0x36 +#define B53_DIS_LEARN 0x3c +#define B53_SFT_LRN_CTRL 0x3e /* * Override Ports 0-7 State on devices with xMII interfaces (8 bit) @@ -253,6 +255,26 @@ /* Revision ID register (8 bit) */ #define B53_REV_ID 0x40 +/* High-level Protocol Control Register (32 bit) */ +#define B53_HL_PRTC_CTRL 0x50 +#define HL_PRTC_ARP_EN (1 << 0) +#define HL_PRTC_RARP_EN (1 << 1) +#define HL_PRTC_DHCP_EN (1 << 2) +#define HL_PRTC_ICMPV4_EN (1 << 3) +#define HL_PRTC_ICMPV6_EN (1 << 4) +#define HL_PRTC_ICMPV6_FWD_MODE (1 << 5) +#define HL_PRTC_IGMP_DIP_EN (1 << 8) +#define HL_PRTC_IGMP_RPTLVE_EN (1 << 9) +#define HL_PRTC_IGMP_RPTVLE_FWD_MODE (1 << 10) +#define HL_PRTC_IGMP_QRY_EN (1 << 11) +#define HL_PRTC_IGMP_QRY_FWD_MODE (1 << 12) +#define HL_PRTC_IGMP_UKN_EN (1 << 13) +#define HL_PRTC_IGMP_UKN_FWD_MODE (1 << 14) +#define HL_PRTC_MLD_RPTDONE_EN (1 << 15) +#define HL_PRTC_MLD_RPTDONE_FWD_MODE (1 << 16) +#define HL_PRTC_MLD_QRY_EN (1 << 17) +#define HL_PRTC_MLD_QRY_FWD_MODE (1 << 18) + /* Broadcom header RX control (16 bit) */ #define B53_BRCM_HDR_RX_DIS 0x60 From patchwork Wed Jan 16 20:00:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026168 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LcVyfRx+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fyng4rw9z9sDX for ; Thu, 17 Jan 2019 07:03:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732193AbfAPUDe (ORCPT ); Wed, 16 Jan 2019 15:03:34 -0500 Received: from mail-yw1-f66.google.com ([209.85.161.66]:44538 "EHLO mail-yw1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732163AbfAPUDc (ORCPT ); Wed, 16 Jan 2019 15:03:32 -0500 Received: by mail-yw1-f66.google.com with SMTP id b63so2900768ywc.11 for ; Wed, 16 Jan 2019 12:03:31 -0800 (PST) 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=61kJRgAHiPAs/4u/rsaX9zX3GHTNWz6BIEpA+UYqK3w=; b=LcVyfRx+TCC10FZUoh5e6sdeuLvrE0m3wH1hnyZ+xrHFo9dPHp5p8CjPR/G8X+raXq DIr3XOvDORyYRfZaM5MgbT1ue5j8NIM/7f0MBU+5lRVP2z4IhSvof4Uo+GKpuugJK9oi YNS7PYa2VOyuv9E0+LZU2FHitpBWUFpAoopfE2OIAK3DjzTSoMsi5ldRXs2UeJutSAz3 djCPYpOnyhgMSTVnkM2Kwdxr1G4xhNy7sxg9QSvs+t6SrcGCb5I998y5h4gAsYDTpGEb VClUr2lU9ApQbGY9LrbuvO1NpIWJtOiit9iwUeM8LIctAQA7RmQGVQYrtbUB2vgHe8g9 GlRA== 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=61kJRgAHiPAs/4u/rsaX9zX3GHTNWz6BIEpA+UYqK3w=; b=OfGP8Y4rPE1ogn0vSRGTPPI16Fe6X8fvLkxwvlhwtq5xxJvU2n5qoNt8+fdwYv2Cwi //XjoIK8exwKk8ctYadK3i+sLBQGdMJSNQWsNYBGm1RG9XJOPnkLKpSwl9ucnVW5l4p3 YPvD3tKFkuS3lZCD/twgqtLf1f7z88OZVoGwfUmT+45GqmeSWNrazlbBtpPpG5tjmayf F8l/qGAegoALZjfbrdM/SBjjj6rdMAiEifNHZWR7pc/NHUjgHexwfXPqsFJbqPKF2wsP TLvZsyi9Hm8WgkUU51VR40NezmwxOtPCiV/MzFdC0LseTAj1yBaGdGwoJLawdfXSTP/U 5hAw== X-Gm-Message-State: AJcUukeViTV/QH5esLqo5Fexg7O2ekzsakZ1rbZp6hw0r9tRasPjCWHv Pex5FbixvlsD28QoeGgz1jIuDsFe X-Google-Smtp-Source: ALg8bN5C6rcIEfoZ8wHpX1awxHUusz1Q4zi6Ts0KN6D0mETMI7Jh94PVLxtpha7Et1daQl7g36c5rQ== X-Received: by 2002:a81:1c42:: with SMTP id c63mr8760353ywc.89.1547669010815; Wed, 16 Jan 2019 12:03:30 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:30 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 06/14] net: dsa: b53: Add support for MDB Date: Wed, 16 Jan 2019 12:00:54 -0800 Message-Id: <20190116200102.2749-7-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In preparation for supporting IGMP snooping with or without the use of a bridge, add support within b53_common.c to program the ARL entries for multicast operations. The key difference is that a multicast ARL entry is comprised of a bitmask of enabled ports, instead of a port number. Signed-off-by: Florian Fainelli --- drivers/net/dsa/b53/b53_common.c | 62 ++++++++++++++++++++++++++++++-- drivers/net/dsa/b53/b53_priv.h | 8 ++++- 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 2fef4c564420..6c894ad4768a 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1503,11 +1503,25 @@ static int b53_arl_op(struct b53_device *dev, int op, int port, idx = 1; } - memset(&ent, 0, sizeof(ent)); - ent.port = port; + /* For multicast address, the port is a bitmask and the validity + * is determined by having at least one port being still active + */ + if (!is_multicast_ether_addr(addr)) { + ent.port = port; + ent.is_valid = is_valid; + } else { + if (is_valid) + ent.port |= BIT(port); + else + ent.port &= ~BIT(port); + + ent.is_valid = !!(ent.port); + } + ent.is_valid = is_valid; ent.vid = vid; ent.is_static = true; + ent.is_age = false; memcpy(ent.mac, addr, ETH_ALEN); b53_arl_from_entry(&mac_vid, &fwd_entry, &ent); @@ -1626,6 +1640,47 @@ int b53_fdb_dump(struct dsa_switch *ds, int port, } EXPORT_SYMBOL(b53_fdb_dump); +int b53_mdb_prepare(struct dsa_switch *ds, int port, + const struct switchdev_obj_port_mdb *mdb) +{ + struct b53_device *priv = ds->priv; + + /* 5325 and 5365 require some more massaging, but could + * be supported eventually + */ + if (is5325(priv) || is5365(priv)) + return -EOPNOTSUPP; + + return 0; +} +EXPORT_SYMBOL(b53_mdb_prepare); + +void b53_mdb_add(struct dsa_switch *ds, int port, + const struct switchdev_obj_port_mdb *mdb) +{ + struct b53_device *priv = ds->priv; + int ret; + + ret = b53_arl_op(priv, 0, port, mdb->addr, mdb->vid, true); + if (ret) + dev_err(ds->dev, "failed to add MDB entry\n"); +} +EXPORT_SYMBOL(b53_mdb_add); + +int b53_mdb_del(struct dsa_switch *ds, int port, + const struct switchdev_obj_port_mdb *mdb) +{ + struct b53_device *priv = ds->priv; + int ret; + + ret = b53_arl_op(priv, 0, port, mdb->addr, mdb->vid, false); + if (ret) + dev_err(ds->dev, "failed to delete MDB entry\n"); + + return ret; +} +EXPORT_SYMBOL(b53_mdb_del); + int b53_br_join(struct dsa_switch *ds, int port, struct net_device *br) { struct b53_device *dev = ds->priv; @@ -1969,6 +2024,9 @@ static const struct dsa_switch_ops b53_switch_ops = { .port_fdb_del = b53_fdb_del, .port_mirror_add = b53_mirror_add, .port_mirror_del = b53_mirror_del, + .port_mdb_prepare = b53_mdb_prepare, + .port_mdb_add = b53_mdb_add, + .port_mdb_del = b53_mdb_del, }; struct b53_chip_data { diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h index 4dc7ee38b258..620638ff9338 100644 --- a/drivers/net/dsa/b53/b53_priv.h +++ b/drivers/net/dsa/b53/b53_priv.h @@ -251,7 +251,7 @@ b53_build_op(write48, u64); b53_build_op(write64, u64); struct b53_arl_entry { - u8 port; + u16 port; u8 mac[ETH_ALEN]; u16 vid; u8 is_valid:1; @@ -350,6 +350,12 @@ int b53_fdb_del(struct dsa_switch *ds, int port, const unsigned char *addr, u16 vid); int b53_fdb_dump(struct dsa_switch *ds, int port, dsa_fdb_dump_cb_t *cb, void *data); +int b53_mdb_prepare(struct dsa_switch *ds, int port, + const struct switchdev_obj_port_mdb *mdb); +void b53_mdb_add(struct dsa_switch *ds, int port, + const struct switchdev_obj_port_mdb *mdb); +int b53_mdb_del(struct dsa_switch *ds, int port, + const struct switchdev_obj_port_mdb *mdb); int b53_mirror_add(struct dsa_switch *ds, int port, struct dsa_mall_mirror_tc_entry *mirror, bool ingress); enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds, int port); From patchwork Wed Jan 16 20:00:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026169 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QKvYILRY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fynj0hVJz9sCh for ; Thu, 17 Jan 2019 07:03:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732204AbfAPUDf (ORCPT ); Wed, 16 Jan 2019 15:03:35 -0500 Received: from mail-yw1-f68.google.com ([209.85.161.68]:42383 "EHLO mail-yw1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732185AbfAPUDe (ORCPT ); Wed, 16 Jan 2019 15:03:34 -0500 Received: by mail-yw1-f68.google.com with SMTP id x2so2908491ywc.9 for ; Wed, 16 Jan 2019 12:03:33 -0800 (PST) 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=TJyRoY35BZ44Wn/vP37Pz+tEPeYCUHy1JVXuNzq45LQ=; b=QKvYILRYzLD5+uqodygtfDklH/QgPCfkAm7eHlsEHmjGHAox3SAPBmq+T1di6707Q4 y7zCcCVP9HoONWCi706i60x/1Iq2BS+YivaAD1FnnVOurbib53518yRrzc4CSw8qXZlI Q1y8YWFjrzaB4e9WcaxujqsfeTMqq1PZRlRc1EOCFISGHK/LRISqw8JadlOfDSr69nkE 3ogOdUp3NISYC0kJSmDnZhMN6PtS+ipqNELwoB5sMIaJ23OMu3keCVKVTdHA2x0AxVB/ 2P+HgHObEgEYOiiV4OaGikq9PVrDk3ki1qm+oK/QUgi5p9Bcfsqrtrw3HVUqbS1rPElI YkPw== 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=TJyRoY35BZ44Wn/vP37Pz+tEPeYCUHy1JVXuNzq45LQ=; b=m5k19sVcZGRp1YHLIh10mn7ROE7woeJOktknpxCJUJkhKxPAilnnujKAtIS5H5BhHo jo6CXbgrQaQOh1Sb1tNFgzzTrnerdSHNqtCzmrQqPRmoR/vFBi4QHHEUO395zPvtgvgU HQjTEcTJrJVc36wit8J4aBV1SNCuqK77/iyJF1Gwp+gvBAMN+8WwWlq4fU71FT/s4102 NxUi5vYhmawCDSe0DZplHVwYTQs+WyUJrbcsFMhFZsEh3sk1OIAeszar5brCG8VZ2Rpg s7pLD+yXw3pt37XbJmO4zIpRDHeLe6ZO/RAAnqpnf6ngDq96APl1RW4I37Nev7mQou34 Jvkw== X-Gm-Message-State: AJcUukcozdPrkPRXajk8Kp5SgtVpSG9xtrySaVKZPDjiTWaOKTsbGliY uB73sXlR3YHtpIz7HT/n7TEO7T0G X-Google-Smtp-Source: ALg8bN4xWRYd7pqiqqp8IZdkHcp4eL/otFxB2S04TRLIS7NXthxc7hrFy4ZijpOlQZFLbfZkRxf2hg== X-Received: by 2002:a81:ac56:: with SMTP id z22mr9637343ywj.40.1547669012709; Wed, 16 Jan 2019 12:03:32 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:31 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 07/14] net: dsa: Add ability to program multicast filter for CPU port Date: Wed, 16 Jan 2019 12:00:55 -0800 Message-Id: <20190116200102.2749-8-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When the switch ports operate as individual network devices, the switch driver might have configured the switch to flood multicast all the way to the CPU port. This is really undesireable as it can lead to receiving a lot of unwanted traffic that the network stack needs to filter in software. For each valid multicast address, program it into the switch's MDB only when the host is interested in receiving such traffic, e.g: running an multicast application. Signed-off-by: Florian Fainelli --- net/dsa/slave.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/net/dsa/slave.c b/net/dsa/slave.c index a3fcc1d01615..33f6b88b6fd6 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -68,6 +68,39 @@ static int dsa_slave_get_iflink(const struct net_device *dev) return dsa_slave_to_master(dev)->ifindex; } +static int dsa_slave_sync_unsync_mdb_addr(struct net_device *dev, + const unsigned char *addr, bool add) +{ + struct switchdev_obj_port_mdb mdb = { + .obj = { + .id = SWITCHDEV_OBJ_ID_HOST_MDB, + .flags = SWITCHDEV_F_DEFER, + }, + .vid = 0, + }; + int ret = -EOPNOTSUPP; + + ether_addr_copy(mdb.addr, addr); + if (add) + ret = switchdev_port_obj_add(dev, &mdb.obj, NULL); + else + ret = switchdev_port_obj_del(dev, &mdb.obj); + + return ret; +} + +static int dsa_slave_sync_mdb_addr(struct net_device *dev, + const unsigned char *addr) +{ + return dsa_slave_sync_unsync_mdb_addr(dev, addr, true); +} + +static int dsa_slave_unsync_mdb_addr(struct net_device *dev, + const unsigned char *addr) +{ + return dsa_slave_sync_unsync_mdb_addr(dev, addr, false); +} + static int dsa_slave_open(struct net_device *dev) { struct net_device *master = dsa_slave_to_master(dev); @@ -126,6 +159,8 @@ static int dsa_slave_close(struct net_device *dev) dev_mc_unsync(master, dev); dev_uc_unsync(master, dev); + __hw_addr_unsync_dev(&dev->mc, dev, dsa_slave_unsync_mdb_addr); + if (dev->flags & IFF_ALLMULTI) dev_set_allmulti(master, -1); if (dev->flags & IFF_PROMISC) @@ -150,7 +185,17 @@ static void dsa_slave_change_rx_flags(struct net_device *dev, int change) static void dsa_slave_set_rx_mode(struct net_device *dev) { struct net_device *master = dsa_slave_to_master(dev); + struct dsa_port *dp = dsa_slave_to_port(dev); + /* If the port is bridged, the bridge takes care of sending + * SWITCHDEV_OBJ_ID_HOST_MDB to program the host's MC filter + */ + if (netdev_mc_empty(dev) || dp->bridge_dev) + goto out; + + __hw_addr_sync_dev(&dev->mc, dev, dsa_slave_sync_mdb_addr, + dsa_slave_unsync_mdb_addr); +out: dev_mc_sync(master, dev); dev_uc_sync(master, dev); } @@ -1395,6 +1440,11 @@ static int dsa_slave_changeupper(struct net_device *dev, if (netif_is_bridge_master(info->upper_dev)) { if (info->linking) { + /* Remove existing MC addresses that might have been + * programmed + */ + __hw_addr_unsync_dev(&dev->mc, dev, + dsa_slave_unsync_mdb_addr); err = dsa_port_bridge_join(dp, info->upper_dev); err = notifier_from_errno(err); } else { From patchwork Wed Jan 16 20:00:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026172 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="a8A851CX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fynq2t59z9sCh for ; Thu, 17 Jan 2019 07:03:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732227AbfAPUDi (ORCPT ); Wed, 16 Jan 2019 15:03:38 -0500 Received: from mail-yw1-f65.google.com ([209.85.161.65]:43636 "EHLO mail-yw1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732206AbfAPUDg (ORCPT ); Wed, 16 Jan 2019 15:03:36 -0500 Received: by mail-yw1-f65.google.com with SMTP id n21so2907847ywd.10 for ; Wed, 16 Jan 2019 12:03:35 -0800 (PST) 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=WTpEG0hverzLx5Az4KZkJD9LeNYpfD5yIIcyKuae3VI=; b=a8A851CXvI5HfQnkbDXCK7mlCuBqOHT/XBim8EGzMwStBpJnZC2h7MD9/Q65DiWzJI Y3cOl1nr768c14aPNli1Q+IAmHaQW/9w4tUbFEvhERPPq227Cqy4U0FsFsC6SsK+cF0V E+kke0OGL+9CF8lxnA6AiK3vPQc0yh3vSIcL/XXeQNHUehbarNfneOgHE/aYtDlyMk+j 8SdAT7DVc3MQaZ1SyBi+R9S3EZgeZnneO7PJgezKS5rvSGeF5qVFNAmiDMECW13kHnB5 3SxZ4fxyV2kkb3Awp91l2WgyvvTU6e040E7W49o+/N2/QVFoicfk7N58Ly914EcZtNRH TRCg== 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=WTpEG0hverzLx5Az4KZkJD9LeNYpfD5yIIcyKuae3VI=; b=uf+Itdu/beY+82gu//cl+AXC33rm2pcKUYGEtkMexvOzYtpMVAU7nhXBeCtoYjXFis 2w1+kpbbLvkXbMqUzQ4DtJAJQlGSbdljgSGamO+5wx15lNQUtMJ9H+QWpbwpLE93tUQy /mSndisbWgLwjoL7lqtaZPCblTEy06NkhwsvuKEl9ViSpFPyNIFc3+9L6AvOxrVJskc8 p1nvoCHJoeE/yV/vBegy270l/AcZUnCEtkX7szgQNEckNttEBbYeSvf9y2e/hnXarsiV M3iOU+XxWu7brcQ+K56v83BIeZq3gNWxVyJnJYDql/tBl1YZWT/yij8KX5CtCF2g6AMQ kxxw== X-Gm-Message-State: AJcUukdHro1sf3MefEGt5UyWo84LJRU9nOu2VpDFwW0IB53r3ijIPpKF S6MhlTZ3oiusucGpyjlp01tvwRvB X-Google-Smtp-Source: ALg8bN6Qvc2jcHMrAqdq5U3bOe/HGCcaqcuSj4Kit7Rqv8dAnvtc8z3nnZzfZi3zo82Yfz6uwEeVoA== X-Received: by 2002:a0d:d1c2:: with SMTP id t185mr9071124ywd.199.1547669014579; Wed, 16 Jan 2019 12:03:34 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:33 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 08/14] net: dsa: Add ndo_vlan_rx_{add, kill}_vid implementation Date: Wed, 16 Jan 2019 12:00:56 -0800 Message-Id: <20190116200102.2749-9-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In order to properly support VLAN filtering being enabled/disabled on a bridge, while having other ports being non bridge port members, we need to support the ndo_vlan_rx_{add,kill}_vid callbacks in order to make sure the non-bridge ports can continue receiving VLAN tags, even when the switch is globally configured to do ingress/egress VID checking. We don't allow configuring VLAN devices on a bridge port member though, since the bridge with VLAN awareness should be taking care of that, if needed. Since we can call dsa_port_vlan_{add,del} with a bridge_dev pointer NULL, we now need to check that in these two functions. Signed-off-by: Florian Fainelli --- net/dsa/port.c | 12 +++++++++-- net/dsa/slave.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/net/dsa/port.c b/net/dsa/port.c index 2d7e01b23572..185e85a4f5f0 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -252,7 +252,11 @@ int dsa_port_vlan_add(struct dsa_port *dp, .vlan = vlan, }; - if (br_vlan_enabled(dp->bridge_dev)) + /* Can be called from dsa_slave_port_obj_add() or + * dsa_slave_vlan_rx_add_vid() + */ + if ((dp->bridge_dev && br_vlan_enabled(dp->bridge_dev)) || + !dp->bridge_dev) return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &info); return 0; @@ -270,7 +274,11 @@ int dsa_port_vlan_del(struct dsa_port *dp, if (netif_is_bridge_master(vlan->obj.orig_dev)) return -EOPNOTSUPP; - if (br_vlan_enabled(dp->bridge_dev)) + /* Can be called from dsa_slave_port_obj_del() or + * dsa_slave_vlan_rx_kill_vid() + */ + if ((dp->bridge_dev && br_vlan_enabled(dp->bridge_dev)) || + !dp->bridge_dev) return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info); return 0; diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 33f6b88b6fd6..e266ef329583 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1027,6 +1027,54 @@ static int dsa_slave_get_ts_info(struct net_device *dev, return ds->ops->get_ts_info(ds, p->dp->index, ts); } +static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto, + u16 vid) +{ + struct dsa_port *dp = dsa_slave_to_port(dev); + struct switchdev_obj_port_vlan vlan = { }; + int ret = 0; + + /* If the port is bridged and the bridge is VLAN aware, let the bridge + * manage VLANs + */ + if (dp->bridge_dev && br_vlan_enabled(dp->bridge_dev)) + return -EINVAL; + + /* This API only allows programming tagged, non-PVID VIDs */ + vlan.vid_begin = vid; + vlan.vid_end = vid; + + ret = dsa_port_vlan_add(dp, &vlan, NULL); + if (ret == -EOPNOTSUPP) + ret = 0; + + return ret; +} + +static int dsa_slave_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, + u16 vid) +{ + struct dsa_port *dp = dsa_slave_to_port(dev); + struct switchdev_obj_port_vlan vlan = { }; + int ret = 0; + + /* If the port is bridged and the bridge is VLAN aware, let the bridge + * manage VLANs + */ + if (dp->bridge_dev && br_vlan_enabled(dp->bridge_dev)) + return -EINVAL; + + /* This API only allows programming tagged, non-PVID VIDs */ + vlan.vid_begin = vid; + vlan.vid_end = vid; + + ret = dsa_port_vlan_del(dp, &vlan); + if (ret == -EOPNOTSUPP) + ret = 0; + + return ret; +} + static const struct ethtool_ops dsa_slave_ethtool_ops = { .get_drvinfo = dsa_slave_get_drvinfo, .get_regs_len = dsa_slave_get_regs_len, @@ -1090,6 +1138,8 @@ static const struct net_device_ops dsa_slave_netdev_ops = { .ndo_get_phys_port_name = dsa_slave_get_phys_port_name, .ndo_setup_tc = dsa_slave_setup_tc, .ndo_get_stats64 = dsa_slave_get_stats64, + .ndo_vlan_rx_add_vid = dsa_slave_vlan_rx_add_vid, + .ndo_vlan_rx_kill_vid = dsa_slave_vlan_rx_kill_vid, }; static const struct switchdev_ops dsa_slave_switchdev_ops = { @@ -1350,7 +1400,8 @@ int dsa_slave_create(struct dsa_port *port) if (slave_dev == NULL) return -ENOMEM; - slave_dev->features = master->vlan_features | NETIF_F_HW_TC; + slave_dev->features = master->vlan_features | NETIF_F_HW_TC | + NETIF_F_HW_VLAN_CTAG_FILTER; slave_dev->hw_features |= NETIF_F_HW_TC; slave_dev->ethtool_ops = &dsa_slave_ethtool_ops; eth_hw_addr_inherit(slave_dev, master); From patchwork Wed Jan 16 20:00:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026170 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f79PY2RX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fynm1pNVz9sCh for ; Thu, 17 Jan 2019 07:03:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731988AbfAPUDj (ORCPT ); Wed, 16 Jan 2019 15:03:39 -0500 Received: from mail-yw1-f66.google.com ([209.85.161.66]:44556 "EHLO mail-yw1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732213AbfAPUDh (ORCPT ); Wed, 16 Jan 2019 15:03:37 -0500 Received: by mail-yw1-f66.google.com with SMTP id b63so2900979ywc.11 for ; Wed, 16 Jan 2019 12:03:37 -0800 (PST) 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=LDCpuwMTsExuN9AY2TbB7aHKA/vWaZhq13Goarr46z4=; b=f79PY2RXVHH7yHcXa3cXRx0DuXclit0MjIQ8P/TV+0eMkgxR5xPQNgTV+QBfmrGs3Z RJpaNhOaZu0tgQaS/fLDiGjPYJq9wqpWjWbqC7sI72g/viw0a6BzI5MxIzNAe4tt99eU lBmK37prqXUg7bQOVy8DE+Wl2MrujC9qIpRNwu9dPj9WRYGYIr/J/kwmejVlrLP2KIBt YlBYbs151Z4nwwL6yLFGflYQ9OIXz/Z5P4Ack7M53qYOoU7WMYfuBvsY9JFAXtEjKJ2O lZ8i6WJSqQCpTqW0J5bkt4pt85juTCX8YKzCTSBeph+bsawhYfFLJ8TBoSEhblV8hGhK 5kIA== 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=LDCpuwMTsExuN9AY2TbB7aHKA/vWaZhq13Goarr46z4=; b=AWHAhdeTrdyocjHk8MuERN9r60hoJYSihVbRguB/YG6ALH6ftV+cCgoNUJ9FdvrZY1 q7uAb5IESt1+V7syneszyX5IzBd9GE48XfDk/kndF/YsswzsP9BYc4P/+hAZRHQWl5Kn thgq8nJHJrBpCpLDRbA1sACWv+uz+GtFtimM84brchgBQu4HBTefwsKrM4HGMGovnmRv pH398cxHc1VIaJvjpEjaha/RrcluSWwKxoXkOHuBL44jUb6t7EPa0/CWzNkOZGEX1jZE PEJDQlgFoX3iIeBwH73NQwiN3Sr11D7YbuBVTk//AXqPbZmXyy5hpEkgjwMZBck5EhDA c91w== X-Gm-Message-State: AJcUuke4A4ysDICRYix21WUkkm9KiMdN4m9moV+DNhz9jZ9zh7tykgVy 0Tf4CQHhBex7phvVtfKmRLPCEci1 X-Google-Smtp-Source: ALg8bN4Tus9j0TUHK71jjCwqT9C7mwn8nSTR4NQ1iGc16Riux/lyDGGuzpwbvspUkDtbaPJ7LMDm4Q== X-Received: by 2002:a81:4511:: with SMTP id s17mr9315913ywa.430.1547669016367; Wed, 16 Jan 2019 12:03:36 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:35 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 09/14] net: bridge: Propagate MC addresses with VID through switchdev Date: Wed, 16 Jan 2019 12:00:57 -0800 Message-Id: <20190116200102.2749-10-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In order for bridge port members to get a chance to implement unicast and multicast address filtering correctly, which would matter for e.g: switch network devices, synchronize the UC and MC lists down to the individual bridge port members using switchdev HOST_MDB objects such that this does not impact drivers that already have a ndo_set_rx_mode() operation which likely already operate in promiscuous mode. When the bridge has multicast snooping enabled, proper HOST_MDB notifications will be sent through br_mdb_notify() already. Signed-off-by: Florian Fainelli --- net/bridge/br_device.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 013323b6dbe4..ce10d6b7b151 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include "br_private.h" @@ -182,8 +183,62 @@ static int br_dev_open(struct net_device *dev) return 0; } +static int bridge_sync_unsync_mc_addr(struct net_device *dev, + const unsigned char *addr, + bool add) +{ + struct net_bridge *br = netdev_priv(dev); + struct switchdev_obj_port_mdb mdb = { + .obj = { + .orig_dev = dev, + .id = SWITCHDEV_OBJ_ID_HOST_MDB, + .flags = SWITCHDEV_F_DEFER, + }, + .vid = 0, + }; + struct net_bridge_port *p; + int ret = -EOPNOTSUPP; + +#ifdef CONFIG_BRIDGE_VLAN_FILTERING + if (br_vlan_enabled(dev)) + mdb.vid = br->default_pvid; +#endif + + ether_addr_copy(mdb.addr, addr); + spin_lock_bh(&br->lock); + list_for_each_entry(p, &br->port_list, list) { + if (add) + ret = switchdev_port_obj_add(p->dev, &mdb.obj, NULL); + else + ret = switchdev_port_obj_del(p->dev, &mdb.obj); + if (ret) + goto out; + } +out: + spin_unlock_bh(&br->lock); + return ret; +} + +static int bridge_sync_mc_addr(struct net_device *dev, + const unsigned char *addr) +{ + return bridge_sync_unsync_mc_addr(dev, addr, true); +} + +static int bridge_unsync_mc_addr(struct net_device *dev, + const unsigned char *addr) +{ + return bridge_sync_unsync_mc_addr(dev, addr, false); +} + static void br_dev_set_multicast_list(struct net_device *dev) { + /* HOST_MDB notifications are sent through MDB notifications */ + if (br_multicast_enabled(dev)) + return; + + __hw_addr_sync_dev(&dev->mc, dev, bridge_sync_mc_addr, + bridge_unsync_mc_addr); } static void br_dev_change_rx_flags(struct net_device *dev, int change) From patchwork Wed Jan 16 20:00:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026171 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JC4FlgDc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fynn6g80z9sCh for ; Thu, 17 Jan 2019 07:03:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732266AbfAPUDk (ORCPT ); Wed, 16 Jan 2019 15:03:40 -0500 Received: from mail-yw1-f68.google.com ([209.85.161.68]:41729 "EHLO mail-yw1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732244AbfAPUDj (ORCPT ); Wed, 16 Jan 2019 15:03:39 -0500 Received: by mail-yw1-f68.google.com with SMTP id f65so2909914ywc.8 for ; Wed, 16 Jan 2019 12:03:39 -0800 (PST) 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=JEutX8kgB6GAcF/QGEpqEAY8qJKUc7qUN7KGrDDvLRE=; b=JC4FlgDcNoI3UMr1aBxvM5X8sE2bLc6VOvgAgGiq0dFyydN4GfFvxWoqnsMYerYFp5 Saa+D0ZfBwnpHYCsVhjRGUdGxbb6oJxIA7nVAlrNSFieTe+4Sx0SxfkBuPzy5OIBApWy i4mfiiWJ8i5dL0ta8yD8pJW+zlG9yQrkBUCtJ09a43Fk6cZVoSDgddwQfZ9jnFIFKoe0 a+hF/OYj8wXXc4CEh1TKnqPR9q4VOi+2URpGNPpIOgd9Jhe9pciq0y1LBtKhr6SaOJhG VL3Gs/x3tqTge6kELZsD1mthRYkpOlF0CbIerpRYbGOIJjzg29ZKxULUlXrM2s9Ykgsq usjw== 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=JEutX8kgB6GAcF/QGEpqEAY8qJKUc7qUN7KGrDDvLRE=; b=jF/FNzciJ4ZRCx/ty5jskZq1YlvfXbG3x0Rmm04AQt/cIWPInN2hlK2fM1VIMWWkDu aO/iaB26yBKVVzs2oJzpJGqKdbsPl8mIoZSMe3rk5b+bwQc1Gi1uGAM4I9K4i27tSvSq ztE2rYqED+oEC/lNUQBSK2hg24ngKF85mPKFKzugUnhAdKsP7ZMTFWZCurRBgpaWuPIv JFCdEi/PVr/b0PlgAQWk1WM5FqOfSBGWiE9bzDsWBkZFwKJ32XdxjuK+CrIKr0H2qlCH zmM+FsEHhI9Dvt0H5oaMAhSCssjWwfwr3ZSCQu2B17z6cUSCVfE9U2nT/Ir4+k0Cgi1x X/4w== X-Gm-Message-State: AJcUukdm/pouDEL5ybcbCPhS7eASKtllSKs2e+PzP1uNx3nAYDfKtdsb Gd3/OpMFaeLAxRb1i8BOQW0Ff8AF X-Google-Smtp-Source: ALg8bN514V8cflzZ6ZOts2lHLU7AJqGzxsyq4LYUPPxn9q8ztOOvk+11ULUvR8gtt1LenakhOGE9YQ== X-Received: by 2002:a0d:ccd6:: with SMTP id o205mr9313037ywd.339.1547669018310; Wed, 16 Jan 2019 12:03:38 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:37 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 10/14] net: vlan: Propagate MC addresses with VID through switchdev Date: Wed, 16 Jan 2019 12:00:58 -0800 Message-Id: <20190116200102.2749-11-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The VLAN real device could be an Ethernet switch port and that switch might have VLAN filtering globally enabled (because of a bridge requesting VLAN filtering on the switch on another port) and so when programming multicast addresses, we need the multicast filter programming to be aware of the correct VLAN ID as well. Ethernet drivers that do not implement switchdev_port_{add,del} operations and do not specifically check for SWITCHDEV_OBJ_ID_HOST_MDB are not affected by that change. Signed-off-by: Florian Fainelli --- net/8021q/vlan_dev.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index b2d9c8f27cd7..ea2ef9d78dcb 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -312,6 +312,43 @@ static int vlan_dev_open(struct net_device *dev) return err; } +static int vlan_dev_sync_unsync_mc_addr(struct net_device *dev, + const unsigned char *addr, + bool add) +{ + struct net_device *real_dev = vlan_dev_priv(dev)->real_dev; + struct switchdev_obj_port_mdb mdb = { + .obj = { + .orig_dev = dev, + .id = SWITCHDEV_OBJ_ID_HOST_MDB, + .flags = SWITCHDEV_F_DEFER, + }, + .vid = vlan_dev_vlan_id(dev), + }; + int ret = -EOPNOTSUPP; + + ether_addr_copy(mdb.addr, addr); + if (add) + ret = switchdev_port_obj_add(real_dev, &mdb.obj, NULL); + else + ret = switchdev_port_obj_del(real_dev, &mdb.obj); + + return ret; +} + +static int vlan_dev_sync_mc_addr(struct net_device *dev, + const unsigned char *addr) +{ + return vlan_dev_sync_unsync_mc_addr(dev, addr, true); +} + +static int vlan_dev_unsync_mc_addr(struct net_device *dev, + const unsigned char *addr) +{ + return vlan_dev_sync_unsync_mc_addr(dev, addr, false); +} + + static int vlan_dev_stop(struct net_device *dev) { struct vlan_dev_priv *vlan = vlan_dev_priv(dev); @@ -319,6 +356,7 @@ static int vlan_dev_stop(struct net_device *dev) dev_mc_unsync(real_dev, dev); dev_uc_unsync(real_dev, dev); + __hw_addr_unsync_dev(&dev->mc, dev, vlan_dev_unsync_mc_addr); if (dev->flags & IFF_ALLMULTI) dev_set_allmulti(real_dev, -1); if (dev->flags & IFF_PROMISC) @@ -483,6 +521,8 @@ static void vlan_dev_change_rx_flags(struct net_device *dev, int change) static void vlan_dev_set_rx_mode(struct net_device *vlan_dev) { + __hw_addr_sync_dev(&vlan_dev->mc, vlan_dev, vlan_dev_sync_mc_addr, + vlan_dev_unsync_mc_addr); dev_mc_sync(vlan_dev_priv(vlan_dev)->real_dev, vlan_dev); dev_uc_sync(vlan_dev_priv(vlan_dev)->real_dev, vlan_dev); } From patchwork Wed Jan 16 20:00:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026173 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="t5i9Jfv9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fynt6Wvwz9sCh for ; Thu, 17 Jan 2019 07:03:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732274AbfAPUDp (ORCPT ); Wed, 16 Jan 2019 15:03:45 -0500 Received: from mail-yw1-f66.google.com ([209.85.161.66]:40137 "EHLO mail-yw1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732244AbfAPUDm (ORCPT ); Wed, 16 Jan 2019 15:03:42 -0500 Received: by mail-yw1-f66.google.com with SMTP id g194so2911048ywe.7 for ; Wed, 16 Jan 2019 12:03:41 -0800 (PST) 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=LQmcwQpg9X9bNg67SqJHMVqilF+UsBd7H1NgLsz4Cn0=; b=t5i9Jfv92Ss1kCY4ByjtsU28O40/RU+Oa32lX2FB3WgBiST+N4Z9QeeuAm9b5qaGzc 49zvPcgVe5QqUuz5X73rpoB0f6Kw7kxPlOrzY5e1KK2o7hZDZAzaTlKXDkz0+PKCwDXf 7SgTEKYEwgAhiKchmZHIXWope5zBBYnK4nsMbXZTazH2CVrRml5scc4uuuxFIxeU12tA wNZjbWpsukyaO+JHwC3PaSS0H/mpbLhlXj9Cf2F39T8/xbqIgIA4w5WJHyUqWL1t7FhD DitFeZGOC6tIVh4PCzkFo5B3fosICw3vo7napO1mAbZHs0uayknfASriHU1e7xPm0IBW dmYA== 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=LQmcwQpg9X9bNg67SqJHMVqilF+UsBd7H1NgLsz4Cn0=; b=HmwbonWpiweVujQ6dLjRMtbiDqzPPzGapWc1ENSq3zUTQnJwp8g0AMmRF54yiVOhVp D0wTqo0eE6DKT1QNSPu5MKOdFbuk5EmPydOlh/kWjSZDOb7+ePyiHzZCv4Vt3gL8+k6L 9+wASpmiQ2ZjTxbx19f3o+74WOqpSwXtfV66xMoLOYXtE8ffzwESs8eSQOyeuxHo/3Z2 RYN58L3BzaYXhtHz/WAxlbGw3rxhSfd7iS3qDZMmV/y7v4sL8f6dd+rtZQpCjYY5A9f4 nkDj+bxLDoVtfRLCyQ54aJe3zH5cGksgsE12hDxEAAqKcigbebEACU25dRHjzXgXpH3T bvLA== X-Gm-Message-State: AJcUukecp6ka28lFOaPhpPJMQjqUe2qhQ6WsmAZi5TnE8teJR/PawXs0 mlYWr7slC9+c3oElOevxnKPAr8LN X-Google-Smtp-Source: ALg8bN6tAqekQpF8sWEo8c8KLW8VFJUOqseHTyrkm/bTJsJ9IhcuKMrnvCDq7go1yzOmXEbB3ZvsLA== X-Received: by 2002:a81:2a55:: with SMTP id q82mr8867141ywq.311.1547669020657; Wed, 16 Jan 2019 12:03:40 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:39 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 11/14] net: dsa: Make VLAN filtering use DSA notifiers Date: Wed, 16 Jan 2019 12:00:59 -0800 Message-Id: <20190116200102.2749-12-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In preparation for allowing for global checks that would apply to the entire switch and not just on a per-port basis, make the VLAN filtering attribute follow other switchdev attributes/objects and make it use the DSA notifier infrastructure. Signed-off-by: Florian Fainelli --- net/dsa/dsa_priv.h | 11 ++++++++++- net/dsa/port.c | 17 +++++++---------- net/dsa/switch.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index 026a05774bf7..aad8acc70183 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -26,6 +26,7 @@ enum { DSA_NOTIFIER_MDB_DEL, DSA_NOTIFIER_VLAN_ADD, DSA_NOTIFIER_VLAN_DEL, + DSA_NOTIFIER_VLAN_FILTERING, }; /* DSA_NOTIFIER_AGEING_TIME */ @@ -57,7 +58,7 @@ struct dsa_notifier_mdb_info { int port; }; -/* DSA_NOTIFIER_VLAN_* */ +/* DSA_NOTIFIER_VLAN_{ADD,DEL} */ struct dsa_notifier_vlan_info { const struct switchdev_obj_port_vlan *vlan; struct switchdev_trans *trans; @@ -65,6 +66,14 @@ struct dsa_notifier_vlan_info { int port; }; +/* DSA_NOTIFIER_VLAN_FILTERING */ +struct dsa_notifier_vlan_filtering_info { + bool vlan_filtering; + struct switchdev_trans *trans; + int sw_index; + int port; +}; + struct dsa_slave_priv { /* Copy of CPU port xmit for faster access in slave transmit hot path */ struct sk_buff * (*xmit)(struct sk_buff *skb, diff --git a/net/dsa/port.c b/net/dsa/port.c index 185e85a4f5f0..d7b057d46460 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -146,17 +146,14 @@ void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br) int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering, struct switchdev_trans *trans) { - struct dsa_switch *ds = dp->ds; - - /* bridge skips -EOPNOTSUPP, so skip the prepare phase */ - if (switchdev_trans_ph_prepare(trans)) - return 0; - - if (ds->ops->port_vlan_filtering) - return ds->ops->port_vlan_filtering(ds, dp->index, - vlan_filtering); + struct dsa_notifier_vlan_filtering_info info = { + .sw_index = dp->ds->index, + .port = dp->index, + .trans = trans, + .vlan_filtering = vlan_filtering, + }; - return 0; + return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_FILTERING, &info); } int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock, diff --git a/net/dsa/switch.c b/net/dsa/switch.c index 142b294d3446..831334dc5e79 100644 --- a/net/dsa/switch.c +++ b/net/dsa/switch.c @@ -235,6 +235,32 @@ static int dsa_switch_vlan_del(struct dsa_switch *ds, return 0; } +static int dsa_switch_vlan_filtering(struct dsa_switch *ds, + struct dsa_notifier_vlan_filtering_info *info) +{ + struct switchdev_trans *trans = info->trans; + bool vlan_filtering = info->vlan_filtering; + int port = info->port; + int err; + + /* bridge skips -EOPNOTSUPP, so skip the prepare phase */ + if (switchdev_trans_ph_prepare(trans)) + return 0; + + /* Build a mask of port members */ + bitmap_zero(ds->bitmap, ds->num_ports); + if (ds->index == info->sw_index) + set_bit(port, ds->bitmap); + + for_each_set_bit(port, ds->bitmap, ds->num_ports) { + err = ds->ops->port_vlan_filtering(ds, port, vlan_filtering); + if (err) + return err; + } + + return 0; +} + static int dsa_switch_event(struct notifier_block *nb, unsigned long event, void *info) { @@ -269,6 +295,9 @@ static int dsa_switch_event(struct notifier_block *nb, case DSA_NOTIFIER_VLAN_DEL: err = dsa_switch_vlan_del(ds, info); break; + case DSA_NOTIFIER_VLAN_FILTERING: + err = dsa_switch_vlan_filtering(ds, info); + break; default: err = -EOPNOTSUPP; break; From patchwork Wed Jan 16 20:01:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026175 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tijxJKAV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fynz4qg7z9sCh for ; Thu, 17 Jan 2019 07:03:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732311AbfAPUDs (ORCPT ); Wed, 16 Jan 2019 15:03:48 -0500 Received: from mail-yw1-f67.google.com ([209.85.161.67]:43653 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732268AbfAPUDo (ORCPT ); Wed, 16 Jan 2019 15:03:44 -0500 Received: by mail-yw1-f67.google.com with SMTP id n21so2908088ywd.10 for ; Wed, 16 Jan 2019 12:03:43 -0800 (PST) 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=RXV104XivffX/oUqKPlk/V803i3ijUs034q3KjO8D/o=; b=tijxJKAVrXbFNecEB0S1czkalfAoVsE74XV1Hvxdzsvjlf1xSc+HDpimx9bT/sYDDY ZubCwQrFD45pTnVqZHlA70iXBuSksHOn7VpktzrbNA2V12XK9rwhZrEt3KRmHQAfpOHe ZX4BnbgDGvOdqIiEMknanIXQlWI27qxxkawqgIQX9LKYOfcw6Ah7OjnEApbcUmQUcMz0 xXK+4cQhmQAIcsqKs6OsRfAvbZPFIaWpfhER7Bxgf4vc+9cbWJRLxXH8UKYrxEUMxey3 tmQ5iuIAdszH5vZaRi1xbjYvvfdUJs/XKFwO3922lVim8Igb4IUp98A+Qo/60l4WvaFy DRLQ== 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=RXV104XivffX/oUqKPlk/V803i3ijUs034q3KjO8D/o=; b=ONIKk7krBlL/3TxNx0LblGCGgzFMHRUC9Iw4YTPJm1y2YFxCzpV82K9AOtxfEDfbEg syWWM76z7gZWWyyp87v/ExEXdLsbhpshcpMdGrCxYrkfxlsO8ygydTvb7psgO4qAoSNJ tMjyvpvKzNAcu8Y9SdgUITal2CijK+V5HYTcFFDgvN1hNEVAM8wHecKFP7XTKtu8dZBx jpeBPsXQN7ZmcLzi8iHZ6e2zQOPW5MuI1KKnRU6oa58PX8ybWpzITiORVtZWDxQH9qXU 14opjMAtmqjA1y6ZLK2e5t7bqIVoj3oja00Mk2BXsHGOE8Jo0+lghgFUOE+nshGiYXRd Oqew== X-Gm-Message-State: AJcUukdU30ZUFaR+03DVUsRpXCWS++hkya/lizwttDNmM4VNSvDtZYUB ITKptp05XpJtgpBR80hW2fqfHHGY X-Google-Smtp-Source: ALg8bN5SW12GUbxcVAqmJB02VoEsEcsjDvAr9VKag/YYG254sS075EqRd+quHGtQS0QpbFfP1mdgjg== X-Received: by 2002:a81:f00c:: with SMTP id p12mr9335016ywm.55.1547669022639; Wed, 16 Jan 2019 12:03:42 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:41 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 12/14] net: dsa: Wire up multicast IGMP snooping attribute notification Date: Wed, 16 Jan 2019 12:01:00 -0800 Message-Id: <20190116200102.2749-13-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The bridge can at runtime be configured with or without IGMP snooping enabled but we were not processing the switchdev attribute that notifies about that toggle, do this now. Signed-off-by: Florian Fainelli --- include/net/dsa.h | 2 ++ net/dsa/dsa_priv.h | 11 +++++++++++ net/dsa/port.c | 13 +++++++++++++ net/dsa/slave.c | 4 ++++ net/dsa/switch.c | 28 ++++++++++++++++++++++++++++ 5 files changed, 58 insertions(+) diff --git a/include/net/dsa.h b/include/net/dsa.h index b3eefe8e18fd..11cd4db3bc9e 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -479,6 +479,8 @@ struct dsa_switch_ops { /* * Multicast database */ + int (*port_multicast_toggle)(struct dsa_switch *ds, int port, + bool mc_disabled); int (*port_mdb_prepare)(struct dsa_switch *ds, int port, const struct switchdev_obj_port_mdb *mdb); void (*port_mdb_add)(struct dsa_switch *ds, int port, diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index aad8acc70183..6f7ed2b3494f 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -27,6 +27,7 @@ enum { DSA_NOTIFIER_VLAN_ADD, DSA_NOTIFIER_VLAN_DEL, DSA_NOTIFIER_VLAN_FILTERING, + DSA_NOTIFIER_MC_DISABLED, }; /* DSA_NOTIFIER_AGEING_TIME */ @@ -74,6 +75,14 @@ struct dsa_notifier_vlan_filtering_info { int port; }; +/* DSA_NOTIFIER_MC_DISABLED */ +struct dsa_notifier_mc_disabled_info { + bool mc_disabled; + struct switchdev_trans *trans; + int sw_index; + int port; +}; + struct dsa_slave_priv { /* Copy of CPU port xmit for faster access in slave transmit hot path */ struct sk_buff * (*xmit)(struct sk_buff *skb, @@ -154,6 +163,8 @@ int dsa_port_enable(struct dsa_port *dp, struct phy_device *phy); void dsa_port_disable(struct dsa_port *dp, struct phy_device *phy); int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br); void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br); +int dsa_port_multicast_toggle(struct dsa_port *dp, bool mc_disabled, + struct switchdev_trans *trans); int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering, struct switchdev_trans *trans); int dsa_port_ageing_time(struct dsa_port *dp, clock_t ageing_clock, diff --git a/net/dsa/port.c b/net/dsa/port.c index d7b057d46460..148458941b51 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -143,6 +143,19 @@ void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br) dsa_port_set_state_now(dp, BR_STATE_FORWARDING); } +int dsa_port_multicast_toggle(struct dsa_port *dp, bool mc_disabled, + struct switchdev_trans *trans) +{ + struct dsa_notifier_mc_disabled_info info = { + .sw_index = dp->ds->index, + .port = dp->index, + .trans = trans, + .mc_disabled = mc_disabled, + }; + + return dsa_port_notify(dp, DSA_NOTIFIER_MC_DISABLED, &info); +} + int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering, struct switchdev_trans *trans) { diff --git a/net/dsa/slave.c b/net/dsa/slave.c index e266ef329583..acb7f1830e98 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -337,6 +337,10 @@ static int dsa_slave_port_attr_set(struct net_device *dev, case SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME: ret = dsa_port_ageing_time(dp, attr->u.ageing_time, trans); break; + case SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED: + ret = dsa_port_multicast_toggle(dp, attr->u.mc_disabled, + trans); + break; default: ret = -EOPNOTSUPP; break; diff --git a/net/dsa/switch.c b/net/dsa/switch.c index 831334dc5e79..e095eb808434 100644 --- a/net/dsa/switch.c +++ b/net/dsa/switch.c @@ -261,6 +261,31 @@ static int dsa_switch_vlan_filtering(struct dsa_switch *ds, return 0; } +static int dsa_switch_mc_disabled(struct dsa_switch *ds, + struct dsa_notifier_mc_disabled_info *info) +{ + struct switchdev_trans *trans = info->trans; + bool mc_disabled = info->mc_disabled; + int port = info->port; + int err; + + if (switchdev_trans_ph_prepare(trans)) + return ds->ops->port_multicast_toggle ? 0 : -EOPNOTSUPP; + + /* Build a mask of port members */ + bitmap_zero(ds->bitmap, ds->num_ports); + if (ds->index == info->sw_index) + set_bit(port, ds->bitmap); + + for_each_set_bit(port, ds->bitmap, ds->num_ports) { + err = ds->ops->port_multicast_toggle(ds, port, mc_disabled); + if (err) + return err; + } + + return 0; +} + static int dsa_switch_event(struct notifier_block *nb, unsigned long event, void *info) { @@ -298,6 +323,9 @@ static int dsa_switch_event(struct notifier_block *nb, case DSA_NOTIFIER_VLAN_FILTERING: err = dsa_switch_vlan_filtering(ds, info); break; + case DSA_NOTIFIER_MC_DISABLED: + err = dsa_switch_mc_disabled(ds, info); + break; default: err = -EOPNOTSUPP; break; From patchwork Wed Jan 16 20:01:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026176 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vPBX2E4O"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fyp10khVz9sCh for ; Thu, 17 Jan 2019 07:03:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732288AbfAPUDr (ORCPT ); Wed, 16 Jan 2019 15:03:47 -0500 Received: from mail-yw1-f67.google.com ([209.85.161.67]:45621 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732244AbfAPUDq (ORCPT ); Wed, 16 Jan 2019 15:03:46 -0500 Received: by mail-yw1-f67.google.com with SMTP id d190so2895335ywd.12 for ; Wed, 16 Jan 2019 12:03:45 -0800 (PST) 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=mdUnN5x3Vn8Yt72tUN0LMxO57uYgS0rR0UfsRiQw270=; b=vPBX2E4O4cKS+/b03UCZwduEfF6G/mVsQFm/Kk9qUuGiQ8j8kHDJwzoHXoOhDzV3ZH YUfGeuy79STc3pDn54m/wX+yrHLVFRty6fHp0qyou/0YC4GiSwCMZP18dcu8oN2moAsD of0+qj8iwz55JsivNk12AGU2Rpev+nwZvW2GFV2ysU5OiSslIiZ3tUlq58CB/vPIzlPi V9o+f0Jzrp+M8H27hl78u6owddT0RJiul8OTMQPsfhP86L39nMGquMzb0q8yvUtXSzaV lML3R1XxR58SBY7vOXWG006BzxYif3z3UVZJw6bgKI2g9yyOMoCApUyoqRxntcx42Us3 prnQ== 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=mdUnN5x3Vn8Yt72tUN0LMxO57uYgS0rR0UfsRiQw270=; b=bEluu4yVCHM/9msX+RLJAyFsLecah73jGNbGkgCHJImHgJ6FRPDw7U3GC50zjyjxmM xUROoS+2NvgtUh7uqko59mOIzN8+I82JA4L38BYXBBOaRNQgzGMINy/8JVReXsCTOohK /jwkwpTEzCZUX+ijGH4dEc9Zp+mAwwUdzJPG45HhybKGhVLFGEi6esrlYU332U+WJLL/ oHWoRN4L9ZiGtIK3rDn0HeupO8R8dLz9/TL6sx/QcPb7/hepsx/+go5M5ThWhI3336x9 v+d9pkXEoEZUkacpQ9NyrnScfQcfcfne4NumZcDbxOIDlNSc5gKizb4LMuDqQwqdU1t5 +3SA== X-Gm-Message-State: AJcUukeKg8PmUe7gFR/SGpvQZcJb4aWSbFgOjkF5x/oSf8+VFuLQPe7I N/4+0rbFadpSZHX9cWy/2D5SAozE X-Google-Smtp-Source: ALg8bN4dnln0LFC+IZLMxfHOK2F4rrJEsgXBB94S80O8MTbkT4N6EGFz8I0ub6SlWBwdRgpFu3A+uQ== X-Received: by 2002:a81:a887:: with SMTP id f129mr9341976ywh.221.1547669024650; Wed, 16 Jan 2019 12:03:44 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:43 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 13/14] net: dsa: b53: Add support for toggling IGMP snooping Date: Wed, 16 Jan 2019 12:01:01 -0800 Message-Id: <20190116200102.2749-14-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add the required configuration knobs to honor the turning off of IGMP snooping (typically through the bridge interface) which means that when IGMP snooping is off, we must be flooding mutlicast since we do not get any notifications about IGMP join/leave through the network stack running on the bridge. Signed-off-by: Florian Fainelli --- drivers/net/dsa/b53/b53_common.c | 30 ++++++++++++++++++++++++++++++ drivers/net/dsa/b53/b53_priv.h | 2 ++ 2 files changed, 32 insertions(+) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 6c894ad4768a..2c9f6f6abdf3 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1640,6 +1640,35 @@ int b53_fdb_dump(struct dsa_switch *ds, int port, } EXPORT_SYMBOL(b53_fdb_dump); +int b53_multicast_toggle(struct dsa_switch *ds, int port, + bool mc_disabled) +{ + struct b53_device *dev = ds->priv; + u16 mc_ctrl; + + if (is5325(dev) || is5365(dev)) + return -EOPNOTSUPP; + + /* Allow port to flood multicast */ + b53_read16(dev, B53_CTRL_PAGE, B53_MC_FLOOD_MASK, &mc_ctrl); + if (mc_disabled) + mc_ctrl |= BIT(port); + else + mc_ctrl &= ~BIT(port); + b53_write16(dev, B53_CTRL_PAGE, B53_MC_FLOOD_MASK, mc_ctrl); + + /* And flood IP multicast as well */ + b53_read16(dev, B53_CTRL_PAGE, B53_IPMC_FLOOD_MASK, &mc_ctrl); + if (mc_disabled) + mc_ctrl |= BIT(port); + else + mc_ctrl &= ~BIT(port); + b53_write16(dev, B53_CTRL_PAGE, B53_IPMC_FLOOD_MASK, mc_ctrl); + + return 0; +} +EXPORT_SYMBOL(b53_multicast_toggle); + int b53_mdb_prepare(struct dsa_switch *ds, int port, const struct switchdev_obj_port_mdb *mdb) { @@ -2025,6 +2054,7 @@ static const struct dsa_switch_ops b53_switch_ops = { .port_mirror_add = b53_mirror_add, .port_mirror_del = b53_mirror_del, .port_mdb_prepare = b53_mdb_prepare, + .port_multicast_toggle = b53_multicast_toggle, .port_mdb_add = b53_mdb_add, .port_mdb_del = b53_mdb_del, }; diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h index 620638ff9338..cd259fb8b00e 100644 --- a/drivers/net/dsa/b53/b53_priv.h +++ b/drivers/net/dsa/b53/b53_priv.h @@ -350,6 +350,8 @@ int b53_fdb_del(struct dsa_switch *ds, int port, const unsigned char *addr, u16 vid); int b53_fdb_dump(struct dsa_switch *ds, int port, dsa_fdb_dump_cb_t *cb, void *data); +int b53_multicast_toggle(struct dsa_switch *ds, int port, + bool mc_disabled); int b53_mdb_prepare(struct dsa_switch *ds, int port, const struct switchdev_obj_port_mdb *mdb); void b53_mdb_add(struct dsa_switch *ds, int port, From patchwork Wed Jan 16 20:01:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026174 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NSsad5Zf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fyny0n6qz9sCh for ; Thu, 17 Jan 2019 07:03:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732325AbfAPUDt (ORCPT ); Wed, 16 Jan 2019 15:03:49 -0500 Received: from mail-yw1-f67.google.com ([209.85.161.67]:43661 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732277AbfAPUDs (ORCPT ); Wed, 16 Jan 2019 15:03:48 -0500 Received: by mail-yw1-f67.google.com with SMTP id n21so2908200ywd.10 for ; Wed, 16 Jan 2019 12:03:47 -0800 (PST) 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=9X+G7UmBxLH47qeToljX8uA7p5u7jCs+886M6gHJ2Ko=; b=NSsad5ZfbBUX/InRSoURtRV/PAqtwH665HL18Z0SOTQ/qUarCs+qx/ldyiuMMIX889 3rlY8Y9j9ATyS5y8XaGim+ZnFFaCMGBcoPvQiO+GD0+M86rJT+t6jpHOAFkY7VYtM53s VlK9MKq0A1L5e6C69wH3QNARHYViUSd8A1ZWdlbnOSdfvboPCJNFdBbLybDx+eNN37vN YRGJA2c/npTbofSlzYgaxLHyTYXzU4ALiLIMTIhwSCYXYSDpLDhQE+CQIb2YwWLG5rUL wvmI8v+F5MahZvcvZNUQDIGXqA7OOIbWV7v2IO7Emr/9D0i+G7Bp07EvgiC7oxyk2e7A RuRw== 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=9X+G7UmBxLH47qeToljX8uA7p5u7jCs+886M6gHJ2Ko=; b=E60yHBQfwjt59LEMKKvcs/qlIzFLEMTYsL4Wu+MOUtKP8sEuFW0rJpdCNnQcTlLVlv SeTN4ywA1AnOfppgbfbbLMPJ45viaecet2xfjzLG68yXwMKQaRKskwUscmXuWd7ZE71o TBT3dLxKZ5M6NtiwaKOH0Y7jrIxYkZYVNK2flwZX4GyC34sIXEdtOVXWgJx5DhG9uabJ ciYnZA1xIWUV2XkCbYLgOEdhKuiYl85Dghd++BceyfFFe0vx8l+3xRe3Mq4ueJYp0y0+ q39WVDxmwSJtPIOISLQ5YQD214mIHL9wiwuN53DHZNcmF/KpHmUxEF6QxRrPUCnekb/f 5J+w== X-Gm-Message-State: AJcUukdxa1hlGmLIE7gVciX3lLUqXaIu5tzm+0Yzuc4iTP5vU0vsjgRw 6qKAG0MwWYvaN3yTUMp2d4se/nKK X-Google-Smtp-Source: ALg8bN5eqa5Pqu8K2RCptocwThaVj5/BaOyqR0c0hQ2aHQ03OgQg16kLMvyayj2/RWshC+sp3txQ1Q== X-Received: by 2002:a81:a6d7:: with SMTP id d206mr9346706ywh.484.1547669026494; Wed, 16 Jan 2019 12:03:46 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:45 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 14/14] net: dsa: bcm_sf2: Enable management mode Date: Wed, 16 Jan 2019 12:01:02 -0800 Message-Id: <20190116200102.2749-15-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that we have all the necessary plumbing in place to get notified when a multicast MAC address must be programmed, configure the switch to oeprate in managed mode and let the network stack learn about management traffic. Signed-off-by: Florian Fainelli --- drivers/net/dsa/b53/b53_common.c | 39 ++++++++++++++++++++-- drivers/net/dsa/b53/b53_priv.h | 1 + drivers/net/dsa/bcm_sf2.c | 56 +++++++++++++++++++++++--------- drivers/net/dsa/bcm_sf2_regs.h | 5 +++ 4 files changed, 84 insertions(+), 17 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 2c9f6f6abdf3..37bc25107158 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -364,8 +364,6 @@ static void b53_enable_vlan(struct b53_device *dev, bool enable, b53_read8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL5, &vc5); } - mgmt &= ~SM_SW_FWD_MODE; - if (enable) { vc0 |= VC0_VLAN_EN | VC0_VID_CHK_EN | VC0_VID_HASH_VID; vc1 |= VC1_RX_MCST_UNTAG_EN | VC1_RX_MCST_FWD_EN; @@ -490,6 +488,43 @@ static int b53_fast_age_vlan(struct b53_device *dev, u16 vid) return b53_flush_arl(dev, FAST_AGE_VLAN); } +void b53_port_learn_setup(struct dsa_switch *ds, int port) +{ + struct b53_device *dev = ds->priv; + u16 reg; + + /* Enable learning */ + b53_read16(dev, B53_CTRL_PAGE, B53_DIS_LEARN, ®); + reg &= ~BIT(port); + b53_write16(dev, B53_CTRL_PAGE, B53_DIS_LEARN, reg); + + /* Software learning control disabled */ + b53_read16(dev, B53_CTRL_PAGE, B53_SFT_LRN_CTRL, ®); + reg &= ~BIT(port); + b53_write16(dev, B53_CTRL_PAGE, B53_SFT_LRN_CTRL, reg); + + /* Configure IP multicast, allow Unicast ARL misses to be forwarded */ + b53_read16(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, ®); + reg |= B53_IPMC_FWD_EN | B53_UC_FWD_EN; + b53_write16(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, reg); + + /* Set port in Unicast lookup forward map */ + b53_read16(dev, B53_CTRL_PAGE, B53_UC_FLOOD_MASK, ®); + reg |= BIT(port); + b53_write16(dev, B53_CTRL_PAGE, B53_UC_FLOOD_MASK, reg); + + /* Do not set port in Multicast lookup forward map, learn */ + b53_read16(dev, B53_CTRL_PAGE, B53_MC_FLOOD_MASK, ®); + reg &= ~BIT(port); + b53_write16(dev, B53_CTRL_PAGE, B53_MC_FLOOD_MASK, reg); + + /* Do not set port in IP multicast lookup formward map, learn */ + b53_read16(dev, B53_CTRL_PAGE, B53_IPMC_FLOOD_MASK, ®); + reg &= ~BIT(port); + b53_write16(dev, B53_CTRL_PAGE, B53_IPMC_FLOOD_MASK, reg); +} +EXPORT_SYMBOL(b53_port_learn_setup); + void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port) { struct b53_device *dev = ds->priv; diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h index cd259fb8b00e..1806304c38cc 100644 --- a/drivers/net/dsa/b53/b53_priv.h +++ b/drivers/net/dsa/b53/b53_priv.h @@ -309,6 +309,7 @@ static inline int b53_switch_get_reset_gpio(struct b53_device *dev) #endif /* Exported functions towards other drivers */ +void b53_port_learn_setup(struct dsa_switch *ds, int port); void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port); int b53_configure_vlan(struct dsa_switch *ds); void b53_get_strings(struct dsa_switch *ds, int port, u32 stringset, diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 361fbde76654..c9e6ffb737a4 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -51,19 +51,19 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port) reg &= ~P_TXQ_PSM_VDD(port); core_writel(priv, reg, CORE_MEM_PSM_VDD_CTRL); - /* Enable Broadcast, Multicast, Unicast forwarding to IMP port */ - reg = core_readl(priv, CORE_IMP_CTL); - reg |= (RX_BCST_EN | RX_MCST_EN | RX_UCST_EN); - reg &= ~(RX_DIS | TX_DIS); - core_writel(priv, reg, CORE_IMP_CTL); + /* Enable forwarding and managed mode */ + core_writel(priv, SW_FWDG_EN | SW_FWDG_MODE, CORE_SWMODE); - /* Enable forwarding */ - core_writel(priv, SW_FWDG_EN, CORE_SWMODE); + /* Configure port for learning */ + b53_port_learn_setup(ds, port); - /* Enable IMP port in dumb mode */ - reg = core_readl(priv, CORE_SWITCH_CTRL); - reg |= MII_DUMB_FWDG_EN; - core_writel(priv, reg, CORE_SWITCH_CTRL); + /* Enable IGMP and MLD high-level protocol snooping support */ + reg = HL_PRTC_IGMP_RPTLVE_EN | HL_PRTC_IGMP_RPTVLE_FWD_MODE | + HL_PRTC_IGMP_QRY_EN | HL_PRTC_IGMP_QRY_FWD_MODE | + HL_PRTC_IGMP_UKN_EN | HL_PRTC_IGMP_UKN_FWD_MODE | + HL_PRTC_MLD_RPTDONE_EN | HL_PRTC_MLD_RPTDONE_FWD_MODE | + HL_PRTC_MLD_QRY_EN | HL_PRTC_MLD_QRY_FWD_MODE; + b53_write32(priv->dev, B53_MGMT_PAGE, B53_HL_PRTC_CTRL, reg); /* Configure Traffic Class to QoS mapping, allow each priority to map * to a different queue number @@ -75,10 +75,26 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port) b53_brcm_hdr_setup(ds, port); + /* Set IMP0 or IMP1 port to be managed port, enable BPDU */ + reg = core_readl(priv, CORE_GMNCFGCFG); + reg &= ~(FRM_MGNP_MASK << FRM_MGNP_SHIFT); + if (port == core_readl(priv, CORE_IMP0_PRT_ID)) + reg |= FRM_MNGP_IMP0 << FRM_MGNP_SHIFT; + if (port == core_readl(priv, CORE_IMP1_PRT_ID)) + reg |= FRM_MGNP_IMP_DUAL << FRM_MGNP_SHIFT; + reg |= RXBPDU_EN; + core_writel(priv, reg, CORE_GMNCFGCFG); + /* Force link status for IMP port */ reg = core_readl(priv, offset); reg |= (MII_SW_OR | LINK_STS); core_writel(priv, reg, offset); + + /* Enable Broadcast, Unicast forwarding to IMP port */ + reg = core_readl(priv, CORE_IMP_CTL); + reg |= (RX_BCST_EN | RX_UCST_EN); + reg &= ~(RX_DIS | TX_DIS); + core_writel(priv, reg, CORE_IMP_CTL); } static void bcm_sf2_gphy_enable_set(struct dsa_switch *ds, bool enable) @@ -166,10 +182,8 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port, reg &= ~P_TXQ_PSM_VDD(port); core_writel(priv, reg, CORE_MEM_PSM_VDD_CTRL); - /* Enable learning */ - reg = core_readl(priv, CORE_DIS_LEARN); - reg &= ~BIT(port); - core_writel(priv, reg, CORE_DIS_LEARN); + /* Configure port for learning */ + b53_port_learn_setup(ds, port); /* Enable Broadcom tags for that port if requested */ if (priv->brcm_tag_mask & BIT(port)) @@ -683,6 +697,7 @@ static int bcm_sf2_sw_suspend(struct dsa_switch *ds) { struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds); unsigned int port; + u32 reg; bcm_sf2_intr_disable(priv); @@ -695,6 +710,13 @@ static int bcm_sf2_sw_suspend(struct dsa_switch *ds) bcm_sf2_port_disable(ds, port, NULL); } + /* Disable management mode since we won't be able to + * perform any tasks while being suspended. + */ + reg = core_readl(priv, CORE_SWMODE); + reg &= ~SW_FWDG_MODE; + core_writel(priv, reg, CORE_SWMODE); + return 0; } @@ -930,6 +952,10 @@ static const struct dsa_switch_ops bcm_sf2_ops = { .set_rxnfc = bcm_sf2_set_rxnfc, .port_mirror_add = b53_mirror_add, .port_mirror_del = b53_mirror_del, + .port_multicast_toggle = b53_multicast_toggle, + .port_mdb_prepare = b53_mdb_prepare, + .port_mdb_add = b53_mdb_add, + .port_mdb_del = b53_mdb_del, }; struct bcm_sf2_of_data { diff --git a/drivers/net/dsa/bcm_sf2_regs.h b/drivers/net/dsa/bcm_sf2_regs.h index 0a1e530d52b7..211db9a2e9e9 100644 --- a/drivers/net/dsa/bcm_sf2_regs.h +++ b/drivers/net/dsa/bcm_sf2_regs.h @@ -222,8 +222,13 @@ enum bcm_sf2_reg_offs { #define CORE_GMNCFGCFG 0x0800 #define RST_MIB_CNT (1 << 0) #define RXBPDU_EN (1 << 1) +#define FRM_MGNP_SHIFT 6 +#define FRM_MGNP_MASK 0x3 +#define FRM_MNGP_IMP0 2 +#define FRM_MGNP_IMP_DUAL 3 #define CORE_IMP0_PRT_ID 0x0804 +#define CORE_IMP1_PRT_ID 0x0808 #define CORE_RST_MIB_CNT_EN 0x0950