Implementation of a Stateless Multicast Packet Type
v7 cover Implementation of a Stateless Multicast Packet Type
In-Reply-To:
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 v7:
* PATCH 1/3:
* rebased to current main/master branch (resolved net/multicast/routing.h)
* renamed batadv_mcast_forw_orig_to_neigh() to batadv_orig_to_router() and moved it to originator.c, for reuse in fragmentation.c
* added a SKB_LINEAR_ASSERT() to batadv_mcast_forw_packet()
* adjusted batadv_mcast_forw_scrub_dests():
added a new macro that updates two dest pointers
to avoid confusion due to two different updating methods, removed goto's and a little reordering
* PATCH 2/3:
* added SKB_LINEAR_ASSERT() to batadv_mcast_forw_scrape()
* PATCH 3/3:
* simplified batadv_mcast_forw_shrink_pack_dests():
moved parts to new sub function batadv_mcast_forw_shrink_fill(), removed keeping track of filler over the whole function (might be slower, as we might check+skip the same zero
MAC entry multiple times, for each slot, but a lot easier to read - and we don't prioritize performance with this patchset yet)
Changelog v6:
* PATCH 2/3:
* add missing include of linux/compiler.h for the newly added likely() in v5
* added kerneldoc for @num_dests_pushed to
the in v5 newly added batadv_mcast_forw_push_adjust_padding()
* updated kerneldoc of batadv_mcast_forw_push_adjust_padding(), original text was wrongly copy & pasted from batadv_mcast_forw_push_est_padding() without adjustments
* PATCH 3/3:
* added missing "static" attribute to the newly added batadv_mcast_forw_shrink_align_offset() in v5
Changelog v5:
* removed patches 1/5 + 2/5, as they were already applied
* rebased to current main branch
* changed padding behaviour:
* now 2 bytes padding on the end of the multicast tracker TVLV, if number of destination nodes is even
* as number of destination nodes might change between initial check until after pushing them, functions to post-adjust padding after pushing were added
* added/fixed TTL handling
* removed skb_pull() bailing from sub-functions of batadv_mcast_forw_push(), to only have a single skb_pull() to keep track of in batadv_mcast_forw_push() to revert the changes to the skb; instead a "unsigned short *tvlv_len" is passsed along in batadv_mcast_.*push.*() functions to keep track of how many bytes were pushed
* moved + verified skb->ip_summed invalidation
* batadv_mcast_forw_shrink_tracker() xmas tree ordering
* reword batadv_mcast_forw_push_dest() "Return:" kerneldoc
* fixed spelling: outter -> outer
Changelog v4:
* PATCH 4/5:
* add missing include for linux/types.h in multicast.h
* add missing kerneldoc for @bat_priv in batadv_mcast_forw_push_dest() and batadv_mcast_forw_push_tvlvs()
* use sizeof_field(type, field) instead of sizeof(((type *)0)->field) in batadv_mcast_forw_push_dest()
* PATCH 5/5:
* rename num_dests_remove to num_dests_reduce in batadv_mcast_forw_shrink_align_offse() to fix kerneldocs and for consistency
* fix typo in kerneldoc in batadv_mcast_forw_shrink_update_headers()
-> @num_dest_reduce -> @num_dests_reduce
* use sizeof_field(type, field) instead of sizeof(((type *)0)->field) in batadv_mcast_forw_shrink_align_offset()
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 v7 1/3 batman-adv: mcast: implement multicast packet reception and forwarding
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.
--- include/uapi/linux/batadv_packet.h | 45 +++++- net/batman-adv/Makefile | 1 + net/batman-adv/fragmentation.c | 7 +- net/batman-adv/main.c | 2 + net/batman-adv/multicast.c | 48 +++++- net/batman-adv/multicast.h | 5 + net/batman-adv/multicast_forw.c | 240 +++++++++++++++++++++++++++++ net/batman-adv/originator.c | 28 ++++ net/batman-adv/originator.h | 3 + net/batman-adv/routing.c | 70 +++++++++ net/batman-adv/routing.h | 11 ++ net/batman-adv/soft-interface.c | 12 ++ net/batman-adv/types.h | 64 ++++++++ 13 files changed, 519 insertions(+), 17 deletions(-) create mode 100644 net/batman-adv/multicast_forw.c
include/uapi/linux/batadv_packet.h +39 -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,14 @@ 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 +*/ +struct batadv_tvlv_mcast_tracker { +__be16 num_dests; +}; +#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/fragmentation.c +1 -6
@@ -351,18 +351,14 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb, struct batadv_orig_node *orig_node_src) {struct batadv_priv *bat_priv =netdev_priv (recv_if->soft_iface); -struct batadv_orig_node *orig_node_dst;struct batadv_neigh_node *neigh_node =NULL ;struct batadv_frag_packet *packet;u16 total_size;bool ret = false; packet = (struct batadv_frag_packet *)skb->data; - orig_node_dst =batadv_orig_hash_find (bat_priv, packet->dest); -if (!orig_node_dst) - goto out; - neigh_node =batadv_find_router (bat_priv, orig_node_dst, recv_if); + neigh_node =batadv_orig_to_router (bat_priv, packet->dest, recv_if);if (!neigh_node) goto out;
@@ -381,7 +377,6 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb, } out: -batadv_orig_node_put (orig_node_dst);batadv_neigh_node_put (neigh_node);return ret; }
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 +240 -0
240 lines not on this page · raw message
net/batman-adv/originator.c +28 -0
@@ -311,6 +311,33 @@ batadv_orig_router_get(struct batadv_orig_node *orig_node,return router; } +/** +* batadv_orig_to_router() - get next hop neighbor to an orig address +* @bat_priv: the bat priv with all the soft interface information +* @orig_addr: the originator MAC address to search the best next hop router for +* @if_outgoing: the interface where the payload packet has been received or +* the OGM should be sent to +* +* Return: A neighbor node which is the best router towards the given originator +* address. +*/ +struct batadv_neigh_node * +batadv_orig_to_router (struct batadv_priv *bat_priv,u8 *orig_addr, +struct batadv_hard_iface *if_outgoing) +{ +struct batadv_neigh_node *neigh_node; +struct batadv_orig_node *orig_node; + + orig_node =batadv_orig_hash_find (bat_priv, orig_addr); +if (!orig_node) +return NULL ; + + neigh_node =batadv_find_router (bat_priv, orig_node, if_outgoing); +batadv_orig_node_put (orig_node); + +return neigh_node; +} +/** * batadv_orig_ifinfo_get() - find the ifinfo from an orig_node * @orig_node: the orig node to be queried
@@ -942,6 +969,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/originator.h +3 -0
@@ -36,6 +36,9 @@ void batadv_neigh_node_release(struct kref *ref);struct batadv_neigh_node *batadv_orig_router_get (struct batadv_orig_node *orig_node,const struct batadv_hard_iface *if_outgoing); +struct batadv_neigh_node * +batadv_orig_to_router (struct batadv_priv *bat_priv,u8 *orig_addr, +struct batadv_hard_iface *if_outgoing);struct batadv_neigh_ifinfo *batadv_neigh_ifinfo_new (struct batadv_neigh_node *neigh,struct batadv_hard_iface *if_outgoing);
net/batman-adv/routing.c +70 -0
73 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_unicast_tvlv (struct sk_buff *skb,struct batadv_hard_iface *recv_if); int batadv_recv_unhandled_unicast_packet(struct sk_buff *skb,
net/batman-adv/soft-interface.c +12 -0
@@ -925,6 +925,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.40.1
PATCH v7 2/3 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 | 25 +- net/batman-adv/multicast_forw.c | 732 ++++++++++++++++++++++++++++++++ net/batman-adv/soft-interface.c | 6 +- net/batman-adv/types.h | 6 + 5 files changed, 840 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 outer 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, count)) +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 +23 -2
@@ -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 as
@@ -28,6 +29,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 +43,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 +64,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 count); + +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 +113,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 +732 -0
761 lines not on this page · raw message
net/batman-adv/soft-interface.c +5 -1
@@ -301,12 +301,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 :
@@ -365,6 +366,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))
@@ -762,6 +765,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.40.1
PATCH v7 3/3 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 | 207 ++++++++++++++++++++++++++++++++ 1 file changed, 207 insertions(+)
net/batman-adv/multicast_forw.c +207 -0
@@ -698,6 +698,212 @@ batadv_mcast_forw_scrub_dests(struct batadv_priv *bat_priv, } } +/** +* batadv_mcast_forw_shrink_fill() - swap slot with next non-zero destination +* @slot: the to be filled zero-MAC destination entry in a tracker TVLV +* @num_dests_slot: remaining entries in tracker TVLV from/including slot +* +* Searches for the next non-zero-MAC destination entry in a tracker TVLV after +* the given slot pointer. And if found, swaps it with the zero-MAC destination +* entry which the slot points to. +* +* Return: true if slot was swapped/filled successfully, false otherwise. +*/ +static bool batadv_mcast_forw_shrink_fill (u8 *slot,u16 num_dests_slot) +{ +u16 num_dests_filler; +u8 *filler; + +/* sanity check, should not happen */ +if (!num_dests_slot) +return false; + + 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 (filler, num_dests_filler) { +if (is_zero_ether_addr (filler)) +continue ; + +ether_addr_copy (slot, filler); +eth_zero_addr (filler); +return true; + } + +return false; +} + +/** +* 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 head and all zero MAC addresses in skb +* tail direction, within the multicast tracker TVLV. +* +* Return: The number of consecutive zero MAC address destinations which are +* now at the end of the multicast tracker TVLV. +*/ +static int batadv_mcast_forw_shrink_pack_dests (struct sk_buff *skb) +{ +struct batadv_tvlv_mcast_tracker *mcast_tracker; +unsigned char *skb_net_hdr; +u16 num_dests_slot; +u8 *slot; + + 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); + + slot = (u8 *)mcast_tracker +sizeof (*mcast_tracker); + +batadv_mcast_forw_tracker_for_each_dest (slot, num_dests_slot) { +/* find an empty slot */ +if (!is_zero_ether_addr (slot)) +continue ; + +if (!batadv_mcast_forw_shrink_fill (slot, num_dests_slot)) +/* could not find a filler, so we successfully packed +* and can stop - and must not reduce num_dests_slot! +*/ +break ; + } + +/* num_dests_slot is now the amount of reduced, zeroed +* destinations at the end of the tracker TVLV +*/ +return num_dests_slot; +} + +/** +* batadv_mcast_forw_shrink_align_offset() - get new alignment offset +* @num_dests_old: the old, to be updated amount of destination nodes +* @num_dests_reduce: the number of destinations that were removed +* +* Calculates the amount of potential extra alignment offset that is needed to +* adjust the TVLV padding after the change in destination nodes. +* +* Return: +* 0: If no change to padding is needed. +* 2: If padding needs to be removed. +* -2: If padding needs to be added. +*/ +static short +batadv_mcast_forw_shrink_align_offset (unsigned int num_dests_old, +unsigned int num_dests_reduce) +{ +/* even amount of removed destinations -> no alignment change */ +if (!(num_dests_reduce %2 )) +return 0 ; + +/* even to odd amount of destinations -> remove padding */ +if (!(num_dests_old %2 )) +return 2 ; + +/* odd to even amount of destinations -> add padding */ +return -2 ; +} + +/** +* batadv_mcast_forw_shrink_update_headers() - update shrunk mc packet headers +* @skb: the batman-adv multicast packet to update headers of +* @num_dests_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; +short 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); + offset =ETH_ALEN * num_dests_reduce + align_offset; + num_dests -= num_dests_reduce; + +/* update tracker header */ + mcast_tracker->num_dests =htons (num_dests); + +/* 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. +*/ +static void +batadv_mcast_forw_shrink_move_headers (struct sk_buff *skb,unsigned int offset) +{ +struct batadv_tvlv_mcast_tracker *mcast_tracker; +unsigned char *skb_net_hdr; +unsigned int len; +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); + len =skb_network_offset (skb) +sizeof (*mcast_tracker); + len += num_dests *ETH_ALEN ; + +batadv_mcast_forw_scrape (skb, len, offset); +} + +/** +* 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) +{ +unsigned int offset; +u16 dests_reduced; + + 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
@@ -787,6 +993,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.40.1
Sven Eckelmann
maintainerOn Thursday, 7 September 2023 03:09:07 CEST Linus Lüssing wrote:
[...]
Quoted 3 lines
Changelog v7:
* PATCH 1/3:
* rebased to current main/master branch (resolvednet/multicast/routing.h)
Are you trying to take over batman-adv and make it the *multicast* mesh protocol? :D
Quoted 3 lines
* renamed
batadv_mcast_forw_orig_to_neigh()tobatadv_orig_to_router()and moved it tooriginator.c, for reuse infragmentation.c
For this, you should also remove routing.h from fragmentation.c in patch 1. Same for multicast_forw.c
I have already queued it up in linux-merge with these changes
Quoted 1 line
* PATCH 3/3:
@Simon, can you please also check the remaining code changes? To quickly identify modifications, you can use
pipx install b4
# in you batman-adv repo
b4 diff -- [email protected]
Quoted 7 lines
* simplified
batadv_mcast_forw_shrink_pack_dests():
moved parts to new sub functionbatadv_mcast_forw_shrink_fill(), removed keeping track of filler over the whole function (might be slower, as we might check+skip the same zero
MAC entry multiple times, for each slot, but a lot easier to read - and we don't prioritize performance with this patchset yet)
Independent of the outcome for this patchset, something like this would often be implemented by starting the search on one side of an array and get the replacement from the other side of the array - and when start and end overlap then the algorithm stops. At least for me, it is easier to comprehend than some filler which needs to be pushed forward and is influenced by a variable which is (unexpectedly) modified inside a macro:
#! /usr/bin/env python3
from random import randint
# initialize test array
def random_array():
slots = []
for i in range(100):
slots.append(randint(0, 5))
return slots
# searches from the end towards the empty slot for fillers (non-zero) #
# returns a non-zero entry if return value > empty_slot def find_filler(slots, empty_slot, end):
while end > empty_slot:
if slots[end] != 0:
break
end -= 1
return end
# searches from the front for empty entries and replaces them with # non-empty entries from the end
#
# returns number of non-empty entries
def move_empty_to_end(slots):
non_empty = 0
start = 0
length = len(slots)
end = length - 1
# replace empty entries at the beginning with non-empty from end while start < end:
# ignore non-empty entries at the start
if slots[start] != 0:
start += 1
non_empty += 1
continue
# find replacement at end new_end = find_filler(slots, start, end) if new_end <= start:
# no replacement found
break
# move non-empty entry from end to start slots[start] = slots[new_end] end = new_end - 1
slots[new_end] = 0
# count remaining non-empty
for i in range(start, length):
if slots[i] == 0:
break
non_empty += 1
return non_empty
slots = random_array()
count_non_empty = move_empty_to_end(slots)
# just to make sure that everything is empty
print(slots[count_non_empty:])
# memmove simulator :)
slots = slots[:count_non_empty]
# just to see the non-empty entries
print(slots)
While the natural way would actually be to move non-empty entries to the end (and then only move the header), your implementation needs them at the start. So I did it similar in this PoC.
Kind regards,
Sven
Quoted 6 lines · CET Sven Eckelmann
@Simon, can you please also check the remaining code changes? To quickly identify modifications, you can use
pipx install b4
# in you batman-adv repo
b4 diff -- [email protected]
Sorry for the delay, this actually slipped through the cracks on my end ... thanks Sven for reminding.
I've checked especially against the points I raised last time. I think batadv_mcast_forw_shrink_pack_dests() looks much better now. batadv_mcast_forw_scrub_dests() is still quite hard to comprehend, but better than before - and good enough to be adopted in my opinion. We'll make sure to direct bug reports from that to Linus in any case. ;)
So I'd give for this series:
Thank you!
Simon
Sven Eckelmann
maintainerOn Thursday, 7 September 2023 03:09:07 CET Linus Lüssing wrote:
[...]
Quoted 13 lines
Changelog v7:
* PATCH 1/3:
* rebased to current main/master branch (resolvednet/multicast/routing.h)
* renamedbatadv_mcast_forw_orig_to_neigh()tobatadv_orig_to_router()and moved it tooriginator.c, for reuse infragmentation.c
* added aSKB_LINEAR_ASSERT()tobatadv_mcast_forw_packet()
* adjustedbatadv_mcast_forw_scrub_dests():
added a new macro that updates two dest pointers
to avoid confusion due to two different updating methods, removed goto's and a little reordering
* PATCH 2/3:
* addedSKB_LINEAR_ASSERT()tobatadv_mcast_forw_scrape()
Quoted 8 lines
* PATCH 3/3:
* simplifiedbatadv_mcast_forw_shrink_pack_dests():
moved parts to new sub functionbatadv_mcast_forw_shrink_fill(), removed keeping track of filler over the whole function (might be slower, as we might check+skip the same zero
MAC entry multiple times, for each slot, but a lot easier to read - and we don't prioritize performance with this patchset yet)
Merged. But I think the wireshark implementation is still missing.
Kind regards,
Sven