Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 adc47037 编写于 作者: N Nikolay Aleksandrov 提交者： David S. Miller
浏览文件
操作

net: bridge: multicast: use multicast contexts instead of bridge or port 

Pass multicast context pointers to multicast functions instead of bridge/port.
This would make it easier later to switch these contexts to their per-vlan
versions. The patch is basically search and replace, no functional changes.
Signed-off-by: NNikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 d3d065c0
展开全部 隐藏空白更改
内联 并排
Showing with 575 addition and 515 deletion
net/bridge/br_device.c
浏览文件 @ adc47037
...@@ -28,6 +28,7 @@ EXPORT_SYMBOL_GPL(nf_br_ops); ...@@ -28,6 +28,7 @@ EXPORT_SYMBOL_GPL(nf_br_ops);
netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct net_bridge *br = netdev_priv(dev); struct net_bridge *br = netdev_priv(dev);
struct net_bridge_mcast *brmctx = &br->multicast_ctx;
struct net_bridge_fdb_entry *dst; struct net_bridge_fdb_entry *dst;
struct net_bridge_mdb_entry *mdst; struct net_bridge_mdb_entry *mdst;
const struct nf_br_ops *nf_ops; const struct nf_br_ops *nf_ops;
...@@ -82,15 +83,15 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -82,15 +83,15 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
br_flood(br, skb, BR_PKT_MULTICAST, false, true); br_flood(br, skb, BR_PKT_MULTICAST, false, true);
goto out; goto out;
} }
if (br_multicast_rcv(br, NULL, skb, vid)) { if (br_multicast_rcv(brmctx, NULL, skb, vid)) {
kfree_skb(skb); kfree_skb(skb);
goto out; goto out;
} }
mdst = br_mdb_get(br, skb, vid); mdst = br_mdb_get(brmctx, skb, vid);
if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) && if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) &&
br_multicast_querier_exists(br, eth_hdr(skb), mdst)) br_multicast_querier_exists(brmctx, eth_hdr(skb), mdst))
br_multicast_flood(mdst, skb, false, true); br_multicast_flood(mdst, skb, brmctx, false, true);
else else
br_flood(br, skb, BR_PKT_MULTICAST, false, true); br_flood(br, skb, BR_PKT_MULTICAST, false, true);
} else if ((dst = br_fdb_find_rcu(br, dest, vid)) != NULL) { } else if ((dst = br_fdb_find_rcu(br, dest, vid)) != NULL) {
......
net/bridge/br_forward.c
浏览文件 @ adc47037
...@@ -267,20 +267,19 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb, ...@@ -267,20 +267,19 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb,
/* called with rcu_read_lock */ /* called with rcu_read_lock */
void br_multicast_flood(struct net_bridge_mdb_entry *mdst, void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
struct sk_buff *skb, struct sk_buff *skb,
struct net_bridge_mcast *brmctx,
bool local_rcv, bool local_orig) bool local_rcv, bool local_orig)
{ {
struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
struct net_bridge *br = netdev_priv(dev);
struct net_bridge_port *prev = NULL; struct net_bridge_port *prev = NULL;
struct net_bridge_port_group *p; struct net_bridge_port_group *p;
bool allow_mode_include = true; bool allow_mode_include = true;
struct hlist_node *rp; struct hlist_node *rp;
rp = br_multicast_get_first_rport_node(br, skb); rp = br_multicast_get_first_rport_node(brmctx, skb);
if (mdst) { if (mdst) {
p = rcu_dereference(mdst->ports); p = rcu_dereference(mdst->ports);
if (br_multicast_should_handle_mode(br, mdst->addr.proto) && if (br_multicast_should_handle_mode(brmctx, mdst->addr.proto) &&
br_multicast_is_star_g(&mdst->addr)) br_multicast_is_star_g(&mdst->addr))
allow_mode_include = false; allow_mode_include = false;
} else { } else {
......
net/bridge/br_input.c
浏览文件 @ adc47037
...@@ -69,8 +69,10 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb ...@@ -69,8 +69,10 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
struct net_bridge_port *p = br_port_get_rcu(skb->dev); struct net_bridge_port *p = br_port_get_rcu(skb->dev);
enum br_pkt_type pkt_type = BR_PKT_UNICAST; enum br_pkt_type pkt_type = BR_PKT_UNICAST;
struct net_bridge_fdb_entry *dst = NULL; struct net_bridge_fdb_entry *dst = NULL;
struct net_bridge_mcast_port *pmctx;
struct net_bridge_mdb_entry *mdst; struct net_bridge_mdb_entry *mdst;
bool local_rcv, mcast_hit = false; bool local_rcv, mcast_hit = false;
struct net_bridge_mcast *brmctx;
struct net_bridge *br; struct net_bridge *br;
u16 vid = 0; u16 vid = 0;
u8 state; u8 state;
...@@ -78,6 +80,8 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb ...@@ -78,6 +80,8 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
if (!p || p->state == BR_STATE_DISABLED) if (!p || p->state == BR_STATE_DISABLED)
goto drop; goto drop;
brmctx = &p->br->multicast_ctx;
pmctx = &p->multicast_ctx;
state = p->state; state = p->state;
if (!br_allowed_ingress(p->br, nbp_vlan_group_rcu(p), skb, &vid, if (!br_allowed_ingress(p->br, nbp_vlan_group_rcu(p), skb, &vid,
&state)) &state))
...@@ -98,7 +102,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb ...@@ -98,7 +102,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
local_rcv = true; local_rcv = true;
} else { } else {
pkt_type = BR_PKT_MULTICAST; pkt_type = BR_PKT_MULTICAST;
if (br_multicast_rcv(br, p, skb, vid)) if (br_multicast_rcv(brmctx, pmctx, skb, vid))
goto drop; goto drop;
} }
} }
...@@ -128,11 +132,11 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb ...@@ -128,11 +132,11 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
switch (pkt_type) { switch (pkt_type) {
case BR_PKT_MULTICAST: case BR_PKT_MULTICAST:
mdst = br_mdb_get(br, skb, vid); mdst = br_mdb_get(brmctx, skb, vid);
if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) && if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) &&
br_multicast_querier_exists(br, eth_hdr(skb), mdst)) { br_multicast_querier_exists(brmctx, eth_hdr(skb), mdst)) {
if ((mdst && mdst->host_joined) || if ((mdst && mdst->host_joined) ||
br_multicast_is_router(br, skb)) { br_multicast_is_router(brmctx, skb)) {
local_rcv = true; local_rcv = true;
br->dev->stats.multicast++; br->dev->stats.multicast++;
} }
...@@ -162,7 +166,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb ...@@ -162,7 +166,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
if (!mcast_hit) if (!mcast_hit)
br_flood(br, skb, pkt_type, local_rcv, false); br_flood(br, skb, pkt_type, local_rcv, false);
else else
br_multicast_flood(mdst, skb, local_rcv, false); br_multicast_flood(mdst, skb, brmctx, local_rcv, false);
} }
if (local_rcv) if (local_rcv)
......
net/bridge/br_mdb.c
浏览文件 @ adc47037
...@@ -1092,7 +1092,7 @@ static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port, ...@@ -1092,7 +1092,7 @@ static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port,
* a new INCLUDE port (S,G) then all of *,G EXCLUDE ports need to be * a new INCLUDE port (S,G) then all of *,G EXCLUDE ports need to be
* added to it for proper replication * added to it for proper replication
*/ */
if (br_multicast_should_handle_mode(br, group.proto)) { if (br_multicast_should_handle_mode(&br->multicast_ctx, group.proto)) {
switch (filter_mode) { switch (filter_mode) {
case MCAST_EXCLUDE: case MCAST_EXCLUDE:
br_multicast_star_g_handle_mode(p, MCAST_EXCLUDE); br_multicast_star_g_handle_mode(p, MCAST_EXCLUDE);
......
net/bridge/br_multicast.c
浏览文件 @ adc47037
此差异已折叠。
net/bridge/br_multicast_eht.c
浏览文件 @ adc47037
...@@ -33,7 +33,8 @@ ...@@ -33,7 +33,8 @@
static bool br_multicast_del_eht_set_entry(struct net_bridge_port_group *pg, static bool br_multicast_del_eht_set_entry(struct net_bridge_port_group *pg,
union net_bridge_eht_addr *src_addr, union net_bridge_eht_addr *src_addr,
union net_bridge_eht_addr *h_addr); union net_bridge_eht_addr *h_addr);
static void br_multicast_create_eht_set_entry(struct net_bridge_port_group *pg, static void br_multicast_create_eht_set_entry(const struct net_bridge_mcast *brmctx,
struct net_bridge_port_group *pg,
union net_bridge_eht_addr *src_addr, union net_bridge_eht_addr *src_addr,
union net_bridge_eht_addr *h_addr, union net_bridge_eht_addr *h_addr,
int filter_mode, int filter_mode,
...@@ -388,7 +389,8 @@ static void br_multicast_ip_src_to_eht_addr(const struct br_ip *src, ...@@ -388,7 +389,8 @@ static void br_multicast_ip_src_to_eht_addr(const struct br_ip *src,
} }
} }
static void br_eht_convert_host_filter_mode(struct net_bridge_port_group *pg, static void br_eht_convert_host_filter_mode(const struct net_bridge_mcast *brmctx,
struct net_bridge_port_group *pg,
union net_bridge_eht_addr *h_addr, union net_bridge_eht_addr *h_addr,
int filter_mode) int filter_mode)
{ {
...@@ -405,14 +407,15 @@ static void br_eht_convert_host_filter_mode(struct net_bridge_port_group *pg, ...@@ -405,14 +407,15 @@ static void br_eht_convert_host_filter_mode(struct net_bridge_port_group *pg,
br_multicast_del_eht_set_entry(pg, &zero_addr, h_addr); br_multicast_del_eht_set_entry(pg, &zero_addr, h_addr);
break; break;
case MCAST_EXCLUDE: case MCAST_EXCLUDE:
br_multicast_create_eht_set_entry(pg, &zero_addr, h_addr, br_multicast_create_eht_set_entry(brmctx, pg, &zero_addr,
MCAST_EXCLUDE, h_addr, MCAST_EXCLUDE,
true); true);
break; break;
} }
} }
static void br_multicast_create_eht_set_entry(struct net_bridge_port_group *pg, static void br_multicast_create_eht_set_entry(const struct net_bridge_mcast *brmctx,
struct net_bridge_port_group *pg,
union net_bridge_eht_addr *src_addr, union net_bridge_eht_addr *src_addr,
union net_bridge_eht_addr *h_addr, union net_bridge_eht_addr *h_addr,
int filter_mode, int filter_mode,
...@@ -441,8 +444,8 @@ static void br_multicast_create_eht_set_entry(struct net_bridge_port_group *pg, ...@@ -441,8 +444,8 @@ static void br_multicast_create_eht_set_entry(struct net_bridge_port_group *pg,
if (!set_h) if (!set_h)
goto fail_set_entry; goto fail_set_entry;
mod_timer(&set_h->timer, jiffies + br_multicast_gmi(br)); mod_timer(&set_h->timer, jiffies + br_multicast_gmi(brmctx));
mod_timer(&eht_set->timer, jiffies + br_multicast_gmi(br)); mod_timer(&eht_set->timer, jiffies + br_multicast_gmi(brmctx));
return; return;
...@@ -499,7 +502,8 @@ static void br_multicast_del_eht_host(struct net_bridge_port_group *pg, ...@@ -499,7 +502,8 @@ static void br_multicast_del_eht_host(struct net_bridge_port_group *pg,
} }
/* create new set entries from reports */ /* create new set entries from reports */
static void __eht_create_set_entries(struct net_bridge_port_group *pg, static void __eht_create_set_entries(const struct net_bridge_mcast *brmctx,
struct net_bridge_port_group *pg,
union net_bridge_eht_addr *h_addr, union net_bridge_eht_addr *h_addr,
void *srcs, void *srcs,
u32 nsrcs, u32 nsrcs,
...@@ -512,8 +516,8 @@ static void __eht_create_set_entries(struct net_bridge_port_group *pg, ...@@ -512,8 +516,8 @@ static void __eht_create_set_entries(struct net_bridge_port_group *pg,
memset(&eht_src_addr, 0, sizeof(eht_src_addr)); memset(&eht_src_addr, 0, sizeof(eht_src_addr));
for (src_idx = 0; src_idx < nsrcs; src_idx++) { for (src_idx = 0; src_idx < nsrcs; src_idx++) {
memcpy(&eht_src_addr, srcs + (src_idx * addr_size), addr_size); memcpy(&eht_src_addr, srcs + (src_idx * addr_size), addr_size);
br_multicast_create_eht_set_entry(pg, &eht_src_addr, h_addr, br_multicast_create_eht_set_entry(brmctx, pg, &eht_src_addr,
filter_mode, h_addr, filter_mode,
false); false);
} }
} }
...@@ -549,7 +553,8 @@ static bool __eht_del_set_entries(struct net_bridge_port_group *pg, ...@@ -549,7 +553,8 @@ static bool __eht_del_set_entries(struct net_bridge_port_group *pg,
return changed; return changed;
} }
static bool br_multicast_eht_allow(struct net_bridge_port_group *pg, static bool br_multicast_eht_allow(const struct net_bridge_mcast *brmctx,
struct net_bridge_port_group *pg,
union net_bridge_eht_addr *h_addr, union net_bridge_eht_addr *h_addr,
void *srcs, void *srcs,
u32 nsrcs, u32 nsrcs,
...@@ -559,8 +564,8 @@ static bool br_multicast_eht_allow(struct net_bridge_port_group *pg, ...@@ -559,8 +564,8 @@ static bool br_multicast_eht_allow(struct net_bridge_port_group *pg,
switch (br_multicast_eht_host_filter_mode(pg, h_addr)) { switch (br_multicast_eht_host_filter_mode(pg, h_addr)) {
case MCAST_INCLUDE: case MCAST_INCLUDE:
__eht_create_set_entries(pg, h_addr, srcs, nsrcs, addr_size, __eht_create_set_entries(brmctx, pg, h_addr, srcs, nsrcs,
MCAST_INCLUDE); addr_size, MCAST_INCLUDE);
break; break;
case MCAST_EXCLUDE: case MCAST_EXCLUDE:
changed = __eht_del_set_entries(pg, h_addr, srcs, nsrcs, changed = __eht_del_set_entries(pg, h_addr, srcs, nsrcs,
...@@ -571,7 +576,8 @@ static bool br_multicast_eht_allow(struct net_bridge_port_group *pg, ...@@ -571,7 +576,8 @@ static bool br_multicast_eht_allow(struct net_bridge_port_group *pg,
return changed; return changed;
} }
static bool br_multicast_eht_block(struct net_bridge_port_group *pg, static bool br_multicast_eht_block(const struct net_bridge_mcast *brmctx,
struct net_bridge_port_group *pg,
union net_bridge_eht_addr *h_addr, union net_bridge_eht_addr *h_addr,
void *srcs, void *srcs,
u32 nsrcs, u32 nsrcs,
...@@ -585,7 +591,7 @@ static bool br_multicast_eht_block(struct net_bridge_port_group *pg, ...@@ -585,7 +591,7 @@ static bool br_multicast_eht_block(struct net_bridge_port_group *pg,
addr_size); addr_size);
break; break;
case MCAST_EXCLUDE: case MCAST_EXCLUDE:
__eht_create_set_entries(pg, h_addr, srcs, nsrcs, addr_size, __eht_create_set_entries(brmctx, pg, h_addr, srcs, nsrcs, addr_size,
MCAST_EXCLUDE); MCAST_EXCLUDE);
break; break;
} }
...@@ -594,7 +600,8 @@ static bool br_multicast_eht_block(struct net_bridge_port_group *pg, ...@@ -594,7 +600,8 @@ static bool br_multicast_eht_block(struct net_bridge_port_group *pg,
} }
/* flush_entries is true when changing mode */ /* flush_entries is true when changing mode */
static bool __eht_inc_exc(struct net_bridge_port_group *pg, static bool __eht_inc_exc(const struct net_bridge_mcast *brmctx,
struct net_bridge_port_group *pg,
union net_bridge_eht_addr *h_addr, union net_bridge_eht_addr *h_addr,
void *srcs, void *srcs,
u32 nsrcs, u32 nsrcs,
...@@ -612,11 +619,10 @@ static bool __eht_inc_exc(struct net_bridge_port_group *pg, ...@@ -612,11 +619,10 @@ static bool __eht_inc_exc(struct net_bridge_port_group *pg,
/* if we're changing mode del host and its entries */ /* if we're changing mode del host and its entries */
if (flush_entries) if (flush_entries)
br_multicast_del_eht_host(pg, h_addr); br_multicast_del_eht_host(pg, h_addr);
__eht_create_set_entries(pg, h_addr, srcs, nsrcs, addr_size, __eht_create_set_entries(brmctx, pg, h_addr, srcs, nsrcs, addr_size,
filter_mode); filter_mode);
/* we can be missing sets only if we've deleted some entries */ /* we can be missing sets only if we've deleted some entries */
if (flush_entries) { if (flush_entries) {
struct net_bridge *br = pg->key.port->br;
struct net_bridge_group_eht_set *eht_set; struct net_bridge_group_eht_set *eht_set;
struct net_bridge_group_src *src_ent; struct net_bridge_group_src *src_ent;
struct hlist_node *tmp; struct hlist_node *tmp;
...@@ -647,14 +653,15 @@ static bool __eht_inc_exc(struct net_bridge_port_group *pg, ...@@ -647,14 +653,15 @@ static bool __eht_inc_exc(struct net_bridge_port_group *pg,
&eht_src_addr); &eht_src_addr);
if (!eht_set) if (!eht_set)
continue; continue;
mod_timer(&eht_set->timer, jiffies + br_multicast_lmqt(br)); mod_timer(&eht_set->timer, jiffies + br_multicast_lmqt(brmctx));
} }
} }
return changed; return changed;
} }
static bool br_multicast_eht_inc(struct net_bridge_port_group *pg, static bool br_multicast_eht_inc(const struct net_bridge_mcast *brmctx,
struct net_bridge_port_group *pg,
union net_bridge_eht_addr *h_addr, union net_bridge_eht_addr *h_addr,
void *srcs, void *srcs,
u32 nsrcs, u32 nsrcs,
...@@ -663,14 +670,15 @@ static bool br_multicast_eht_inc(struct net_bridge_port_group *pg, ...@@ -663,14 +670,15 @@ static bool br_multicast_eht_inc(struct net_bridge_port_group *pg,
{ {
bool changed; bool changed;
changed = __eht_inc_exc(pg, h_addr, srcs, nsrcs, addr_size, changed = __eht_inc_exc(brmctx, pg, h_addr, srcs, nsrcs, addr_size,
MCAST_INCLUDE, to_report); MCAST_INCLUDE, to_report);
br_eht_convert_host_filter_mode(pg, h_addr, MCAST_INCLUDE); br_eht_convert_host_filter_mode(brmctx, pg, h_addr, MCAST_INCLUDE);
return changed; return changed;
} }
static bool br_multicast_eht_exc(struct net_bridge_port_group *pg, static bool br_multicast_eht_exc(const struct net_bridge_mcast *brmctx,
struct net_bridge_port_group *pg,
union net_bridge_eht_addr *h_addr, union net_bridge_eht_addr *h_addr,
void *srcs, void *srcs,
u32 nsrcs, u32 nsrcs,
...@@ -679,14 +687,15 @@ static bool br_multicast_eht_exc(struct net_bridge_port_group *pg, ...@@ -679,14 +687,15 @@ static bool br_multicast_eht_exc(struct net_bridge_port_group *pg,
{ {
bool changed; bool changed;
changed = __eht_inc_exc(pg, h_addr, srcs, nsrcs, addr_size, changed = __eht_inc_exc(brmctx, pg, h_addr, srcs, nsrcs, addr_size,
MCAST_EXCLUDE, to_report); MCAST_EXCLUDE, to_report);
br_eht_convert_host_filter_mode(pg, h_addr, MCAST_EXCLUDE); br_eht_convert_host_filter_mode(brmctx, pg, h_addr, MCAST_EXCLUDE);
return changed; return changed;
} }
static bool __eht_ip4_handle(struct net_bridge_port_group *pg, static bool __eht_ip4_handle(const struct net_bridge_mcast *brmctx,
struct net_bridge_port_group *pg,
union net_bridge_eht_addr *h_addr, union net_bridge_eht_addr *h_addr,
void *srcs, void *srcs,
u32 nsrcs, u32 nsrcs,
...@@ -696,24 +705,25 @@ static bool __eht_ip4_handle(struct net_bridge_port_group *pg, ...@@ -696,24 +705,25 @@ static bool __eht_ip4_handle(struct net_bridge_port_group *pg,
switch (grec_type) { switch (grec_type) {
case IGMPV3_ALLOW_NEW_SOURCES: case IGMPV3_ALLOW_NEW_SOURCES:
br_multicast_eht_allow(pg, h_addr, srcs, nsrcs, sizeof(__be32)); br_multicast_eht_allow(brmctx, pg, h_addr, srcs, nsrcs,
sizeof(__be32));
break; break;
case IGMPV3_BLOCK_OLD_SOURCES: case IGMPV3_BLOCK_OLD_SOURCES:
changed = br_multicast_eht_block(pg, h_addr, srcs, nsrcs, changed = br_multicast_eht_block(brmctx, pg, h_addr, srcs, nsrcs,
sizeof(__be32)); sizeof(__be32));
break; break;
case IGMPV3_CHANGE_TO_INCLUDE: case IGMPV3_CHANGE_TO_INCLUDE:
to_report = true; to_report = true;
fallthrough; fallthrough;
case IGMPV3_MODE_IS_INCLUDE: case IGMPV3_MODE_IS_INCLUDE:
changed = br_multicast_eht_inc(pg, h_addr, srcs, nsrcs, changed = br_multicast_eht_inc(brmctx, pg, h_addr, srcs, nsrcs,
sizeof(__be32), to_report); sizeof(__be32), to_report);
break; break;
case IGMPV3_CHANGE_TO_EXCLUDE: case IGMPV3_CHANGE_TO_EXCLUDE:
to_report = true; to_report = true;
fallthrough; fallthrough;
case IGMPV3_MODE_IS_EXCLUDE: case IGMPV3_MODE_IS_EXCLUDE:
changed = br_multicast_eht_exc(pg, h_addr, srcs, nsrcs, changed = br_multicast_eht_exc(brmctx, pg, h_addr, srcs, nsrcs,
sizeof(__be32), to_report); sizeof(__be32), to_report);
break; break;
} }
...@@ -722,7 +732,8 @@ static bool __eht_ip4_handle(struct net_bridge_port_group *pg, ...@@ -722,7 +732,8 @@ static bool __eht_ip4_handle(struct net_bridge_port_group *pg,
} }
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
static bool __eht_ip6_handle(struct net_bridge_port_group *pg, static bool __eht_ip6_handle(const struct net_bridge_mcast *brmctx,
struct net_bridge_port_group *pg,
union net_bridge_eht_addr *h_addr, union net_bridge_eht_addr *h_addr,
void *srcs, void *srcs,
u32 nsrcs, u32 nsrcs,
...@@ -732,18 +743,18 @@ static bool __eht_ip6_handle(struct net_bridge_port_group *pg, ...@@ -732,18 +743,18 @@ static bool __eht_ip6_handle(struct net_bridge_port_group *pg,
switch (grec_type) { switch (grec_type) {
case MLD2_ALLOW_NEW_SOURCES: case MLD2_ALLOW_NEW_SOURCES:
br_multicast_eht_allow(pg, h_addr, srcs, nsrcs, br_multicast_eht_allow(brmctx, pg, h_addr, srcs, nsrcs,
sizeof(struct in6_addr)); sizeof(struct in6_addr));
break; break;
case MLD2_BLOCK_OLD_SOURCES: case MLD2_BLOCK_OLD_SOURCES:
changed = br_multicast_eht_block(pg, h_addr, srcs, nsrcs, changed = br_multicast_eht_block(brmctx, pg, h_addr, srcs, nsrcs,
sizeof(struct in6_addr)); sizeof(struct in6_addr));
break; break;
case MLD2_CHANGE_TO_INCLUDE: case MLD2_CHANGE_TO_INCLUDE:
to_report = true; to_report = true;
fallthrough; fallthrough;
case MLD2_MODE_IS_INCLUDE: case MLD2_MODE_IS_INCLUDE:
changed = br_multicast_eht_inc(pg, h_addr, srcs, nsrcs, changed = br_multicast_eht_inc(brmctx, pg, h_addr, srcs, nsrcs,
sizeof(struct in6_addr), sizeof(struct in6_addr),
to_report); to_report);
break; break;
...@@ -751,7 +762,7 @@ static bool __eht_ip6_handle(struct net_bridge_port_group *pg, ...@@ -751,7 +762,7 @@ static bool __eht_ip6_handle(struct net_bridge_port_group *pg,
to_report = true; to_report = true;
fallthrough; fallthrough;
case MLD2_MODE_IS_EXCLUDE: case MLD2_MODE_IS_EXCLUDE:
changed = br_multicast_eht_exc(pg, h_addr, srcs, nsrcs, changed = br_multicast_eht_exc(brmctx, pg, h_addr, srcs, nsrcs,
sizeof(struct in6_addr), sizeof(struct in6_addr),
to_report); to_report);
break; break;
...@@ -762,7 +773,8 @@ static bool __eht_ip6_handle(struct net_bridge_port_group *pg, ...@@ -762,7 +773,8 @@ static bool __eht_ip6_handle(struct net_bridge_port_group *pg,
#endif #endif
/* true means an entry was deleted */ /* true means an entry was deleted */
bool br_multicast_eht_handle(struct net_bridge_port_group *pg, bool br_multicast_eht_handle(const struct net_bridge_mcast *brmctx,
struct net_bridge_port_group *pg,
void *h_addr, void *h_addr,
void *srcs, void *srcs,
u32 nsrcs, u32 nsrcs,
...@@ -779,12 +791,12 @@ bool br_multicast_eht_handle(struct net_bridge_port_group *pg, ...@@ -779,12 +791,12 @@ bool br_multicast_eht_handle(struct net_bridge_port_group *pg,
memset(&eht_host_addr, 0, sizeof(eht_host_addr)); memset(&eht_host_addr, 0, sizeof(eht_host_addr));
memcpy(&eht_host_addr, h_addr, addr_size); memcpy(&eht_host_addr, h_addr, addr_size);
if (addr_size == sizeof(__be32)) if (addr_size == sizeof(__be32))
changed = __eht_ip4_handle(pg, &eht_host_addr, srcs, nsrcs, changed = __eht_ip4_handle(brmctx, pg, &eht_host_addr, srcs,
grec_type); nsrcs, grec_type);
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
else else
changed = __eht_ip6_handle(pg, &eht_host_addr, srcs, nsrcs, changed = __eht_ip6_handle(brmctx, pg, &eht_host_addr, srcs,
grec_type); nsrcs, grec_type);
#endif #endif
out: out:
......
net/bridge/br_private.h
浏览文件 @ adc47037
...@@ -817,9 +817,10 @@ int br_ioctl_deviceless_stub(struct net *net, unsigned int cmd, ...@@ -817,9 +817,10 @@ int br_ioctl_deviceless_stub(struct net *net, unsigned int cmd,
/* br_multicast.c */ /* br_multicast.c */
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
int br_multicast_rcv(struct net_bridge *br, struct net_bridge_port *port, int br_multicast_rcv(struct net_bridge_mcast *brmctx,
struct net_bridge_mcast_port *pmctx,
struct sk_buff *skb, u16 vid); struct sk_buff *skb, u16 vid);
struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br, struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge_mcast *brmctx,
struct sk_buff *skb, u16 vid); struct sk_buff *skb, u16 vid);
int br_multicast_add_port(struct net_bridge_port *port); int br_multicast_add_port(struct net_bridge_port *port);
void br_multicast_del_port(struct net_bridge_port *port); void br_multicast_del_port(struct net_bridge_port *port);
...@@ -831,8 +832,9 @@ void br_multicast_leave_snoopers(struct net_bridge *br); ...@@ -831,8 +832,9 @@ void br_multicast_leave_snoopers(struct net_bridge *br);
void br_multicast_open(struct net_bridge *br); void br_multicast_open(struct net_bridge *br);
void br_multicast_stop(struct net_bridge *br); void br_multicast_stop(struct net_bridge *br);
void br_multicast_dev_del(struct net_bridge *br); void br_multicast_dev_del(struct net_bridge *br);
void br_multicast_flood(struct net_bridge_mdb_entry *mdst, void br_multicast_flood(struct net_bridge_mdb_entry *mdst, struct sk_buff *skb,
struct sk_buff *skb, bool local_rcv, bool local_orig); 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 *br, 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_port *p, unsigned long val);
int br_multicast_toggle(struct net_bridge *br, unsigned long val, int br_multicast_toggle(struct net_bridge *br, unsigned long val,
...@@ -861,7 +863,8 @@ void br_rtr_notify(struct net_device *dev, struct net_bridge_port *port, ...@@ -861,7 +863,8 @@ void br_rtr_notify(struct net_device *dev, struct net_bridge_port *port,
void br_multicast_del_pg(struct net_bridge_mdb_entry *mp, void br_multicast_del_pg(struct net_bridge_mdb_entry *mp,
struct net_bridge_port_group *pg, struct net_bridge_port_group *pg,
struct net_bridge_port_group __rcu **pp); struct net_bridge_port_group __rcu **pp);
void br_multicast_count(struct net_bridge *br, const struct net_bridge_port *p, void br_multicast_count(struct net_bridge *br,
const struct net_bridge_port *p,
const struct sk_buff *skb, u8 type, u8 dir); const struct sk_buff *skb, u8 type, u8 dir);
int br_multicast_init_stats(struct net_bridge *br); int br_multicast_init_stats(struct net_bridge *br);
void br_multicast_uninit_stats(struct net_bridge *br); void br_multicast_uninit_stats(struct net_bridge *br);
...@@ -890,10 +893,9 @@ static inline bool br_group_is_l2(const struct br_ip *group) ...@@ -890,10 +893,9 @@ static inline bool br_group_is_l2(const struct br_ip *group)
rcu_dereference_protected(X, lockdep_is_held(&br->multicast_lock)) rcu_dereference_protected(X, lockdep_is_held(&br->multicast_lock))
static inline struct hlist_node * static inline struct hlist_node *
br_multicast_get_first_rport_node(struct net_bridge *br, struct sk_buff *skb) br_multicast_get_first_rport_node(struct net_bridge_mcast *brmctx,
struct sk_buff *skb)
{ {
struct net_bridge_mcast *brmctx = &br->multicast_ctx;
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
if (skb->protocol == htons(ETH_P_IPV6)) if (skb->protocol == htons(ETH_P_IPV6))
return rcu_dereference(hlist_first_rcu(&brmctx->ip6_mc_router_list)); return rcu_dereference(hlist_first_rcu(&brmctx->ip6_mc_router_list));
...@@ -936,10 +938,8 @@ static inline bool br_ip6_multicast_is_router(struct net_bridge_mcast *brmctx) ...@@ -936,10 +938,8 @@ static inline bool br_ip6_multicast_is_router(struct net_bridge_mcast *brmctx)
} }
static inline bool static inline bool
br_multicast_is_router(struct net_bridge *br, struct sk_buff *skb) br_multicast_is_router(struct net_bridge_mcast *brmctx, struct sk_buff *skb)
{ {
struct net_bridge_mcast *brmctx = &br->multicast_ctx;
switch (brmctx->multicast_router) { switch (brmctx->multicast_router) {
case MDB_RTR_TYPE_PERM: case MDB_RTR_TYPE_PERM:
return true; return true;
...@@ -960,14 +960,14 @@ br_multicast_is_router(struct net_bridge *br, struct sk_buff *skb) ...@@ -960,14 +960,14 @@ br_multicast_is_router(struct net_bridge *br, struct sk_buff *skb)
} }
static inline bool static inline bool
__br_multicast_querier_exists(struct net_bridge *br, __br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
struct bridge_mcast_other_query *querier, struct bridge_mcast_other_query *querier,
const bool is_ipv6) const bool is_ipv6)
{ {
bool own_querier_enabled; bool own_querier_enabled;
if (br_opt_get(br, BROPT_MULTICAST_QUERIER)) { if (br_opt_get(brmctx->br, BROPT_MULTICAST_QUERIER)) {
if (is_ipv6 && !br_opt_get(br, BROPT_HAS_IPV6_ADDR)) if (is_ipv6 && !br_opt_get(brmctx->br, BROPT_HAS_IPV6_ADDR))
own_querier_enabled = false; own_querier_enabled = false;
else else
own_querier_enabled = true; own_querier_enabled = true;
...@@ -979,18 +979,18 @@ __br_multicast_querier_exists(struct net_bridge *br, ...@@ -979,18 +979,18 @@ __br_multicast_querier_exists(struct net_bridge *br,
(own_querier_enabled || timer_pending(&querier->timer)); (own_querier_enabled || timer_pending(&querier->timer));
} }
static inline bool br_multicast_querier_exists(struct net_bridge *br, static inline bool br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
struct ethhdr *eth, struct ethhdr *eth,
const struct net_bridge_mdb_entry *mdb) const struct net_bridge_mdb_entry *mdb)
{ {
switch (eth->h_proto) { switch (eth->h_proto) {
case (htons(ETH_P_IP)): case (htons(ETH_P_IP)):
return __br_multicast_querier_exists(br, return __br_multicast_querier_exists(brmctx,
&br->multicast_ctx.ip4_other_query, false); &brmctx->ip4_other_query, false);
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
case (htons(ETH_P_IPV6)): case (htons(ETH_P_IPV6)):
return __br_multicast_querier_exists(br, return __br_multicast_querier_exists(brmctx,
&br->multicast_ctx.ip6_other_query, true); &brmctx->ip6_other_query, true);
#endif #endif
default: default:
return !!mdb && br_group_is_l2(&mdb->addr); return !!mdb && br_group_is_l2(&mdb->addr);
...@@ -1011,15 +1011,16 @@ static inline bool br_multicast_is_star_g(const struct br_ip *ip) ...@@ -1011,15 +1011,16 @@ static inline bool br_multicast_is_star_g(const struct br_ip *ip)
} }
} }
static inline bool br_multicast_should_handle_mode(const struct net_bridge *br, static inline bool
__be16 proto) br_multicast_should_handle_mode(const struct net_bridge_mcast *brmctx,
__be16 proto)
{ {
switch (proto) { switch (proto) {
case htons(ETH_P_IP): case htons(ETH_P_IP):
return !!(br->multicast_ctx.multicast_igmp_version == 3); return !!(brmctx->multicast_igmp_version == 3);
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
case htons(ETH_P_IPV6): case htons(ETH_P_IPV6):
return !!(br->multicast_ctx.multicast_mld_version == 2); return !!(brmctx->multicast_mld_version == 2);
#endif #endif
default: default:
return false; return false;
...@@ -1031,28 +1032,28 @@ static inline int br_multicast_igmp_type(const struct sk_buff *skb) ...@@ -1031,28 +1032,28 @@ static inline int br_multicast_igmp_type(const struct sk_buff *skb)
return BR_INPUT_SKB_CB(skb)->igmp; return BR_INPUT_SKB_CB(skb)->igmp;
} }
static inline unsigned long br_multicast_lmqt(const struct net_bridge *br) static inline unsigned long br_multicast_lmqt(const struct net_bridge_mcast *brmctx)
{ {
return br->multicast_ctx.multicast_last_member_interval * return brmctx->multicast_last_member_interval *
br->multicast_ctx.multicast_last_member_count; brmctx->multicast_last_member_count;
} }
static inline unsigned long br_multicast_gmi(const struct net_bridge *br) static inline unsigned long br_multicast_gmi(const struct net_bridge_mcast *brmctx)
{ {
/* use the RFC default of 2 for QRV */ /* use the RFC default of 2 for QRV */
return 2 * br->multicast_ctx.multicast_query_interval + return 2 * brmctx->multicast_query_interval +
br->multicast_ctx.multicast_query_response_interval; brmctx->multicast_query_response_interval;
} }
#else #else
static inline int br_multicast_rcv(struct net_bridge *br, static inline int br_multicast_rcv(struct net_bridge_mcast *brmctx,
struct net_bridge_port *port, struct net_bridge_mcast_port *pmctx,
struct sk_buff *skb, struct sk_buff *skb,
u16 vid) u16 vid)
{ {
return 0; return 0;
} }
static inline struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br, static inline struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge_mcast *brmctx,
struct sk_buff *skb, u16 vid) struct sk_buff *skb, u16 vid)
{ {
return NULL; return NULL;
...@@ -1101,17 +1102,18 @@ static inline void br_multicast_dev_del(struct net_bridge *br) ...@@ -1101,17 +1102,18 @@ static inline void br_multicast_dev_del(struct net_bridge *br)
static inline void br_multicast_flood(struct net_bridge_mdb_entry *mdst, static inline void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
struct sk_buff *skb, struct sk_buff *skb,
struct net_bridge_mcast *brmctx,
bool local_rcv, bool local_orig) bool local_rcv, bool local_orig)
{ {
} }
static inline bool br_multicast_is_router(struct net_bridge *br, static inline bool br_multicast_is_router(struct net_bridge_mcast *brmctx,
struct sk_buff *skb) struct sk_buff *skb)
{ {
return false; return false;
} }
static inline bool br_multicast_querier_exists(struct net_bridge *br, static inline bool br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
struct ethhdr *eth, struct ethhdr *eth,
const struct net_bridge_mdb_entry *mdb) const struct net_bridge_mdb_entry *mdb)
{ {
......
net/bridge/br_private_mcast_eht.h
浏览文件 @ adc47037
...@@ -51,7 +51,8 @@ struct net_bridge_group_eht_set { ...@@ -51,7 +51,8 @@ struct net_bridge_group_eht_set {
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
void br_multicast_eht_clean_sets(struct net_bridge_port_group *pg); void br_multicast_eht_clean_sets(struct net_bridge_port_group *pg);
bool br_multicast_eht_handle(struct net_bridge_port_group *pg, bool br_multicast_eht_handle(const struct net_bridge_mcast *brmctx,
struct net_bridge_port_group *pg,
void *h_addr, void *h_addr,
void *srcs, void *srcs,
u32 nsrcs, u32 nsrcs,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或