batman-adv: Add multicast optimization support for bridged setups
RFC PATCH v2 1/1 batman-adv: Add multicast optimization support for bridged setups
So far, the recently added multicast optimizations did not support a configuration where a bridge is on top of the soft-interface (e.g. bat0).
Now the Linux bridge code is able to provide us with the missing bits:
Multicast Listeners: The bridge hands us a list of multicast listeners it has detected behind the bridge which we will announce through the mesh via the translation table, allowing other nodes to direct multicast packets to these clients behind the bridge even with enabled multicast optimizations.
Queriers: The bridge informs us whether there is a selected IGMP or MLD querier behind the bridge or if there is no querier at all. In these cases we need all according IPv4 or IPv6 multicast traffic directed to us.
These two parts together allow us to serve all multicast listeners with IPv6 link-local multicast packets even when bridges are involved and our multicast optimizations enabled.
---
Changes in v2:
* fetching local (= on this same kernel) multicast listeners from the bridge instead of the bat0 interface if a bridge is present
- just like ip addresses and routes should be used from br0, the same goes for multicast listeners
* beautification of batadv_mcast_mla_br_addr_cpy(), now using already present functions from the kernel instead of own, hackish approach
* changed names of some goto-labels (not using "skip" anymore)
* using new, third bridge multicast export (because this export is not upstream yet, I've added the "RFC" in the title):
br_multicast_has_querier_anywhere()
* adding compat stubs for two bridge multicast exports, to make batman-adv compile- and usable even if a 3.16 kernel was compiled without bridge code - the stubs are supposed to be upstream in the bridge code in 3.17 (therefore just 'compat')
* updated kerneldocs for batadv_mcast_mla_bridge_get() and batadv_mcast_mla_softif_get()
* The two sentences in the commit message starting with "Queriers: ..." were slightly modified to include the third bridge multicast export
compat.c | 37 ++++++++++++++ compat.h | 32 ++++++++++++ main.h | 2 + multicast.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++------- 4 files changed, 216 insertions(+), 18 deletions(-)
compat.c +37 -0
@@ -109,3 +109,40 @@ void batadv_free_rcu_tvlv_handler(struct rcu_head *rcu) }#endif /* < KERNEL_VERSION(3, 0, 0) */ + +#if LINUX_VERSION_CODE <KERNEL_VERSION (3 ,16 ,0 ) + +int br_multicast_list_adjacent (struct net_device *dev, +struct list_head *br_ip_list) +{ +return 0 ; +} + +bool br_multicast_has_querier_adjacent (struct net_device *dev,int proto) +{ +return false; +} + +#endif /* < KERNEL_VERSION(3, 16, 0) */ + +#if LINUX_VERSION_CODE <KERNEL_VERSION (3 ,17 ,0 ) + +bool br_multicast_has_querier_anywhere (struct net_device *dev,int proto) +{ +return false; +} + +#if !(IS_ENABLED (CONFIG_BRIDGE ) &&IS_ENABLED (CONFIG_BRIDGE_IGMP_SNOOPING )) +int br_multicast_list_adjacent (struct net_device *dev, +struct list_head *br_ip_list) +{ +return 0 ; +} + +bool br_multicast_has_querier_adjacent (struct net_device *dev,int proto) +{ +return false; +} +#endif + +#endif /* < KERNEL_VERSION(3, 17, 0) */
compat.h +32 -0
@@ -240,6 +240,12 @@ static inline void skb_reset_mac_len(struct sk_buff *skb)#endif /* < KERNEL_VERSION(3, 0, 0) */ +#if LINUX_VERSION_CODE <KERNEL_VERSION (3 ,1 ,0 ) + +#define IS_ENABLED (x) defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) + +#endif /* < KERNEL_VERSION(3, 1, 0) */ +#if LINUX_VERSION_CODE <KERNEL_VERSION (3 ,3 ,0 )#define batadv_interface_add_vid (x, y, z) \
@@ -444,6 +450,32 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\#define pskb_copy_for_clone pskb_copy +int br_multicast_list_adjacent (struct net_device *dev, +struct list_head *br_ip_list); +bool br_multicast_has_querier_adjacent (struct net_device *dev,int proto); + +struct br_ip { +union { +__be32 ip4; +#if IS_ENABLED (CONFIG_IPV6 ) +struct in6_addr ip6; +#endif + } u; +__be16 proto; +__u16 vid; +}; + +struct br_ip_list { +struct list_head list; +struct br_ip addr; +}; +#endif /* < KERNEL_VERSION(3, 16, 0) */ +#if LINUX_VERSION_CODE <KERNEL_VERSION (3 ,17 ,0 ) + +bool br_multicast_has_querier_anywhere (struct net_device *dev,int proto); + +#endif /* < KERNEL_VERSION(3, 17, 0) */ +#endif /* _NET_BATMAN_ADV_COMPAT_H_ */
main.h +2 -0
@@ -169,6 +169,7 @@ enum batadv_uev_type {#include <linux/netdevice.h> /* netdevice */ #include <linux/etherdevice.h> /* ethernet address classification */ #include <linux/if_ether.h> /* ethernet header */ +#include <linux/if_bridge.h> /* bridge / multicast-snooping communication */ #include <linux/poll.h> /* poll_table */ #include <linux/kthread.h> /* kernel threads */ #include <linux/pkt_sched.h> /* schedule types */
@@ -177,6 +178,7 @@ enum batadv_uev_type {#include <linux/slab.h> #include <net/sock.h> /* struct sock */ #include <net/addrconf.h> /* ipv6 address stuff */ +#include <net/ip.h> #include <linux/ip.h> #include <net/rtnetlink.h> #include <linux/jiffies.h>
multicast.c +145 -18
224 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Quoted 3 lines · Linus Lüssing
* using new, third bridge multicast export (because this export is not upstream yet, I've added the "RFC" in the title):
br_multicast_has_querier_anywhere()
Ok, third export is upstream in net-next, so will be in 3.17. I'm therefore lifting the RFC, from my side could be added to batman-adv master. Let me know if you'd like a resend without the "RFC" tag in the title.
Cheers, Linus
Quoted 10 lines · On Wednesday 09 July 2014 03:17:55 Linus Lüssing wrote:
Quoted 4 lines · Linus Lüssing
* using new, third bridge multicast export (because this export is
not upstream yet, I've added the "RFC" in the title):
br_multicast_has_querier_anywhere()Ok, third export is upstream in net-next, so will be in 3.17. I'm therefore lifting the RFC, from my side could be added to batman-adv master. Let me know if you'd like a resend without the "RFC" tag in the title.
Please resend for the sake of clarity.
Thanks,
Marek