Commit bbc318f6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bridge-mrd' 



Linus Lüssing says:

====================
bridge: implement Multicast Router Discovery (RFC4286)

This patchset adds initial Multicast Router Discovery support to
the Linux bridge (RFC4286). With MRD it is possible to detect multicast
routers and mark bridge ports and forward multicast packets to such routers
accordingly.

So far, multicast routers are detected via IGMP/MLD queries and PIM
messages in the Linux bridge. As there is only one active, selected
querier at a time RFC4541 ("Considerations for Internet Group Management
Protocol (IGMP) and Multicast Listener Discovery (MLD) Snooping
Switches") section 2.1.1.a) recommends snooping Multicast Router
Advertisements as provided by MRD (RFC4286).

The first two patches are refactoring some existing code which is reused
for parsing the Multicast Router Advertisements later in the fourth
patch. The third patch lets the bridge join the all-snoopers multicast
address to be able to reliably receive the Multicast Router
Advertisements.

What is not implemented yet from RFC4286 yet:

* Sending Multicast Router Solicitations:
  -> RFC4286: "[...] may be sent when [...] an interface is
     (re-)initialized [or] MRD is enabled"
* Snooping Multicast Router Terminations:
  -> currently this only relies on our own timeouts
* Adjusting timeouts with the values provided in the announcements

Changes in v2:

* rebased to current net-next/master (no conflicts/changes)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6679cf09 4b3087c7

include/linux/igmp.h

+10 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/skbuff.h>

#include <linux/timer.h>

#include <linux/in.h>

#include <linux/ip.h>

#include <linux/refcount.h>

#include <uapi/linux/igmp.h>
@@ -106,6 +107,14 @@ struct ip_mc_list { 
#define IGMPV3_QQIC(value) IGMPV3_EXP(0x80, 4, 3, value)

#define IGMPV3_MRC(value) IGMPV3_EXP(0x80, 4, 3, value)



static inline int ip_mc_may_pull(struct sk_buff *skb, unsigned int len)

{

	if (skb_transport_offset(skb) + ip_transport_len(skb) < len)

		return -EINVAL;



	return pskb_may_pull(skb, len);

}



extern int ip_check_mc_rcu(struct in_device *dev, __be32 mc_addr, __be32 src_addr, u8 proto);

extern int igmp_rcv(struct sk_buff *);

extern int ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr);
@@ -130,6 +139,6 @@ extern void ip_mc_unmap(struct in_device *); 
extern void ip_mc_remap(struct in_device *);

extern void ip_mc_dec_group(struct in_device *in_dev, __be32 addr);

extern void ip_mc_inc_group(struct in_device *in_dev, __be32 addr);

int ip_mc_check_igmp(struct sk_buff *skb, struct sk_buff **skb_trimmed);

int ip_mc_check_igmp(struct sk_buff *skb);



#endif

include/linux/in.h

+5 −0
Original line number Diff line number Diff line
@@ -60,6 +60,11 @@ static inline bool ipv4_is_lbcast(__be32 addr) 
	return addr == htonl(INADDR_BROADCAST);

}



static inline bool ipv4_is_all_snoopers(__be32 addr)

{

	return addr == htonl(INADDR_ALLSNOOPERS_GROUP);

}



static inline bool ipv4_is_zeronet(__be32 addr)

{

	return (addr & htonl(0xff000000)) == htonl(0x00000000);

include/linux/ip.h

+5 −0
Original line number Diff line number Diff line
@@ -34,4 +34,9 @@ static inline struct iphdr *ipip_hdr(const struct sk_buff *skb) 
{

	return (struct iphdr *)skb_transport_header(skb);

}



static inline unsigned int ip_transport_len(const struct sk_buff *skb)

{

	return ntohs(ip_hdr(skb)->tot_len) - skb_network_header_len(skb);

}

#endif	/* _LINUX_IP_H */

include/linux/ipv6.h

+6 −0
Original line number Diff line number Diff line
@@ -104,6 +104,12 @@ static inline struct ipv6hdr *ipipv6_hdr(const struct sk_buff *skb) 
	return (struct ipv6hdr *)skb_transport_header(skb);

}



static inline unsigned int ipv6_transport_len(const struct sk_buff *skb)

{

	return ntohs(ipv6_hdr(skb)->payload_len) + sizeof(struct ipv6hdr) -

	       skb_network_header_len(skb);

}



/* 

   This structure contains results of exthdrs parsing

   as offsets from skb->nh.

include/net/addrconf.h

+26 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ struct prefix_info { 
	struct in6_addr		prefix;

};



#include <linux/ipv6.h>

#include <linux/netdevice.h>

#include <net/if_inet6.h>

#include <net/ipv6.h>
@@ -201,6 +202,15 @@ u32 ipv6_addr_label(struct net *net, const struct in6_addr *addr, 
/*

 *	multicast prototypes (mcast.c)

 */

static inline int ipv6_mc_may_pull(struct sk_buff *skb,

				   unsigned int len)

{

	if (skb_transport_offset(skb) + ipv6_transport_len(skb) < len)

		return -EINVAL;



	return pskb_may_pull(skb, len);

}



int ipv6_sock_mc_join(struct sock *sk, int ifindex,

		      const struct in6_addr *addr);

int ipv6_sock_mc_drop(struct sock *sk, int ifindex,
@@ -219,7 +229,8 @@ void ipv6_mc_unmap(struct inet6_dev *idev); 
void ipv6_mc_remap(struct inet6_dev *idev);

void ipv6_mc_init_dev(struct inet6_dev *idev);

void ipv6_mc_destroy_dev(struct inet6_dev *idev);

int ipv6_mc_check_mld(struct sk_buff *skb, struct sk_buff **skb_trimmed);

int ipv6_mc_check_icmpv6(struct sk_buff *skb);

int ipv6_mc_check_mld(struct sk_buff *skb);

void addrconf_dad_failure(struct sk_buff *skb, struct inet6_ifaddr *ifp);



bool ipv6_chk_mcast_addr(struct net_device *dev, const struct in6_addr *group,
@@ -489,6 +500,20 @@ static inline bool ipv6_addr_is_solict_mult(const struct in6_addr *addr) 
#endif

}



static inline bool ipv6_addr_is_all_snoopers(const struct in6_addr *addr)

{

#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64

	__be64 *p = (__be64 *)addr;



	return ((p[0] ^ cpu_to_be64(0xff02000000000000UL)) |

		(p[1] ^ cpu_to_be64(0x6a))) == 0UL;

#else

	return ((addr->s6_addr32[0] ^ htonl(0xff020000)) |

		addr->s6_addr32[1] | addr->s6_addr32[2] |

		(addr->s6_addr32[3] ^ htonl(0x0000006a))) == 0;

#endif

}



#ifdef CONFIG_PROC_FS

int if6_proc_init(void);

void if6_proc_exit(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE