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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14D94C433EF for ; Tue, 8 Mar 2022 08:01:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243395AbiCHICI (ORCPT ); Tue, 8 Mar 2022 03:02:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230340AbiCHICG (ORCPT ); Tue, 8 Mar 2022 03:02:06 -0500 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 122D03E0E9 for ; Tue, 8 Mar 2022 00:01:09 -0800 (PST) Received: by mail-lj1-x229.google.com with SMTP id l12so23835505ljh.12 for ; Tue, 08 Mar 2022 00:01:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=waldekranz-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=N1JQmXY3MiDRND7VSRLrJaIi39qStDN8kUy7mhBbHvU=; b=OSplhnKUOwP/veTrvwlJNWoyd87iFGFw8KdsfnskpNvi1DmxUUgeZ0y6FXU0giiaOP 9BVNdyU7XnlL2cClz2rvZAGklte+z/PEetCiaCped+Uf4MBQcpaplfit3FIKb7AWzd/H qrvJS6ujHQQ1suru6bmMtVfnlqCcKiVEoG8rdEhcEGaW/COSjpVP+Esrb4s4UhTA8d4D p9x28oqyveUyDWRkb/H5dKvNfzWBNXnlzwHieQzR/W23XRLZB+hT40Kou+DhLb0scGCr H8QDY73piaAptUbBkzZaupPKKevN87TEEqJ1jSXSOCQY+WpGSwQXUMvpcYTb+d2RL5OG I/Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=N1JQmXY3MiDRND7VSRLrJaIi39qStDN8kUy7mhBbHvU=; b=S5FcaWLJCdhc16gCbRkJ/+h447OnyZxvwabgjb/5ftqx2yUE4g4Kinwt+pGQ8CiocC zx8F68I3/ucLrdTRJpYGPNF8HeowZOpgkRmvAuVSscD3r7f34JR46av1gnkODi9FGO0H NTrGUq6uQPMTtRrw7MsySj23yGtoizNnVZulFTBrAhOIlLLixgAv1mVmBHVh+5U9fPHq wnKFmqR4DdsNmBJfCaJx8GbogD841qypgXraXoEIrM9bwAjyWWAOpFWSFsVR6c5+K7ZR 4yILztnvl4HYZc0DBFtcd9nShs8Jcg8oD3FQaYy9y75zyya2v/sigw8lsnp1KHLPkDWB L+3Q== X-Gm-Message-State: AOAM533nZTKAnQ6ZR/bWBBS1x1qw/aAbtGXoOIAVXlMa0ZS2s6G8XPHS m4UvkH3i2FV7H7GQjMAfkQeCsg== X-Google-Smtp-Source: ABdhPJzPOIXh4HnWtAOAlC47hq9ZERGpuF6ToCpO0+7qk5e2A7SDC0OW6NBscxM5ucBIvZxa8h8pUQ== X-Received: by 2002:a2e:bf1b:0:b0:247:d88b:2b05 with SMTP id c27-20020a2ebf1b000000b00247d88b2b05mr9754887ljr.515.1646726467224; Tue, 08 Mar 2022 00:01:07 -0800 (PST) Received: from wkz-x280 (a124.broadband3.quicknet.se. [46.17.184.124]) by smtp.gmail.com with ESMTPSA id n16-20020a0565120ad000b00443c3f383c5sm3337466lfu.231.2022.03.08.00.01.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Mar 2022 00:01:06 -0800 (PST) From: Tobias Waldekranz To: Vladimir Oltean Cc: davem@davemloft.net, kuba@kernel.org, Andrew Lunn , Vivien Didelot , Florian Fainelli , Jiri Pirko , Ivan Vecera , Roopa Prabhu , Nikolay Aleksandrov , Russell King , Petr Machata , Cooper Lees , Ido Schimmel , Matt Johnston , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bridge@lists.linux-foundation.org Subject: Re: [PATCH v2 net-next 04/10] net: bridge: mst: Notify switchdev drivers of VLAN MSTI migrations In-Reply-To: <20220303205921.sxb52jzw4jcdj6m7@skbuf> References: <20220301100321.951175-1-tobias@waldekranz.com> <20220301100321.951175-5-tobias@waldekranz.com> <20220303205921.sxb52jzw4jcdj6m7@skbuf> Date: Tue, 08 Mar 2022 09:01:04 +0100 Message-ID: <87y21kna9r.fsf@waldekranz.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 03, 2022 at 22:59, Vladimir Oltean wrote: > On Tue, Mar 01, 2022 at 11:03:15AM +0100, Tobias Waldekranz wrote: >> Whenever a VLAN moves to a new MSTI, send a switchdev notification so >> that switchdevs can... >> >> ...either refuse the migration if the hardware does not support >> offloading of MST... >> >> ..or track a bridge's VID to MSTI mapping when offloading is >> supported. >> >> Signed-off-by: Tobias Waldekranz >> --- >> include/net/switchdev.h | 10 +++++++ >> net/bridge/br_mst.c | 15 +++++++++++ >> net/bridge/br_switchdev.c | 57 +++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 82 insertions(+) >> >> diff --git a/include/net/switchdev.h b/include/net/switchdev.h >> index 3e424d40fae3..39e57aa5005a 100644 >> --- a/include/net/switchdev.h >> +++ b/include/net/switchdev.h >> @@ -28,6 +28,7 @@ enum switchdev_attr_id { >> SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED, >> SWITCHDEV_ATTR_ID_BRIDGE_MROUTER, >> SWITCHDEV_ATTR_ID_MRP_PORT_ROLE, >> + SWITCHDEV_ATTR_ID_VLAN_MSTI, >> }; >> >> struct switchdev_brport_flags { >> @@ -35,6 +36,14 @@ struct switchdev_brport_flags { >> unsigned long mask; >> }; >> >> +struct switchdev_vlan_attr { >> + u16 vid; >> + >> + union { >> + u16 msti; >> + }; > > Do you see other VLAN attributes that would be added in the future, such > as to justify making this a single-element union from the get-go? I could imagine being able to control things like multicast snooping on a per-VLAN basis. Being able to act as a multicast router in one VLAN but not another. > Anyway if that is the case, we're lacking an id for the attribute type, > so we'd end up needing to change drivers when a second union element > appears. Otherwise they'd all expect an u16 msti. My idea was that `enum switchdev_attr_id` would hold all of that information. In this example SWITCHDEV_ATTR_ID_VLAN_MSTI, denotes both that `vlan_attr` is the valid member of `u` and that `msti` is the valid member of `vlan_attr`. If we add SWITCHDEV_ATTR_ID_VLAN_SNOOPING, that would point to both `vlan_attr` and a new `bool snooping` in the union. Do you think we should just have a SWITCHDEV_ATTR_ID_VLAN_ATTR for all per-VLAN attributes and then have a separate union? >> +}; >> + >> struct switchdev_attr { >> struct net_device *orig_dev; >> enum switchdev_attr_id id; >> @@ -50,6 +59,7 @@ struct switchdev_attr { >> u16 vlan_protocol; /* BRIDGE_VLAN_PROTOCOL */ >> bool mc_disabled; /* MC_DISABLED */ >> u8 mrp_port_role; /* MRP_PORT_ROLE */ >> + struct switchdev_vlan_attr vlan_attr; /* VLAN_* */ >> } u; >> }; >> >> diff --git a/net/bridge/br_mst.c b/net/bridge/br_mst.c >> index 8dea8e7257fd..aba603675165 100644 >> --- a/net/bridge/br_mst.c >> +++ b/net/bridge/br_mst.c >> @@ -7,6 +7,7 @@ >> */ >> >> #include >> +#include >> >> #include "br_private.h" >> >> @@ -65,9 +66,23 @@ static void br_mst_vlan_sync_state(struct net_bridge_vlan *pv, u16 msti) >> >> int br_mst_vlan_set_msti(struct net_bridge_vlan *mv, u16 msti) >> { >> + struct switchdev_attr attr = { >> + .id = SWITCHDEV_ATTR_ID_VLAN_MSTI, >> + .flags = SWITCHDEV_F_DEFER, > > Is the bridge spinlock held (atomic context), or otherwise why is > SWITCHDEV_F_DEFER needed here? Nope, just copypasta. In fact, it shouldn't be needed when setting the state either, as you can only change the state via a netlink message. I will remove it. >> + .orig_dev = mv->br->dev, >> + .u.vlan_attr = { >> + .vid = mv->vid, >> + .msti = msti, >> + }, >> + }; >> struct net_bridge_vlan_group *vg; >> struct net_bridge_vlan *pv; >> struct net_bridge_port *p; >> + int err; >> + >> + err = switchdev_port_attr_set(mv->br->dev, &attr, NULL); > > Treating a "VLAN attribute" as a "port attribute of the bridge" is > pushing the taxonomy just a little, but I don't have a better suggestion. Isn't there prior art here? I thought things like VLAN filtering already worked like this? >> + if (err && err != -EOPNOTSUPP) >> + return err; >> >> mv->msti = msti; >> >> diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c >> index 6f6a70121a5e..160d7659f88a 100644 >> --- a/net/bridge/br_switchdev.c >> +++ b/net/bridge/br_switchdev.c >> @@ -428,6 +428,57 @@ static int br_switchdev_vlan_replay(struct net_device *br_dev, >> return 0; >> } >> >> +static int br_switchdev_mst_replay(struct net_device *br_dev, >> + const void *ctx, bool adding, >> + struct notifier_block *nb, >> + struct netlink_ext_ack *extack) > > "bool adding" is unused, and replaying the VLAN to MSTI associations > before deleting them makes little sense anyway. > > I understand the appeal of symmetry, so maybe put an > > if (adding) { > err = br_switchdev_vlan_attr_replay(...); > if (err && err != -EOPNOTSUPP) > return err; > } > > at the end of br_switchdev_vlan_replay()? Yeah, that is better. Will change. >> +{ >> + struct switchdev_notifier_port_attr_info attr_info = { >> + .info = { >> + .dev = br_dev, >> + .extack = extack, >> + .ctx = ctx, >> + }, >> + }; >> + struct net_bridge *br = netdev_priv(br_dev); >> + struct net_bridge_vlan_group *vg; >> + struct net_bridge_vlan *v; >> + int err; >> + >> + ASSERT_RTNL(); >> + >> + if (!nb) >> + return 0; >> + >> + if (!netif_is_bridge_master(br_dev)) >> + return -EINVAL; >> + >> + vg = br_vlan_group(br); >> + >> + list_for_each_entry(v, &vg->vlan_list, vlist) { >> + struct switchdev_attr attr = { >> + .id = SWITCHDEV_ATTR_ID_VLAN_MSTI, >> + .flags = SWITCHDEV_F_DEFER, > > I don't think SWITCHDEV_F_DEFER has any effect on a replay. Right, will fix. >> + .orig_dev = br_dev, >> + .u.vlan_attr = { >> + .vid = v->vid, >> + .msti = v->msti, >> + } >> + }; >> + >> + if (!v->msti) >> + continue; >> + >> + attr_info.attr = &attr; >> + err = nb->notifier_call(nb, SWITCHDEV_PORT_ATTR_SET, &attr_info); >> + err = notifier_to_errno(err); >> + if (err) >> + return err; >> + } >> + >> + return 0; >> +} >> + >> #ifdef CONFIG_BRIDGE_IGMP_SNOOPING >> struct br_switchdev_mdb_complete_info { >> struct net_bridge_port *port; >> @@ -695,6 +746,10 @@ static int nbp_switchdev_sync_objs(struct net_bridge_port *p, const void *ctx, >> if (err && err != -EOPNOTSUPP) >> return err; >> >> + err = br_switchdev_mst_replay(br_dev, ctx, true, blocking_nb, extack); >> + if (err && err != -EOPNOTSUPP) >> + return err; >> + >> err = br_switchdev_mdb_replay(br_dev, dev, ctx, true, blocking_nb, >> extack); >> if (err && err != -EOPNOTSUPP) >> @@ -719,6 +774,8 @@ static void nbp_switchdev_unsync_objs(struct net_bridge_port *p, >> >> br_switchdev_mdb_replay(br_dev, dev, ctx, false, blocking_nb, NULL); >> >> + br_switchdev_mst_replay(br_dev, ctx, false, blocking_nb, NULL); >> + >> br_switchdev_vlan_replay(br_dev, ctx, false, blocking_nb, NULL); >> } >> >> -- >> 2.25.1 >>