Commit deb96566 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: bridge: mcast: use br_ip's src for src groups and querier address 



Now that we have src and dst in br_ip it is logical to use the src field
for the cases where we need to work with a source address such as
querier source address and group source address.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e1ac1185

net/bridge/br_mdb.c

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static int __mdb_fill_srcs(struct sk_buff *skb, 
		switch (ent->addr.proto) {

		case htons(ETH_P_IP):

			if (nla_put_in_addr(skb, MDBA_MDB_SRCATTR_ADDRESS,

					    ent->addr.u.ip4)) {

					    ent->addr.src.ip4)) {

				nla_nest_cancel(skb, nest_ent);

				goto out_cancel_err;

			}
@@ -106,7 +106,7 @@ static int __mdb_fill_srcs(struct sk_buff *skb, 
#if IS_ENABLED(CONFIG_IPV6)

		case htons(ETH_P_IPV6):

			if (nla_put_in6_addr(skb, MDBA_MDB_SRCATTR_ADDRESS,

					     &ent->addr.u.ip6)) {

					     &ent->addr.src.ip6)) {

				nla_nest_cancel(skb, nest_ent);

				goto out_cancel_err;

			}

net/bridge/br_multicast.c

+28 −28
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static struct sk_buff *br_ip4_multicast_alloc_query(struct net_bridge *br, 
			if (over_lmqt == time_after(ent->timer.expires,

						    lmqt) &&

			    ent->src_query_rexmit_cnt > 0) {

				ihv3->srcs[lmqt_srcs++] = ent->addr.u.ip4;

				ihv3->srcs[lmqt_srcs++] = ent->addr.src.ip4;

				ent->src_query_rexmit_cnt--;

				if (need_rexmit && ent->src_query_rexmit_cnt)

					*need_rexmit = true;
@@ -584,7 +584,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br, 
			if (over_llqt == time_after(ent->timer.expires,

						    llqt) &&

			    ent->src_query_rexmit_cnt > 0) {

				mld2q->mld2q_srcs[llqt_srcs++] = ent->addr.u.ip6;

				mld2q->mld2q_srcs[llqt_srcs++] = ent->addr.src.ip6;

				ent->src_query_rexmit_cnt--;

				if (need_rexmit && ent->src_query_rexmit_cnt)

					*need_rexmit = true;
@@ -717,13 +717,13 @@ br_multicast_find_group_src(struct net_bridge_port_group *pg, struct br_ip *ip) 
	switch (ip->proto) {

	case htons(ETH_P_IP):

		hlist_for_each_entry(ent, &pg->src_list, node)

			if (ip->u.ip4 == ent->addr.u.ip4)

			if (ip->src.ip4 == ent->addr.src.ip4)

				return ent;

		break;

#if IS_ENABLED(CONFIG_IPV6)

	case htons(ETH_P_IPV6):

		hlist_for_each_entry(ent, &pg->src_list, node)

			if (!ipv6_addr_cmp(&ent->addr.u.ip6, &ip->u.ip6))

			if (!ipv6_addr_cmp(&ent->addr.src.ip6, &ip->src.ip6))

				return ent;

		break;

#endif
@@ -742,14 +742,14 @@ br_multicast_new_group_src(struct net_bridge_port_group *pg, struct br_ip *src_i 


	switch (src_ip->proto) {

	case htons(ETH_P_IP):

		if (ipv4_is_zeronet(src_ip->u.ip4) ||

		    ipv4_is_multicast(src_ip->u.ip4))

		if (ipv4_is_zeronet(src_ip->src.ip4) ||

		    ipv4_is_multicast(src_ip->src.ip4))

			return NULL;

		break;

#if IS_ENABLED(CONFIG_IPV6)

	case htons(ETH_P_IPV6):

		if (ipv6_addr_any(&src_ip->u.ip6) ||

		    ipv6_addr_is_multicast(&src_ip->u.ip6))

		if (ipv6_addr_any(&src_ip->src.ip6) ||

		    ipv6_addr_is_multicast(&src_ip->src.ip6))

			return NULL;

		break;

#endif
@@ -1019,10 +1019,10 @@ static void br_multicast_select_own_querier(struct net_bridge *br, 
					    struct sk_buff *skb)

{

	if (ip->proto == htons(ETH_P_IP))

		br->ip4_querier.addr.u.ip4 = ip_hdr(skb)->saddr;

		br->ip4_querier.addr.src.ip4 = ip_hdr(skb)->saddr;

#if IS_ENABLED(CONFIG_IPV6)

	else

		br->ip6_querier.addr.u.ip6 = ipv6_hdr(skb)->saddr;

		br->ip6_querier.addr.src.ip6 = ipv6_hdr(skb)->saddr;

#endif

}
@@ -1399,7 +1399,7 @@ static bool br_multicast_isinc_allow(struct net_bridge_port_group *pg, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.u, srcs, src_size);

		memcpy(&src_ip.src, srcs, src_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (!ent) {

			ent = br_multicast_new_group_src(pg, &src_ip);
@@ -1433,7 +1433,7 @@ static void __grp_src_isexc_incl(struct net_bridge_port_group *pg, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.u, srcs, src_size);

		memcpy(&src_ip.src, srcs, src_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (ent)

			ent->flags &= ~BR_SGRP_F_DELETE;
@@ -1467,7 +1467,7 @@ static bool __grp_src_isexc_excl(struct net_bridge_port_group *pg, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.u, srcs, src_size);

		memcpy(&src_ip.src, srcs, src_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (ent) {

			ent->flags &= ~BR_SGRP_F_DELETE;
@@ -1530,7 +1530,7 @@ static bool __grp_src_toin_incl(struct net_bridge_port_group *pg, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.u, srcs, src_size);

		memcpy(&src_ip.src, srcs, src_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (ent) {

			ent->flags &= ~BR_SGRP_F_SEND;
@@ -1573,7 +1573,7 @@ static bool __grp_src_toin_excl(struct net_bridge_port_group *pg, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.u, srcs, src_size);

		memcpy(&src_ip.src, srcs, src_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (ent) {

			if (timer_pending(&ent->timer)) {
@@ -1634,7 +1634,7 @@ static void __grp_src_toex_incl(struct net_bridge_port_group *pg, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.u, srcs, src_size);

		memcpy(&src_ip.src, srcs, src_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (ent) {

			ent->flags = (ent->flags & ~BR_SGRP_F_DELETE) |
@@ -1672,7 +1672,7 @@ static bool __grp_src_toex_excl(struct net_bridge_port_group *pg, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.u, srcs, src_size);

		memcpy(&src_ip.src, srcs, src_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (ent) {

			ent->flags &= ~BR_SGRP_F_DELETE;
@@ -1736,7 +1736,7 @@ static void __grp_src_block_incl(struct net_bridge_port_group *pg, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.u, srcs, src_size);

		memcpy(&src_ip.src, srcs, src_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (ent) {

			ent->flags |= BR_SGRP_F_SEND;
@@ -1770,7 +1770,7 @@ static bool __grp_src_block_excl(struct net_bridge_port_group *pg, 
	memset(&src_ip, 0, sizeof(src_ip));

	src_ip.proto = pg->addr.proto;

	for (src_idx = 0; src_idx < nsrcs; src_idx++) {

		memcpy(&src_ip.u, srcs, src_size);

		memcpy(&src_ip.src, srcs, src_size);

		ent = br_multicast_find_group_src(pg, &src_ip);

		if (!ent) {

			ent = br_multicast_new_group_src(pg, &src_ip);
@@ -2071,16 +2071,16 @@ static bool br_ip4_multicast_select_querier(struct net_bridge *br, 
	    !timer_pending(&br->ip4_other_query.timer))

		goto update;



	if (!br->ip4_querier.addr.u.ip4)

	if (!br->ip4_querier.addr.src.ip4)

		goto update;



	if (ntohl(saddr) <= ntohl(br->ip4_querier.addr.u.ip4))

	if (ntohl(saddr) <= ntohl(br->ip4_querier.addr.src.ip4))

		goto update;



	return false;



update:

	br->ip4_querier.addr.u.ip4 = saddr;

	br->ip4_querier.addr.src.ip4 = saddr;



	/* update protected by general multicast_lock by caller */

	rcu_assign_pointer(br->ip4_querier.port, port);
@@ -2097,13 +2097,13 @@ static bool br_ip6_multicast_select_querier(struct net_bridge *br, 
	    !timer_pending(&br->ip6_other_query.timer))

		goto update;



	if (ipv6_addr_cmp(saddr, &br->ip6_querier.addr.u.ip6) <= 0)

	if (ipv6_addr_cmp(saddr, &br->ip6_querier.addr.src.ip6) <= 0)

		goto update;



	return false;



update:

	br->ip6_querier.addr.u.ip6 = *saddr;

	br->ip6_querier.addr.src.ip6 = *saddr;



	/* update protected by general multicast_lock by caller */

	rcu_assign_pointer(br->ip6_querier.port, port);
@@ -2118,10 +2118,10 @@ static bool br_multicast_select_querier(struct net_bridge *br, 
{

	switch (saddr->proto) {

	case htons(ETH_P_IP):

		return br_ip4_multicast_select_querier(br, port, saddr->u.ip4);

		return br_ip4_multicast_select_querier(br, port, saddr->src.ip4);

#if IS_ENABLED(CONFIG_IPV6)

	case htons(ETH_P_IPV6):

		return br_ip6_multicast_select_querier(br, port, &saddr->u.ip6);

		return br_ip6_multicast_select_querier(br, port, &saddr->src.ip6);

#endif

	}
@@ -2263,7 +2263,7 @@ static void br_ip4_multicast_query(struct net_bridge *br, 


	if (!group) {

		saddr.proto = htons(ETH_P_IP);

		saddr.u.ip4 = iph->saddr;

		saddr.src.ip4 = iph->saddr;



		br_multicast_query_received(br, port, &br->ip4_other_query,

					    &saddr, max_delay);
@@ -2351,7 +2351,7 @@ static int br_ip6_multicast_query(struct net_bridge *br, 


	if (is_general_query) {

		saddr.proto = htons(ETH_P_IPV6);

		saddr.u.ip6 = ipv6_hdr(skb)->saddr;

		saddr.src.ip6 = ipv6_hdr(skb)->saddr;



		br_multicast_query_received(br, port, &br->ip6_other_query,

					    &saddr, max_delay);