net: bridge: mcast: add support for port/vlan router control
Subsystems (3)
Nikolay Aleksandrov
maintainercover net: bridge: mcast: add support for port/vlan router control
From: Nikolay Aleksandrov <[email protected]>
Hi,
This small set adds control over port/vlan mcast router config. Initially I had added host vlan entry router control via vlan's global options but that is really unnecessary and we can use a single per-vlan option to control it both for port/vlan and host/vlan entries. Since it's all still in net-next we can convert BRIDGE_VLANDB_GOPTS_MCAST_ROUTER to BRIDGE_VLANDB_ENTRY_MCAST_ROUTER and use it for both. That makes much more sense and is easier for user-space. Patch 01 prepares the port router function to be used with port mcast context instead of port and then patch 02 converts the global vlan mcast router option to per-vlan mcast router option which directly gives us both host/vlan and port/vlan mcast router control without any additional changes.
This way we get the following coherent syntax:
[ port/vlan mcast router]
$ bridge vlan set vid 100 dev ens20 mcast_router 2
[ bridge/vlan mcast router ]
$ bridge vlan set vid 100 dev bridge mcast_router 2 instead of: $ bridge vlan set vid 100 dev bridge mcast_router 1 global
The mcast_router should not be regarded as a global option, it controls the port/vlan and bridge/vlan mcast router behaviour.
This is the last set needed for the initial per-vlan mcast support. Next patch-sets:
- iproute2 support
- selftests
Thanks,
Nik
Nikolay Aleksandrov (2):
net: bridge: mcast: br_multicast_set_port_router takes multicast
context as argument
net: bridge: vlan: convert mcast router global opt to per-vlan entry
include/uapi/linux/if_bridge.h | 2 +- net/bridge/br_multicast.c | 24 ++++++++++++---- net/bridge/br_netlink.c | 3 +- net/bridge/br_private.h | 18 +++++++++++- net/bridge/br_sysfs_if.c | 2 +- net/bridge/br_vlan.c | 1 + net/bridge/br_vlan_options.c | 51 ++++++++++++++++++++++------------ 7 files changed, 74 insertions(+), 27 deletions(-)
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 1/2 net: bridge: mcast: br_multicast_set_port_router takes multicast context as argument
From: Nikolay Aleksandrov <[email protected]>
Change br_multicast_set_port_router to take port multicast context as its first argument so we can later use it to control port/vlan mcast router option.
--- net/bridge/br_multicast.c | 11 ++++++----- net/bridge/br_netlink.c | 3 ++- net/bridge/br_private.h | 3 ++- net/bridge/br_sysfs_if.c | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-)
net/bridge/br_multicast.c +6 -5
@@ -4246,15 +4246,16 @@ br_multicast_rport_del_notify(struct net_bridge_mcast_port *pmctx, bool deleted) pmctx->multicast_router =MDB_RTR_TYPE_TEMP_QUERY ; } -int br_multicast_set_port_router (struct net_bridge_port *p,unsigned long val) +int br_multicast_set_port_router (struct net_bridge_mcast_port *pmctx, +unsigned long val) { -struct net_bridge_mcast *brmctx = &p->br->multicast_ctx; -struct net_bridge_mcast_port *pmctx = &p->multicast_ctx; +struct net_bridge_mcast *brmctx;unsigned long now = jiffies;int err = -EINVAL ;bool del = false; -spin_lock (&p->br->multicast_lock); + brmctx =br_multicast_port_ctx_get_global (pmctx); +spin_lock (&brmctx->br->multicast_lock);if (pmctx->multicast_router == val) {/* Refresh the temp router port timer */ if (pmctx->multicast_router ==MDB_RTR_TYPE_TEMP ) {
@@ -4304,7 +4305,7 @@ int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val) } err =0 ; unlock: -spin_unlock (&p->br->multicast_lock); +spin_unlock (&brmctx->br->multicast_lock);return err; }
net/bridge/br_netlink.c +2 -1
@@ -932,7 +932,8 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[],if (tb[IFLA_BRPORT_MULTICAST_ROUTER ]) {u8 mcast_router =nla_get_u8 (tb[IFLA_BRPORT_MULTICAST_ROUTER ]); - err =br_multicast_set_port_router (p, mcast_router); + err =br_multicast_set_port_router (&p->multicast_ctx, + mcast_router);if (err)return err; }
net/bridge/br_private.h +2 -1
@@ -879,7 +879,8 @@ void br_multicast_flood(struct net_bridge_mdb_entry *mdst, struct sk_buff *skb,struct net_bridge_mcast *brmctx, bool local_rcv, bool local_orig);int br_multicast_set_router (struct net_bridge_mcast *brmctx,unsigned long val); -int br_multicast_set_port_router (struct net_bridge_port *p,unsigned long val); +int br_multicast_set_port_router (struct net_bridge_mcast_port *pmctx, +unsigned long val);int br_multicast_toggle (struct net_bridge *br,unsigned long val,struct netlink_ext_ack *extack);int br_multicast_set_querier (struct net_bridge_mcast *brmctx,unsigned long val);
net/bridge/br_sysfs_if.c +1 -1
@@ -250,7 +250,7 @@ static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)static int store_multicast_router (struct net_bridge_port *p,unsigned long v) { -return br_multicast_set_port_router (p, v); +return br_multicast_set_port_router (&p->multicast_ctx, v); } static BRPORT_ATTR(multicast_router, 0644, show_multicast_router, store_multicast_router);
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 2/2 net: bridge: vlan: convert mcast router global option to per-vlan entry
In reply to Nikolay AleksandrovFrom: Nikolay Aleksandrov <[email protected]>
The per-vlan router option controls the port/vlan and host vlan entries' mcast router config. The global option controlled only the host vlan config, but that is unnecessary and incosistent as it's not really a global vlan option, but rather bridge option to control host router config, so convert BRIDGE_VLANDB_GOPTS_MCAST_ROUTER to BRIDGE_VLANDB_ENTRY_MCAST_ROUTER which can be used to control both host vlan and port vlan mcast router config.
--- include/uapi/linux/if_bridge.h | 2 +- net/bridge/br_multicast.c | 13 +++++++++ net/bridge/br_private.h | 15 ++++++++++ net/bridge/br_vlan.c | 1 + net/bridge/br_vlan_options.c | 51 ++++++++++++++++++++++------------ 5 files changed, 63 insertions(+), 19 deletions(-)
include/uapi/linux/if_bridge.h +1 -1
@@ -506,6 +506,7 @@ enum {BRIDGE_VLANDB_ENTRY_STATE ,BRIDGE_VLANDB_ENTRY_TUNNEL_INFO ,BRIDGE_VLANDB_ENTRY_STATS , +BRIDGE_VLANDB_ENTRY_MCAST_ROUTER , __BRIDGE_VLANDB_ENTRY_MAX, };#define BRIDGE_VLANDB_ENTRY_MAX (__BRIDGE_VLANDB_ENTRY_MAX - 1)
@@ -561,7 +562,6 @@ enum {BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL ,BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL ,BRIDGE_VLANDB_GOPTS_MCAST_QUERIER , -BRIDGE_VLANDB_GOPTS_MCAST_ROUTER ,BRIDGE_VLANDB_GOPTS_MCAST_ROUTER_PORTS ,BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_STATE , __BRIDGE_VLANDB_GOPTS_MAX
net/bridge/br_multicast.c +13 -0
@@ -4310,6 +4310,19 @@ int br_multicast_set_port_router(struct net_bridge_mcast_port *pmctx,return err; } +int br_multicast_set_vlan_router (struct net_bridge_vlan *v,u8 mcast_router) +{ +int err; + +if (br_vlan_is_master (v)) + err =br_multicast_set_router (&v->br_mcast_ctx, mcast_router); +else + err =br_multicast_set_port_router (&v->port_mcast_ctx, + mcast_router); + +return err; +} +static void br_multicast_start_querier (struct net_bridge_mcast *brmctx,struct bridge_mcast_own_query *query) {
net/bridge/br_private.h +15 -0
@@ -676,6 +676,20 @@ static inline bool br_vlan_valid_range(const struct bridge_vlan_info *cur,return true; } +static inline u8 br_vlan_multicast_router (const struct net_bridge_vlan *v) +{ +u8 mcast_router =MDB_RTR_TYPE_DISABLED ; + +#ifdef CONFIG_BRIDGE_IGMP_SNOOPING +if (!br_vlan_is_master (v)) + mcast_router = v->port_mcast_ctx.multicast_router; +else + mcast_router = v->br_mcast_ctx.multicast_router; +#endif + +return mcast_router; +} +static inline int br_afspec_cmd_to_rtm (int cmd) {switch (cmd) {
@@ -881,6 +895,7 @@ void br_multicast_flood(struct net_bridge_mdb_entry *mdst, struct sk_buff *skb,int br_multicast_set_router (struct net_bridge_mcast *brmctx,unsigned long val);int br_multicast_set_port_router (struct net_bridge_mcast_port *pmctx,unsigned long val); +int br_multicast_set_vlan_router (struct net_bridge_vlan *v,u8 mcast_router);int br_multicast_toggle (struct net_bridge *br,unsigned long val,struct netlink_ext_ack *extack);int br_multicast_set_querier (struct net_bridge_mcast *brmctx,unsigned long val);
net/bridge/br_vlan.c +1 -0
@@ -2136,6 +2136,7 @@ static const struct nla_policy br_vlan_db_policy[BRIDGE_VLANDB_ENTRY_MAX + 1] = [BRIDGE_VLANDB_ENTRY_RANGE] = { .type = NLA_U16 }, [BRIDGE_VLANDB_ENTRY_STATE] = { .type = NLA_U8 }, [BRIDGE_VLANDB_ENTRY_TUNNEL_INFO] = { .type = NLA_NESTED }, + [BRIDGE_VLANDB_ENTRY_MCAST_ROUTER] = { .type = NLA_U8 }, }; static int br_vlan_rtm_process_one(struct net_device *dev,
net/bridge/br_vlan_options.c +33 -18
98 lines not on this page · raw message
Signature · 1 line
2.31.1
This series was applied to netdev/net-next.git (refs/heads/master):
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
Quoted 15 lines · On Fri, 20 Aug 2021 15:42:53 +0300 you wrote:
From: Nikolay Aleksandrov <[email protected]>
Hi,
This small set adds control over port/vlan mcast router config. Initially I had added host vlan entry router control via vlan's global options but that is really unnecessary and we can use a single per-vlan option to control it both for port/vlan and host/vlan entries. Since it's all still in net-next we can convertBRIDGE_VLANDB_GOPTS_MCAST_ROUTERtoBRIDGE_VLANDB_ENTRY_MCAST_ROUTERand use it for both. That makes much more sense and is easier for user-space. Patch 01 prepares the port router function to be used with port mcast context instead of port and then patch 02 converts the global vlan mcast router option to per-vlan mcast router option which directly gives us both host/vlan and port/vlan mcast router control without any additional changes.
Quoted 1 line
[...]
Here is the summary with links:
- [net-next,1/2] net: bridge: mcast: br_multicast_set_port_router takes multicast context as argument
https://git.kernel.org/netdev/net-next/c/a53581d5559e - [net-next,2/2] net: bridge: vlan: convert mcast router global option to per-vlan entry https://git.kernel.org/netdev/net-next/c/2796d846d74a
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html