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;