commits August 2023

commits@lists.open-mesh.org

1 participants
59 discussions

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.5-rc1-7-g6f96d46f9a1a
by postmaster＠open-mesh.org 14 Aug '23

14 Aug '23

The following commit has been merged in the batadv/net-next branch: commit 02e61f06a97e7ba73fa44046d6da097e5c2aacc8 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Aug 2 10:24:20 2023 +0200 batman-adv: Keep batadv_netlink_notify_* static The batadv_netlink_notify_*() functions are not used by any other source file. Just keep them local to netlink.c to get informed by the compiler when they are not used anymore. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index ad5714f737be..b6c512ce6704 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -377,7 +377,7 @@ nla_put_failure: * * Return: 0 on success, < 0 on error */ -int batadv_netlink_notify_mesh(struct batadv_priv *bat_priv) +static int batadv_netlink_notify_mesh(struct batadv_priv *bat_priv) { struct sk_buff *msg; int ret; @@ -858,8 +858,8 @@ nla_put_failure: * * Return: 0 on success, < 0 on error */ -int batadv_netlink_notify_hardif(struct batadv_priv *bat_priv, - struct batadv_hard_iface *hard_iface) +static int batadv_netlink_notify_hardif(struct batadv_priv *bat_priv, + struct batadv_hard_iface *hard_iface) { struct sk_buff *msg; int ret; @@ -1073,8 +1073,8 @@ nla_put_failure: * * Return: 0 on success, < 0 on error */ -int batadv_netlink_notify_vlan(struct batadv_priv *bat_priv, - struct batadv_softif_vlan *vlan) +static int batadv_netlink_notify_vlan(struct batadv_priv *bat_priv, + struct batadv_softif_vlan *vlan) { struct sk_buff *msg; int ret; diff --git a/net/batman-adv/netlink.h b/net/batman-adv/netlink.h index 48102cc7490c..876d2806a67d 100644 --- a/net/batman-adv/netlink.h +++ b/net/batman-adv/netlink.h @@ -21,12 +21,6 @@ int batadv_netlink_tpmeter_notify(struct batadv_priv *bat_priv, const u8 *dst, u8 result, u32 test_time, u64 total_bytes, u32 cookie); -int batadv_netlink_notify_mesh(struct batadv_priv *bat_priv); -int batadv_netlink_notify_hardif(struct batadv_priv *bat_priv, - struct batadv_hard_iface *hard_iface); -int batadv_netlink_notify_vlan(struct batadv_priv *bat_priv, - struct batadv_softif_vlan *vlan); - extern struct genl_family batadv_netlink_family; #endif /* _NET_BATMAN_ADV_NETLINK_H_ */ -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v6.5-rc6, created. v6.5-rc6
by postmaster＠open-mesh.org 13 Aug '23

13 Aug '23

The annotated tag, v6.5-rc6 has been created at e42df5dc5f39a088f3611d9f09619f53dd6d3a5d (tag) tagging 2ccdd1b13c591d306f0401d98dedc4bdcd02b421 (commit) replaces v6.5-rc5 tagged by Linus Torvalds on Sun Aug 13 11:29:55 2023 -0700 - Shortlog ------------------------------------------------------------ Linux 6.5-rc6 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmTZISMeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGP+kH/RJWesO8dQ1b2jRh v1dexbytGUykROpmHBnJKDznwsSBnhDlI9Tu62dumWKRrCzwZto8Hag1QC2jYrra x7f3W087HdTSh3j5B92kGK/ZXgm4NwjVI078ujSv/e+qJMB3behpdL7uUkFUeeVV OaDhlSL4ILlyVOYPX3sHMiPutmZcXxe8/25o4aylpBrzlClKen7OODRz6gIwyVOR Nufgi/H5bkB4rDLOVI87HrxQMSpCtyGJtjTB78e/aRvIwYhJq16iuq+uBqOxQqgr anlg1nJ3r6/LphiT9H63xNFwIJDxtL7I1V8CQ9Jyvf/O4MNGSaM7sHw2l8ujTxU9 hf4GYyY= =loC2 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[doc] backup-redmine/2023-08-12,main: doc: open-mesh/News-draft (47f62fee)
by postmaster＠open-mesh.org 12 Aug '23

12 Aug '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-08-12,main >--------------------------------------------------------------- commit 47f62feec137f032aac195d7d50bef0cd57973da Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jul 28 19:22:03 2023 +0000 doc: open-mesh/News-draft >--------------------------------------------------------------- 47f62feec137f032aac195d7d50bef0cd57973da open-mesh/News-draft.textile | 59 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/open-mesh/News-draft.textile b/open-mesh/News-draft.textile index b333d3e9..20b1f41a 100644 --- a/open-mesh/News-draft.textile +++ b/open-mesh/News-draft.textile @@ -1,27 +1,28 @@ -h1. DRAFT: Batman-adv 2023.1 released +h1. DRAFT: Batman-adv 2023.2 released -May 16th, 2023. Today the B.A.T.M.A.N. team publishes the May 2023 update to batman-adv! Initial infrastructure changes for multicast packets with multiple (unicast) destination addresses were integrated. +Aug 4th, 2023. Today the B.A.T.M.A.N. team publishes the August 2023 update to batman-adv! Alfred now allows to send data via unix socket to a primary server when none of the interfaces is ready. Also several bug fixes and code cleanups are included in this version. As the kernel module always depends on the Linux kernel it is compiled against, it does not make sense to provide binaries on our website. As usual, you will find the signed tarballs in our download section: -https://downloads.open-mesh.org/batman/releases/batman-adv-2023.1/ +https://downloads.open-mesh.org/batman/releases/batman-adv-2023.2/ h2. Thanks Thanks to all people sending in patches: -* Linus Lüssing <linus.luessing(a)c0d3.blue> +* Marek Lindner <mareklindner(a)neomailbox.ch> +* Remi Pommarel <repk(a)triplefau.lt> * Simon Wunderlich <sw(a)simonwunderlich.de> * Sven Eckelmann <sven(a)narfation.org> -* Vladimir Oltean <vladimir.oltean(a)nxp.com> +* Vladislav Efanov <VEfanov(a)ispras.ru> h2. batman-adv <pre> $ git describe origin/main -v2023.0-6-gb097e63c -$ range=v2023.0..v2023.0-6-gb097e63c +v2023.1-9-ged12d0c1 +$ range=v2023.1..v2023.1-9-ged12d0c1 $ git shortlog --email --no-merges "${range}" $ git log --no-merges "${range}"|grep -e '$Reported\|Tested\|Acked\|Reviewed-by\|Co-authored-by$-by'|sed 's/.*:/*/'|sort|uniq @@ -30,16 +31,10 @@ $ git log --no-merges "${range}"|grep -e '\(Reported\|Tested\|Acked\|Reviewed-by features ======== - batman-adv: mcast: remove now redundant single ucast forwarding - batman-adv: tvlv: prepare for tvlv enabled multicast packet type - new kernel version ================== - batman-adv: introduce skb_vlan_eth_hdr() - batman-adv: Drop prandom.h includes - coding style cleanup/refactoring @@ -48,30 +43,36 @@ coding style cleanup/refactoring various ======= - batman-adv: Fix mailing list address - + batman-adv: compat: Use native kstrtox.h for 5.10.185 bugfixes ======== + batman-adv: Do not get eth header before batadv_check_management_packet + batman-adv: Trigger events for auto adjusted MTU + batman-adv: Don't increase MTU when set by user + batman-adv: Broken sync while rescheduling delayed work -2023.1 (2023-05-16) +2023.2 (2023-08-04) =================== -* support latest kernels (4.14 - 6.4) -* drop single unicast transfer optimization for unsnoopable IP addresses -* prepare infrastructure for multicast packets with multiple unicast destination - addresses +* support latest kernels (4.14 - 6.5) +* bugs squashed: + + - potenial invalid memory access when processing ELP/OGM2 packets + - drop pending DAT worker when interface shuts down + - inform network stack about automatically adjusted MTUs + - keep user defined MTU limit when MTU is recalculated </pre> h2. batctl <pre> $ git describe origin/main -v2023.0-2-gea10c02 -$ range=v2023.0..v2023.0-2-gea10c02 +v2023.1-1-g2cfb13e +$ range=v2023.1..v2023.1-1-g2cfb13e $ git shortlog --email --no-merges "${range}" $ git log --no-merges "${range}"|grep -e '$Reported\|Tested\|Acked\|Reviewed-by\|Co-authored-by$-by'|sed 's/.*:/*/'|sort|uniq @@ -84,7 +85,6 @@ features coding style cleanup/refactoring ================================ -* batman-adv: prepare for tvlv enabled multicast packet type @@ -93,11 +93,10 @@ bugfixes -2023.1 (2023-05-16) +2023.2 (2023-08-04) =================== -* Synchronize with kernel headers - +* (no changes) </pre> @@ -105,18 +104,18 @@ h2. alfred <pre> $ git describe origin/main -v2023.0-1-g06844d5 -$ range=v2023.0..v2023.0-1-g06844d5 +v2023.1-2-g94b3c4b +$ range=v2023.1..v2023.1-2-g94b3c4b $ git shortlog --email --no-merges "${range}" $ git log --no-merges "${range}"|grep -e '$Reported\|Tested\|Acked\|Reviewed-by\|Co-authored-by$-by'|sed 's/.*:/*/'|sort|uniq -2023.1 (2023-05-16) +2023.2 (2023-08-04) =================== -* (no changes) +* receive data with valid source on unix sock without active interface </pre>

1 0

[doc] backup-redmine/2023-08-12,main: doc: open-mesh/News-draft (2751bbd1)
by postmaster＠open-mesh.org 12 Aug '23

12 Aug '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-08-12,main >--------------------------------------------------------------- commit 2751bbd1d7cf01a1117cbd92a4060f698247d85f Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jul 28 20:08:00 2023 +0000 doc: open-mesh/News-draft >--------------------------------------------------------------- 2751bbd1d7cf01a1117cbd92a4060f698247d85f open-mesh/News-draft.textile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/open-mesh/News-draft.textile b/open-mesh/News-draft.textile index 20b1f41a..4b1392d6 100644 --- a/open-mesh/News-draft.textile +++ b/open-mesh/News-draft.textile @@ -16,7 +16,6 @@ Thanks to all people sending in patches: * Sven Eckelmann <sven(a)narfation.org> * Vladislav Efanov <VEfanov(a)ispras.ru> - h2. batman-adv <pre> @@ -61,7 +60,7 @@ bugfixes * support latest kernels (4.14 - 6.5) * bugs squashed: - - potenial invalid memory access when processing ELP/OGM2 packets + - avoid potential invalid memory access when processing ELP/OGM2 packets - drop pending DAT worker when interface shuts down - inform network stack about automatically adjusted MTUs - keep user defined MTU limit when MTU is recalculated

1 0

[doc] backup-redmine/2023-08-12,main: doc: batman-adv/SubmittingLinux (448ea24c)
by postmaster＠open-mesh.org 12 Aug '23

12 Aug '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-08-12,main >--------------------------------------------------------------- commit 448ea24c4db3986b598755013fc4f65ab6b7cea6 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jul 14 10:26:17 2023 +0000 doc: batman-adv/SubmittingLinux >--------------------------------------------------------------- 448ea24c4db3986b598755013fc4f65ab6b7cea6 batman-adv/SubmittingLinux.textile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/batman-adv/SubmittingLinux.textile b/batman-adv/SubmittingLinux.textile index b41318b3..9a0c92d1 100644 --- a/batman-adv/SubmittingLinux.textile +++ b/batman-adv/SubmittingLinux.textile @@ -375,7 +375,7 @@ The patches then have to be prepared and the cover letter has to be created for <pre> TAG=batadv-next-for-netdev-20160701 -git format-patch --cover-letter base/net-next..${TAG} +git format-patch --cover-letter --subject-prefix='PATCH net-next' base/net-next..${TAG} sed -i '/\*\*\* BLURB HERE \*\*\*/q' 0000-cover-letter.patch git request-pull base/net-next git://git.open-mesh.org/linux-merge.git ${TAG} >> 0000-cover-letter.patch # write cover letter @@ -386,7 +386,7 @@ or for net: <pre> TAG=batadv-net-for-netdev-20160701 -git format-patch --cover-letter base/net..${TAG} +git format-patch --cover-letter --subject-prefix='PATCH net' base/net..${TAG} sed -i '/\*\*\* BLURB HERE \*\*\*/q' 0000-cover-letter.patch git request-pull base/net git://git.open-mesh.org/linux-merge.git ${TAG} >> 0000-cover-letter.patch # write cover letter

1 0

[doc] backup-redmine/2023-08-12,main: doc: open-mesh/News-draft (7a5b0c08)
by postmaster＠open-mesh.org 12 Aug '23

12 Aug '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-08-12,main >--------------------------------------------------------------- commit 7a5b0c08a285fe673cd8110150d1eb949200dde0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Aug 9 17:42:45 2023 +0000 doc: open-mesh/News-draft >--------------------------------------------------------------- 7a5b0c08a285fe673cd8110150d1eb949200dde0 open-mesh/News-draft.textile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/open-mesh/News-draft.textile b/open-mesh/News-draft.textile index 4b1392d6..06fec3ff 100644 --- a/open-mesh/News-draft.textile +++ b/open-mesh/News-draft.textile @@ -20,8 +20,8 @@ h2. batman-adv <pre> $ git describe origin/main -v2023.1-9-ged12d0c1 -$ range=v2023.1..v2023.1-9-ged12d0c1 +v2023.1-13-g67f427d8 +$ range=v2023.1..v2023.1-13-g67f427d8 $ git shortlog --email --no-merges "${range}" $ git log --no-merges "${range}"|grep -e '$Reported\|Tested\|Acked\|Reviewed-by\|Co-authored-by$-by'|sed 's/.*:/*/'|sort|uniq @@ -64,6 +64,8 @@ bugfixes - drop pending DAT worker when interface shuts down - inform network stack about automatically adjusted MTUs - keep user defined MTU limit when MTU is recalculated + - fix packet memory leak when sending OGM2 via inactive interfaces + - fix TT memory leak for roamed back clients </pre> h2. batctl

1 0

[doc] main: Merge branch 'backup-redmine/2023-08-12' (abfb5ad7)
by postmaster＠open-mesh.org 12 Aug '23

12 Aug '23

Repository : ssh://git@diktynna/doc On branch : main >--------------------------------------------------------------- commit abfb5ad77bce7fceb972a968b3f9c82ecd9cadfe Merge: f3ea75b2 7a5b0c08 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Aug 12 10:33:51 2023 +0200 Merge branch 'backup-redmine/2023-08-12' >--------------------------------------------------------------- abfb5ad77bce7fceb972a968b3f9c82ecd9cadfe batman-adv/Multicast-Packet-Type.rst | 27 +++-- batman-adv/Multicast-Packet-Type.textile | 175 +++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 15 deletions(-) diff --cc batman-adv/Multicast-Packet-Type.rst index d82541f1,00000000..d9f03680 mode 100644,000000..100644 --- a/batman-adv/Multicast-Packet-Type.rst +++ b/batman-adv/Multicast-Packet-Type.rst @@@ -1,297 -1,0 +1,294 @@@ +.. SPDX-License-Identifier: GPL-2.0 + +============================= +DRAFT - Multicast Packet Type +============================= + +*This is a draft and not upstream yet.* + +Implementation: +`linus/multicast-packet-type <https://git.open-mesh.org/batman-adv.git/shortlog/refs/heads/linus/multicas…>`__ + +Brief +===== + +Reduce number of packets / overhead by introducing a new batman-adv +multicast packet type which is capable of holding multiple destination +addresses. + +Current State +============= + +batman-adv now has IP multicast group awareness. And with that can +detect in advance which other nodes want to receive an IPv4/IPv6 +multicast packet for a specific multicast destination/multicast group. + +The sender algorithm so far is simply either sending a packet via one +batman-adv unicast packet for each interested destination node: + +.. image:: basic-multicast-multiple-receivers.svg + +Or when the number of destination is larger than 16 (default, +configurable) it will fall back to using a single batman-adv broadcast +packet: + +.. image:: basic-multicast-many-receivers.svg + +The former method is more efficient when the number of interested nodes +is rather small. And allows bothering less nodes in the mesh and by that +then generating less overhead in the overall mesh. However it still +often leads to duplicated transmissions of the multicast IP packet +especially on the first hops. + +For more details see: + +* :doc:`Multicast Optimizations <Multicast-optimizations>` + +Technical Specification +======================= + +MCAST packet type header +------------------------ + +:: + + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Packet Type | Version | TTL | reserved | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | TVLV length | MCAST Tracker TVLV ... | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-| + | ... | Data ... | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-| + | ... | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +* Packet Type: BATADV_MCAST (0x05) +* Version: 15 +* TTL: +* reserved: 0x00 +* TVLV length: +* Data: Encapsulated ethernet frame with 2 byte alignment (to make IP + packets 4 byte aligned) + +MCAST Tracker TVLV +~~~~~~~~~~~~~~~~~~ + +:: + + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | TVLV Type | TVLV Version | TVLV Length | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | #Num Dests (N) | [padding] | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Dest 1 ... | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | ... | Dest 2 ... | ++ | #Num Dests (N) | Dest 1 ... | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | ... | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ ++ | Dest 2 ... | ++ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | ... | Dest N ... | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | ... | ++ | ... | [padding] | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +* TVLV Type: 0x07 +* TVLV Version: 1 +* #Num Dests: Number of destinations (originator MAC addresses) - * [padding]: Optional, only present if #Num Dests are even, to make - Tracker TVLV 4 byte aligned (to make encapsulated IP packets 4 byte - aligned) ++* [padding]: Optional 2 byte padding, only present if #Num Dests are ++ even, to make Tracker TVLV 4 byte aligned (to make encapsulated IP ++ packets 4 byte aligned) + +OGM Multicast TVLV flags +------------------------ + +The following flag is added to the +:ref:`MCAST flags <batman-adv-multicast-optimizations-tech-multicast-tvlv>` in the +multicast TVLV of an OGM: + +BATADV_MCAST_HAVE_MC_PTYPE_CAPA (Bit 5): +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Signalizes that: + +#. This node is capable of receiving, parsing and forwarding a + batman-adv multicast packet with a multicast tracker TVLV. +#. All hard interfaces of this node have an MTU of at least 1280. + +Statistics Counters +=================== + +*“$ batctl statistics”* can be used to check if the batman-adv multicast +packet type is used and working as expected. + +mcast_tx + transmitted batman-adv multicast packets (for each + outgoing ethernet frame) +mcast_tx_bytes + bytes counter for *mcast_tx* (encapsulated packet + size, includes/assumes 14 bytes for outer ethernet frame) +mcast_tx_local + counter for multicast packets which were locally + encapsulated and transmitted as batman-adv multicast packets +mcast_tx_local_bytes + bytes counter for *mcast_tx_local* + (decapsulated packet size, including the payload ethernet frame) +mcast_rx + received batman-adv multicast packet counter (for each + incoming ethernet frame) +mcast_rx_bytes + bytes counter for *mcast_rx* (encapsulated packet + size, includes/assumes 14 bytes for outer ethernet frame) +mcast_rx_local + counter for received batman-adv multicast packets + which were forwarded to the local soft interface, ak. “bat0” +mcast_rx_local_bytes + bytes counter for *mcast_rx_local* + (decapsulated packet size, including the payload ethernet frame) +mcast_fwd + counter for received batman-adv multicast packets + which were forwarded to other, neighboring nodes (for each incoming + ethernet frame) +mcast_fwd_bytes + bytes counter for *mcast_fwd* (encapsulated + packet size, includes/assumes 14 bytes for outer ethernet frame) + +Extensibility +============= + +Using an optional TVLV for receiver indication allows more flexibility +between the data and control plane, to increase the number of receiving +nodes and/or reducing overhead in the future. + +For instance a forwarding node could cache the destinations in the +tracker TVLV with a hash in a *key:hash([dests]) -> [dests]* database. +And a sender could prefill this database by sending a multicast packet +with a tracker TVLV, but without the actual payload data. Then a sender +could later use a more compact tracker TVLV variant which only contains +the *hash([dests])* next to the payload data. + +Limitations +=========== + +* Neither the BATMAN IV nor BATMAN V routing algorithm can currently + perform path MTU discovery. And the batman-adv fragmentation is not + yet capable of handling this new batman-adv packet type, nor is it + capable of reassembling per hop. Therefore the easy solution for now + is to require an interface MTU of at least 1280 bytes on each active + hard interface. 1280 bytes is also the `IPv6 minimum + MTU <https://www.rfc-editor.org/rfc/rfc2460#section-5>`__, so this + makes it already less likely to be undercut in practice. - * If the payload data’s size together with the number destination nodes - is too large, so if the final batman-adv multicast packet would - exceed 1280 bytes (excluding the outter ethernet frame), then the - batman-adv multicast packet type cannot/will not be used. Example - limits: ++* If the payload data's size together with the number destination nodes ++ is too large, so if the final batman-adv multicast packet would exceed ++ 1280 bytes (excluding the outer ethernet frame), then the batman-adv ++ multicast packet type cannot/will not be used. Example limits: + + - 2 destination nodes: 1222 bytes ethernet frame size + - 8 destination nodes: 1186 bytes ethernet frame size + - 32 destination nodes: 1030 bytes ethernet frame size + - 128 destination nodes: 454 bytes ethernet frame size + - 196 destination nodes: 46 bytes ethernet frame size (= `minimum + ethernet frame + size <https://en.wikipedia.org/wiki/Ethernet_frame#Payload>`__ + without a VLAN) + - If such a limitation is reached then batman-adv will either fallback to ++If such a limitation is reached then batman-adv will either fall back to +multicast via multiple batman-adv unicast packes. Or if that is not +possible either, to classic flooding. + +* Multicast fanout setting is not considered yet. A multicast payload + packet will only use one or no batman-adv multicast packet for now, + for reduced complexity. And a batman-adv node would not know how to + best split destinations to reduce the number of + resplits/retransmissions along the paths / multicast tree. + +Open questions +============== + +[STRIKEOUT:#Num Dests size] +--------------------------- + +| [STRIKEOUT:\* 1 or 2 bytes for #Num Dests for Address X?] +| - If limit of entries were reached, we could just send another +| mcast packet? (~6*256 = 1536). Or do we want to be prepared +| for jumbo frames?- + + +-> going for 2 bytes / potential jumbo frame support + +[STRIKEOUT:Non ideal splits] +---------------------------- + +[STRIKEOUT:If a packet with n destinations gets too large for the MTU +then batman-adv would/should/could try to split it into m packets with +n/3 destinations each. where m <= mcast_fanout.] + +[STRIKEOUT:However when splitting like this then such the splitting node +does not know the best sorting into these m packets. Another node will +likely later need to split again due to different next hops for the +destinations in a packet.] + +[STRIKEOUT:A batman-adv node currently cannot anticipate this for +optimized splitting, as it does not know the full topology. Which would +potentially lead to more transmissions than necessary.] + +-> Going for just one multicast packet instead of up to mcast_fanout to +start with, for simplicity. + +[STRIKEOUT:Fragmentation / MTUs:] +--------------------------------- + +[STRIKEOUT:On transit a forwarding node might have an interface with a +smaller MTU than the node which originated the packet. A node could try +to split a packet into multiple packets with less destinations. However +if the payload data is larger than the interface MTU already then it +would still not fit. And the batman-adv fragmentation code won’t be able +to look into and split within a multicast packet type header.] + +[STRIKEOUT:Workaround A):] + +[STRIKEOUT:By default only apply multicast packet type if resulting +packet is smaller than 1280 (minimum IPv6 packet size) or even 576 +(minimum accepeted IPv4 datagram size?). Maybe add a configuration +option, which defaults to 576 bytes? While in practice configuring it to +1280 should usually be fine these days with IPv6 capable networks.] + +[STRIKEOUT:Solution B)] + +[STRIKEOUT:Later ideally the fragmentation code would be able to split +the payload within a multicast packet type, while leaving multicast +packet type headers in tact. A node should still forward packets if due +to this splitting the mcast-fanout limit were violated, to avoid packet +loss.] + +-> Workaround C): We require a 1280 bytes MTU on all hard interfaces and +only then set the multicast packet type capability flag. + +[STRIKEOUT:Adding a sequence number? / How to avoid loops with tracker marking later?] +-------------------------------------------------------------------------------------- + +[STRIKEOUT:When later implementing a split control <=> data plane as +originally envisioned, by allowing to send a multicast packet with only +the tracker TVLV, without data. And caching this information to fill a +multicast routing table. And then allowing to send a multicast packet +without the tracker TVLV afterwards, there is the following issue:] + +[STRIKEOUT:When first a path is marked through the tracker TVLV, then +paths change due to OGM updates. And then a tracker packet marks such +new paths then the merger of both the old and newly tracker marked paths +could create routing loops, as the old path is not automatically +invalidated.] + +[STRIKEOUT:Solution:] + +[STRIKEOUT:Don’t mark paths. Instead use the tracker TVLV to fill a +cache with the mcast/dests lists and assign a hash to this information. +Then later send the multicast data with a TVLV containing only this hash +instead of the full mcast/dests list. Therefore a specific list of +destinations is still maintained and routing decisions still happen on +the go, loopfree, instead of trying to a maintain a loopfree, adjacent +multicast routing table.] + +-> Don’t add a sequence number, we don’t need it now. And a new +hashing/caching TVLV described above should work fine later.

1 0

[batman-adv] main,main: Merge branch 'stable' (67f427d8)
by postmaster＠open-mesh.org 09 Aug '23

09 Aug '23

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit 67f427d87c403b983520f0f8d8db8bf3900f34bb Merge: 7225bc2a 9024db26 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Aug 9 17:34:57 2023 +0200 Merge branch 'stable' >--------------------------------------------------------------- 67f427d87c403b983520f0f8d8db8bf3900f34bb net/batman-adv/bat_v_ogm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[batman-adv] main,main: batman-adv: Fix batadv_v_ogm_aggr_send memory leak (9024db26)
by postmaster＠open-mesh.org 09 Aug '23

09 Aug '23

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit 9024db261180f73fc687a9ecc7e79e3b0ccf50dc Author: Remi Pommarel <repk(a)triplefau.lt> Date: Wed Aug 9 17:29:13 2023 +0200 batman-adv: Fix batadv_v_ogm_aggr_send memory leak When batadv_v_ogm_aggr_send is called for an inactive interface, the skb is silently dropped by batadv_v_ogm_send_to_if() but never freed causing the following memory leak: unreferenced object 0xffff00000c164800 (size 512): comm "kworker/u8:1", pid 2648, jiffies 4295122303 (age 97.656s) hex dump (first 32 bytes): 00 80 af 09 00 00 ff ff e1 09 00 00 75 01 60 83 ............u.`. 1f 00 00 00 b8 00 00 00 15 00 05 00 da e3 d3 64 ...............d backtrace: [<0000000007ad20f6>] __kmalloc_track_caller+0x1a8/0x310 [<00000000d1029e55>] kmalloc_reserve.constprop.0+0x70/0x13c [<000000008b9d4183>] __alloc_skb+0xec/0x1fc [<00000000c7af5051>] __netdev_alloc_skb+0x48/0x23c [<00000000642ee5f5>] batadv_v_ogm_aggr_send+0x50/0x36c [<0000000088660bd7>] batadv_v_ogm_aggr_work+0x24/0x40 [<0000000042fc2606>] process_one_work+0x3b0/0x610 [<000000002f2a0b1c>] worker_thread+0xa0/0x690 [<0000000059fae5d4>] kthread+0x1fc/0x210 [<000000000c587d3a>] ret_from_fork+0x10/0x20 Free the skb in that case to fix this leak. Cc: stable(a)vger.kernel.org Fixes: 632835348e65 ("batman-adv: OGMv2 - add basic infrastructure") Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 9024db261180f73fc687a9ecc7e79e3b0ccf50dc net/batman-adv/bat_v_ogm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 84eac41d..e503ee0d 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -123,8 +123,10 @@ static void batadv_v_ogm_send_to_if(struct sk_buff *skb, { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - if (hard_iface->if_status != BATADV_IF_ACTIVE) + if (hard_iface->if_status != BATADV_IF_ACTIVE) { + kfree_skb(skb); return; + } batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_TX); batadv_add_counter(bat_priv, BATADV_CNT_MGMT_TX_BYTES,

1 0

[linux-merge]linux integration; branch, batadv/net, updated. v6.5-rc1-5-g421d467dc2d4
by postmaster＠open-mesh.org 09 Aug '23

09 Aug '23

The following commit has been merged in the batadv/net branch: commit 421d467dc2d483175bad4fb76a31b9e5a3d744cf Author: Remi Pommarel <repk(a)triplefau.lt> Date: Wed Aug 9 17:29:13 2023 +0200 batman-adv: Fix batadv_v_ogm_aggr_send memory leak When batadv_v_ogm_aggr_send is called for an inactive interface, the skb is silently dropped by batadv_v_ogm_send_to_if() but never freed causing the following memory leak: unreferenced object 0xffff00000c164800 (size 512): comm "kworker/u8:1", pid 2648, jiffies 4295122303 (age 97.656s) hex dump (first 32 bytes): 00 80 af 09 00 00 ff ff e1 09 00 00 75 01 60 83 ............u.`. 1f 00 00 00 b8 00 00 00 15 00 05 00 da e3 d3 64 ...............d backtrace: [<0000000007ad20f6>] __kmalloc_track_caller+0x1a8/0x310 [<00000000d1029e55>] kmalloc_reserve.constprop.0+0x70/0x13c [<000000008b9d4183>] __alloc_skb+0xec/0x1fc [<00000000c7af5051>] __netdev_alloc_skb+0x48/0x23c [<00000000642ee5f5>] batadv_v_ogm_aggr_send+0x50/0x36c [<0000000088660bd7>] batadv_v_ogm_aggr_work+0x24/0x40 [<0000000042fc2606>] process_one_work+0x3b0/0x610 [<000000002f2a0b1c>] worker_thread+0xa0/0x690 [<0000000059fae5d4>] kthread+0x1fc/0x210 [<000000000c587d3a>] ret_from_fork+0x10/0x20 Free the skb in that case to fix this leak. Cc: stable(a)vger.kernel.org Fixes: 0da0035942d4 ("batman-adv: OGMv2 - add basic infrastructure") Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 84eac41d4658..e503ee0d896b 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -123,8 +123,10 @@ static void batadv_v_ogm_send_to_if(struct sk_buff *skb, { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - if (hard_iface->if_status != BATADV_IF_ACTIVE) + if (hard_iface->if_status != BATADV_IF_ACTIVE) { + kfree_skb(skb); return; + } batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_TX); batadv_add_counter(bat_priv, BATADV_CNT_MGMT_TX_BYTES, -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits August 2023