From: Ido Schimmel <idosch@idosch.org> To: Nikolay Aleksandrov <razor@blackwall.org> Cc: netdev@vger.kernel.org, roopa@nvidia.com, kuba@kernel.org, davem@davemloft.net, bridge@lists.linux-foundation.org Subject: Re: [PATCH net-next 3/6] net: bridge: fdb: add new nl attribute-based flush call Date: Mon, 11 Apr 2022 11:33:18 +0300 [thread overview] Message-ID: <YlPnznOq3k8KZg2n@shredder> (raw) In-Reply-To: <20220409105857.803667-4-razor@blackwall.org> On Sat, Apr 09, 2022 at 01:58:54PM +0300, Nikolay Aleksandrov wrote: > Add a new fdb flush call which parses the embedded attributes in > BRIDGE_FLUSH_FDB and fills in the fdb flush descriptor to delete only > matching entries. Currently it's a complete flush, support for more > fine-grained filtering will be added in the following patches. > > Signed-off-by: Nikolay Aleksandrov <razor@blackwall.org> > --- > include/uapi/linux/if_bridge.h | 8 ++++++++ > net/bridge/br_fdb.c | 24 ++++++++++++++++++++++++ > net/bridge/br_netlink.c | 8 ++++++++ > net/bridge/br_private.h | 2 ++ > 4 files changed, 42 insertions(+) > > diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h > index 221a4256808f..2f3799cf14b2 100644 > --- a/include/uapi/linux/if_bridge.h > +++ b/include/uapi/linux/if_bridge.h > @@ -807,7 +807,15 @@ enum { > /* embedded in IFLA_BRIDGE_FLUSH */ > enum { > BRIDGE_FLUSH_UNSPEC, > + BRIDGE_FLUSH_FDB, > __BRIDGE_FLUSH_MAX > }; > #define BRIDGE_FLUSH_MAX (__BRIDGE_FLUSH_MAX - 1) > + > +/* embedded in BRIDGE_FLUSH_FDB */ > +enum { > + FDB_FLUSH_UNSPEC, > + __FDB_FLUSH_MAX > +}; > +#define FDB_FLUSH_MAX (__FDB_FLUSH_MAX - 1) > #endif /* _UAPI_LINUX_IF_BRIDGE_H */ > diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c > index 4b0bf88c4121..62f694a739e1 100644 > --- a/net/bridge/br_fdb.c > +++ b/net/bridge/br_fdb.c > @@ -594,6 +594,30 @@ void br_fdb_flush(struct net_bridge *br, > rcu_read_unlock(); > } > > +static const struct nla_policy br_fdb_flush_policy[FDB_FLUSH_MAX + 1] = { > + [FDB_FLUSH_UNSPEC] = { .type = NLA_REJECT }, > +}; > + > +int br_fdb_flush_nlattr(struct net_bridge *br, struct nlattr *fdb_flush_attr, > + struct netlink_ext_ack *extack) > +{ > + struct nlattr *fdb_flush_tb[FDB_FLUSH_MAX + 1]; > + struct net_bridge_fdb_flush_desc desc = {}; > + int err; > + > + err = nla_parse_nested(fdb_flush_tb, FDB_FLUSH_MAX, fdb_flush_attr, > + br_fdb_flush_policy, extack); > + if (err) > + return err; > + > + br_debug(br, "flushing port ifindex: %d vlan id: %u flags: 0x%lx flags mask: 0x%lx\n", > + desc.port_ifindex, desc.vlan_id, desc.flags, desc.flags_mask); > + > + br_fdb_flush(br, &desc); > + > + return 0; > +} > + > /* Flush all entries referring to a specific port. > * if do_all is set also flush static entries > * if vid is set delete all entries that match the vlan_id > diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c > index 6e6dce6880c9..bd2c91e5723d 100644 > --- a/net/bridge/br_netlink.c > +++ b/net/bridge/br_netlink.c > @@ -781,6 +781,7 @@ int br_process_vlan_info(struct net_bridge *br, > > static const struct nla_policy br_flush_policy[BRIDGE_FLUSH_MAX + 1] = { > [BRIDGE_FLUSH_UNSPEC] = { .type = NLA_REJECT }, > + [BRIDGE_FLUSH_FDB] = { .type = NLA_NESTED }, In a previous submission [1] Jakub suggested using NLA_POLICY_NESTED() [1] https://lore.kernel.org/netdev/20220224221447.6c7fa95d@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com/ > }; > > static int br_flush(struct net_bridge *br, int cmd, > @@ -804,6 +805,13 @@ static int br_flush(struct net_bridge *br, int cmd, > if (err) > return err; > > + if (flush_tb[BRIDGE_FLUSH_FDB]) { > + err = br_fdb_flush_nlattr(br, flush_tb[BRIDGE_FLUSH_FDB], > + extack); > + if (err) > + return err; > + } > + > return 0; > } > > diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h > index e6930e9ee69d..c7ea531d30ef 100644 > --- a/net/bridge/br_private.h > +++ b/net/bridge/br_private.h > @@ -768,6 +768,8 @@ int br_fdb_hash_init(struct net_bridge *br); > void br_fdb_hash_fini(struct net_bridge *br); > void br_fdb_flush(struct net_bridge *br, > const struct net_bridge_fdb_flush_desc *desc); > +int br_fdb_flush_nlattr(struct net_bridge *br, struct nlattr *fdb_flush_attr, > + struct netlink_ext_ack *extack); > void br_fdb_find_delete_local(struct net_bridge *br, > const struct net_bridge_port *p, > const unsigned char *addr, u16 vid); > -- > 2.35.1 >
WARNING: multiple messages have this Message-ID (diff)
From: Ido Schimmel <idosch@idosch.org> To: Nikolay Aleksandrov <razor@blackwall.org> Cc: netdev@vger.kernel.org, bridge@lists.linux-foundation.org, davem@davemloft.net, kuba@kernel.org, roopa@nvidia.com Subject: Re: [Bridge] [PATCH net-next 3/6] net: bridge: fdb: add new nl attribute-based flush call Date: Mon, 11 Apr 2022 11:33:18 +0300 [thread overview] Message-ID: <YlPnznOq3k8KZg2n@shredder> (raw) In-Reply-To: <20220409105857.803667-4-razor@blackwall.org> On Sat, Apr 09, 2022 at 01:58:54PM +0300, Nikolay Aleksandrov wrote: > Add a new fdb flush call which parses the embedded attributes in > BRIDGE_FLUSH_FDB and fills in the fdb flush descriptor to delete only > matching entries. Currently it's a complete flush, support for more > fine-grained filtering will be added in the following patches. > > Signed-off-by: Nikolay Aleksandrov <razor@blackwall.org> > --- > include/uapi/linux/if_bridge.h | 8 ++++++++ > net/bridge/br_fdb.c | 24 ++++++++++++++++++++++++ > net/bridge/br_netlink.c | 8 ++++++++ > net/bridge/br_private.h | 2 ++ > 4 files changed, 42 insertions(+) > > diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h > index 221a4256808f..2f3799cf14b2 100644 > --- a/include/uapi/linux/if_bridge.h > +++ b/include/uapi/linux/if_bridge.h > @@ -807,7 +807,15 @@ enum { > /* embedded in IFLA_BRIDGE_FLUSH */ > enum { > BRIDGE_FLUSH_UNSPEC, > + BRIDGE_FLUSH_FDB, > __BRIDGE_FLUSH_MAX > }; > #define BRIDGE_FLUSH_MAX (__BRIDGE_FLUSH_MAX - 1) > + > +/* embedded in BRIDGE_FLUSH_FDB */ > +enum { > + FDB_FLUSH_UNSPEC, > + __FDB_FLUSH_MAX > +}; > +#define FDB_FLUSH_MAX (__FDB_FLUSH_MAX - 1) > #endif /* _UAPI_LINUX_IF_BRIDGE_H */ > diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c > index 4b0bf88c4121..62f694a739e1 100644 > --- a/net/bridge/br_fdb.c > +++ b/net/bridge/br_fdb.c > @@ -594,6 +594,30 @@ void br_fdb_flush(struct net_bridge *br, > rcu_read_unlock(); > } > > +static const struct nla_policy br_fdb_flush_policy[FDB_FLUSH_MAX + 1] = { > + [FDB_FLUSH_UNSPEC] = { .type = NLA_REJECT }, > +}; > + > +int br_fdb_flush_nlattr(struct net_bridge *br, struct nlattr *fdb_flush_attr, > + struct netlink_ext_ack *extack) > +{ > + struct nlattr *fdb_flush_tb[FDB_FLUSH_MAX + 1]; > + struct net_bridge_fdb_flush_desc desc = {}; > + int err; > + > + err = nla_parse_nested(fdb_flush_tb, FDB_FLUSH_MAX, fdb_flush_attr, > + br_fdb_flush_policy, extack); > + if (err) > + return err; > + > + br_debug(br, "flushing port ifindex: %d vlan id: %u flags: 0x%lx flags mask: 0x%lx\n", > + desc.port_ifindex, desc.vlan_id, desc.flags, desc.flags_mask); > + > + br_fdb_flush(br, &desc); > + > + return 0; > +} > + > /* Flush all entries referring to a specific port. > * if do_all is set also flush static entries > * if vid is set delete all entries that match the vlan_id > diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c > index 6e6dce6880c9..bd2c91e5723d 100644 > --- a/net/bridge/br_netlink.c > +++ b/net/bridge/br_netlink.c > @@ -781,6 +781,7 @@ int br_process_vlan_info(struct net_bridge *br, > > static const struct nla_policy br_flush_policy[BRIDGE_FLUSH_MAX + 1] = { > [BRIDGE_FLUSH_UNSPEC] = { .type = NLA_REJECT }, > + [BRIDGE_FLUSH_FDB] = { .type = NLA_NESTED }, In a previous submission [1] Jakub suggested using NLA_POLICY_NESTED() [1] https://lore.kernel.org/netdev/20220224221447.6c7fa95d@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com/ > }; > > static int br_flush(struct net_bridge *br, int cmd, > @@ -804,6 +805,13 @@ static int br_flush(struct net_bridge *br, int cmd, > if (err) > return err; > > + if (flush_tb[BRIDGE_FLUSH_FDB]) { > + err = br_fdb_flush_nlattr(br, flush_tb[BRIDGE_FLUSH_FDB], > + extack); > + if (err) > + return err; > + } > + > return 0; > } > > diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h > index e6930e9ee69d..c7ea531d30ef 100644 > --- a/net/bridge/br_private.h > +++ b/net/bridge/br_private.h > @@ -768,6 +768,8 @@ int br_fdb_hash_init(struct net_bridge *br); > void br_fdb_hash_fini(struct net_bridge *br); > void br_fdb_flush(struct net_bridge *br, > const struct net_bridge_fdb_flush_desc *desc); > +int br_fdb_flush_nlattr(struct net_bridge *br, struct nlattr *fdb_flush_attr, > + struct netlink_ext_ack *extack); > void br_fdb_find_delete_local(struct net_bridge *br, > const struct net_bridge_port *p, > const unsigned char *addr, u16 vid); > -- > 2.35.1 >
next prev parent reply other threads:[~2022-04-11 8:33 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-09 10:58 [PATCH net-next 0/6] net: bridge: add flush filtering support Nikolay Aleksandrov 2022-04-09 10:58 ` [Bridge] " Nikolay Aleksandrov 2022-04-09 10:58 ` [PATCH net-next 1/6] net: bridge: add a generic flush operation Nikolay Aleksandrov 2022-04-09 10:58 ` [Bridge] " Nikolay Aleksandrov 2022-04-09 10:58 ` [PATCH net-next 2/6] net: bridge: fdb: add support for fine-grained flushing Nikolay Aleksandrov 2022-04-09 10:58 ` [Bridge] " Nikolay Aleksandrov 2022-04-11 8:20 ` Ido Schimmel 2022-04-11 8:20 ` [Bridge] " Ido Schimmel 2022-04-11 8:54 ` Nikolay Aleksandrov 2022-04-11 8:54 ` [Bridge] " Nikolay Aleksandrov 2022-04-09 10:58 ` [PATCH net-next 3/6] net: bridge: fdb: add new nl attribute-based flush call Nikolay Aleksandrov 2022-04-09 10:58 ` [Bridge] " Nikolay Aleksandrov 2022-04-11 8:33 ` Ido Schimmel [this message] 2022-04-11 8:33 ` Ido Schimmel 2022-04-11 9:01 ` Nikolay Aleksandrov 2022-04-11 9:01 ` [Bridge] " Nikolay Aleksandrov 2022-04-11 8:41 ` Ido Schimmel 2022-04-11 8:41 ` [Bridge] " Ido Schimmel 2022-04-11 9:05 ` Nikolay Aleksandrov 2022-04-11 9:05 ` [Bridge] " Nikolay Aleksandrov 2022-04-09 10:58 ` [PATCH net-next 4/6] net: bridge: fdb: add support for flush filtering based on ndm flags and state Nikolay Aleksandrov 2022-04-09 10:58 ` [Bridge] " Nikolay Aleksandrov 2022-04-11 8:47 ` Ido Schimmel 2022-04-11 8:47 ` [Bridge] " Ido Schimmel 2022-04-11 9:07 ` Nikolay Aleksandrov 2022-04-11 9:07 ` [Bridge] " Nikolay Aleksandrov 2022-04-09 10:58 ` [PATCH net-next 5/6] net: bridge: fdb: add support for flush filtering based on ifindex Nikolay Aleksandrov 2022-04-09 10:58 ` [Bridge] " Nikolay Aleksandrov 2022-04-11 8:57 ` Ido Schimmel 2022-04-11 8:57 ` [Bridge] " Ido Schimmel 2022-04-11 9:03 ` Nikolay Aleksandrov 2022-04-11 9:03 ` [Bridge] " Nikolay Aleksandrov 2022-04-09 10:58 ` [PATCH net-next 6/6] net: bridge: fdb: add support for flush filtering based on vlan id Nikolay Aleksandrov 2022-04-09 10:58 ` [Bridge] " Nikolay Aleksandrov 2022-04-09 12:36 ` [PATCH net-next 0/6] net: bridge: add flush filtering support Nikolay Aleksandrov 2022-04-09 12:36 ` [Bridge] " Nikolay Aleksandrov 2022-04-10 20:43 ` Nikolay Aleksandrov 2022-04-10 20:43 ` [Bridge] " Nikolay Aleksandrov 2022-04-11 7:47 ` Ido Schimmel 2022-04-11 7:47 ` [Bridge] " Ido Schimmel 2022-04-11 8:53 ` Nikolay Aleksandrov 2022-04-11 8:53 ` [Bridge] " Nikolay Aleksandrov 2022-04-11 8:54 ` Ido Schimmel 2022-04-11 8:54 ` [Bridge] " Ido Schimmel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=YlPnznOq3k8KZg2n@shredder \ --to=idosch@idosch.org \ --cc=bridge@lists.linux-foundation.org \ --cc=davem@davemloft.net \ --cc=kuba@kernel.org \ --cc=netdev@vger.kernel.org \ --cc=razor@blackwall.org \ --cc=roopa@nvidia.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.