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 DB487C00140 for ; Tue, 2 Aug 2022 08:27:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234340AbiHBI10 (ORCPT ); Tue, 2 Aug 2022 04:27:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232747AbiHBI1Y (ORCPT ); Tue, 2 Aug 2022 04:27:24 -0400 Received: from mailout-taastrup.gigahost.dk (mailout-taastrup.gigahost.dk [46.183.139.199]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52C2925C46; Tue, 2 Aug 2022 01:27:22 -0700 (PDT) Received: from mailout.gigahost.dk (mailout.gigahost.dk [89.186.169.112]) by mailout-taastrup.gigahost.dk (Postfix) with ESMTP id 28EF8188589F; Tue, 2 Aug 2022 08:27:20 +0000 (UTC) Received: from smtp.gigahost.dk (smtp.gigahost.dk [89.186.169.109]) by mailout.gigahost.dk (Postfix) with ESMTP id D4ADE25032B8; Tue, 2 Aug 2022 08:27:19 +0000 (UTC) Received: by smtp.gigahost.dk (Postfix, from userid 1000) id C83B0A1E00B7; Tue, 2 Aug 2022 08:27:19 +0000 (UTC) X-Screener-Id: 413d8c6ce5bf6eab4824d0abaab02863e8e3f662 MIME-Version: 1.0 Date: Tue, 02 Aug 2022 10:27:19 +0200 From: netdev@kapio-technology.com To: Vladimir Oltean Cc: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org, Andrew Lunn , Vivien Didelot , Florian Fainelli , Eric Dumazet , Paolo Abeni , Jiri Pirko , Ivan Vecera , Roopa Prabhu , Nikolay Aleksandrov , Shuah Khan , Daniel Borkmann , Ido Schimmel , linux-kernel@vger.kernel.org, bridge@lists.linux-foundation.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH v4 net-next 2/6] net: switchdev: add support for offloading of fdb locked flag In-Reply-To: <20220708085403.sk7znfad3x2mnxeh@skbuf> References: <20220707152930.1789437-1-netdev@kapio-technology.com> <20220707152930.1789437-3-netdev@kapio-technology.com> <20220708085403.sk7znfad3x2mnxeh@skbuf> User-Agent: Gigahost Webmail Message-ID: <50bb7ce47f993fb9522476bac69c935e@kapio-technology.com> X-Sender: netdev@kapio-technology.com Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2022-07-08 10:54, Vladimir Oltean wrote: >> }; >> >> /* TODO: ideally DSA ports would have a single dp->link_dp member, >> diff --git a/include/net/switchdev.h b/include/net/switchdev.h >> index aa0171d5786d..9f83c835ee62 100644 >> --- a/include/net/switchdev.h >> +++ b/include/net/switchdev.h >> @@ -245,6 +245,7 @@ struct switchdev_notifier_fdb_info { >> u16 vid; >> u8 added_by_user:1, >> is_local:1, >> + is_locked:1, >> offloaded:1; >> }; >> >> diff --git a/net/bridge/br.c b/net/bridge/br.c >> index 96e91d69a9a8..fe0a4741fcda 100644 >> --- a/net/bridge/br.c >> +++ b/net/bridge/br.c >> @@ -166,7 +166,8 @@ static int br_switchdev_event(struct >> notifier_block *unused, >> case SWITCHDEV_FDB_ADD_TO_BRIDGE: >> fdb_info = ptr; >> err = br_fdb_external_learn_add(br, p, fdb_info->addr, >> - fdb_info->vid, false); >> + fdb_info->vid, false, >> + fdb_info->is_locked); >> if (err) { >> err = notifier_from_errno(err); >> break; >> diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c >> index ee9064a536ae..32ebb18050b9 100644 >> --- a/net/bridge/br_fdb.c >> +++ b/net/bridge/br_fdb.c >> @@ -1136,7 +1136,7 @@ static int __br_fdb_add(struct ndmsg *ndm, >> struct net_bridge *br, >> "FDB entry towards bridge must be permanent"); >> return -EINVAL; >> } >> - err = br_fdb_external_learn_add(br, p, addr, vid, true); >> + err = br_fdb_external_learn_add(br, p, addr, vid, true, false); >> } else { >> spin_lock_bh(&br->hash_lock); >> err = fdb_add_entry(br, p, addr, ndm, nlh_flags, vid, nfea_tb); >> @@ -1366,7 +1366,7 @@ void br_fdb_unsync_static(struct net_bridge *br, >> struct net_bridge_port *p) >> >> int br_fdb_external_learn_add(struct net_bridge *br, struct >> net_bridge_port *p, >> const unsigned char *addr, u16 vid, >> - bool swdev_notify) >> + bool swdev_notify, bool locked) >> { >> struct net_bridge_fdb_entry *fdb; >> bool modified = false; >> @@ -1386,6 +1386,9 @@ int br_fdb_external_learn_add(struct net_bridge >> *br, struct net_bridge_port *p, >> if (!p) >> flags |= BIT(BR_FDB_LOCAL); >> >> + if (locked) >> + flags |= BIT(BR_FDB_ENTRY_LOCKED); >> + >> fdb = fdb_create(br, p, addr, vid, flags); >> if (!fdb) { >> err = -ENOMEM; >> diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h >> index 47a3598d25c8..9082451b4d40 100644 >> --- a/net/bridge/br_private.h >> +++ b/net/bridge/br_private.h >> @@ -811,7 +811,7 @@ int br_fdb_sync_static(struct net_bridge *br, >> struct net_bridge_port *p); >> void br_fdb_unsync_static(struct net_bridge *br, struct >> net_bridge_port *p); >> int br_fdb_external_learn_add(struct net_bridge *br, struct >> net_bridge_port *p, >> const unsigned char *addr, u16 vid, >> - bool swdev_notify); >> + bool swdev_notify, bool locked); >> int br_fdb_external_learn_del(struct net_bridge *br, struct >> net_bridge_port *p, >> const unsigned char *addr, u16 vid, >> bool swdev_notify); >> diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c >> index 8f3d76c751dd..85e566b856e1 100644 >> --- a/net/bridge/br_switchdev.c >> +++ b/net/bridge/br_switchdev.c >> @@ -136,6 +136,7 @@ static void br_switchdev_fdb_populate(struct >> net_bridge *br, >> item->added_by_user = test_bit(BR_FDB_ADDED_BY_USER, &fdb->flags); >> item->offloaded = test_bit(BR_FDB_OFFLOADED, &fdb->flags); >> item->is_local = test_bit(BR_FDB_LOCAL, &fdb->flags); >> + item->is_locked = test_bit(BR_FDB_ENTRY_LOCKED, &fdb->flags); >> item->info.dev = (!p || item->is_local) ? br->dev : p->dev; >> item->info.ctx = ctx; >> } >> diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h >> index d9722e49864b..42f47a94b0f0 100644 >> --- a/net/dsa/dsa_priv.h >> +++ b/net/dsa/dsa_priv.h >> @@ -65,6 +65,7 @@ struct dsa_notifier_fdb_info { >> const struct dsa_port *dp; >> const unsigned char *addr; >> u16 vid; >> + bool is_locked; > > drop > If this is dropped, the whole scheme will not work as userspace will not get notifications of new locked entries from the driver. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 1716781379 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 250AE81374 MIME-Version: 1.0 Date: Tue, 02 Aug 2022 10:27:19 +0200 From: netdev@kapio-technology.com In-Reply-To: <20220708085403.sk7znfad3x2mnxeh@skbuf> References: <20220707152930.1789437-1-netdev@kapio-technology.com> <20220707152930.1789437-3-netdev@kapio-technology.com> <20220708085403.sk7znfad3x2mnxeh@skbuf> Message-ID: <50bb7ce47f993fb9522476bac69c935e@kapio-technology.com> Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Bridge] [PATCH v4 net-next 2/6] net: switchdev: add support for offloading of fdb locked flag List-Id: Linux Ethernet Bridging List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladimir Oltean Cc: Ivan Vecera , Andrew Lunn , Florian Fainelli , Jiri Pirko , Daniel Borkmann , netdev@vger.kernel.org, Nikolay Aleksandrov , bridge@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Ido Schimmel , Vivien Didelot , Eric Dumazet , linux-kselftest@vger.kernel.org, Roopa Prabhu , kuba@kernel.org, Paolo Abeni , Shuah Khan , davem@davemloft.net On 2022-07-08 10:54, Vladimir Oltean wrote: >> }; >> >> /* TODO: ideally DSA ports would have a single dp->link_dp member, >> diff --git a/include/net/switchdev.h b/include/net/switchdev.h >> index aa0171d5786d..9f83c835ee62 100644 >> --- a/include/net/switchdev.h >> +++ b/include/net/switchdev.h >> @@ -245,6 +245,7 @@ struct switchdev_notifier_fdb_info { >> u16 vid; >> u8 added_by_user:1, >> is_local:1, >> + is_locked:1, >> offloaded:1; >> }; >> >> diff --git a/net/bridge/br.c b/net/bridge/br.c >> index 96e91d69a9a8..fe0a4741fcda 100644 >> --- a/net/bridge/br.c >> +++ b/net/bridge/br.c >> @@ -166,7 +166,8 @@ static int br_switchdev_event(struct >> notifier_block *unused, >> case SWITCHDEV_FDB_ADD_TO_BRIDGE: >> fdb_info = ptr; >> err = br_fdb_external_learn_add(br, p, fdb_info->addr, >> - fdb_info->vid, false); >> + fdb_info->vid, false, >> + fdb_info->is_locked); >> if (err) { >> err = notifier_from_errno(err); >> break; >> diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c >> index ee9064a536ae..32ebb18050b9 100644 >> --- a/net/bridge/br_fdb.c >> +++ b/net/bridge/br_fdb.c >> @@ -1136,7 +1136,7 @@ static int __br_fdb_add(struct ndmsg *ndm, >> struct net_bridge *br, >> "FDB entry towards bridge must be permanent"); >> return -EINVAL; >> } >> - err = br_fdb_external_learn_add(br, p, addr, vid, true); >> + err = br_fdb_external_learn_add(br, p, addr, vid, true, false); >> } else { >> spin_lock_bh(&br->hash_lock); >> err = fdb_add_entry(br, p, addr, ndm, nlh_flags, vid, nfea_tb); >> @@ -1366,7 +1366,7 @@ void br_fdb_unsync_static(struct net_bridge *br, >> struct net_bridge_port *p) >> >> int br_fdb_external_learn_add(struct net_bridge *br, struct >> net_bridge_port *p, >> const unsigned char *addr, u16 vid, >> - bool swdev_notify) >> + bool swdev_notify, bool locked) >> { >> struct net_bridge_fdb_entry *fdb; >> bool modified = false; >> @@ -1386,6 +1386,9 @@ int br_fdb_external_learn_add(struct net_bridge >> *br, struct net_bridge_port *p, >> if (!p) >> flags |= BIT(BR_FDB_LOCAL); >> >> + if (locked) >> + flags |= BIT(BR_FDB_ENTRY_LOCKED); >> + >> fdb = fdb_create(br, p, addr, vid, flags); >> if (!fdb) { >> err = -ENOMEM; >> diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h >> index 47a3598d25c8..9082451b4d40 100644 >> --- a/net/bridge/br_private.h >> +++ b/net/bridge/br_private.h >> @@ -811,7 +811,7 @@ int br_fdb_sync_static(struct net_bridge *br, >> struct net_bridge_port *p); >> void br_fdb_unsync_static(struct net_bridge *br, struct >> net_bridge_port *p); >> int br_fdb_external_learn_add(struct net_bridge *br, struct >> net_bridge_port *p, >> const unsigned char *addr, u16 vid, >> - bool swdev_notify); >> + bool swdev_notify, bool locked); >> int br_fdb_external_learn_del(struct net_bridge *br, struct >> net_bridge_port *p, >> const unsigned char *addr, u16 vid, >> bool swdev_notify); >> diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c >> index 8f3d76c751dd..85e566b856e1 100644 >> --- a/net/bridge/br_switchdev.c >> +++ b/net/bridge/br_switchdev.c >> @@ -136,6 +136,7 @@ static void br_switchdev_fdb_populate(struct >> net_bridge *br, >> item->added_by_user = test_bit(BR_FDB_ADDED_BY_USER, &fdb->flags); >> item->offloaded = test_bit(BR_FDB_OFFLOADED, &fdb->flags); >> item->is_local = test_bit(BR_FDB_LOCAL, &fdb->flags); >> + item->is_locked = test_bit(BR_FDB_ENTRY_LOCKED, &fdb->flags); >> item->info.dev = (!p || item->is_local) ? br->dev : p->dev; >> item->info.ctx = ctx; >> } >> diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h >> index d9722e49864b..42f47a94b0f0 100644 >> --- a/net/dsa/dsa_priv.h >> +++ b/net/dsa/dsa_priv.h >> @@ -65,6 +65,7 @@ struct dsa_notifier_fdb_info { >> const struct dsa_port *dp; >> const unsigned char *addr; >> u16 vid; >> + bool is_locked; > > drop > If this is dropped, the whole scheme will not work as userspace will not get notifications of new locked entries from the driver.