Skip to content

Commit

Permalink
net: bridge: mcast: rename multicast router lists and timers
Browse files Browse the repository at this point in the history 
In preparation for the upcoming split of multicast router state into
their IPv4 and IPv6 variants, rename the affected variable to the IPv4
version first to avoid some renames in later commits.

Signed-off-by: Linus Lüssing <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
@T-X @davem330
T-X authored and davem330 committed May 13, 2021
1 parent 8380c81 commit ce6f709
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 34 deletions.
4 changes: 2 additions & 2 deletions net/bridge/br_forward.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
bool allow_mode_include = true;
struct hlist_node *rp;

rp = rcu_dereference(hlist_first_rcu(&br->router_list));
rp = rcu_dereference(hlist_first_rcu(&br->ip4_mc_router_list));
if (mdst) {
p = rcu_dereference(mdst->ports);
if (br_multicast_should_handle_mode(br, mdst->addr.proto) &&
Expand All @@ -290,7 +290,7 @@ void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
struct net_bridge_port *port, *lport, *rport;

lport = p ? p->key.port : NULL;
rport = hlist_entry_safe(rp, struct net_bridge_port, rlist);
rport = hlist_entry_safe(rp, struct net_bridge_port, ip4_rlist);

if ((unsigned long)lport > (unsigned long)rport) {
port = lport;
Expand Down
6 changes: 3 additions & 3 deletions net/bridge/br_mdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@ static int br_rports_fill_info(struct sk_buff *skb, struct netlink_callback *cb,
struct net_bridge_port *p;
struct nlattr *nest, *port_nest;

if (!br->multicast_router || hlist_empty(&br->router_list))
if (!br->multicast_router || hlist_empty(&br->ip4_mc_router_list))
return 0;

nest = nla_nest_start_noflag(skb, MDBA_ROUTER);
if (nest == NULL)
return -EMSGSIZE;

hlist_for_each_entry_rcu(p, &br->router_list, rlist) {
hlist_for_each_entry_rcu(p, &br->ip4_mc_router_list, ip4_rlist) {
if (!p)
continue;
port_nest = nla_nest_start_noflag(skb, MDBA_ROUTER_PORT);
if (!port_nest)
goto fail;
if (nla_put_nohdr(skb, sizeof(u32), &p->dev->ifindex) ||
nla_put_u32(skb, MDBA_ROUTER_PATTR_TIMER,
br_timer_value(&p->multicast_router_timer)) ||
br_timer_value(&p->ip4_mc_router_timer)) ||
nla_put_u8(skb, MDBA_ROUTER_PATTR_TYPE,
p->multicast_router)) {
nla_nest_cancel(skb, port_nest);
Expand Down
48 changes: 24 additions & 24 deletions net/bridge/br_multicast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1357,13 +1357,13 @@ static int br_ip6_multicast_add_group(struct net_bridge *br,
static void br_multicast_router_expired(struct timer_list *t)
{
struct net_bridge_port *port =
from_timer(port, t, multicast_router_timer);
from_timer(port, t, ip4_mc_router_timer);
struct net_bridge *br = port->br;

spin_lock(&br->multicast_lock);
if (port->multicast_router == MDB_RTR_TYPE_DISABLED ||
port->multicast_router == MDB_RTR_TYPE_PERM ||
timer_pending(&port->multicast_router_timer))
timer_pending(&port->ip4_mc_router_timer))
goto out;

__del_port_router(port);
Expand All @@ -1386,12 +1386,12 @@ static void br_mc_router_state_change(struct net_bridge *p,

static void br_multicast_local_router_expired(struct timer_list *t)
{
struct net_bridge *br = from_timer(br, t, multicast_router_timer);
struct net_bridge *br = from_timer(br, t, ip4_mc_router_timer);

spin_lock(&br->multicast_lock);
if (br->multicast_router == MDB_RTR_TYPE_DISABLED ||
br->multicast_router == MDB_RTR_TYPE_PERM ||
timer_pending(&br->multicast_router_timer))
timer_pending(&br->ip4_mc_router_timer))
goto out;

br_mc_router_state_change(br, false);
Expand Down Expand Up @@ -1613,7 +1613,7 @@ int br_multicast_add_port(struct net_bridge_port *port)
port->multicast_router = MDB_RTR_TYPE_TEMP_QUERY;
port->multicast_eht_hosts_limit = BR_MCAST_DEFAULT_EHT_HOSTS_LIMIT;

timer_setup(&port->multicast_router_timer,
timer_setup(&port->ip4_mc_router_timer,
br_multicast_router_expired, 0);
timer_setup(&port->ip4_own_query.timer,
br_ip4_multicast_port_query_expired, 0);
Expand Down Expand Up @@ -1649,7 +1649,7 @@ void br_multicast_del_port(struct net_bridge_port *port)
hlist_move_list(&br->mcast_gc_list, &deleted_head);
spin_unlock_bh(&br->multicast_lock);
br_multicast_gc(&deleted_head);
del_timer_sync(&port->multicast_router_timer);
del_timer_sync(&port->ip4_mc_router_timer);
free_percpu(port->mcast_stats);
}

Expand All @@ -1674,7 +1674,7 @@ static void __br_multicast_enable_port(struct net_bridge_port *port)
br_multicast_enable(&port->ip6_own_query);
#endif
if (port->multicast_router == MDB_RTR_TYPE_PERM &&
hlist_unhashed(&port->rlist))
hlist_unhashed(&port->ip4_rlist))
br_multicast_add_router(br, port);
}

Expand All @@ -1700,7 +1700,7 @@ void br_multicast_disable_port(struct net_bridge_port *port)

__del_port_router(port);

del_timer(&port->multicast_router_timer);
del_timer(&port->ip4_mc_router_timer);
del_timer(&port->ip4_own_query.timer);
#if IS_ENABLED(CONFIG_IPV6)
del_timer(&port->ip6_own_query.timer);
Expand Down Expand Up @@ -2666,19 +2666,19 @@ static void br_multicast_add_router(struct net_bridge *br,
struct net_bridge_port *p;
struct hlist_node *slot = NULL;

if (!hlist_unhashed(&port->rlist))
if (!hlist_unhashed(&port->ip4_rlist))
return;

hlist_for_each_entry(p, &br->router_list, rlist) {
hlist_for_each_entry(p, &br->ip4_mc_router_list, ip4_rlist) {
if ((unsigned long) port >= (unsigned long) p)
break;
slot = &p->rlist;
slot = &p->ip4_rlist;
}

if (slot)
hlist_add_behind_rcu(&port->rlist, slot);
hlist_add_behind_rcu(&port->ip4_rlist, slot);
else
hlist_add_head_rcu(&port->rlist, &br->router_list);
hlist_add_head_rcu(&port->ip4_rlist, &br->ip4_mc_router_list);
br_rtr_notify(br->dev, port, RTM_NEWMDB);
br_port_mc_router_state_change(port, true);
}
Expand All @@ -2690,9 +2690,9 @@ static void br_multicast_mark_router(struct net_bridge *br,

if (!port) {
if (br->multicast_router == MDB_RTR_TYPE_TEMP_QUERY) {
if (!timer_pending(&br->multicast_router_timer))
if (!timer_pending(&br->ip4_mc_router_timer))
br_mc_router_state_change(br, true);
mod_timer(&br->multicast_router_timer,
mod_timer(&br->ip4_mc_router_timer,
now + br->multicast_querier_interval);
}
return;
Expand All @@ -2704,7 +2704,7 @@ static void br_multicast_mark_router(struct net_bridge *br,

br_multicast_add_router(br, port);

mod_timer(&port->multicast_router_timer,
mod_timer(&port->ip4_mc_router_timer,
now + br->multicast_querier_interval);
}

Expand Down Expand Up @@ -3316,7 +3316,7 @@ void br_multicast_init(struct net_bridge *br)
br_opt_toggle(br, BROPT_HAS_IPV6_ADDR, true);

spin_lock_init(&br->multicast_lock);
timer_setup(&br->multicast_router_timer,
timer_setup(&br->ip4_mc_router_timer,
br_multicast_local_router_expired, 0);
timer_setup(&br->ip4_other_query.timer,
br_ip4_multicast_querier_expired, 0);
Expand Down Expand Up @@ -3416,7 +3416,7 @@ void br_multicast_open(struct net_bridge *br)

void br_multicast_stop(struct net_bridge *br)
{
del_timer_sync(&br->multicast_router_timer);
del_timer_sync(&br->ip4_mc_router_timer);
del_timer_sync(&br->ip4_other_query.timer);
del_timer_sync(&br->ip4_own_query.timer);
#if IS_ENABLED(CONFIG_IPV6)
Expand Down Expand Up @@ -3453,7 +3453,7 @@ int br_multicast_set_router(struct net_bridge *br, unsigned long val)
case MDB_RTR_TYPE_DISABLED:
case MDB_RTR_TYPE_PERM:
br_mc_router_state_change(br, val == MDB_RTR_TYPE_PERM);
del_timer(&br->multicast_router_timer);
del_timer(&br->ip4_mc_router_timer);
br->multicast_router = val;
err = 0;
break;
Expand All @@ -3472,9 +3472,9 @@ int br_multicast_set_router(struct net_bridge *br, unsigned long val)

static void __del_port_router(struct net_bridge_port *p)
{
if (hlist_unhashed(&p->rlist))
if (hlist_unhashed(&p->ip4_rlist))
return;
hlist_del_init_rcu(&p->rlist);
hlist_del_init_rcu(&p->ip4_rlist);
br_rtr_notify(p->br->dev, p, RTM_DELMDB);
br_port_mc_router_state_change(p, false);

Expand All @@ -3493,7 +3493,7 @@ int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val)
if (p->multicast_router == val) {
/* Refresh the temp router port timer */
if (p->multicast_router == MDB_RTR_TYPE_TEMP)
mod_timer(&p->multicast_router_timer,
mod_timer(&p->ip4_mc_router_timer,
now + br->multicast_querier_interval);
err = 0;
goto unlock;
Expand All @@ -3502,15 +3502,15 @@ int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val)
case MDB_RTR_TYPE_DISABLED:
p->multicast_router = MDB_RTR_TYPE_DISABLED;
__del_port_router(p);
del_timer(&p->multicast_router_timer);
del_timer(&p->ip4_mc_router_timer);
break;
case MDB_RTR_TYPE_TEMP_QUERY:
p->multicast_router = MDB_RTR_TYPE_TEMP_QUERY;
__del_port_router(p);
break;
case MDB_RTR_TYPE_PERM:
p->multicast_router = MDB_RTR_TYPE_PERM;
del_timer(&p->multicast_router_timer);
del_timer(&p->ip4_mc_router_timer);
br_multicast_add_router(br, p);
break;
case MDB_RTR_TYPE_TEMP:
Expand Down
10 changes: 5 additions & 5 deletions net/bridge/br_private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,16 +307,16 @@ struct net_bridge_port {

#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
struct bridge_mcast_own_query ip4_own_query;
struct timer_list ip4_mc_router_timer;
struct hlist_node ip4_rlist;
#if IS_ENABLED(CONFIG_IPV6)
struct bridge_mcast_own_query ip6_own_query;
#endif /* IS_ENABLED(CONFIG_IPV6) */
u32 multicast_eht_hosts_limit;
u32 multicast_eht_hosts_cnt;
unsigned char multicast_router;
struct bridge_mcast_stats __percpu *mcast_stats;
struct timer_list multicast_router_timer;
struct hlist_head mglist;
struct hlist_node rlist;
#endif

#ifdef CONFIG_SYSFS
Expand Down Expand Up @@ -449,9 +449,9 @@ struct net_bridge {

struct hlist_head mcast_gc_list;
struct hlist_head mdb_list;
struct hlist_head router_list;

struct timer_list multicast_router_timer;
struct hlist_head ip4_mc_router_list;
struct timer_list ip4_mc_router_timer;
struct bridge_mcast_other_query ip4_other_query;
struct bridge_mcast_own_query ip4_own_query;
struct bridge_mcast_querier ip4_querier;
Expand Down Expand Up @@ -868,7 +868,7 @@ static inline bool br_multicast_is_router(struct net_bridge *br)
{
return br->multicast_router == 2 ||
(br->multicast_router == 1 &&
timer_pending(&br->multicast_router_timer));
timer_pending(&br->ip4_mc_router_timer));
}

static inline bool
Expand Down

0 comments on commit ce6f709

Please sign in to comment.