From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED106C282C7 for ; Wed, 30 Jan 2019 00:58:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA07D2082E for ; Wed, 30 Jan 2019 00:58:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SV02eINr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728752AbfA3A6G (ORCPT ); Tue, 29 Jan 2019 19:58:06 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:40351 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727833AbfA3A6C (ORCPT ); Tue, 29 Jan 2019 19:58:02 -0500 Received: by mail-pl1-f196.google.com with SMTP id u18so10206885plq.7 for ; Tue, 29 Jan 2019 16:58:02 -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=fv90w/JFCT9ehavvNBU6jhgUvg4Ioz98Q6Ow6+7Fwdk=; b=SV02eINr41x7Ri28BrpEckXQwokK5QRG34ZcCHQ3ltysbenmCYJ3e6560Jf9Ymglbr ForfV4ECFWQyCpG7czToB/dYDVksYReRkbta+ypzOBkajczPPSJmtwa8gwZkAKZhGDwc 2xNK0CuC1AfHKiL0YVZ8w1YfaMJZwtHQ66jsIc2hD3GoO4e2p4UZiIEOQOQndpK47euw KR2GUAmrUAhekOhIwMDClFGJ9F05hCn1YQ8Doo9IMUOHXdZVz/albViOeR7pe1EPvMUl U/aLggc6EpVT6Q6IrsyaBdyQfB5wyD1knOZfHfQhpSteX6osM4F5gIsuHFVHYYlc60D5 GHoA== 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=fv90w/JFCT9ehavvNBU6jhgUvg4Ioz98Q6Ow6+7Fwdk=; b=tZ45QJaxnUb7Qm8PZZJTylAPBf3wZt0gZ8bJOaxtrUzYKqLVkLCr+tSLEujZcZF/OQ a+iZGJs3f7BBv40P7Y99RDQw5DmLrMeYm6THnDPmDbmwZ6bnDOAr0PU72JilF72RAZd2 bFGLj4douvKAIrwNbwmTVmA7Ax+phDbQJoaiY8nPIOlzKL1UAkj2Sg66tLEZPjvkZOPz SL48rXaJgAf6ize7AhrRp3dIxiHsfx+1PVkpIATdKEarP7CLIdMnOU2KvgbO+k3zknWY QwSYCNzc7vEUMBxqRvpmM8AQlXB98zThvI9PEam1VUJZ+WWQ6JcblvIJwHMnFNbudPyb nX2Q== X-Gm-Message-State: AJcUuke8onyU4klNUI1FBXWh6XSOHXfmKK1iouSTC9itJQweIYw+qv1l TwGTfrvoHtURlmjOcUiOgf3Qn9P3 X-Google-Smtp-Source: ALg8bN7vDfhEUrZhgfVRLyz/l4QclDSVQJILfTww3+AmiscVIi6xKiNZqlTmdyYu+zR/vDB2J1vBbQ== X-Received: by 2002:a17:902:c05:: with SMTP id 5mr28507801pls.155.1548809881282; Tue, 29 Jan 2019 16:58:01 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v191sm67837137pgb.77.2019.01.29.16.57.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jan 2019 16:58:00 -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 v2 09/12] net: dsa: Make VLAN filtering use DSA notifiers Date: Tue, 29 Jan 2019 16:55:45 -0800 Message-Id: <20190130005548.2212-10-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190130005548.2212-1-f.fainelli@gmail.com> References: <20190130005548.2212-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 1f4972dab9f2..1e3db5f2a699 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; -- 2.17.1