Implementation of a Stateless Multicast Packet Type
v3 cover Implementation of a Stateless Multicast Packet Type
Hi,
The following patchset implements a stateless, TVLV capable batman-adv multicast packet type.
The new batman-adv multicast packet type allows to contain several originator destination MAC addresses within a TVLV. Routers on the way will potentially split the batman-adv multicast packet and adjust its tracker TVLV contents.
Routing decisions are still based on the selected BATMAN IV or BATMAN V routing algorithm. So this new batman-adv multicast packet type retains the same loop-free properties.
The purpose of this new packet type is to allow to forward an IP multicast packet with less transmissions / overhead than the multicast-via-multiple-unicasts approach. Or to reach a lot more destinations (currently up to 196, depending on the payload size, see Wiki documentation for details) than with the default multicast fanout for the via-unicasts approach.
This will allow using applications like mDNS again in several Freifunk communities. And with less transmissions will also make more bulky multicast applications, like media streaming (to an assessable amount of receivers) a lot more feasible.
This approach is way simpler than the original multicast (tracker) packet approach we envisioned years ago. As it involves no maintenance of an extra, state based multicast routing table. However the TVLV capability should allow to extend things later, to split control and data plane a bit more for instance, to further increase the number of destinations, to further reduce overhead.
A compact overview can be found in the Wiki here, including limitations:
https://www.open-mesh.org/projects/batman-adv/wiki/Multicast-Packet-Type
Regards, Linus
___
Changelog v3:
* PATCH 1/5:
* remove now obsolete includes
* PATCH 2/5:
* fix batadv_tvlv_handler_register() in network-coding.c
* add missing include for linux/skbuff.h
* move variable declarations out of the switch case
in batadv_tvlv_call_handler()
* PATCH 3/5:
* remove unnecessary include of multicast.h in routing.c
* add a few missing includes to multicast_forw.c (linux/byteorder/generic.h, linux/errno.h, linux/gfp.h, linux/stddef.h uapi/linux/batadv_packet.h, multicast.h)
* PATCH 4/5:
* add missing rcu_read_unlock() in error case before returning in batadv_mcast_forw_push_dests_list()
* remove unnecessary include of soft-interface.h in multicast_forw.c
* add a few missing includes to multicast_forw.c (linux/bug.h, linux/build_bug.h, linux/limits.h, linux/rculist.h, linux/rcupdate.h, linux/string.h)
* make batadv_mcast_forw_mode_by_count() static
* fix return types in the declaration of batadv_mcast_forw_packet_hdrlen() and batadv_mcast_forw_push() in multicast.h
* fix typo in commit message: "that the are capable of"
-> "that the*y* are capable of"
* PATCH 5/5:
* make batadv_mcast_forw_shrink_pack_dests() adhere to 80 characters per line for consistency
* add a "continue" statement after the jump label in batadv_mcast_forw_shrink_pack_dests() to silence the sparse error "error: label at end of compound statement"
Changelog v2:
* Add "[PATCH v2 0/5]" prefix to title of cover letter, so that Patchwork can hopefully find it - no other changes
PATCH v3 1/5 batman-adv: mcast: remove now redundant single ucast forwarding
The multicast code to send a multicast packet via multiple batman-adv unicast packets is not only capable of sending to multiple but also to a single node. Therefore we can safely remove the old, specialized, now redundant multicast-to-single-unicast code.
The only functional change of this simplification is that the edge case of allowing a multicast packet with an unsnoopable destination address (224.0.0.0/24 or ff02::1) where only a single node has signaled interest in it via the batman-adv want-all-unsnoopables multicast flag is now transmitted via a batman-adv broadcast instead of a batman-adv unicast packet. Maintaining this edge case feature does not seem worth the extra lines of code and people should just not expect to be able to snoop and optimize such unsnoopable multicast addresses when bridges are involved.
While at it also renaming a few items in the batadv_forw_mode enum to prepare for the new batman-adv multicast packet type.
--- net/batman-adv/multicast.c | 249 ++------------------------------ net/batman-adv/multicast.h | 38 +---- net/batman-adv/soft-interface.c | 26 ++-- 3 files changed, 33 insertions(+), 280 deletions(-)
net/batman-adv/multicast.c +14 -235
@@ -26,7 +26,6 @@#include <linux/ipv6.h> #include <linux/jiffies.h> #include <linux/kernel.h> -#include <linux/kref.h> #include <linux/list.h> #include <linux/lockdep.h> #include <linux/netdevice.h>
@@ -1144,223 +1143,20 @@ static int batadv_mcast_forw_rtr_count(struct batadv_priv *bat_priv, } } -/** -* batadv_mcast_forw_tt_node_get() - get a multicast tt node -* @bat_priv: the bat priv with all the soft interface information -* @ethhdr: the ether header containing the multicast destination -* -* Return: an orig_node matching the multicast address provided by ethhdr -* via a translation table lookup. This increases the returned nodes refcount. -*/ -static struct batadv_orig_node * -batadv_mcast_forw_tt_node_get (struct batadv_priv *bat_priv, -struct ethhdr *ethhdr) -{ -return batadv_transtable_search (bat_priv,NULL , ethhdr->h_dest, -BATADV_NO_FLAGS ); -} - -/** -* batadv_mcast_forw_ipv4_node_get() - get a node with an ipv4 flag -* @bat_priv: the bat priv with all the soft interface information -* -* Return: an orig_node which has the BATADV_MCAST_WANT_ALL_IPV4 flag set and -* increases its refcount. -*/ -static struct batadv_orig_node * -batadv_mcast_forw_ipv4_node_get (struct batadv_priv *bat_priv) -{ -struct batadv_orig_node *tmp_orig_node, *orig_node =NULL ; - -rcu_read_lock (); -hlist_for_each_entry_rcu (tmp_orig_node, - &bat_priv->mcast.want_all_ipv4_list, - mcast_want_all_ipv4_node) { -if (!kref_get_unless_zero (&tmp_orig_node->refcount)) -continue ; - - orig_node = tmp_orig_node; -break ; - } -rcu_read_unlock (); - -return orig_node; -} - -/** -* batadv_mcast_forw_ipv6_node_get() - get a node with an ipv6 flag -* @bat_priv: the bat priv with all the soft interface information -* -* Return: an orig_node which has the BATADV_MCAST_WANT_ALL_IPV6 flag set -* and increases its refcount. -*/ -static struct batadv_orig_node * -batadv_mcast_forw_ipv6_node_get (struct batadv_priv *bat_priv) -{ -struct batadv_orig_node *tmp_orig_node, *orig_node =NULL ; - -rcu_read_lock (); -hlist_for_each_entry_rcu (tmp_orig_node, - &bat_priv->mcast.want_all_ipv6_list, - mcast_want_all_ipv6_node) { -if (!kref_get_unless_zero (&tmp_orig_node->refcount)) -continue ; - - orig_node = tmp_orig_node; -break ; - } -rcu_read_unlock (); - -return orig_node; -} - -/** -* batadv_mcast_forw_ip_node_get() - get a node with an ipv4/ipv6 flag -* @bat_priv: the bat priv with all the soft interface information -* @ethhdr: an ethernet header to determine the protocol family from -* -* Return: an orig_node which has the BATADV_MCAST_WANT_ALL_IPV4 or -* BATADV_MCAST_WANT_ALL_IPV6 flag, depending on the provided ethhdr, sets and -* increases its refcount. -*/ -static struct batadv_orig_node * -batadv_mcast_forw_ip_node_get (struct batadv_priv *bat_priv, -struct ethhdr *ethhdr) -{ -switch (ntohs (ethhdr->h_proto)) { -case ETH_P_IP : -return batadv_mcast_forw_ipv4_node_get (bat_priv); -case ETH_P_IPV6 : -return batadv_mcast_forw_ipv6_node_get (bat_priv); -default : -/* we shouldn't be here... */ -return NULL ; - } -} - -/** -* batadv_mcast_forw_unsnoop_node_get() - get a node with an unsnoopable flag -* @bat_priv: the bat priv with all the soft interface information -* -* Return: an orig_node which has the BATADV_MCAST_WANT_ALL_UNSNOOPABLES flag -* set and increases its refcount. -*/ -static struct batadv_orig_node * -batadv_mcast_forw_unsnoop_node_get (struct batadv_priv *bat_priv) -{ -struct batadv_orig_node *tmp_orig_node, *orig_node =NULL ; - -rcu_read_lock (); -hlist_for_each_entry_rcu (tmp_orig_node, - &bat_priv->mcast.want_all_unsnoopables_list, - mcast_want_all_unsnoopables_node) { -if (!kref_get_unless_zero (&tmp_orig_node->refcount)) -continue ; - - orig_node = tmp_orig_node; -break ; - } -rcu_read_unlock (); - -return orig_node; -} - -/** -* batadv_mcast_forw_rtr4_node_get() - get a node with an ipv4 mcast router flag -* @bat_priv: the bat priv with all the soft interface information -* -* Return: an orig_node which has the BATADV_MCAST_WANT_NO_RTR4 flag unset and -* increases its refcount. -*/ -static struct batadv_orig_node * -batadv_mcast_forw_rtr4_node_get (struct batadv_priv *bat_priv) -{ -struct batadv_orig_node *tmp_orig_node, *orig_node =NULL ; - -rcu_read_lock (); -hlist_for_each_entry_rcu (tmp_orig_node, - &bat_priv->mcast.want_all_rtr4_list, - mcast_want_all_rtr4_node) { -if (!kref_get_unless_zero (&tmp_orig_node->refcount)) -continue ; - - orig_node = tmp_orig_node; -break ; - } -rcu_read_unlock (); - -return orig_node; -} - -/** -* batadv_mcast_forw_rtr6_node_get() - get a node with an ipv6 mcast router flag -* @bat_priv: the bat priv with all the soft interface information -* -* Return: an orig_node which has the BATADV_MCAST_WANT_NO_RTR6 flag unset -* and increases its refcount. -*/ -static struct batadv_orig_node * -batadv_mcast_forw_rtr6_node_get (struct batadv_priv *bat_priv) -{ -struct batadv_orig_node *tmp_orig_node, *orig_node =NULL ; - -rcu_read_lock (); -hlist_for_each_entry_rcu (tmp_orig_node, - &bat_priv->mcast.want_all_rtr6_list, - mcast_want_all_rtr6_node) { -if (!kref_get_unless_zero (&tmp_orig_node->refcount)) -continue ; - - orig_node = tmp_orig_node; -break ; - } -rcu_read_unlock (); - -return orig_node; -} - -/** -* batadv_mcast_forw_rtr_node_get() - get a node with an ipv4/ipv6 router flag -* @bat_priv: the bat priv with all the soft interface information -* @ethhdr: an ethernet header to determine the protocol family from -* -* Return: an orig_node which has no BATADV_MCAST_WANT_NO_RTR4 or -* BATADV_MCAST_WANT_NO_RTR6 flag, depending on the provided ethhdr, set and -* increases its refcount. -*/ -static struct batadv_orig_node * -batadv_mcast_forw_rtr_node_get (struct batadv_priv *bat_priv, -struct ethhdr *ethhdr) -{ -switch (ntohs (ethhdr->h_proto)) { -case ETH_P_IP : -return batadv_mcast_forw_rtr4_node_get (bat_priv); -case ETH_P_IPV6 : -return batadv_mcast_forw_rtr6_node_get (bat_priv); -default : -/* we shouldn't be here... */ -return NULL ; - } -} -/** * batadv_mcast_forw_mode() - check on how to forward a multicast packet * @bat_priv: the bat priv with all the soft interface information -* @skb: The multicast packet to check -* @orig: an originator to be set to forward the skb to +* @skb: the multicast packet to check * @is_routable: stores whether the destination is routable * -* Return: the forwarding mode as enum batadv_forw_mode and in case of -* BATADV_FORW_SINGLE set the orig to the single originator the skb -* should be forwarded to. +* Return: The forwarding mode as enum batadv_forw_mode. */ enum batadv_forw_mode batadv_mcast_forw_mode (struct batadv_priv *bat_priv,struct sk_buff *skb, -struct batadv_orig_node **orig,int *is_routable) +int *is_routable) {int ret, tt_count, ip_count, unsnoop_count, total_count;bool is_unsnoopable = false; -unsigned int mcast_fanout;struct ethhdr *ethhdr;int rtr_count =0 ;
@@ -1369,7 +1165,7 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb,if (ret == -ENOMEM )return BATADV_FORW_NONE ;else if (ret <0 ) -return BATADV_FORW_ALL ; +return BATADV_FORW_BCAST ; ethhdr =eth_hdr (skb);
@@ -1382,32 +1178,15 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb, total_count = tt_count + ip_count + unsnoop_count + rtr_count; -switch (total_count) { -case 1 : -if (tt_count) - *orig =batadv_mcast_forw_tt_node_get (bat_priv, ethhdr); -else if (ip_count) - *orig =batadv_mcast_forw_ip_node_get (bat_priv, ethhdr); -else if (unsnoop_count) - *orig =batadv_mcast_forw_unsnoop_node_get (bat_priv); -else if (rtr_count) - *orig =batadv_mcast_forw_rtr_node_get (bat_priv, - ethhdr); - -if (*orig) -return BATADV_FORW_SINGLE ; - - fallthrough; -case 0 : +if (!total_count)return BATADV_FORW_NONE ; -default : - mcast_fanout =atomic_read (&bat_priv->multicast_fanout); +else if (unsnoop_count) +return BATADV_FORW_BCAST ; -if (!unsnoop_count && total_count <= mcast_fanout) -return BATADV_FORW_SOME ; - } +if (total_count <=atomic_read (&bat_priv->multicast_fanout)) +return BATADV_FORW_UCASTS ; -return BATADV_FORW_ALL ; +return BATADV_FORW_BCAST ; }/**
@@ -1419,10 +1198,10 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb,* * Return: NET_XMIT_DROP in case of error or NET_XMIT_SUCCESS otherwise. */ -int batadv_mcast_forw_send_orig (struct batadv_priv *bat_priv, -struct sk_buff *skb, -unsigned short vid, -struct batadv_orig_node *orig_node) +static int batadv_mcast_forw_send_orig (struct batadv_priv *bat_priv, +struct sk_buff *skb, +unsigned short vid, +struct batadv_orig_node *orig_node) {/* Avoid sending multicast-in-unicast packets to other BLA * gateways - they already got the frame from the LAN side
net/batman-adv/multicast.h +7 -31
@@ -17,23 +17,16 @@*/ enum batadv_forw_mode {/** -* @BATADV_FORW_ALL: forward the packet to all nodes (currently via -* classic flooding) +* @BATADV_FORW_BCAST: forward the packet to all nodes via a batman-adv +* broadcast packet */ -BATADV_FORW_ALL , +BATADV_FORW_BCAST ,/** -* @BATADV_FORW_SOME: forward the packet to some nodes (currently via -* a multicast-to-unicast conversion and the BATMAN unicast routing -* protocol) +* @BATADV_FORW_UCASTS: forward the packet to some nodes via one +* or more batman-adv unicast packets */ -BATADV_FORW_SOME , - -/** -* @BATADV_FORW_SINGLE: forward the packet to a single node (currently -* via the BATMAN unicast routing protocol) -*/ -BATADV_FORW_SINGLE , +BATADV_FORW_UCASTS ,/** @BATADV_FORW_NONE: don't forward, drop it */ BATADV_FORW_NONE ,
@@ -43,14 +36,8 @@ enum batadv_forw_mode {enum batadv_forw_mode batadv_mcast_forw_mode (struct batadv_priv *bat_priv,struct sk_buff *skb, -struct batadv_orig_node **mcast_single_orig,int *is_routable); -int batadv_mcast_forw_send_orig (struct batadv_priv *bat_priv, -struct sk_buff *skb, -unsigned short vid, -struct batadv_orig_node *orig_node); -int batadv_mcast_forw_send (struct batadv_priv *bat_priv,struct sk_buff *skb,unsigned short vid,int is_routable);
@@ -69,20 +56,9 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig_node);static inline enum batadv_forw_mode batadv_mcast_forw_mode (struct batadv_priv *bat_priv,struct sk_buff *skb, -struct batadv_orig_node **mcast_single_orig,int *is_routable) { -return BATADV_FORW_ALL ; -} - -static inline int -batadv_mcast_forw_send_orig (struct batadv_priv *bat_priv, -struct sk_buff *skb, -unsigned short vid, -struct batadv_orig_node *orig_node) -{ -kfree_skb (skb); -return NET_XMIT_DROP ; +return BATADV_FORW_BCAST ; } static inline int
net/batman-adv/soft-interface.c +12 -14
@@ -48,7 +48,6 @@#include "hard-interface.h" #include "multicast.h" #include "network-coding.h" -#include "originator.h" #include "send.h" #include "translation-table.h"
@@ -196,8 +195,7 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,unsigned short vid;u32 seqno;int gw_mode; -enum batadv_forw_mode forw_mode =BATADV_FORW_SINGLE ; -struct batadv_orig_node *mcast_single_orig =NULL ; +enum batadv_forw_mode forw_mode =BATADV_FORW_BCAST ;int mcast_is_routable =0 ;int network_offset =ETH_HLEN ;__be16 proto;
@@ -301,14 +299,18 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, send:if (do_bcast && !is_broadcast_ether_addr (ethhdr->h_dest)) { forw_mode =batadv_mcast_forw_mode (bat_priv, skb, - &mcast_single_orig, &mcast_is_routable); -if (forw_mode ==BATADV_FORW_NONE ) - goto dropped; - -if (forw_mode ==BATADV_FORW_SINGLE || - forw_mode ==BATADV_FORW_SOME ) +switch (forw_mode) { +case BATADV_FORW_BCAST : +break ; +case BATADV_FORW_UCASTS : do_bcast = false; +break ; +case BATADV_FORW_NONE : + fallthrough; +default : + goto dropped; + } } }
@@ -357,10 +359,7 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,if (ret) goto dropped; ret =batadv_send_skb_via_gw (bat_priv, skb, vid); - }else if (mcast_single_orig) { - ret =batadv_mcast_forw_send_orig (bat_priv, skb, vid, - mcast_single_orig); - }else if (forw_mode ==BATADV_FORW_SOME ) { + }else if (forw_mode ==BATADV_FORW_UCASTS ) { ret =batadv_mcast_forw_send (bat_priv, skb, vid, mcast_is_routable); }else {
@@ -386,7 +385,6 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, dropped_freed:batadv_inc_counter (bat_priv,BATADV_CNT_TX_DROPPED ); end: -batadv_orig_node_put (mcast_single_orig);batadv_hardif_put (primary_if);return NETDEV_TX_OK ; }
Signature · 1 line
2.39.0
PATCH v3 2/5 batman-adv: tvlv: prepare for tvlv enabled multicast packet type
In reply to Linus LüssingPrepare TVLV infrastructure for more packet types, in particular the upcoming batman-adv multicast packet type.
For that swap the OGM vs. unicast-tvlv packet boolean indicator to an explicit unsigned integer packet type variable. And provide the skb to a call to batadv_tvlv_containers_process(), as later the multicast packet's TVLV handler will need to have access not only to the TVLV but the full skb for forwarding. Forwarding will be invoked from the multicast packet's TVLVs' contents later.
--- include/uapi/linux/batadv_packet.h | 2 + net/batman-adv/bat_v_ogm.c | 4 +- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/gateway_common.c | 2 +- net/batman-adv/multicast.c | 2 +- net/batman-adv/network-coding.c | 2 +- net/batman-adv/routing.c | 7 ++- net/batman-adv/translation-table.c | 4 +- net/batman-adv/tvlv.c | 71 ++++++++++++++++++-------- net/batman-adv/tvlv.h | 9 ++-- net/batman-adv/types.h | 6 +++ 11 files changed, 74 insertions(+), 37 deletions(-)
include/uapi/linux/batadv_packet.h +2 -0
@@ -26,6 +26,7 @@* @BATADV_CODED: network coded packets * @BATADV_ELP: echo location packets for B.A.T.M.A.N. V * @BATADV_OGM2: originator messages for B.A.T.M.A.N. V +* @BATADV_MCAST: multicast packet with multiple destination addresses * * @BATADV_UNICAST: unicast packets carrying unicast payload traffic * @BATADV_UNICAST_FRAG: unicast packets carrying a fragment of the original
@@ -42,6 +43,7 @@ enum batadv_packettype {BATADV_CODED =0x02 ,BATADV_ELP =0x03 ,BATADV_OGM2 =0x04 , +BATADV_MCAST =0x05 ,/* 0x40 - 0x7f: unicast */ #define BATADV_UNICAST_MIN 0x40 BATADV_UNICAST = 0x40,
net/batman-adv/bat_v_ogm.c +2 -2
@@ -800,8 +800,8 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv,/* only unknown & newer OGMs contain TVLVs we are interested in */ if (seqno_age >0 && if_outgoing ==BATADV_IF_DEFAULT ) -batadv_tvlv_containers_process (bat_priv, true, orig_node, -NULL ,NULL , +batadv_tvlv_containers_process (bat_priv,BATADV_OGM2 , orig_node, +NULL , (unsigned char *)(ogm2 +1 ),ntohs (ogm2->tvlv_len));
net/batman-adv/distributed-arp-table.c +1 -1
@@ -822,7 +822,7 @@ int batadv_dat_init(struct batadv_priv *bat_priv)batadv_dat_start_timer (bat_priv);batadv_tvlv_handler_register (bat_priv, batadv_dat_tvlv_ogm_handler_v1, -NULL ,BATADV_TVLV_DAT ,1 , +NULL ,NULL ,BATADV_TVLV_DAT ,1 ,BATADV_TVLV_HANDLER_OGM_CIFNOTFND );batadv_dat_tvlv_container_update (bat_priv);return 0 ;
net/batman-adv/gateway_common.c +1 -1
@@ -259,7 +259,7 @@ void batadv_gw_init(struct batadv_priv *bat_priv)atomic_set (&bat_priv->gw.sel_class,1 );batadv_tvlv_handler_register (bat_priv, batadv_gw_tvlv_ogm_handler_v1, -NULL ,BATADV_TVLV_GW ,1 , +NULL ,NULL ,BATADV_TVLV_GW ,1 ,BATADV_TVLV_HANDLER_OGM_CIFNOTFND ); }
net/batman-adv/multicast.c +1 -1
@@ -1826,7 +1826,7 @@ static void batadv_mcast_tvlv_ogm_handler(struct batadv_priv *bat_priv,void batadv_mcast_init (struct batadv_priv *bat_priv) {batadv_tvlv_handler_register (bat_priv, batadv_mcast_tvlv_ogm_handler, -NULL ,BATADV_TVLV_MCAST ,2 , +NULL ,NULL ,BATADV_TVLV_MCAST ,2 ,BATADV_TVLV_HANDLER_OGM_CIFNOTFND );INIT_DELAYED_WORK (&bat_priv->mcast.work, batadv_mcast_mla_update);
net/batman-adv/network-coding.c +1 -1
@@ -160,7 +160,7 @@ int batadv_nc_mesh_init(struct batadv_priv *bat_priv)batadv_nc_start_timer (bat_priv);batadv_tvlv_handler_register (bat_priv, batadv_nc_tvlv_ogm_handler_v1, -NULL ,BATADV_TVLV_NC ,1 , +NULL ,NULL ,BATADV_TVLV_NC ,1 ,BATADV_TVLV_HANDLER_OGM_CIFNOTFND );batadv_nc_tvlv_container_update (bat_priv);return 0 ;
net/batman-adv/routing.c +3 -4
@@ -1073,10 +1073,9 @@ int batadv_recv_unicast_tvlv(struct sk_buff *skb,if (tvlv_buff_len > skb->len - hdr_size) goto free_skb; - ret =batadv_tvlv_containers_process (bat_priv, false,NULL , - unicast_tvlv_packet->src, - unicast_tvlv_packet->dst, - tvlv_buff, tvlv_buff_len); + ret =batadv_tvlv_containers_process (bat_priv,BATADV_UNICAST_TVLV , +NULL , skb, tvlv_buff, + tvlv_buff_len);if (ret !=NET_RX_SUCCESS ) { ret =batadv_route_unicast_packet (skb, recv_if);
net/batman-adv/translation-table.c +2 -2
@@ -4168,11 +4168,11 @@ int batadv_tt_init(struct batadv_priv *bat_priv) }batadv_tvlv_handler_register (bat_priv, batadv_tt_tvlv_ogm_handler_v1, - batadv_tt_tvlv_unicast_handler_v1, + batadv_tt_tvlv_unicast_handler_v1,NULL ,BATADV_TVLV_TT ,1 ,BATADV_NO_FLAGS );batadv_tvlv_handler_register (bat_priv,NULL , - batadv_roam_tvlv_unicast_handler_v1, + batadv_roam_tvlv_unicast_handler_v1,NULL ,BATADV_TVLV_ROAM ,1 ,BATADV_NO_FLAGS );INIT_DELAYED_WORK (&bat_priv->tt.work, batadv_tt_purge);
net/batman-adv/tvlv.c +49 -22
158 lines not on this page · raw message
net/batman-adv/tvlv.h +6 -3
@@ -9,6 +9,7 @@#include "main.h" +#include <linux/skbuff.h> #include <linux/types.h> #include <uapi/linux/batadv_packet.h>
@@ -34,14 +35,16 @@ void batadv_tvlv_handler_register(struct batadv_priv *bat_priv, u8 *src, u8 *dst, void *tvlv_value, u16 tvlv_value_len), + int (*mptr)(struct batadv_priv *bat_priv, + struct sk_buff *skb), u8 type, u8 version, u8 flags);void batadv_tvlv_handler_unregister (struct batadv_priv *bat_priv,u8 type,u8 version);int batadv_tvlv_containers_process (struct batadv_priv *bat_priv, -bool ogm_source, +u8 packet_type,struct batadv_orig_node *orig_node, -u8 *src,u8 *dst, -void *tvlv_buff,u16 tvlv_buff_len); +struct sk_buff *skb,void *tvlv_buff, +u16 tvlv_buff_len);void batadv_tvlv_unicast_send (struct batadv_priv *bat_priv,const u8 *src,const u8 *dst,u8 type,u8 version,void *tvlv_value,u16 tvlv_value_len);
net/batman-adv/types.h +6 -0
@@ -2335,6 +2335,12 @@ struct batadv_tvlv_handler { u8 *src, u8 *dst, void *tvlv_value, u16 tvlv_value_len); +/** +* @mcast_handler: handler callback which is given the tvlv payload to +* process on incoming mcast packet +*/ +int (*mcast_handler)(struct batadv_priv *bat_priv,struct sk_buff *skb); +/** @type: tvlv type this handler feels responsible for */ u8 type;
Signature · 1 line
2.39.0
PATCH v3 3/5 batman-adv: mcast: implement multicast packet reception and forwarding
In reply to Linus LüssingImplement functionality to receive and forward a new TVLV capable multicast packet type.
The new batman-adv multicast packet type allows to contain several originator destination addresses within a TVLV. Routers on the way will potentially split the batman-adv multicast packet and adjust its tracker TVLV contents.
Routing decisions are still based on the selected BATMAN IV or BATMAN V routing algorithm. So this new batman-adv multicast packet type retains the same loop-free properties.
Also a new OGM multicast TVLV flag is introduced to signal to other nodes that we are capable of handling a batman-adv multicast packet and multicast tracker TVLV. And that all of our hard interfaces have an MTU of at least 1280 bytes (IPv6 minimum MTU), as a simple solution for now to avoid MTU issues while forwarding.
--- include/uapi/linux/batadv_packet.h | 48 ++++- net/batman-adv/Makefile | 1 + net/batman-adv/main.c | 2 + net/batman-adv/multicast.c | 48 ++++- net/batman-adv/multicast.h | 5 + net/batman-adv/multicast_forw.c | 274 +++++++++++++++++++++++++++++ net/batman-adv/originator.c | 1 + net/batman-adv/routing.c | 68 +++++++ net/batman-adv/routing.h | 11 ++ net/batman-adv/soft-interface.c | 12 ++ net/batman-adv/types.h | 64 +++++++ 11 files changed, 523 insertions(+), 11 deletions(-) create mode 100644 net/batman-adv/multicast_forw.c
include/uapi/linux/batadv_packet.h +42 -6
@@ -116,6 +116,9 @@ enum batadv_icmp_packettype {* only need routable IPv4 multicast packets we signed up for explicitly * @BATADV_MCAST_WANT_NO_RTR6: we have no IPv6 multicast router and therefore * only need routable IPv6 multicast packets we signed up for explicitly +* @BATADV_MCAST_HAVE_MC_PTYPE_CAPA: we can parse, receive and forward +* batman-adv multicast packets with a multicast tracker TVLV. And all our +* hard interfaces have an MTU of at least 1280 bytes. */ enum batadv_mcast_flags {BATADV_MCAST_WANT_ALL_UNSNOOPABLES =1UL <<0 ,
@@ -123,6 +126,7 @@ enum batadv_mcast_flags {BATADV_MCAST_WANT_ALL_IPV6 =1UL <<2 ,BATADV_MCAST_WANT_NO_RTR4 =1UL <<3 ,BATADV_MCAST_WANT_NO_RTR6 =1UL <<4 , + BATADV_MCAST_HAVE_MC_PTYPE_CAPA = 1UL << 5, };/* tt data subtypes */
@@ -174,14 +178,16 @@ enum batadv_bla_claimframe {* @BATADV_TVLV_TT: translation table tvlv * @BATADV_TVLV_ROAM: roaming advertisement tvlv * @BATADV_TVLV_MCAST: multicast capability tvlv +* @BATADV_TVLV_MCAST_TRACKER: multicast tracker tvlv */ enum batadv_tvlv_type { -BATADV_TVLV_GW =0x01 , -BATADV_TVLV_DAT =0x02 , -BATADV_TVLV_NC =0x03 , -BATADV_TVLV_TT =0x04 , -BATADV_TVLV_ROAM =0x05 , -BATADV_TVLV_MCAST =0x06 , +BATADV_TVLV_GW =0x01 , +BATADV_TVLV_DAT =0x02 , +BATADV_TVLV_NC =0x03 , +BATADV_TVLV_TT =0x04 , +BATADV_TVLV_ROAM =0x05 , +BATADV_TVLV_MCAST =0x06 , +BATADV_TVLV_MCAST_TRACKER =0x07 , };#pragma pack(2)
@@ -487,6 +493,25 @@ struct batadv_bcast_packet {*/ }; +/** +* struct batadv_mcast_packet - multicast packet for network payload +* @packet_type: batman-adv packet type, part of the general header +* @version: batman-adv protocol version, part of the general header +* @ttl: time to live for this packet, part of the general header +* @reserved: reserved byte for alignment +* @tvlv_len: length of the appended tvlv buffer (in bytes) +*/ +struct batadv_mcast_packet { +__u8 packet_type; +__u8 version; +__u8 ttl; +__u8 reserved; +__be16 tvlv_len; +/* "4 bytes boundary + 2 bytes" long to make the payload after the +* following ethernet header again 4 bytes boundary aligned +*/ +}; +/** * struct batadv_coded_packet - network coded packet * @packet_type: batman-adv packet type, part of the general header
@@ -628,6 +653,17 @@ struct batadv_tvlv_mcast_data { __u8 reserved[3]; }; +/** +* struct batadv_tvlv_mcast_tracker - payload of a multicast tracker tvlv +* @num_dests: number of subsequent destination originator MAC addresses +* @align: (optional) alignment bytes to make the tracker TVLV 4 bytes aligned, +* present if num_dests are even, not present if odd +*/ +struct batadv_tvlv_mcast_tracker { +__be16 num_dests; +__u8 align[2 ]; +}; +#pragma pack()#endif /* _UAPI_LINUX_BATADV_PACKET_H_ */
net/batman-adv/Makefile +1 -0
@@ -20,6 +20,7 @@ batman-adv-y += hash.o batman-adv-$(CONFIG_BATMAN_ADV_DEBUG) += log.o batman-adv-y += main.o batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += multicast.o +batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += multicast_forw.o batman-adv-y += netlink.o batman-adv-$(CONFIG_BATMAN_ADV_NC) += network-coding.o batman-adv-y += originator.o
net/batman-adv/main.c +2 -0
@@ -532,6 +532,8 @@ static void batadv_recv_handler_init(void)/* broadcast packet */ batadv_rx_handler[BATADV_BCAST ] = batadv_recv_bcast_packet; +/* multicast packet */ + batadv_rx_handler[BATADV_MCAST ] = batadv_recv_mcast_packet;/* unicast packets ... */ /* unicast with 4 addresses packet */
net/batman-adv/multicast.c +43 -5
84 lines not on this page · raw message
net/batman-adv/multicast.h +5 -0
@@ -52,6 +52,11 @@ void batadv_mcast_free(struct batadv_priv *bat_priv);void batadv_mcast_purge_orig (struct batadv_orig_node *orig_node); +/* multicast_forw.c */ + +int batadv_mcast_forw_tracker_tvlv_handler (struct batadv_priv *bat_priv, +struct sk_buff *skb); +#else static inline enum batadv_forw_mode
net/batman-adv/multicast_forw.c new file +274 -0
274 lines not on this page · raw message
net/batman-adv/originator.c +1 -0
@@ -942,6 +942,7 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv,#ifdef CONFIG_BATMAN_ADV_MCAST orig_node->mcast_flags =BATADV_MCAST_WANT_NO_RTR4 ; orig_node->mcast_flags |=BATADV_MCAST_WANT_NO_RTR6 ; + orig_node->mcast_flags |=BATADV_MCAST_HAVE_MC_PTYPE_CAPA ;INIT_HLIST_NODE (&orig_node->mcast_want_all_unsnoopables_node);INIT_HLIST_NODE (&orig_node->mcast_want_all_ipv4_node);INIT_HLIST_NODE (&orig_node->mcast_want_all_ipv6_node);
net/batman-adv/routing.c +68 -0
71 lines not on this page · raw message
net/batman-adv/routing.h +11 -0
@@ -27,6 +27,17 @@ int batadv_recv_frag_packet(struct sk_buff *skb, struct batadv_hard_iface *iface);int batadv_recv_bcast_packet (struct sk_buff *skb,struct batadv_hard_iface *recv_if); +#ifdef CONFIG_BATMAN_ADV_MCAST +int batadv_recv_mcast_packet (struct sk_buff *skb, +struct batadv_hard_iface *recv_if); +#else +static inline int batadv_recv_mcast_packet (struct sk_buff *skb, +struct batadv_hard_iface *recv_if) +{ +kfree_skb (skb); +return NET_RX_DROP ; +} +#endif int batadv_recv_tt_query (struct sk_buff *skb,struct batadv_hard_iface *recv_if); int batadv_recv_roam_adv(struct sk_buff *skb,
net/batman-adv/soft-interface.c +12 -0
@@ -922,6 +922,18 @@ static const struct { { "tt_response_rx" }, { "tt_roam_adv_tx" }, { "tt_roam_adv_rx" }, +#ifdef CONFIG_BATMAN_ADV_MCAST + { "mcast_tx" }, + { "mcast_tx_bytes" }, + { "mcast_tx_local" }, + { "mcast_tx_local_bytes" }, + { "mcast_rx" }, + { "mcast_rx_bytes" }, + { "mcast_rx_local" }, + { "mcast_rx_local_bytes" }, + { "mcast_fwd" }, + { "mcast_fwd_bytes" }, +#endif #ifdef CONFIG_BATMAN_ADV_DAT { "dat_get_tx" }, { "dat_get_rx" },
net/batman-adv/types.h +64 -0
70 lines not on this page · raw message
Signature · 1 line
2.39.0
Sven Eckelmann
maintainerRe: [PATCH v3 3/5] batman-adv: mcast: implement multicast packet reception and forwarding
Quoted 19 lines · On Monday, 26 December 2022 21:42:35 CET Linus Lüssing wrote:
Implement functionality to receive and forward a new TVLV capable multicast packet type.
The new batman-adv multicast packet type allows to contain several originator destination addresses within a TVLV. Routers on the way will potentially split the batman-adv multicast packet and adjust its tracker TVLV contents.
Routing decisions are still based on the selected BATMAN IV or BATMAN V routing algorithm. So this new batman-adv multicast packet type retains the same loop-free properties.
Also a new OGM multicast TVLV flag is introduced to signal to other nodes that we are capable of handling a batman-adv multicast packet and multicast tracker TVLV. And that all of our hard interfaces have an MTU of at least 1280 bytes (IPv6 minimum MTU), as a simple solution for now to avoid MTU issues while forwarding.
Signed-off-by Linus Lüssing <[email protected]>
Quoted 14 lines
--- include/uapi/linux/batadv_packet.h | 48 ++++- net/batman-adv/Makefile | 1 + net/batman-adv/main.c | 2 + net/batman-adv/multicast.c | 48 ++++- net/batman-adv/multicast.h | 5 + net/batman-adv/multicast_forw.c | 274 +++++++++++++++++++++++++++++ net/batman-adv/originator.c | 1 + net/batman-adv/routing.c | 68 +++++++ net/batman-adv/routing.h | 11 ++ net/batman-adv/soft-interface.c | 12 ++ net/batman-adv/types.h | 64 +++++++ 11 files changed, 523 insertions(+), 11 deletions(-) create mode 100644 net/batman-adv/multicast_forw.c
ecsv/pu: checkpatch ./net/batman-adv/multicast_forw.c
-----------------------------------------------------
CHECK: Macro argument reuse 'num_dests' - possible side-effects? #25: FILE: ./net/batman-adv/multicast_forw.c:25:
+#define batadv_mcast_forw_tracker_for_each_dest(dest, num_dests) \
+ for (; num_dests; num_dests--, (dest) += ETH_ALEN)
total: 0 errors, 0 warnings, 1 checks, 274 lines checked
Re: [PATCH v3 3/5] batman-adv: mcast: implement multicast packet reception and forwarding
Quoted 10 lines · Sven Eckelmann
ecsv/pu: checkpatch
./net/batman-adv/multicast_forw.c
-----------------------------------------------------CHECK: Macro argument reuse '
num_dests' - possible side-effects? #25: FILE:./net/batman-adv/multicast_forw.c:25:
+#definebatadv_mcast_forw_tracker_for_each_dest(dest, num_dests)\
+ for (;num_dests; num_dests--, (dest) +=ETH_ALEN)total: 0 errors, 0 warnings, 1 checks, 274 lines checked
For this I'm not quite sure how to best silence this. I tried the workaround of passing num_dests as a pointer and dereferencing it inside the macro:
#define batadv_mcast_forw_tracker_for_each_dest(dest, num_dests) \
for (; (*(num_dests)); (*(num_dests))--, (dest) += ETH_ALEN)So just like you'd do if you would want intentional side-effects with a normal function. But seems like checkpatch does not recoginze it.
Also all the other for_each macros in the kernel code have side-effects, as far as I know?
Or would you have another idea?
Sven Eckelmann
maintainerRe: [PATCH v3 3/5] batman-adv: mcast: implement multicast packet reception and forwarding
Quoted 12 lines · On Tuesday, 27 December 2022 12:58:41 CET Linus Lüssing wrote:
Quoted 10 lines · Sven Eckelmann
ecsv/pu: checkpatch
./net/batman-adv/multicast_forw.c
-----------------------------------------------------CHECK: Macro argument reuse '
num_dests' - possible side-effects? #25: FILE:./net/batman-adv/multicast_forw.c:25:
+#definebatadv_mcast_forw_tracker_for_each_dest(dest, num_dests)\
+ for (;num_dests; num_dests--, (dest) +=ETH_ALEN)total: 0 errors, 0 warnings, 1 checks, 274 lines checked
Quoted 6 lines
For this I'm not quite sure how to best silence this. I tried the workaround of passing
num_destsas a pointer and dereferencing it inside the macro:#define batadv_mcast_forw_tracker_for_each_dest(dest, num_dests) \ for (; (*(num_dests)); (*(num_dests))--, (dest) += ETH_ALEN)
This doesn't make a lot of sense. The checkpatch output is about using the same argument multiple times. It is explicitly talking about following situation.
#define asd(b) \
do {
if (b)
printk("Foobar %d\n", b);
while (1)
....
asd(x++);Which would then be transformed to following by the preprocessor:
do {
if (x++)
printk("Foobar %d\n", x++);
while (1)So your x after the "call" of asd() would (sometimes) not be x+1 but x+2.
Quoted 7 lines
So just like you'd do if you would want intentional side-effects with a normal function. But seems like checkpatch does not recoginze it.
Also all the other
for_eachmacros in the kernel code have side-effects, as far as I know?Or would you have another idea?
Provide a patch for checkpatch or build_test.git (which would otherwise send this output every day).
Kind regards,
Sven
PATCH v3 4/5 batman-adv: mcast: implement multicast packet generation
In reply to Linus LüssingImplement the preparation of a batman-adv multicast packet and use this under certain conditions.
For one thing this implements the capability to push a complete batman-adv multicast packet header, including a tracker TVLV with all originator destinations that have signaled interest in it, onto a given ethernet frame with an IP multicast packet inside.
For another checks are implemented to determine if encapsulating a multicast packet in this new batman-adv multicast packet type and using it is feasible. Those checks are:
1) Have all nodes signaled that they are capable of handling the new batman-adv multicast packet type?
2) Do all active hard interfaces of all nodes, including us, have an MTU of at least 1280 bytes?
3) Does a complete multicast packet header with all its destination addresses fit onto the given multicast packet / ethernet frame and does not exceed 1280 bytes?
If all checks passed then the new batman-adv multicast packet type will be used for transmission and distribution. Otherwise we fall back to one or more batman-adv unicast packet transmissions, if possible. Or if not possible we will fall back to classic flooding through a batman-adv broadcast packet.
--- net/batman-adv/multicast.c | 79 ++++- net/batman-adv/multicast.h | 24 +- net/batman-adv/multicast_forw.c | 511 ++++++++++++++++++++++++++++++++ net/batman-adv/soft-interface.c | 6 +- net/batman-adv/types.h | 6 + 5 files changed, 618 insertions(+), 8 deletions(-)
net/batman-adv/multicast.c +74 -5
@@ -1177,17 +1177,62 @@ static int batadv_mcast_forw_rtr_count(struct batadv_priv *bat_priv, } } +/** +* batadv_mcast_forw_mode_by_count() - get forwarding mode by count +* @bat_priv: the bat priv with all the soft interface information +* @skb: the multicast packet to check +* @vid: the vlan identifier +* @is_routable: stores whether the destination is routable +* @count: the number of originators the multicast packet need to be sent to +* +* For a multicast packet with multiple destination originators, checks which +* mode to use. For BATADV_FORW_MCAST it also encapsulates the packet with a +* complete batman-adv multicast header. +* +* Return: +* BATADV_FORW_MCAST: If all nodes have multicast packet routing +* capabilities and an MTU >= 1280 on all hard interfaces (including us) +* and the encapsulated multicast packet with all destination addresses +* would still fit into an 1280 bytes batman-adv multicast packet +* (excluding the outter ethernet frame) and we could successfully push +* the full batman-adv multicast packet header. +* BATADV_FORW_UCASTS: If the packet cannot be sent in a batman-adv +* multicast packet and the amount of batman-adv unicast packets needed +* is smaller or equal to the configured multicast fanout. +* BATADV_FORW_BCAST: Otherwise. +*/ +static enum batadv_forw_mode +batadv_mcast_forw_mode_by_count (struct batadv_priv *bat_priv, +struct sk_buff *skb,unsigned short vid, +int is_routable,int count) +{ +unsigned int mcast_hdrlen =batadv_mcast_forw_packet_hdrlen (count); +u8 own_tvlv_flags = bat_priv->mcast.mla_flags.tvlv_flags; + +if (!atomic_read (&bat_priv->mcast.num_no_mc_ptype_capa) && + own_tvlv_flags &BATADV_MCAST_HAVE_MC_PTYPE_CAPA && + skb->len + mcast_hdrlen <=IPV6_MIN_MTU && +batadv_mcast_forw_push (bat_priv, skb, vid, is_routable)) +return BATADV_FORW_MCAST ; + +if (count <=atomic_read (&bat_priv->multicast_fanout)) +return BATADV_FORW_UCASTS ; + +return BATADV_FORW_BCAST ; +} +/** * batadv_mcast_forw_mode() - check on how to forward a multicast packet * @bat_priv: the bat priv with all the soft interface information * @skb: the multicast packet to check +* @vid: the vlan identifier * @is_routable: stores whether the destination is routable * * Return: The forwarding mode as enum batadv_forw_mode. */ enum batadv_forw_mode batadv_mcast_forw_mode (struct batadv_priv *bat_priv,struct sk_buff *skb, -int *is_routable) +unsigned short vid,int *is_routable) {int ret, tt_count, ip_count, unsnoop_count, total_count;bool is_unsnoopable = false;
@@ -1217,10 +1262,8 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb,else if (unsnoop_count)return BATADV_FORW_BCAST ; -if (total_count <=atomic_read (&bat_priv->multicast_fanout)) -return BATADV_FORW_UCASTS ; - -return BATADV_FORW_BCAST ; +return batadv_mcast_forw_mode_by_count (bat_priv, skb, vid, *is_routable, + total_count); }/**
@@ -1780,6 +1823,31 @@ static void batadv_mcast_want_rtr6_update(struct batadv_priv *bat_priv, } } +/** +* batadv_mcast_have_mc_ptype_update() - update multicast packet type counter +* @bat_priv: the bat priv with all the soft interface information +* @orig: the orig_node which multicast state might have changed of +* @mcast_flags: flags indicating the new multicast state +* +* If the BATADV_MCAST_HAVE_MC_PTYPE_CAPA flag of this originator, orig, has +* toggled then this method updates the counter accordingly. +*/ +static void batadv_mcast_have_mc_ptype_update (struct batadv_priv *bat_priv, +struct batadv_orig_node *orig, +u8 mcast_flags) +{ +lockdep_assert_held (&orig->mcast_handler_lock); + +/* switched from flag set to unset */ +if (!(mcast_flags &BATADV_MCAST_HAVE_MC_PTYPE_CAPA ) && + orig->mcast_flags &BATADV_MCAST_HAVE_MC_PTYPE_CAPA ) +atomic_inc (&bat_priv->mcast.num_no_mc_ptype_capa); +/* switched from flag unset to set */ +else if (mcast_flags &BATADV_MCAST_HAVE_MC_PTYPE_CAPA && + !(orig->mcast_flags &BATADV_MCAST_HAVE_MC_PTYPE_CAPA )) +atomic_dec (&bat_priv->mcast.num_no_mc_ptype_capa); +} +/** * batadv_mcast_tvlv_flags_get() - get multicast flags from an OGM TVLV * @enabled: whether the originator has multicast TVLV support enabled
@@ -1848,6 +1916,7 @@ static void batadv_mcast_tvlv_ogm_handler(struct batadv_priv *bat_priv,batadv_mcast_want_ipv6_update (bat_priv, orig, mcast_flags);batadv_mcast_want_rtr4_update (bat_priv, orig, mcast_flags);batadv_mcast_want_rtr6_update (bat_priv, orig, mcast_flags); +batadv_mcast_have_mc_ptype_update (bat_priv, orig, mcast_flags); orig->mcast_flags = mcast_flags;spin_unlock_bh (&orig->mcast_handler_lock);
net/batman-adv/multicast.h +22 -2
@@ -28,6 +28,12 @@ enum batadv_forw_mode {*/ BATADV_FORW_UCASTS , +/** +* @BATADV_FORW_MCAST: forward the packet to some nodes via a +* batman-adv multicast packet +*/ +BATADV_FORW_MCAST , +/** @BATADV_FORW_NONE: don't forward, drop it */ BATADV_FORW_NONE, };
@@ -36,7 +42,7 @@ enum batadv_forw_mode {enum batadv_forw_mode batadv_mcast_forw_mode (struct batadv_priv *bat_priv,struct sk_buff *skb, -int *is_routable); +unsigned short vid,int *is_routable);int batadv_mcast_forw_send (struct batadv_priv *bat_priv,struct sk_buff *skb,unsigned short vid,int is_routable);
@@ -57,11 +63,18 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig_node);int batadv_mcast_forw_tracker_tvlv_handler (struct batadv_priv *bat_priv,struct sk_buff *skb); +unsigned int batadv_mcast_forw_packet_hdrlen (unsigned int num_dests); + +bool batadv_mcast_forw_push (struct batadv_priv *bat_priv,struct sk_buff *skb, +unsigned short vid,int is_routable); + +int batadv_mcast_forw_mcsend (struct batadv_priv *bat_priv,struct sk_buff *skb); +#else static inline enum batadv_forw_mode batadv_mcast_forw_mode (struct batadv_priv *bat_priv,struct sk_buff *skb, -int *is_routable) +unsigned short vid,int *is_routable) {return BATADV_FORW_BCAST ; }
@@ -99,6 +112,13 @@ static inline void batadv_mcast_purge_orig(struct batadv_orig_node *orig_node) { } +static inline int batadv_mcast_forw_mcsend (struct batadv_priv *bat_priv, +struct sk_buff *skb) +{ +kfree_skb (skb); +return NET_XMIT_DROP ; +} +#endif /* CONFIG_BATMAN_ADV_MCAST */ #endif /* _NET_BATMAN_ADV_MULTICAST_H_ */
net/batman-adv/multicast_forw.c +511 -0
544 lines not on this page · raw message
net/batman-adv/soft-interface.c +5 -1
@@ -298,12 +298,13 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, send:if (do_bcast && !is_broadcast_ether_addr (ethhdr->h_dest)) { - forw_mode =batadv_mcast_forw_mode (bat_priv, skb, + forw_mode =batadv_mcast_forw_mode (bat_priv, skb, vid, &mcast_is_routable);switch (forw_mode) {case BATADV_FORW_BCAST :break ;case BATADV_FORW_UCASTS : +case BATADV_FORW_MCAST : do_bcast = false;break ;case BATADV_FORW_NONE :
@@ -362,6 +363,8 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, }else if (forw_mode ==BATADV_FORW_UCASTS ) { ret =batadv_mcast_forw_send (bat_priv, skb, vid, mcast_is_routable); + }else if (forw_mode ==BATADV_FORW_MCAST ) { + ret =batadv_mcast_forw_mcsend (bat_priv, skb); }else {if (batadv_dat_snoop_outgoing_arp_request (bat_priv, skb))
@@ -759,6 +762,7 @@ static int batadv_softif_init_late(struct net_device *dev)atomic_set (&bat_priv->mcast.num_want_all_unsnoopables,0 );atomic_set (&bat_priv->mcast.num_want_all_ipv4,0 );atomic_set (&bat_priv->mcast.num_want_all_ipv6,0 ); +atomic_set (&bat_priv->mcast.num_no_mc_ptype_capa,0 );#endif atomic_set (&bat_priv->gw.mode,BATADV_GW_MODE_OFF );atomic_set (&bat_priv->gw.bandwidth_down,100 );
net/batman-adv/types.h +6 -0
@@ -1342,6 +1342,12 @@ struct batadv_priv_mcast {/** @num_want_all_rtr6: counter for items in want_all_rtr6_list */ atomic_t num_want_all_rtr6; +/** +* @num_no_mc_ptype_capa: counter for number of nodes without the +* BATADV_MCAST_HAVE_MC_PTYPE_CAPA flag +*/ +atomic_t num_no_mc_ptype_capa; +/** * @want_lists_lock: lock for protecting modifications to mcasts * want_all_{unsnoopables,ipv4,ipv6}_list (traversals are rcu-locked)
Signature · 1 line
2.39.0
Sven Eckelmann
maintainerRe: [PATCH v3 4/5] batman-adv: mcast: implement multicast packet generation
Quoted 26 lines · On Monday, 26 December 2022 21:42:36 CET Linus Lüssing wrote:
Implement the preparation of a batman-adv multicast packet and use this under certain conditions.
For one thing this implements the capability to push a complete batman-adv multicast packet header, including a tracker TVLV with all originator destinations that have signaled interest in it, onto a given ethernet frame with an IP multicast packet inside.
For another checks are implemented to determine if encapsulating a multicast packet in this new batman-adv multicast packet type and using it is feasible. Those checks are:
1) Have all nodes signaled that they are capable of handling the new batman-adv multicast packet type?
2) Do all active hard interfaces of all nodes, including us, have an MTU of at least 1280 bytes?
3) Does a complete multicast packet header with all its destination addresses fit onto the given multicast packet / ethernet frame and does not exceed 1280 bytes?If all checks passed then the new batman-adv multicast packet type will be used for transmission and distribution. Otherwise we fall back to one or more batman-adv unicast packet transmissions, if possible. Or if not possible we will fall back to classic flooding through a batman-adv broadcast packet.
Quoted 8 lines
Signed-off-by Linus Lüssing <[email protected]>--- net/batman-adv/multicast.c | 79 ++++- net/batman-adv/multicast.h | 24 +- net/batman-adv/multicast_forw.c | 511 ++++++++++++++++++++++++++++++++ net/batman-adv/soft-interface.c | 6 +- net/batman-adv/types.h | 6 + 5 files changed, 618 insertions(+), 8 deletions(-)
ecsv/pu: checkpatch ./net/batman-adv/multicast_forw.c
-----------------------------------------------------
CHECK: Macro argument reuse 'num_dests' - possible side-effects? #35: FILE: ./net/batman-adv/multicast_forw.c:35:
+#define batadv_mcast_forw_tracker_for_each_dest(dest, num_dests) \
+ for (; num_dests; num_dests--, (dest) += ETH_ALEN)
total: 0 errors, 0 warnings, 1 checks, 785 lines checked
ecsv/pu: headers
----------------
diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h
index 0f0d79c8..4393c3a2 100644
--- a/net/batman-adv/multicast.h
+++ b/net/batman-adv/multicast.h
@@ -11,6 +11,7 @@
#include <linux/netlink.h>
#include <linux/skbuff.h>
+#include <linux/types.h>
/**
* enum batadv_forw_mode - the way a packet should be forwarded asecsv/pu: kerneldoc ./net/batman-adv/multicast_forw.c
----------------------------------------------------
./net/batman-adv/multicast_forw.c:83: warning: Function parameter or member 'bat_priv' not described in 'batadv_mcast_forw_push_dest' ./net/batman-adv/multicast_forw.c:398: warning: Function parameter or member 'bat_priv' not described in 'batadv_mcast_forw_push_tvlvs'
PATCH v3 5/5 batman-adv: mcast: shrink tracker packet after scrubbing
In reply to Linus LüssingRemove all zero MAC address entries (00:00:00:00:00:00) from a multicast packet's tracker TVLV before transmitting it and update all headers accordingly. This way, instead of keeping the multicast packet at a constant size throughout its journey through the mesh, it will become more lightweight, smaller with every interested receiver on the way and on each splitting intersection. Which can save some valuable bandwidth.
--- net/batman-adv/multicast_forw.c | 212 ++++++++++++++++++++++++++++++++ 1 file changed, 212 insertions(+)
net/batman-adv/multicast_forw.c +212 -0
@@ -35,6 +35,9 @@#define batadv_mcast_forw_tracker_for_each_dest (dest, num_dests) \ for (; num_dests; num_dests--, (dest) += ETH_ALEN) +#define batadv_mcast_forw_tracker_for_each_dest_rev (dest, num_dests) \ + for (; num_dests; num_dests--, (dest) -= ETH_ALEN) +/** * batadv_mcast_forw_orig_entry() - get orig_node from an hlist node * @node: the hlist node to get the orig_node from
@@ -529,6 +532,214 @@ batadv_mcast_forw_scrub_dests(struct batadv_priv *bat_priv, } } +/** +* batadv_mcast_forw_shrink_align_offset() - calculate alignment offset +* @num_dests_old: the number of destinations the tracker TVLV had originally +* @num_dests_reduce: the number of destinations that are going to be removed +* +* The multicast tracker TVLV has 2 alignment bytes if the number of destination +* entries are even, to make this TVLV 4 byte aligned to make the encapsulated +* IP packet 4 byte aligned. And no alignment bytes in the tracker TVLV if the +* number of destinations is odd. +* +* This calculates if the 2 alignment bytes in the multicast tracker TVLV need +* to be added, removed or left unchanged. +* +* Return: The number of extra offset in skb tail direction to compensate for +* alignment. Will be -2, 0 or +2. +*/ +static int batadv_mcast_forw_shrink_align_offset (unsigned int num_dests_old, +unsigned int num_dests_remove) +{ +int ret =sizeof (((struct batadv_tvlv_mcast_tracker *)0 )->align); + +/* no change in padding */ +if (!(num_dests_remove %2 )) +return 0 ; + +/* even had padding, remove it, increase the offset */ +if (!(num_dests_old %2 )) +return ret; +/* odd had no padding, add it, decrease the offset */ +else +return -ret; +} + +/** +* batadv_mcast_forw_shrink_pack_dests() - pack destinations of a tracker TVLV +* @skb: the batman-adv multicast packet to compact destinations in +* +* Compacts the originator destination MAC addresses in the multicast tracker +* TVLV of the given multicast packet. This is done by moving all non-zero +* MAC addresses in direction of the skb tail and all zero MAC addresses in skb +* head direction, within the multicast tracker TVLV. +* +* Return: The number of consecutive zero MAC address destinations which are +* now at the front within the multicast tracker TVLV. +*/ +static int batadv_mcast_forw_shrink_pack_dests (struct sk_buff *skb) +{ +struct batadv_tvlv_mcast_tracker *mcast_tracker; +u16 num_dests_slot, num_dests_filler; +unsigned int tracker_hdrlen; +unsigned char *skb_net_hdr; +u8 *slot, *filler; + + skb_net_hdr =skb_network_header (skb); + mcast_tracker = (struct batadv_tvlv_mcast_tracker *)skb_net_hdr; + num_dests_slot =ntohs (mcast_tracker->num_dests); + + tracker_hdrlen =batadv_mcast_forw_tracker_hdrlen (num_dests_slot); + slot = (u8 *)mcast_tracker + tracker_hdrlen; + slot +=ETH_ALEN * (num_dests_slot -1 ); + +if (!num_dests_slot) +return 0 ; + + num_dests_filler = num_dests_slot -1 ; + filler = slot -ETH_ALEN ; + +batadv_mcast_forw_tracker_for_each_dest_rev (slot, num_dests_slot) { +/* find an empty slot */ +if (!is_zero_ether_addr (slot)) +continue ; + +/* keep filler ahead of slot */ +if (filler >= slot) { + num_dests_filler = num_dests_slot -1 ; + filler = slot -ETH_ALEN ; + } + +/* find a candidate to fill the empty slot */ +batadv_mcast_forw_tracker_for_each_dest_rev (filler, + num_dests_filler) { +if (is_zero_ether_addr (filler)) +continue ; + +ether_addr_copy (slot, filler); +eth_zero_addr (filler); + goto cont_next_slot; + } + +/* could not find a filler, we can stop +* - and must not advance the slot pointer! +*/ +if (!num_dests_filler) +break ; + +cont_next_slot: +continue ; + } + +/* num_dests_slot is the amount of reduced destinations */ +return num_dests_slot; +} + +/** +* batadv_mcast_forw_shrink_update_headers() - update shrunk mc packet headers +* @skb: the batman-adv multicast packet to update headers of +* @num_dest_reduce: the number of destinations that were removed +* +* This updates any fields of a batman-adv multicast packet that are affected +* by the reduced number of destinations in the multicast tracket TVLV. In +* particular this updates: +* +* The num_dest field of the multicast tracker TVLV. +* The TVLV length field of the according generic TVLV header. +* The batman-adv multicast packet's total TVLV length field. +* +* Return: The offset in skb's tail direction at which the new batman-adv +* multicast packet header needs to start. +*/ +static unsigned int +batadv_mcast_forw_shrink_update_headers (struct sk_buff *skb, +unsigned int num_dests_reduce) +{ +struct batadv_tvlv_mcast_tracker *mcast_tracker; +struct batadv_mcast_packet *mcast_packet; +struct batadv_tvlv_hdr *tvlv_hdr; +unsigned char *skb_net_hdr; +unsigned int offset; +int align_offset; +u16 num_dests; + + skb_net_hdr =skb_network_header (skb); + mcast_tracker = (struct batadv_tvlv_mcast_tracker *)skb_net_hdr; + num_dests =ntohs (mcast_tracker->num_dests); + + align_offset =batadv_mcast_forw_shrink_align_offset (num_dests, + num_dests_reduce); + num_dests -= num_dests_reduce; + offset =ETH_ALEN * num_dests_reduce + align_offset; + +/* update tracker header */ + mcast_tracker->num_dests =htons (num_dests); +/* align field is already zero'd due to previous eth_zero_addr() call */ + +/* update tracker's tvlv header's length field */ + tvlv_hdr = (struct batadv_tvlv_hdr *)(skb_network_header (skb) - +sizeof (*tvlv_hdr)); + tvlv_hdr->len =htons (ntohs (tvlv_hdr->len) - offset); + +/* update multicast packet header's tvlv length field */ + mcast_packet = (struct batadv_mcast_packet *)skb->data; + mcast_packet->tvlv_len =htons (ntohs (mcast_packet->tvlv_len) - offset); + +return offset; +} + +/** +* batadv_mcast_forw_shrink_move_headers() - move multicast headers by offset +* @skb: the batman-adv multicast packet to move headers for +* @offset: a non-negative offset to move headers by, towards the skb tail +* +* Moves the batman-adv multicast packet header, its multicast tracker TVLV and +* any TVLVs in between by the given offset in direction towards the tail. +* +* It also invalidates the skb checksum. +*/ +static void +batadv_mcast_forw_shrink_move_headers (struct sk_buff *skb,unsigned int offset) +{ +struct batadv_tvlv_mcast_tracker *mcast_tracker; +unsigned int tracker_hdrlen, len; +unsigned char *skb_net_hdr; +u16 num_dests; + + skb_net_hdr =skb_network_header (skb); + mcast_tracker = (struct batadv_tvlv_mcast_tracker *)skb_net_hdr; + num_dests =ntohs (mcast_tracker->num_dests); + tracker_hdrlen =batadv_mcast_forw_tracker_hdrlen (num_dests); + len =skb_network_offset (skb) + tracker_hdrlen; + +memmove (skb->data + offset, skb->data, len); +skb_pull (skb, offset); + +/* invalidate checksum: */ + skb->ip_summed =CHECKSUM_NONE ; +} + +/** +* batadv_mcast_forw_shrink_tracker() - remove zero addresses in a tracker tvlv +* @skb: the batman-adv multicast packet to (potentially) shrink +* +* Removes all destinations with a zero MAC addresses (00:00:00:00:00:00) from +* the given batman-adv multicast packet's tracker TVLV and updates headers +* accordingly to maintain a valid batman-adv multicast packet. +*/ +static void batadv_mcast_forw_shrink_tracker (struct sk_buff *skb) +{ +u16 dests_reduced; +unsigned int offset; + + dests_reduced =batadv_mcast_forw_shrink_pack_dests (skb); +if (!dests_reduced) +return ; + + offset =batadv_mcast_forw_shrink_update_headers (skb, dests_reduced); +batadv_mcast_forw_shrink_move_headers (skb, offset); +} +/** * batadv_mcast_forw_packet() - forward a batman-adv multicast packet * @bat_priv: the bat priv with all the soft interface information
@@ -613,6 +824,7 @@ static int batadv_mcast_forw_packet(struct batadv_priv *bat_priv,batadv_mcast_forw_scrub_dests (bat_priv, neigh_node, dest, next_dest, num_dests); +batadv_mcast_forw_shrink_tracker (nexthop_skb);batadv_inc_counter (bat_priv,BATADV_CNT_MCAST_TX ); batadv_add_counter(bat_priv, BATADV_CNT_MCAST_TX_BYTES,
Signature · 1 line
2.39.0
Sven Eckelmann
maintainerRe: [PATCH v3 5/5] batman-adv: mcast: shrink tracker packet after scrubbing
Quoted 11 lines · On Monday, 26 December 2022 21:42:37 CET Linus Lüssing wrote:
Remove all zero MAC address entries (00:00:00:00:00:00) from a multicast packet's tracker TVLV before transmitting it and update all headers accordingly. This way, instead of keeping the multicast packet at a constant size throughout its journey through the mesh, it will become more lightweight, smaller with every interested receiver on the way and on each splitting intersection. Which can save some valuable bandwidth.
Signed-off-by Linus Lüssing <[email protected]>--- net/batman-adv/multicast_forw.c | 212 ++++++++++++++++++++++++++++++++ 1 file changed, 212 insertions(+)
ecsv/pu: checkpatch ./net/batman-adv/multicast_forw.c
-----------------------------------------------------
CHECK: Macro argument reuse 'num_dests' - possible side-effects? #35: FILE: ./net/batman-adv/multicast_forw.c:35:
+#define batadv_mcast_forw_tracker_for_each_dest(dest, num_dests) \
+ for (; num_dests; num_dests--, (dest) += ETH_ALEN)
CHECK: Macro argument reuse 'num_dests' - possible side-effects? #38: FILE: ./net/batman-adv/multicast_forw.c:38:
+#define batadv_mcast_forw_tracker_for_each_dest_rev(dest, num_dests) \
+ for (; num_dests; num_dests--, (dest) -= ETH_ALEN)
total: 0 errors, 0 warnings, 2 checks, 997 lines checked
ecsv/pu: headers
----------------
diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h
index 0f0d79c8..4393c3a2 100644
--- a/net/batman-adv/multicast.h
+++ b/net/batman-adv/multicast.h
@@ -11,6 +11,7 @@
#include <linux/netlink.h>
#include <linux/skbuff.h>
+#include <linux/types.h>
/**
* enum batadv_forw_mode - the way a packet should be forwarded asecsv/pu: kerneldoc ./net/batman-adv/multicast_forw.c
----------------------------------------------------
./net/batman-adv/multicast_forw.c:86: warning: Function parameter or member 'bat_priv' not described in 'batadv_mcast_forw_push_dest' ./net/batman-adv/multicast_forw.c:401: warning: Function parameter or member 'bat_priv' not described in 'batadv_mcast_forw_push_tvlvs' ./net/batman-adv/multicast_forw.c:553: warning: Function parameter or member 'num_dests_remove' not described in 'batadv_mcast_forw_shrink_align_offset' ./net/batman-adv/multicast_forw.c:553: warning: Excess function parameter 'num_dests_reduce' description in 'batadv_mcast_forw_shrink_align_offset' ./net/batman-adv/multicast_forw.c:657: warning: Function parameter or member 'num_dests_reduce' not described in 'batadv_mcast_forw_shrink_update_headers' ./net/batman-adv/multicast_forw.c:657: warning: Excess function parameter 'num_dest_reduce' description in 'batadv_mcast_forw_shrink_update_headers'
net/batman-adv/multicast_forw.c batadv_mcast_forw_scrub_dests(struct batadv_priv *bat_priv, · line 554
Quoted 4 lines
net/batman-adv/multicast_forw.c +4
-0+static int batadv_mcast_forw_shrink_align_offset (unsigned int num_dests_old, +unsigned int num_dests_remove) +{ +int ret =sizeof (((struct batadv_tvlv_mcast_tracker *)0 )->align);
sizeof_field from linux/stddef.h. Available there since v4.16. So you need to have a compat code commit which introduces it for older kernels.
Kind regards,
Sven