net: bridge: vlan: add global mcast options
Subsystems (3)
Nikolay Aleksandrov
maintainercover net: bridge: vlan: add global mcast options
From: Nikolay Aleksandrov <[email protected]>
Hi,
This is the first follow-up set after the support for per-vlan multicast contexts which extends global vlan options to support bridge's multicast config per-vlan, it enables user-space to change and dump the already existing bridge vlan multicast context options. The global option patches (01 - 09 and 12-13) follow a similar pattern of changing current mcast functions to take multicast context instead of a port/bridge directly. Option equality checks have been added for dumping vlan range compression. The last 2 patches extend the mcast router dump support so it can be re-used when dumping vlan config.
patches 01 - 09: add support for various mcast options patches 10 - 11: prepare for per-vlan querier control patches 12 - 13: add support for querier control and router control patches 14 - 15: add support for dumping per-vlan router ports
Next patch-sets:
- per-port/vlan router option config
- iproute2 support for all new vlan options
- selftests
Thanks,
Nik
Nikolay Aleksandrov (15):
net: bridge: vlan: add support for mcast igmp/mld version global
options
net: bridge: vlan: add support for mcast last member count global
option
net: bridge: vlan: add support for mcast startup query count global
option
net: bridge: vlan: add support for mcast last member interval global
option
net: bridge: vlan: add support for mcast membership interval global
option
net: bridge: vlan: add support for mcast querier interval global
option
net: bridge: vlan: add support for mcast query interval global option
net: bridge: vlan: add support for mcast query response interval
global option
net: bridge: vlan: add support for mcast startup query interval global
option
net: bridge: mcast: move querier state to the multicast context
net: bridge: mcast: querier and query state affect only current
context type
net: bridge: vlan: add support for mcast querier global option
net: bridge: vlan: add support for mcast router global option
net: bridge: mcast: use the proper multicast context when dumping
router ports
net: bridge: vlan: use br_rports_fill_info() to export mcast router
ports
include/uapi/linux/if_bridge.h | 14 +++ net/bridge/br_mdb.c | 60 ++++++----- net/bridge/br_multicast.c | 71 +++++++------ net/bridge/br_netlink.c | 14 ++- net/bridge/br_private.h | 78 ++++++++++++-- net/bridge/br_sysfs_br.c | 10 +- net/bridge/br_vlan_options.c | 186 ++++++++++++++++++++++++++++++++- 7 files changed, 354 insertions(+), 79 deletions(-)
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 1/15 net: bridge: vlan: add support for mcast igmp/mld version global options
From: Nikolay Aleksandrov <[email protected]>
Add support to change and retrieve global vlan IGMP/MLD versions.
--- include/uapi/linux/if_bridge.h | 2 ++ net/bridge/br_multicast.c | 18 ++++++++------- net/bridge/br_netlink.c | 6 +++-- net/bridge/br_private.h | 26 ++++++++++++++++++++-- net/bridge/br_sysfs_br.c | 4 ++-- net/bridge/br_vlan_options.c | 40 ++++++++++++++++++++++++++++++++-- 6 files changed, 80 insertions(+), 16 deletions(-)
include/uapi/linux/if_bridge.h +2 -0
@@ -549,6 +549,8 @@ enum {BRIDGE_VLANDB_GOPTS_ID ,BRIDGE_VLANDB_GOPTS_RANGE ,BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING , +BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION , +BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION , __BRIDGE_VLANDB_GOPTS_MAX };#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
net/bridge/br_multicast.c +10 -8
@@ -4327,7 +4327,8 @@ int br_multicast_set_querier(struct net_bridge *br, unsigned long val)return 0 ; } -int br_multicast_set_igmp_version (struct net_bridge *br,unsigned long val) +int br_multicast_set_igmp_version (struct net_bridge_mcast *brmctx, +unsigned long val) {/* Currently we support only version 2 and 3 */ switch (val) {
@@ -4338,15 +4339,16 @@ int br_multicast_set_igmp_version(struct net_bridge *br, unsigned long val)return -EINVAL ; } -spin_lock_bh (&br->multicast_lock); - br->multicast_ctx.multicast_igmp_version = val; -spin_unlock_bh (&br->multicast_lock); +spin_lock_bh (&brmctx->br->multicast_lock); + brmctx->multicast_igmp_version = val; +spin_unlock_bh (&brmctx->br->multicast_lock);return 0 ; }#if IS_ENABLED (CONFIG_IPV6 ) -int br_multicast_set_mld_version (struct net_bridge *br,unsigned long val) +int br_multicast_set_mld_version (struct net_bridge_mcast *brmctx, +unsigned long val) {/* Currently we support version 1 and 2 */ switch (val) {
@@ -4357,9 +4359,9 @@ int br_multicast_set_mld_version(struct net_bridge *br, unsigned long val)return -EINVAL ; } -spin_lock_bh (&br->multicast_lock); - br->multicast_ctx.multicast_mld_version = val; -spin_unlock_bh (&br->multicast_lock); +spin_lock_bh (&brmctx->br->multicast_lock); + brmctx->multicast_mld_version = val; +spin_unlock_bh (&brmctx->br->multicast_lock);return 0 ; }
net/bridge/br_netlink.c +4 -2
@@ -1443,7 +1443,8 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],__u8 igmp_version; igmp_version =nla_get_u8 (data[IFLA_BR_MCAST_IGMP_VERSION ]); - err =br_multicast_set_igmp_version (br, igmp_version); + err =br_multicast_set_igmp_version (&br->multicast_ctx, + igmp_version);if (err)return err; }
@@ -1453,7 +1454,8 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],__u8 mld_version; mld_version =nla_get_u8 (data[IFLA_BR_MCAST_MLD_VERSION ]); - err =br_multicast_set_mld_version (br, mld_version); + err =br_multicast_set_mld_version (&br->multicast_ctx, + mld_version);if (err)return err; }
net/bridge/br_private.h +24 -2
@@ -896,9 +896,11 @@ int br_multicast_toggle(struct net_bridge *br, unsigned long val, struct netlink_ext_ack *extack);int br_multicast_set_querier (struct net_bridge *br,unsigned long val);int br_multicast_set_hash_max (struct net_bridge *br,unsigned long val); -int br_multicast_set_igmp_version (struct net_bridge *br,unsigned long val); +int br_multicast_set_igmp_version (struct net_bridge_mcast *brmctx, +unsigned long val);#if IS_ENABLED (CONFIG_IPV6 ) -int br_multicast_set_mld_version (struct net_bridge *br,unsigned long val); +int br_multicast_set_mld_version (struct net_bridge_mcast *brmctx, +unsigned long val);#endif struct net_bridge_mdb_entry *br_mdb_ip_get (struct net_bridge *br,struct br_ip *dst);
@@ -1178,6 +1180,19 @@ br_multicast_port_ctx_state_stopped(const struct net_bridge_mcast_port *pmctx) (br_multicast_port_ctx_is_vlan (pmctx) && pmctx->vlan->state ==BR_STATE_BLOCKING ); } + +static inline bool +br_multicast_ctx_options_equal (const struct net_bridge_mcast *brmctx1, +const struct net_bridge_mcast *brmctx2) +{ +return brmctx1->multicast_igmp_version == + brmctx2->multicast_igmp_version && +#if IS_ENABLED(CONFIG_IPV6) + brmctx1->multicast_mld_version == + brmctx2->multicast_mld_version && +#endif + true; +}#else static inline int br_multicast_rcv(struct net_bridge_mcast **brmctx, struct net_bridge_mcast_port **pmctx,
@@ -1343,6 +1358,13 @@ static inline int br_mdb_replay(struct net_device *br_dev, {return -EOPNOTSUPP ; } + +static inline bool +br_multicast_ctx_options_equal (const struct net_bridge_mcast *brmctx1, +const struct net_bridge_mcast *brmctx2) +{ +return true; +}#endif /* br_vlan.c */
net/bridge/br_sysfs_br.c +2 -2
@@ -520,7 +520,7 @@ static ssize_t multicast_igmp_version_show(struct device *d,static int set_multicast_igmp_version (struct net_bridge *br,unsigned long val,struct netlink_ext_ack *extack) { -return br_multicast_set_igmp_version (br, val); +return br_multicast_set_igmp_version (&br->multicast_ctx, val); } static ssize_t multicast_igmp_version_store(struct device *d,
@@ -757,7 +757,7 @@ static ssize_t multicast_mld_version_show(struct device *d,static int set_multicast_mld_version (struct net_bridge *br,unsigned long val,struct netlink_ext_ack *extack) { -return br_multicast_set_mld_version (br, val); +return br_multicast_set_mld_version (&br->multicast_ctx, val); } static ssize_t multicast_mld_version_store(struct device *d,
net/bridge/br_vlan_options.c +38 -2
@@ -264,7 +264,9 @@ bool br_vlan_global_opts_can_enter_range(const struct net_bridge_vlan *v_curr, {return v_curr->vid - r_end->vid ==1 && ((v_curr->priv_flags ^ r_end->priv_flags) & -BR_VLFLAG_GLOBAL_MCAST_ENABLED ) ==0 ; +BR_VLFLAG_GLOBAL_MCAST_ENABLED ) ==0 && +br_multicast_ctx_options_equal (&v_curr->br_mcast_ctx, + &r_end->br_mcast_ctx); } bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,
@@ -285,8 +287,16 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,#ifdef CONFIG_BRIDGE_IGMP_SNOOPING if (nla_put_u8 (skb,BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING , - !!(v_opts->priv_flags &BR_VLFLAG_GLOBAL_MCAST_ENABLED ))) + !!(v_opts->priv_flags &BR_VLFLAG_GLOBAL_MCAST_ENABLED )) || +nla_put_u8 (skb,BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION , + v_opts->br_mcast_ctx.multicast_igmp_version)) + goto out_err; + +#if IS_ENABLED (CONFIG_IPV6 ) +if (nla_put_u8 (skb,BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION , + v_opts->br_mcast_ctx.multicast_mld_version)) goto out_err; +#endif #endif nla_nest_end (skb, nest);
@@ -305,6 +315,8 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void) + nla_total_size(sizeof(u16)) /* BRIDGE_VLANDB_GOPTS_ID */#ifdef CONFIG_BRIDGE_IGMP_SNOOPING +nla_total_size (sizeof (u8))/* BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING */ + +nla_total_size (sizeof (u8))/* BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION */ + + nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION */#endif +nla_total_size (sizeof (u16));/* BRIDGE_VLANDB_GOPTS_RANGE */ }
@@ -359,6 +371,8 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br,bool *changed, struct netlink_ext_ack *extack) { + int err __maybe_unused; + *changed = false; #ifdef CONFIG_BRIDGE_IGMP_SNOOPING if (tb[BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING]) {
@@ -368,6 +382,26 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br,if (br_multicast_toggle_global_vlan (v, !!mc_snooping)) *changed = true; } +if (tb[BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION ]) { +u8 ver; + + ver =nla_get_u8 (tb[BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION ]); + err =br_multicast_set_igmp_version (&v->br_mcast_ctx, ver); +if (err) +return err; + *changed = true; + } +#if IS_ENABLED (CONFIG_IPV6 ) +if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION ]) { +u8 ver; + + ver =nla_get_u8 (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION ]); + err =br_multicast_set_mld_version (&v->br_mcast_ctx, ver); +if (err) +return err; + *changed = true; + } +#endif #endif return 0 ;
@@ -377,6 +411,8 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = { [BRIDGE_VLANDB_GOPTS_ID] = { .type = NLA_U16 }, [BRIDGE_VLANDB_GOPTS_RANGE] = { .type = NLA_U16 }, [BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING] = { .type = NLA_U8 }, + [BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION] = { .type = NLA_U8 }, + [BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION] = { .type = NLA_U8 }, }; int br_vlan_rtm_process_global_options(struct net_device *dev,
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 2/15 net: bridge: vlan: add support for mcast last member count global option
In reply to Nikolay AleksandrovFrom: Nikolay Aleksandrov <[email protected]>
Add support to change and retrieve global vlan multicast last member count option.
--- include/uapi/linux/if_bridge.h | 1 + net/bridge/br_private.h | 2 ++ net/bridge/br_vlan_options.c | 13 ++++++++++++- 3 files changed, 15 insertions(+), 1 deletion(-)
include/uapi/linux/if_bridge.h +1 -0
@@ -551,6 +551,7 @@ enum {BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING ,BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION ,BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION , +BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT , __BRIDGE_VLANDB_GOPTS_MAX };#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
net/bridge/br_private.h +2 -0
@@ -1187,6 +1187,8 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1, {return brmctx1->multicast_igmp_version == brmctx2->multicast_igmp_version && + brmctx1->multicast_last_member_count == + brmctx2->multicast_last_member_count && #if IS_ENABLED(CONFIG_IPV6) brmctx1->multicast_mld_version == brmctx2->multicast_mld_version &&
net/bridge/br_vlan_options.c +12 -1
@@ -289,7 +289,9 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,if (nla_put_u8 (skb,BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING , !!(v_opts->priv_flags &BR_VLFLAG_GLOBAL_MCAST_ENABLED )) ||nla_put_u8 (skb,BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION , - v_opts->br_mcast_ctx.multicast_igmp_version)) + v_opts->br_mcast_ctx.multicast_igmp_version) || +nla_put_u32 (skb,BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT , + v_opts->br_mcast_ctx.multicast_last_member_count)) goto out_err;#if IS_ENABLED (CONFIG_IPV6 )
@@ -317,6 +319,7 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void) +nla_total_size (sizeof (u8))/* BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING */ +nla_total_size (sizeof (u8))/* BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION */ +nla_total_size (sizeof (u8))/* BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION */ + + nla_total_size(sizeof(u32)) /* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT */#endif +nla_total_size (sizeof (u16));/* BRIDGE_VLANDB_GOPTS_RANGE */ }
@@ -391,6 +394,13 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br,return err; *changed = true; } +if (tb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT ]) { +u32 cnt; + + cnt =nla_get_u32 (tb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT ]); + v->br_mcast_ctx.multicast_last_member_count = cnt; + *changed = true; + }#if IS_ENABLED (CONFIG_IPV6 )if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION ]) {u8 ver;
@@ -413,6 +423,7 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = { [BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING] = { .type = NLA_U8 }, [BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION] = { .type = NLA_U8 }, [BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION] = { .type = NLA_U8 }, + [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT] = { .type = NLA_U32 }, }; int br_vlan_rtm_process_global_options(struct net_device *dev,
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 3/15 net: bridge: vlan: add support for mcast startup query count global option
In reply to Nikolay AleksandrovFrom: Nikolay Aleksandrov <[email protected]>
Add support to change and retrieve global vlan multicast startup query count option.
--- include/uapi/linux/if_bridge.h | 1 + net/bridge/br_private.h | 2 ++ net/bridge/br_vlan_options.c | 13 ++++++++++++- 3 files changed, 15 insertions(+), 1 deletion(-)
include/uapi/linux/if_bridge.h +1 -0
@@ -552,6 +552,7 @@ enum {BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION ,BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION ,BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT , +BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT , __BRIDGE_VLANDB_GOPTS_MAX };#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
net/bridge/br_private.h +2 -0
@@ -1189,6 +1189,8 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1, brmctx2->multicast_igmp_version && brmctx1->multicast_last_member_count == brmctx2->multicast_last_member_count && + brmctx1->multicast_startup_query_count == + brmctx2->multicast_startup_query_count && #if IS_ENABLED(CONFIG_IPV6) brmctx1->multicast_mld_version == brmctx2->multicast_mld_version &&
net/bridge/br_vlan_options.c +12 -1
@@ -291,7 +291,9 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,nla_put_u8 (skb,BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION , v_opts->br_mcast_ctx.multicast_igmp_version) ||nla_put_u32 (skb,BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT , - v_opts->br_mcast_ctx.multicast_last_member_count)) + v_opts->br_mcast_ctx.multicast_last_member_count) || +nla_put_u32 (skb,BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT , + v_opts->br_mcast_ctx.multicast_startup_query_count)) goto out_err;#if IS_ENABLED (CONFIG_IPV6 )
@@ -320,6 +322,7 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void) +nla_total_size (sizeof (u8))/* BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION */ +nla_total_size (sizeof (u8))/* BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION */ +nla_total_size (sizeof (u32))/* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT */ + + nla_total_size(sizeof(u32)) /* BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT */#endif +nla_total_size (sizeof (u16));/* BRIDGE_VLANDB_GOPTS_RANGE */ }
@@ -401,6 +404,13 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br, v->br_mcast_ctx.multicast_last_member_count = cnt; *changed = true; } +if (tb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT ]) { +u32 cnt; + + cnt =nla_get_u32 (tb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT ]); + v->br_mcast_ctx.multicast_startup_query_count = cnt; + *changed = true; + }#if IS_ENABLED (CONFIG_IPV6 )if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION ]) {u8 ver;
@@ -424,6 +434,7 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = { [BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION] = { .type = NLA_U8 }, [BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION] = { .type = NLA_U8 }, [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT] = { .type = NLA_U32 }, + [BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT] = { .type = NLA_U32 }, }; int br_vlan_rtm_process_global_options(struct net_device *dev,
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 4/15 net: bridge: vlan: add support for mcast last member interval global option
In reply to Nikolay AleksandrovFrom: Nikolay Aleksandrov <[email protected]>
Add support to change and retrieve global vlan multicast last member interval option.
--- include/uapi/linux/if_bridge.h | 2 ++ net/bridge/br_private.h | 2 ++ net/bridge/br_vlan_options.c | 15 +++++++++++++++ 3 files changed, 19 insertions(+)
include/uapi/linux/if_bridge.h +2 -0
@@ -553,6 +553,8 @@ enum {BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION ,BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT ,BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT , +BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL , +BRIDGE_VLANDB_GOPTS_PAD , __BRIDGE_VLANDB_GOPTS_MAX };#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
net/bridge/br_private.h +2 -0
@@ -1191,6 +1191,8 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1, brmctx2->multicast_last_member_count && brmctx1->multicast_startup_query_count == brmctx2->multicast_startup_query_count && + brmctx1->multicast_last_member_interval == + brmctx2->multicast_last_member_interval && #if IS_ENABLED(CONFIG_IPV6) brmctx1->multicast_mld_version == brmctx2->multicast_mld_version &&
net/bridge/br_vlan_options.c +15 -0
@@ -272,6 +272,7 @@ bool br_vlan_global_opts_can_enter_range(const struct net_bridge_vlan *v_curr,bool br_vlan_global_opts_fill (struct sk_buff *skb,u16 vid,u16 vid_range,const struct net_bridge_vlan *v_opts) { +u64 clockval__maybe_unused ;struct nlattr *nest; nest =nla_nest_start (skb,BRIDGE_VLANDB_GLOBAL_OPTIONS );
@@ -296,6 +297,11 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range, v_opts->br_mcast_ctx.multicast_startup_query_count)) goto out_err; + clockval =jiffies_to_clock_t (v_opts->br_mcast_ctx.multicast_last_member_interval); +if (nla_put_u64_64bit (skb,BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL , + clockval,BRIDGE_VLANDB_GOPTS_PAD )) + goto out_err; +#if IS_ENABLED (CONFIG_IPV6 )if (nla_put_u8 (skb,BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION , v_opts->br_mcast_ctx.multicast_mld_version))
@@ -323,6 +329,7 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void) +nla_total_size (sizeof (u8))/* BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION */ +nla_total_size (sizeof (u32))/* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT */ +nla_total_size (sizeof (u32))/* BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT */ + + nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL */#endif +nla_total_size (sizeof (u16));/* BRIDGE_VLANDB_GOPTS_RANGE */ }
@@ -411,6 +418,13 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br, v->br_mcast_ctx.multicast_startup_query_count = cnt; *changed = true; } +if (tb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL ]) { +u64 val; + + val =nla_get_u64 (tb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL ]); + v->br_mcast_ctx.multicast_last_member_interval =clock_t_to_jiffies (val); + *changed = true; + }#if IS_ENABLED (CONFIG_IPV6 )if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION ]) {u8 ver;
@@ -435,6 +449,7 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = { [BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION] = { .type = NLA_U8 }, [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT] = { .type = NLA_U32 }, [BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT] = { .type = NLA_U32 }, + [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL] = { .type = NLA_U64 }, }; int br_vlan_rtm_process_global_options(struct net_device *dev,
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 5/15 net: bridge: vlan: add support for mcast membership interval global option
In reply to Nikolay AleksandrovFrom: Nikolay Aleksandrov <[email protected]>
Add support to change and retrieve global vlan multicast membership interval option.
--- include/uapi/linux/if_bridge.h | 1 + net/bridge/br_private.h | 2 ++ net/bridge/br_vlan_options.c | 13 +++++++++++++ 3 files changed, 16 insertions(+)
include/uapi/linux/if_bridge.h +1 -0
@@ -555,6 +555,7 @@ enum {BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT ,BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL ,BRIDGE_VLANDB_GOPTS_PAD , +BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL , __BRIDGE_VLANDB_GOPTS_MAX };#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
net/bridge/br_private.h +2 -0
@@ -1193,6 +1193,8 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1, brmctx2->multicast_startup_query_count && brmctx1->multicast_last_member_interval == brmctx2->multicast_last_member_interval && + brmctx1->multicast_membership_interval == + brmctx2->multicast_membership_interval && #if IS_ENABLED(CONFIG_IPV6) brmctx1->multicast_mld_version == brmctx2->multicast_mld_version &&
net/bridge/br_vlan_options.c +13 -0
@@ -301,6 +301,10 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,if (nla_put_u64_64bit (skb,BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL , clockval,BRIDGE_VLANDB_GOPTS_PAD )) goto out_err; + clockval =jiffies_to_clock_t (v_opts->br_mcast_ctx.multicast_membership_interval); +if (nla_put_u64_64bit (skb,BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL , + clockval,BRIDGE_VLANDB_GOPTS_PAD )) + goto out_err;#if IS_ENABLED (CONFIG_IPV6 ) if (nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,
@@ -330,6 +334,7 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void) +nla_total_size (sizeof (u32))/* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT */ +nla_total_size (sizeof (u32))/* BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT */ +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL */ + + nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL */#endif +nla_total_size (sizeof (u16));/* BRIDGE_VLANDB_GOPTS_RANGE */ }
@@ -425,6 +430,13 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br, v->br_mcast_ctx.multicast_last_member_interval =clock_t_to_jiffies (val); *changed = true; } +if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL ]) { +u64 val; + + val =nla_get_u64 (tb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL ]); + v->br_mcast_ctx.multicast_membership_interval =clock_t_to_jiffies (val); + *changed = true; + }#if IS_ENABLED (CONFIG_IPV6 )if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION ]) {u8 ver;
@@ -450,6 +462,7 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = { [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT] = { .type = NLA_U32 }, [BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT] = { .type = NLA_U32 }, [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL] = { .type = NLA_U64 }, + [BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL] = { .type = NLA_U64 }, }; int br_vlan_rtm_process_global_options(struct net_device *dev,
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 6/15 net: bridge: vlan: add support for mcast querier interval global option
In reply to Nikolay AleksandrovFrom: Nikolay Aleksandrov <[email protected]>
Add support to change and retrieve global vlan multicast querier interval option.
--- include/uapi/linux/if_bridge.h | 1 + net/bridge/br_private.h | 2 ++ net/bridge/br_vlan_options.c | 13 +++++++++++++ 3 files changed, 16 insertions(+)
include/uapi/linux/if_bridge.h +1 -0
@@ -556,6 +556,7 @@ enum {BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL ,BRIDGE_VLANDB_GOPTS_PAD ,BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL , +BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL , __BRIDGE_VLANDB_GOPTS_MAX };#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
net/bridge/br_private.h +2 -0
@@ -1195,6 +1195,8 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1, brmctx2->multicast_last_member_interval && brmctx1->multicast_membership_interval == brmctx2->multicast_membership_interval && + brmctx1->multicast_querier_interval == + brmctx2->multicast_querier_interval && #if IS_ENABLED(CONFIG_IPV6) brmctx1->multicast_mld_version == brmctx2->multicast_mld_version &&
net/bridge/br_vlan_options.c +13 -0
@@ -305,6 +305,10 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,if (nla_put_u64_64bit (skb,BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL , clockval,BRIDGE_VLANDB_GOPTS_PAD )) goto out_err; + clockval =jiffies_to_clock_t (v_opts->br_mcast_ctx.multicast_querier_interval); +if (nla_put_u64_64bit (skb,BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL , + clockval,BRIDGE_VLANDB_GOPTS_PAD )) + goto out_err;#if IS_ENABLED (CONFIG_IPV6 ) if (nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,
@@ -335,6 +339,7 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void) +nla_total_size (sizeof (u32))/* BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT */ +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL */ +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL */ + + nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL */#endif +nla_total_size (sizeof (u16));/* BRIDGE_VLANDB_GOPTS_RANGE */ }
@@ -437,6 +442,13 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br, v->br_mcast_ctx.multicast_membership_interval =clock_t_to_jiffies (val); *changed = true; } +if (tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL ]) { +u64 val; + + val =nla_get_u64 (tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL ]); + v->br_mcast_ctx.multicast_querier_interval =clock_t_to_jiffies (val); + *changed = true; + }#if IS_ENABLED (CONFIG_IPV6 )if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION ]) {u8 ver;
@@ -463,6 +475,7 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = { [BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT] = { .type = NLA_U32 }, [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL] = { .type = NLA_U64 }, [BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL] = { .type = NLA_U64 }, + [BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL] = { .type = NLA_U64 }, }; int br_vlan_rtm_process_global_options(struct net_device *dev,
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 7/15 net: bridge: vlan: add support for mcast query interval global option
In reply to Nikolay AleksandrovFrom: Nikolay Aleksandrov <[email protected]>
Add support to change and retrieve global vlan multicast query interval option.
--- include/uapi/linux/if_bridge.h | 1 + net/bridge/br_private.h | 2 ++ net/bridge/br_vlan_options.c | 13 +++++++++++++ 3 files changed, 16 insertions(+)
include/uapi/linux/if_bridge.h +1 -0
@@ -557,6 +557,7 @@ enum {BRIDGE_VLANDB_GOPTS_PAD ,BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL ,BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL , +BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL , __BRIDGE_VLANDB_GOPTS_MAX };#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
net/bridge/br_private.h +2 -0
@@ -1197,6 +1197,8 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1, brmctx2->multicast_membership_interval && brmctx1->multicast_querier_interval == brmctx2->multicast_querier_interval && + brmctx1->multicast_query_interval == + brmctx2->multicast_query_interval && #if IS_ENABLED(CONFIG_IPV6) brmctx1->multicast_mld_version == brmctx2->multicast_mld_version &&
net/bridge/br_vlan_options.c +13 -0
@@ -309,6 +309,10 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,if (nla_put_u64_64bit (skb,BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL , clockval,BRIDGE_VLANDB_GOPTS_PAD )) goto out_err; + clockval =jiffies_to_clock_t (v_opts->br_mcast_ctx.multicast_query_interval); +if (nla_put_u64_64bit (skb,BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL , + clockval,BRIDGE_VLANDB_GOPTS_PAD )) + goto out_err;#if IS_ENABLED (CONFIG_IPV6 ) if (nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,
@@ -340,6 +344,7 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void) +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL */ +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL */ +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL */ + + nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL */#endif +nla_total_size (sizeof (u16));/* BRIDGE_VLANDB_GOPTS_RANGE */ }
@@ -449,6 +454,13 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br, v->br_mcast_ctx.multicast_querier_interval =clock_t_to_jiffies (val); *changed = true; } +if (tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL ]) { +u64 val; + + val =nla_get_u64 (tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL ]); + v->br_mcast_ctx.multicast_query_interval =clock_t_to_jiffies (val); + *changed = true; + }#if IS_ENABLED (CONFIG_IPV6 )if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION ]) {u8 ver;
@@ -470,6 +482,7 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = { [BRIDGE_VLANDB_GOPTS_RANGE] = { .type = NLA_U16 }, [BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING] = { .type = NLA_U8 }, [BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION] = { .type = NLA_U8 }, + [BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL] = { .type = NLA_U64 }, [BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION] = { .type = NLA_U8 }, [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT] = { .type = NLA_U32 }, [BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT] = { .type = NLA_U32 },
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 8/15 net: bridge: vlan: add support for mcast query response interval global option
In reply to Nikolay AleksandrovFrom: Nikolay Aleksandrov <[email protected]>
Add support to change and retrieve global vlan multicast query response interval option.
--- include/uapi/linux/if_bridge.h | 1 + net/bridge/br_private.h | 2 ++ net/bridge/br_vlan_options.c | 13 +++++++++++++ 3 files changed, 16 insertions(+)
include/uapi/linux/if_bridge.h +1 -0
@@ -558,6 +558,7 @@ enum {BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL ,BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL ,BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL , +BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL , __BRIDGE_VLANDB_GOPTS_MAX };#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
net/bridge/br_private.h +2 -0
@@ -1199,6 +1199,8 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1, brmctx2->multicast_querier_interval && brmctx1->multicast_query_interval == brmctx2->multicast_query_interval && + brmctx1->multicast_query_response_interval == + brmctx2->multicast_query_response_interval && #if IS_ENABLED(CONFIG_IPV6) brmctx1->multicast_mld_version == brmctx2->multicast_mld_version &&
net/bridge/br_vlan_options.c +13 -0
@@ -313,6 +313,10 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,if (nla_put_u64_64bit (skb,BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL , clockval,BRIDGE_VLANDB_GOPTS_PAD )) goto out_err; + clockval =jiffies_to_clock_t (v_opts->br_mcast_ctx.multicast_query_response_interval); +if (nla_put_u64_64bit (skb,BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL , + clockval,BRIDGE_VLANDB_GOPTS_PAD )) + goto out_err;#if IS_ENABLED (CONFIG_IPV6 ) if (nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,
@@ -345,6 +349,7 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void) +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL */ +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL */ +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL */ + + nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL */#endif +nla_total_size (sizeof (u16));/* BRIDGE_VLANDB_GOPTS_RANGE */ }
@@ -461,6 +466,13 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br, v->br_mcast_ctx.multicast_query_interval =clock_t_to_jiffies (val); *changed = true; } +if (tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL ]) { +u64 val; + + val =nla_get_u64 (tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL ]); + v->br_mcast_ctx.multicast_query_response_interval =clock_t_to_jiffies (val); + *changed = true; + }#if IS_ENABLED (CONFIG_IPV6 )if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION ]) {u8 ver;
@@ -489,6 +501,7 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = { [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL] = { .type = NLA_U64 }, [BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL] = { .type = NLA_U64 }, [BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL] = { .type = NLA_U64 }, + [BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL] = { .type = NLA_U64 }, }; int br_vlan_rtm_process_global_options(struct net_device *dev,
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 9/15 net: bridge: vlan: add support for mcast startup query interval global option
In reply to Nikolay AleksandrovFrom: Nikolay Aleksandrov <[email protected]>
Add support to change and retrieve global vlan multicast startup query interval option.
--- include/uapi/linux/if_bridge.h | 1 + net/bridge/br_private.h | 2 ++ net/bridge/br_vlan_options.c | 13 +++++++++++++ 3 files changed, 16 insertions(+)
include/uapi/linux/if_bridge.h +1 -0
@@ -559,6 +559,7 @@ enum {BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL ,BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL ,BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL , +BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL , __BRIDGE_VLANDB_GOPTS_MAX };#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
net/bridge/br_private.h +2 -0
@@ -1201,6 +1201,8 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1, brmctx2->multicast_query_interval && brmctx1->multicast_query_response_interval == brmctx2->multicast_query_response_interval && + brmctx1->multicast_startup_query_interval == + brmctx2->multicast_startup_query_interval && #if IS_ENABLED(CONFIG_IPV6) brmctx1->multicast_mld_version == brmctx2->multicast_mld_version &&
net/bridge/br_vlan_options.c +13 -0
@@ -317,6 +317,10 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,if (nla_put_u64_64bit (skb,BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL , clockval,BRIDGE_VLANDB_GOPTS_PAD )) goto out_err; + clockval =jiffies_to_clock_t (v_opts->br_mcast_ctx.multicast_startup_query_interval); +if (nla_put_u64_64bit (skb,BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL , + clockval,BRIDGE_VLANDB_GOPTS_PAD )) + goto out_err;#if IS_ENABLED (CONFIG_IPV6 ) if (nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,
@@ -350,6 +354,7 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void) +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL */ +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL */ +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL */ + + nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL */#endif +nla_total_size (sizeof (u16));/* BRIDGE_VLANDB_GOPTS_RANGE */ }
@@ -473,6 +478,13 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br, v->br_mcast_ctx.multicast_query_response_interval =clock_t_to_jiffies (val); *changed = true; } +if (tb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL ]) { +u64 val; + + val =nla_get_u64 (tb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL ]); + v->br_mcast_ctx.multicast_startup_query_interval =clock_t_to_jiffies (val); + *changed = true; + }#if IS_ENABLED (CONFIG_IPV6 )if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION ]) {u8 ver;
@@ -501,6 +513,7 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = { [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL] = { .type = NLA_U64 }, [BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL] = { .type = NLA_U64 }, [BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL] = { .type = NLA_U64 }, + [BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL] = { .type = NLA_U64 }, [BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL] = { .type = NLA_U64 }, };
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 10/15 net: bridge: mcast: move querier state to the multicast context
In reply to Nikolay AleksandrovFrom: Nikolay Aleksandrov <[email protected]>
We need to have the querier state per multicast context in order to have per-vlan control, so remove the internal option bit and move it to the multicast context. Also annotate the lockless reads of the new variable.
--- net/bridge/br_multicast.c | 21 +++++++++++---------- net/bridge/br_netlink.c | 2 +- net/bridge/br_private.h | 4 ++-- net/bridge/br_sysfs_br.c | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-)
net/bridge/br_multicast.c +11 -10
@@ -1668,7 +1668,7 @@ static void br_multicast_send_query(struct net_bridge_mcast *brmctx,if (!br_multicast_ctx_should_use (brmctx, pmctx) || !br_opt_get (brmctx->br,BROPT_MULTICAST_ENABLED ) || - !br_opt_get (brmctx->br,BROPT_MULTICAST_QUERIER )) + !brmctx->multicast_querier)return ;memset (&br_group.dst,0 ,sizeof (br_group.dst));
@@ -1747,14 +1747,16 @@ static void br_multicast_port_group_rexmit(struct timer_list *t)spin_lock (&br->multicast_lock);if (!netif_running (br->dev) ||hlist_unhashed (&pg->mglist) || - !br_opt_get (br,BROPT_MULTICAST_ENABLED ) || - !br_opt_get (br,BROPT_MULTICAST_QUERIER )) + !br_opt_get (br,BROPT_MULTICAST_ENABLED )) goto out; pmctx =br_multicast_pg_to_port_ctx (pg);if (!pmctx) goto out; brmctx =br_multicast_port_ctx_get_global (pmctx); +if (!brmctx->multicast_querier) + goto out; +if (pg->key.addr.proto ==htons (ETH_P_IP )) other_query = &brmctx->ip4_other_query;#if IS_ENABLED (CONFIG_IPV6 )
@@ -1974,8 +1976,7 @@ static void __grp_src_query_marked_and_rexmit(struct net_bridge_mcast *brmctx,if (ent->flags &BR_SGRP_F_SEND ) { ent->flags &= ~BR_SGRP_F_SEND ;if (ent->timer.expires > lmqt) { -if (br_opt_get (brmctx->br, -BROPT_MULTICAST_QUERIER ) && +if (brmctx->multicast_querier && other_query && !timer_pending (&other_query->timer)) ent->src_query_rexmit_cnt = lmqc;
@@ -1984,7 +1985,7 @@ static void __grp_src_query_marked_and_rexmit(struct net_bridge_mcast *brmctx, } } -if (!br_opt_get (brmctx->br,BROPT_MULTICAST_QUERIER ) || +if (!brmctx->multicast_querier || !other_query ||timer_pending (&other_query->timer))return ;
@@ -2015,7 +2016,7 @@ static void __grp_send_query_and_rexmit(struct net_bridge_mcast *brmctx, other_query = &brmctx->ip6_other_query;#endif -if (br_opt_get (brmctx->br,BROPT_MULTICAST_QUERIER ) && +if (brmctx->multicast_querier && other_query && !timer_pending (&other_query->timer)) { lmi = now + brmctx->multicast_last_member_interval; pg->grp_query_rexmit_cnt = brmctx->multicast_last_member_count -1 ;
@@ -3316,7 +3317,7 @@ br_multicast_leave_group(struct net_bridge_mcast *brmctx,if (timer_pending (&other_query->timer)) goto out; -if (br_opt_get (brmctx->br,BROPT_MULTICAST_QUERIER )) { +if (brmctx->multicast_querier) {__br_multicast_send_query (brmctx, pmctx,NULL ,NULL , &mp->addr, false,0 ,NULL );
@@ -4300,10 +4301,10 @@ int br_multicast_set_querier(struct net_bridge *br, unsigned long val) val = !!val;spin_lock_bh (&br->multicast_lock); -if (br_opt_get (br,BROPT_MULTICAST_QUERIER ) == val) +if (brmctx->multicast_querier == val) goto unlock; -br_opt_toggle (br,BROPT_MULTICAST_QUERIER , !!val); +WRITE_ONCE (brmctx->multicast_querier, val);if (!val) goto unlock;
net/bridge/br_netlink.c +1 -1
@@ -1645,7 +1645,7 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev)nla_put_u8 (skb,IFLA_BR_MCAST_QUERY_USE_IFADDR ,br_opt_get (br,BROPT_MULTICAST_QUERY_USE_IFADDR )) ||nla_put_u8 (skb,IFLA_BR_MCAST_QUERIER , -br_opt_get (br,BROPT_MULTICAST_QUERIER )) || +READ_ONCE (br->multicast_ctx.multicast_querier)) ||nla_put_u8 (skb,IFLA_BR_MCAST_STATS_ENABLED ,br_opt_get (br,BROPT_MULTICAST_STATS_ENABLED )) || nla_put_u32(skb, IFLA_BR_MCAST_HASH_ELASTICITY, RHT_ELASTICITY) ||
net/bridge/br_private.h +2 -2
@@ -118,6 +118,7 @@ struct net_bridge_mcast {u32 multicast_last_member_count;u32 multicast_startup_query_count; +u8 multicast_querier;u8 multicast_igmp_version;u8 multicast_router;#if IS_ENABLED (CONFIG_IPV6 )
@@ -439,7 +440,6 @@ enum net_bridge_opts {BROPT_NF_CALL_ARPTABLES ,BROPT_GROUP_ADDR_SET ,BROPT_MULTICAST_ENABLED , -BROPT_MULTICAST_QUERIER ,BROPT_MULTICAST_QUERY_USE_IFADDR ,BROPT_MULTICAST_STATS_ENABLED , BROPT_HAS_IPV6_ADDR,
@@ -1041,7 +1041,7 @@ __br_multicast_querier_exists(struct net_bridge_mcast *brmctx, {bool own_querier_enabled; -if (br_opt_get (brmctx->br,BROPT_MULTICAST_QUERIER )) { +if (READ_ONCE (brmctx->multicast_querier)) {if (is_ipv6 && !br_opt_get (brmctx->br,BROPT_HAS_IPV6_ADDR )) own_querier_enabled = false;else
net/bridge/br_sysfs_br.c +1 -1
@@ -447,7 +447,7 @@ static ssize_t multicast_querier_show(struct device *d, char *buf) {struct net_bridge *br =to_bridge (d); -return sprintf (buf,"%d\n" ,br_opt_get (br,BROPT_MULTICAST_QUERIER )); +return sprintf (buf,"%d\n" ,READ_ONCE (br->multicast_ctx.multicast_querier)); } static int set_multicast_querier(struct net_bridge *br, unsigned long val,
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 11/15 net: bridge: mcast: querier and query state affect only current context type
In reply to Nikolay AleksandrovFrom: Nikolay Aleksandrov <[email protected]>
It is a minor optimization and better behaviour to make sure querier and query sending routines affect only the matching multicast context depending if vlan snooping is enabled (vlan ctx vs bridge ctx). It also avoids sending unnecessary extra query packets.
--- net/bridge/br_multicast.c | 14 +++++++++----- net/bridge/br_private.h | 11 +++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-)
net/bridge/br_multicast.c +9 -5
@@ -1628,7 +1628,8 @@ static void __br_multicast_send_query(struct net_bridge_mcast *brmctx,struct sk_buff *skb;u8 igmp_type; -if (!br_multicast_ctx_should_use (brmctx, pmctx)) +if (!br_multicast_ctx_should_use (brmctx, pmctx) || + !br_multicast_ctx_matches_vlan_snooping (brmctx))return ; again_under_lmqt:
@@ -3875,9 +3876,9 @@ void br_multicast_open(struct net_bridge *br)__br_multicast_open (&vlan->br_mcast_ctx); } } + }else { +__br_multicast_open (&br->multicast_ctx); } - -__br_multicast_open (&br->multicast_ctx); }static void __br_multicast_stop (struct net_bridge_mcast *brmctx)
@@ -4028,9 +4029,9 @@ void br_multicast_stop(struct net_bridge *br)__br_multicast_stop (&vlan->br_mcast_ctx); } } + }else { +__br_multicast_stop (&br->multicast_ctx); } - -__br_multicast_stop (&br->multicast_ctx); }void br_multicast_dev_del (struct net_bridge *br)
@@ -4175,6 +4176,9 @@ static void br_multicast_start_querier(struct net_bridge_mcast *brmctx, {struct net_bridge_port *port; +if (!br_multicast_ctx_matches_vlan_snooping (brmctx)) +return ; +__br_multicast_open_query (brmctx->br, query);rcu_read_lock ();
net/bridge/br_private.h +11 -0
@@ -1209,6 +1209,17 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1,#endif true; } + +static inline bool +br_multicast_ctx_matches_vlan_snooping (const struct net_bridge_mcast *brmctx) +{ +bool vlan_snooping_enabled; + + vlan_snooping_enabled = !!br_opt_get (brmctx->br, +BROPT_MCAST_VLAN_SNOOPING_ENABLED ); + +return !!(vlan_snooping_enabled ==br_multicast_ctx_is_vlan (brmctx)); +}#else static inline int br_multicast_rcv(struct net_bridge_mcast **brmctx, struct net_bridge_mcast_port **pmctx,
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 12/15 net: bridge: vlan: add support for mcast querier global option
In reply to Nikolay AleksandrovFrom: Nikolay Aleksandrov <[email protected]>
Add support to change and retrieve global vlan multicast querier state. We just need to pass multicast context to br_multicast_set_querier instead of bridge device and the rest of the logic remains the same.
--- include/uapi/linux/if_bridge.h | 1 + net/bridge/br_multicast.c | 7 +++---- net/bridge/br_netlink.c | 5 +++-- net/bridge/br_private.h | 5 +++-- net/bridge/br_sysfs_br.c | 4 ++-- net/bridge/br_vlan_options.c | 15 ++++++++++++++- 6 files changed, 26 insertions(+), 11 deletions(-)
include/uapi/linux/if_bridge.h +1 -0
@@ -560,6 +560,7 @@ enum {BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL ,BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL ,BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL , +BRIDGE_VLANDB_GOPTS_MCAST_QUERIER , __BRIDGE_VLANDB_GOPTS_MAX };#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
net/bridge/br_multicast.c +3 -4
@@ -4297,14 +4297,13 @@ bool br_multicast_router(const struct net_device *dev) }EXPORT_SYMBOL_GPL (br_multicast_router); -int br_multicast_set_querier (struct net_bridge *br,unsigned long val) +int br_multicast_set_querier (struct net_bridge_mcast *brmctx,unsigned long val) { -struct net_bridge_mcast *brmctx = &br->multicast_ctx;unsigned long max_delay; val = !!val; -spin_lock_bh (&br->multicast_lock); +spin_lock_bh (&brmctx->br->multicast_lock);if (brmctx->multicast_querier == val) goto unlock;
@@ -4327,7 +4326,7 @@ int br_multicast_set_querier(struct net_bridge *br, unsigned long val)#endif unlock: -spin_unlock_bh (&br->multicast_lock); +spin_unlock_bh (&brmctx->br->multicast_lock);return 0 ; }
net/bridge/br_netlink.c +3 -2
@@ -1372,7 +1372,8 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],if (data[IFLA_BR_MCAST_QUERIER ]) {u8 mcast_querier =nla_get_u8 (data[IFLA_BR_MCAST_QUERIER ]); - err =br_multicast_set_querier (br, mcast_querier); + err =br_multicast_set_querier (&br->multicast_ctx, + mcast_querier);if (err)return err; }
@@ -1645,7 +1646,7 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev)nla_put_u8 (skb,IFLA_BR_MCAST_QUERY_USE_IFADDR ,br_opt_get (br,BROPT_MULTICAST_QUERY_USE_IFADDR )) ||nla_put_u8 (skb,IFLA_BR_MCAST_QUERIER , -READ_ONCE (br->multicast_ctx.multicast_querier)) || + br->multicast_ctx.multicast_querier) ||nla_put_u8 (skb,IFLA_BR_MCAST_STATS_ENABLED ,br_opt_get (br,BROPT_MULTICAST_STATS_ENABLED )) || nla_put_u32(skb, IFLA_BR_MCAST_HASH_ELASTICITY, RHT_ELASTICITY) ||
net/bridge/br_private.h +3 -2
@@ -894,7 +894,7 @@ int br_multicast_set_router(struct net_bridge *br, unsigned long val);int br_multicast_set_port_router (struct net_bridge_port *p,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 *br,unsigned long val); +int br_multicast_set_querier (struct net_bridge_mcast *brmctx,unsigned long val);int br_multicast_set_hash_max (struct net_bridge *br,unsigned long val);int br_multicast_set_igmp_version (struct net_bridge_mcast *brmctx,unsigned long val);
@@ -1041,7 +1041,7 @@ __br_multicast_querier_exists(struct net_bridge_mcast *brmctx, {bool own_querier_enabled; -if (READ_ONCE (brmctx->multicast_querier)) { +if (brmctx->multicast_querier) {if (is_ipv6 && !br_opt_get (brmctx->br,BROPT_HAS_IPV6_ADDR )) own_querier_enabled = false;else
@@ -1203,6 +1203,7 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1, brmctx2->multicast_query_response_interval && brmctx1->multicast_startup_query_interval == brmctx2->multicast_startup_query_interval && + brmctx1->multicast_querier == brmctx2->multicast_querier && #if IS_ENABLED(CONFIG_IPV6) brmctx1->multicast_mld_version == brmctx2->multicast_mld_version &&
net/bridge/br_sysfs_br.c +2 -2
@@ -447,13 +447,13 @@ static ssize_t multicast_querier_show(struct device *d, char *buf) {struct net_bridge *br =to_bridge (d); -return sprintf (buf,"%d\n" ,READ_ONCE (br->multicast_ctx.multicast_querier)); +return sprintf (buf,"%d\n" , br->multicast_ctx.multicast_querier); }static int set_multicast_querier (struct net_bridge *br,unsigned long val,struct netlink_ext_ack *extack) { -return br_multicast_set_querier (br, val); +return br_multicast_set_querier (&br->multicast_ctx, val); } static ssize_t multicast_querier_store(struct device *d,
net/bridge/br_vlan_options.c +14 -1
@@ -294,7 +294,9 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,nla_put_u32 (skb,BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT , v_opts->br_mcast_ctx.multicast_last_member_count) ||nla_put_u32 (skb,BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT , - v_opts->br_mcast_ctx.multicast_startup_query_count)) + v_opts->br_mcast_ctx.multicast_startup_query_count) || +nla_put_u8 (skb,BRIDGE_VLANDB_GOPTS_MCAST_QUERIER , + v_opts->br_mcast_ctx.multicast_querier)) goto out_err; clockval =jiffies_to_clock_t (v_opts->br_mcast_ctx.multicast_last_member_interval);
@@ -355,6 +357,7 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void) +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL */ +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL */ +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL */ + + nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_QUERIER */#endif +nla_total_size (sizeof (u16));/* BRIDGE_VLANDB_GOPTS_RANGE */ }
@@ -485,6 +488,15 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br, v->br_mcast_ctx.multicast_startup_query_interval =clock_t_to_jiffies (val); *changed = true; } +if (tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER ]) { +u8 val; + + val =nla_get_u8 (tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER ]); + err =br_multicast_set_querier (&v->br_mcast_ctx, val); +if (err) +return err; + *changed = true; + }#if IS_ENABLED (CONFIG_IPV6 )if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION ]) {u8 ver;
@@ -507,6 +519,7 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = { [BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING] = { .type = NLA_U8 }, [BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION] = { .type = NLA_U8 }, [BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL] = { .type = NLA_U64 }, + [BRIDGE_VLANDB_GOPTS_MCAST_QUERIER] = { .type = NLA_U8 }, [BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION] = { .type = NLA_U8 }, [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT] = { .type = NLA_U32 }, [BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT] = { .type = NLA_U32 },
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 13/15 net: bridge: vlan: add support for mcast router global option
In reply to Nikolay AleksandrovFrom: Nikolay Aleksandrov <[email protected]>
Add support to change and retrieve global vlan multicast router state which is used for the bridge itself. We just need to pass multicast context to br_multicast_set_router instead of bridge device and the rest of the logic remains the same.
--- include/uapi/linux/if_bridge.h | 1 + net/bridge/br_multicast.c | 11 +++++------ net/bridge/br_netlink.c | 3 ++- net/bridge/br_private.h | 3 ++- net/bridge/br_sysfs_br.c | 2 +- net/bridge/br_vlan_options.c | 15 ++++++++++++++- 6 files changed, 25 insertions(+), 10 deletions(-)
include/uapi/linux/if_bridge.h +1 -0
@@ -561,6 +561,7 @@ 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_MAX };#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
net/bridge/br_multicast.c +5 -6
@@ -4053,17 +4053,16 @@ void br_multicast_dev_del(struct net_bridge *br)rcu_barrier (); } -int br_multicast_set_router (struct net_bridge *br,unsigned long val) +int br_multicast_set_router (struct net_bridge_mcast *brmctx,unsigned long val) { -struct net_bridge_mcast *brmctx = &br->multicast_ctx;int err = -EINVAL ; -spin_lock_bh (&br->multicast_lock); +spin_lock_bh (&brmctx->br->multicast_lock);switch (val) {case MDB_RTR_TYPE_DISABLED :case MDB_RTR_TYPE_PERM : -br_mc_router_state_change (br, val ==MDB_RTR_TYPE_PERM ); +br_mc_router_state_change (brmctx->br, val ==MDB_RTR_TYPE_PERM );del_timer (&brmctx->ip4_mc_router_timer);#if IS_ENABLED (CONFIG_IPV6 )del_timer (&brmctx->ip6_mc_router_timer);
@@ -4073,13 +4072,13 @@ int br_multicast_set_router(struct net_bridge *br, unsigned long val)break ;case MDB_RTR_TYPE_TEMP_QUERY :if (brmctx->multicast_router !=MDB_RTR_TYPE_TEMP_QUERY ) -br_mc_router_state_change (br, false); +br_mc_router_state_change (brmctx->br, false); brmctx->multicast_router = val; err =0 ;break ; } -spin_unlock_bh (&br->multicast_lock); +spin_unlock_bh (&brmctx->br->multicast_lock);return err; }
net/bridge/br_netlink.c +2 -1
@@ -1349,7 +1349,8 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],if (data[IFLA_BR_MCAST_ROUTER ]) {u8 multicast_router =nla_get_u8 (data[IFLA_BR_MCAST_ROUTER ]); - err =br_multicast_set_router (br, multicast_router); + err =br_multicast_set_router (&br->multicast_ctx, + multicast_router);if (err)return err; }
net/bridge/br_private.h +2 -1
@@ -890,7 +890,7 @@ void br_multicast_dev_del(struct net_bridge *br);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 *br,unsigned long val); +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_toggle (struct net_bridge *br,unsigned long val,struct netlink_ext_ack *extack);
@@ -1204,6 +1204,7 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1, brmctx1->multicast_startup_query_interval == brmctx2->multicast_startup_query_interval && brmctx1->multicast_querier == brmctx2->multicast_querier && + brmctx1->multicast_router == brmctx2->multicast_router && #if IS_ENABLED(CONFIG_IPV6) brmctx1->multicast_mld_version == brmctx2->multicast_mld_version &&
net/bridge/br_sysfs_br.c +1 -1
@@ -390,7 +390,7 @@ static ssize_t multicast_router_show(struct device *d,static int set_multicast_router (struct net_bridge *br,unsigned long val,struct netlink_ext_ack *extack) { -return br_multicast_set_router (br, val); +return br_multicast_set_router (&br->multicast_ctx, val); } static ssize_t multicast_router_store(struct device *d,
net/bridge/br_vlan_options.c +14 -1
@@ -296,7 +296,9 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,nla_put_u32 (skb,BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT , v_opts->br_mcast_ctx.multicast_startup_query_count) ||nla_put_u8 (skb,BRIDGE_VLANDB_GOPTS_MCAST_QUERIER , - v_opts->br_mcast_ctx.multicast_querier)) + v_opts->br_mcast_ctx.multicast_querier) || +nla_put_u8 (skb,BRIDGE_VLANDB_GOPTS_MCAST_ROUTER , + v_opts->br_mcast_ctx.multicast_router)) goto out_err; clockval =jiffies_to_clock_t (v_opts->br_mcast_ctx.multicast_last_member_interval);
@@ -358,6 +360,7 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void) +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL */ +nla_total_size (sizeof (u64))/* BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL */ +nla_total_size (sizeof (u8))/* BRIDGE_VLANDB_GOPTS_MCAST_QUERIER */ + + nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_ROUTER */#endif +nla_total_size (sizeof (u16));/* BRIDGE_VLANDB_GOPTS_RANGE */ }
@@ -497,6 +500,15 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br,return err; *changed = true; } +if (tb[BRIDGE_VLANDB_GOPTS_MCAST_ROUTER ]) { +u8 val; + + val =nla_get_u8 (tb[BRIDGE_VLANDB_GOPTS_MCAST_ROUTER ]); + err =br_multicast_set_router (&v->br_mcast_ctx, val); +if (err) +return err; + *changed = true; + }#if IS_ENABLED (CONFIG_IPV6 )if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION ]) {u8 ver;
@@ -520,6 +532,7 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = { [BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION] = { .type = NLA_U8 }, [BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL] = { .type = NLA_U64 }, [BRIDGE_VLANDB_GOPTS_MCAST_QUERIER] = { .type = NLA_U8 }, + [BRIDGE_VLANDB_GOPTS_MCAST_ROUTER] = { .type = NLA_U8 }, [BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION] = { .type = NLA_U8 }, [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT] = { .type = NLA_U32 }, [BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT] = { .type = NLA_U32 },
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 14/15 net: bridge: mcast: use the proper multicast context when dumping router ports
In reply to Nikolay AleksandrovFrom: Nikolay Aleksandrov <[email protected]>
When we are dumping the router ports of a vlan mcast context we need to use the bridge/vlan and port/vlan's multicast contexts to check if IPv4/IPv6 router port is present and later to dump the vlan id.
--- net/bridge/br_mdb.c | 49 ++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 18 deletions(-)
net/bridge/br_mdb.c +31 -18
@@ -16,7 +16,7 @@#include "br_private.h" -static bool br_rports_have_mc_router (struct net_bridge_mcast *brmctx) +static bool br_rports_have_mc_router (const struct net_bridge_mcast *brmctx) {#if IS_ENABLED (CONFIG_IPV6 ) return !hlist_empty(&brmctx->ip4_mc_router_list) ||
@@ -27,46 +27,58 @@ static bool br_rports_have_mc_router(struct net_bridge_mcast *brmctx) }static bool -br_ip4_rports_get_timer (struct net_bridge_port *port,unsigned long *timer) +br_ip4_rports_get_timer (struct net_bridge_mcast_port *pmctx, +unsigned long *timer) { - *timer =br_timer_value (&port->multicast_ctx.ip4_mc_router_timer); -return !hlist_unhashed (&port->multicast_ctx.ip4_rlist); + *timer =br_timer_value (&pmctx->ip4_mc_router_timer); +return !hlist_unhashed (&pmctx->ip4_rlist); }static bool -br_ip6_rports_get_timer (struct net_bridge_port *port,unsigned long *timer) +br_ip6_rports_get_timer (struct net_bridge_mcast_port *pmctx, +unsigned long *timer) {#if IS_ENABLED (CONFIG_IPV6 ) - *timer =br_timer_value (&port->multicast_ctx.ip6_mc_router_timer); -return !hlist_unhashed (&port->multicast_ctx.ip6_rlist); + *timer =br_timer_value (&pmctx->ip6_mc_router_timer); +return !hlist_unhashed (&pmctx->ip6_rlist);#else *timer =0 ;return false;#endif } -static int br_rports_fill_info (struct sk_buff *skb,struct netlink_callback *cb, -struct net_device *dev) +static int br_rports_fill_info (struct sk_buff *skb, +const struct net_bridge_mcast *brmctx) { -struct net_bridge *br =netdev_priv (dev); +u16 vid = brmctx->vlan ? brmctx->vlan->vid :0 ;bool have_ip4_mc_rtr, have_ip6_mc_rtr;unsigned long ip4_timer, ip6_timer;struct nlattr *nest, *port_nest;struct net_bridge_port *p; -if (!br->multicast_ctx.multicast_router) -return 0 ; - -if (!br_rports_have_mc_router (&br->multicast_ctx)) +if (!brmctx->multicast_router || !br_rports_have_mc_router (brmctx))return 0 ; nest =nla_nest_start_noflag (skb,MDBA_ROUTER );if (nest ==NULL )return -EMSGSIZE ; -list_for_each_entry_rcu (p, &br->port_list, list) { - have_ip4_mc_rtr =br_ip4_rports_get_timer (p, &ip4_timer); - have_ip6_mc_rtr =br_ip6_rports_get_timer (p, &ip6_timer); +list_for_each_entry_rcu (p, &brmctx->br->port_list, list) { +struct net_bridge_mcast_port *pmctx; + +if (vid) { +struct net_bridge_vlan *v; + + v =br_vlan_find (nbp_vlan_group (p), vid); +if (!v) +continue ; + pmctx = &v->port_mcast_ctx; + }else { + pmctx = &p->multicast_ctx; + } + + have_ip4_mc_rtr =br_ip4_rports_get_timer (pmctx, &ip4_timer); + have_ip6_mc_rtr =br_ip6_rports_get_timer (pmctx, &ip6_timer);if (!have_ip4_mc_rtr && !have_ip6_mc_rtr)continue ;
@@ -390,6 +402,7 @@ static int br_mdb_dump(struct sk_buff *skb, struct netlink_callback *cb)for_each_netdev_rcu (net, dev) {if (dev->priv_flags &IFF_EBRIDGE ) { +struct net_bridge *br =netdev_priv (dev);struct br_port_msg *bpm;if (idx < s_idx)
@@ -406,7 +419,7 @@ static int br_mdb_dump(struct sk_buff *skb, struct netlink_callback *cb) bpm->ifindex = dev->ifindex;if (br_mdb_fill_info (skb, cb, dev) <0 ) goto out; -if (br_rports_fill_info (skb, cb, dev) <0 ) +if (br_rports_fill_info (skb, &br->multicast_ctx) <0 ) goto out; cb->args[1 ] =0 ;
Signature · 1 line
2.31.1
Nikolay Aleksandrov
maintainerPATCH 15/15 net: bridge: vlan: use br_rports_fill_info() to export mcast router ports
In reply to Nikolay AleksandrovFrom: Nikolay Aleksandrov <[email protected]>
Embed the standard multicast router port export by br_rports_fill_info() into a new global vlan attribute BRIDGE_VLANDB_GOPTS_MCAST_ROUTER_PORTS. In order to have the same format for the global bridge mcast context and the per-vlan mcast context we need a double-nesting:
- BRIDGE_VLANDB_GOPTS_MCAST_ROUTER_PORTS
- MDBA_ROUTER
Currently we don't compare router lists, if any router port exists in the bridge mcast contexts we consider their option sets as different and export them separately.
In addition we export the router port vlan id when dumping similar to the router port notification format.
--- include/uapi/linux/if_bridge.h | 1 + net/bridge/br_mdb.c | 17 ++++------------- net/bridge/br_private.h | 15 +++++++++++++++ net/bridge/br_vlan_options.c | 18 ++++++++++++++++++ 4 files changed, 38 insertions(+), 13 deletions(-)
include/uapi/linux/if_bridge.h +1 -0
@@ -562,6 +562,7 @@ enum {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_MAX };#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
net/bridge/br_mdb.c +4 -13
@@ -16,16 +16,6 @@#include "br_private.h" -static bool br_rports_have_mc_router (const struct net_bridge_mcast *brmctx) -{ -#if IS_ENABLED (CONFIG_IPV6 ) -return !hlist_empty (&brmctx->ip4_mc_router_list) || - !hlist_empty (&brmctx->ip6_mc_router_list); -#else -return !hlist_empty (&brmctx->ip4_mc_router_list); -#endif -} -static bool br_ip4_rports_get_timer (struct net_bridge_mcast_port *pmctx,unsigned long *timer)
@@ -47,8 +37,8 @@ br_ip6_rports_get_timer(struct net_bridge_mcast_port *pmctx,#endif } -static int br_rports_fill_info (struct sk_buff *skb, -const struct net_bridge_mcast *brmctx) +int br_rports_fill_info (struct sk_buff *skb, +const struct net_bridge_mcast *brmctx) {u16 vid = brmctx->vlan ? brmctx->vlan->vid :0 ;bool have_ip4_mc_rtr, have_ip6_mc_rtr;
@@ -97,7 +87,8 @@ static int br_rports_fill_info(struct sk_buff *skb, ip4_timer)) || (have_ip6_mc_rtr && nla_put_u32(skb, MDBA_ROUTER_PATTR_INET6_TIMER, - ip6_timer))) { + ip6_timer)) || + (vid && nla_put_u16(skb, MDBA_ROUTER_PATTR_VID, vid))) {nla_nest_cancel (skb, port_nest); goto fail; }
net/bridge/br_private.h +15 -0
@@ -958,6 +958,8 @@ bool br_multicast_toggle_global_vlan(struct net_bridge_vlan *vlan, bool on);int br_mdb_replay (struct net_device *br_dev,struct net_device *dev,const void *ctx,bool adding,struct notifier_block *nb,struct netlink_ext_ack *extack); +int br_rports_fill_info (struct sk_buff *skb, +const struct net_bridge_mcast *brmctx);static inline bool br_group_is_l2 (const struct br_ip *group) {
@@ -1181,6 +1183,17 @@ br_multicast_port_ctx_state_stopped(const struct net_bridge_mcast_port *pmctx) pmctx->vlan->state == BR_STATE_BLOCKING); } +static inline bool +br_rports_have_mc_router (const struct net_bridge_mcast *brmctx) +{ +#if IS_ENABLED (CONFIG_IPV6 ) +return !hlist_empty (&brmctx->ip4_mc_router_list) || + !hlist_empty (&brmctx->ip6_mc_router_list); +#else +return !hlist_empty (&brmctx->ip4_mc_router_list); +#endif +} +static inline bool br_multicast_ctx_options_equal (const struct net_bridge_mcast *brmctx1,const struct net_bridge_mcast *brmctx2)
@@ -1205,6 +1218,8 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1, brmctx2->multicast_startup_query_interval && brmctx1->multicast_querier == brmctx2->multicast_querier && brmctx1->multicast_router == brmctx2->multicast_router && + !br_rports_have_mc_router (brmctx1) && + !br_rports_have_mc_router (brmctx2) && #if IS_ENABLED(CONFIG_IPV6) brmctx1->multicast_mld_version == brmctx2->multicast_mld_version &&
net/bridge/br_vlan_options.c +18 -0
@@ -272,6 +272,7 @@ bool br_vlan_global_opts_can_enter_range(const struct net_bridge_vlan *v_curr,bool br_vlan_global_opts_fill (struct sk_buff *skb,u16 vid,u16 vid_range,const struct net_bridge_vlan *v_opts) { +struct nlattr *nest2__maybe_unused ;u64 clockval__maybe_unused ;struct nlattr *nest;
@@ -326,6 +327,23 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range, clockval, BRIDGE_VLANDB_GOPTS_PAD)) goto out_err; +if (br_rports_have_mc_router (&v_opts->br_mcast_ctx)) { + nest2 =nla_nest_start (skb, +BRIDGE_VLANDB_GOPTS_MCAST_ROUTER_PORTS ); +if (!nest2) + goto out_err; + +rcu_read_lock (); +if (br_rports_fill_info (skb, &v_opts->br_mcast_ctx)) { +rcu_read_unlock (); +nla_nest_cancel (skb, nest2); + goto out_err; + } +rcu_read_unlock (); + +nla_nest_end (skb, nest2); + } +#if IS_ENABLED (CONFIG_IPV6 )if (nla_put_u8 (skb,BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION , v_opts->br_mcast_ctx.multicast_mld_version))
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 13 lines · On Tue, 10 Aug 2021 18:29:18 +0300 you wrote:
From: Nikolay Aleksandrov <[email protected]>
Hi,
This is the first follow-up set after the support for per-vlan multicast contexts which extends global vlan options to support bridge's multicast config per-vlan, it enables user-space to change and dump the already existing bridge vlan multicast context options. The global option patches (01 - 09 and 12-13) follow a similar pattern of changing current mcast functions to take multicast context instead of a port/bridge directly. Option equality checks have been added for dumping vlan range compression. The last 2 patches extend the mcast router dump support so it can be re-used when dumping vlan config.
Quoted 1 line
[...]
Here is the summary with links:
- [net-next,01/15] net: bridge: vlan: add support for mcast igmp/mld version global options
https://git.kernel.org/netdev/net-next/c/df271cd641f1 - [net-next,02/15] net: bridge: vlan: add support for mcast last member count global option https://git.kernel.org/netdev/net-next/c/931ba87d2017 - [net-next,03/15] net: bridge: vlan: add support for mcast startup query count global option https://git.kernel.org/netdev/net-next/c/50725f6e6b21 - [net-next,04/15] net: bridge: vlan: add support for mcast last member interval global option https://git.kernel.org/netdev/net-next/c/77f6ababa299 - [net-next,05/15] net: bridge: vlan: add support for mcast membership interval global option https://git.kernel.org/netdev/net-next/c/2da0aea21f1c - [net-next,06/15] net: bridge: vlan: add support for mcast querier interval global option https://git.kernel.org/netdev/net-next/c/cd9269d46310 - [net-next,07/15] net: bridge: vlan: add support for mcast query interval global option https://git.kernel.org/netdev/net-next/c/d6c08aba4f29 - [net-next,08/15] net: bridge: vlan: add support for mcast query response interval global option https://git.kernel.org/netdev/net-next/c/425214508b1b - [net-next,09/15] net: bridge: vlan: add support for mcast startup query interval global option https://git.kernel.org/netdev/net-next/c/941121ee22a6 - [net-next,10/15] net: bridge: mcast: move querier state to the multicast context https://git.kernel.org/netdev/net-next/c/4d5b4e84c724 - [net-next,11/15] net: bridge: mcast: querier and query state affect only current context type https://git.kernel.org/netdev/net-next/c/cb486ce99576 - [net-next,12/15] net: bridge: vlan: add support for mcast querier global option https://git.kernel.org/netdev/net-next/c/62938182c359 - [net-next,13/15] net: bridge: vlan: add support for mcast router global option https://git.kernel.org/netdev/net-next/c/a97df080b6a8 - [net-next,14/15] net: bridge: mcast: use the proper multicast context when dumping router ports https://git.kernel.org/netdev/net-next/c/e04d377ff6ce - [net-next,15/15] net: bridge: vlan: use br_rports_fill_info() to export mcast router ports https://git.kernel.org/netdev/net-next/c/dc002875c22b
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html