commits December 2022

commits@lists.open-mesh.org

1 participants
50 discussions

[linux-merge]linux integration; branch, batadv/lts/5.15, updated. v5.15.83-17-gd68f50bfb00f
by postmaster＠open-mesh.org 21 Dec '22

21 Dec '22

The following commit has been merged in the batadv/lts/5.15 branch: commit 0cac1c84e1ccdd71924c644f83e24f5ef47d6f7c Author: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> Date: Tue Jul 19 18:08:12 2022 +0200 batman-adv: Use netif_rx_any_context() any. This reverts the stable commit e65d78b12fbc0 ("batman-adv: Use netif_rx().") The commit message says: | Since commit | baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.") | | the function netif_rx() can be used in preemptible/thread context as | well as in interrupt context. This commit (baebdf48c3600) has not been backported to the 5.15 stable series and therefore, the commit which builds upon it, must not be backported either. Revert the backport and use netif_rx_any_context() again. Signed-off-by: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 11f6ef657d82..17687848daec 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -443,7 +443,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac, batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES, skb->len + ETH_HLEN); - netif_rx(skb); + netif_rx_any_context(skb); out: batadv_hardif_put(primary_if); } -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/lts/5.15, updated. v5.15.83-17-gd68f50bfb00f
by postmaster＠open-mesh.org 21 Dec '22

21 Dec '22

The following commit has been merged in the batadv/lts/5.15 branch: commit 8f37aad74f46dd5d8b95fac17804b75f77931fa9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Apr 16 13:51:10 2022 +0200 batman-adv: Don't skb_split skbuffs with frag_list [ Upstream commit a063f2fba3fa633a599253b62561051ac185fa99 ] The receiving interface might have used GRO to receive more fragments than MAX_SKB_FRAGS fragments. In this case, these will not be stored in skb_shinfo(skb)->frags but merged into the frag list. batman-adv relies on the function skb_split to split packets up into multiple smaller packets which are not larger than the MTU on the outgoing interface. But this function cannot handle frag_list entries and is only operating on skb_shinfo(skb)->frags. If it is still trying to split such an skb and xmit'ing it on an interface without support for NETIF_F_FRAGLIST, then validate_xmit_skb() will try to linearize it. But this fails due to inconsistent information. And __pskb_pull_tail will trigger a BUG_ON after skb_copy_bits() returns an error. In case of entries in frag_list, just linearize the skb before operating on it with skb_split(). Reported-by: Felix Kaechele <felix(a)kaechele.ca> Fixes: c6c8fea29769 ("net: Add batman-adv meshing protocol") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Tested-by: Felix Kaechele <felix(a)kaechele.ca> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Sasha Levin <sashal(a)kernel.org> diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 0899a729a23f..c120c7c6d25f 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -475,6 +475,17 @@ int batadv_frag_send_packet(struct sk_buff *skb, goto free_skb; } + /* GRO might have added fragments to the fragment list instead of + * frags[]. But this is not handled by skb_split and must be + * linearized to avoid incorrect length information after all + * batman-adv fragments were created and submitted to the + * hard-interface + */ + if (skb_has_frag_list(skb) && __skb_linearize(skb)) { + ret = -ENOMEM; + goto free_skb; + } + /* Create one header to be copied to all fragments */ frag_header.packet_type = BATADV_UNICAST_FRAG; frag_header.version = BATADV_COMPAT_VERSION; -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/lts/4.4, deleted. v4.4.294
by postmaster＠open-mesh.org 21 Dec '22

21 Dec '22

The branch, batadv/lts/4.4 has been deleted was 90b74a039f807b3ff911d886afe2645c4522542d ----------------------------------------------------------------------- 90b74a039f807b3ff911d886afe2645c4522542d Linux 4.4.294 ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] branch 'stable' created
by postmaster＠open-mesh.org 18 Dec '22

18 Dec '22

Repository : ssh://git@diktynna/batman-adv New branch : stable Referencing: add5917e6d0ca569d74e6f13a008d9089f7fe014

1 0

[batman-adv] branch 'main' created
by postmaster＠open-mesh.org 18 Dec '22

18 Dec '22

Repository : ssh://git@diktynna/batman-adv New branch : main Referencing: 0e9dac10fe75874798bb15766a85dd27ac172f16

1 0

[batman-adv] branch 'maint' deleted
by postmaster＠open-mesh.org 18 Dec '22

18 Dec '22

Repository : ssh://git@diktynna/batman-adv Deleted branch: maint

1 0

[batman-adv] branch 'master' deleted
by postmaster＠open-mesh.org 18 Dec '22

18 Dec '22

Repository : ssh://git@diktynna/batman-adv Deleted branch: master

1 0

[batman-adv] main,main: batman-adv: Include random.h for get_random_u32_below (0e9dac10)
by postmaster＠open-mesh.org 18 Dec '22

18 Dec '22

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit 0e9dac10fe75874798bb15766a85dd27ac172f16 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 17 12:40:08 2022 +0100 batman-adv: Include random.h for get_random_u32_below The commit a15d3f3c1c2a ("batman-adv: use get_random_u32_below() instead of deprecated function") replaced the prandom.h function prandom_u32_max with the random.h function get_random_u32_below. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 0e9dac10fe75874798bb15766a85dd27ac172f16 net/batman-adv/network-coding.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 5e1f422b..ecd871ab 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -26,6 +26,7 @@ #include <linux/net.h> #include <linux/netdevice.h> #include <linux/printk.h> +#include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/skbuff.h>

1 0

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.1-9627-g6c6fb8a04333
by postmaster＠open-mesh.org 18 Dec '22

18 Dec '22

The following commit has been merged in the batadv/net-next branch: commit 6c6fb8a04333932b75ec527ca0de6fe60aa4bb7d Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 17 12:40:08 2022 +0100 batman-adv: Drop prandom.h includes The commit 8032bf1233a7 ("treewide: use get_random_u32_below() instead of deprecated function") replaced the prandom.h function prandom_u32_max with the random.h function get_random_u32_below. There is no need to still include prandom.h. 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_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 114ee5da261f..828fb393ee94 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -27,7 +27,6 @@ #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/pkt_sched.h> -#include <linux/prandom.h> #include <linux/printk.h> #include <linux/random.h> #include <linux/rculist.h> diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index f9a58fb5442e..acff565849ae 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -21,7 +21,6 @@ #include <linux/minmax.h> #include <linux/netdevice.h> #include <linux/nl80211.h> -#include <linux/prandom.h> #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index addfd8c4fe95..96e027364ddd 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -21,7 +21,6 @@ #include <linux/minmax.h> #include <linux/mutex.h> #include <linux/netdevice.h> -#include <linux/prandom.h> #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index bf29fba4dde5..ecd871abda34 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -25,8 +25,8 @@ #include <linux/lockdep.h> #include <linux/net.h> #include <linux/netdevice.h> -#include <linux/prandom.h> #include <linux/printk.h> +#include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/skbuff.h> -- linux integration

1 0

[batman-adv] master: batman-adv: Drop prandom.h includes (94578ebb)
by postmaster＠open-mesh.org 17 Dec '22

17 Dec '22

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 94578ebbc722fbdb0e960745f270fed83d80390c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 17 12:40:08 2022 +0100 batman-adv: Drop prandom.h includes The commit a15d3f3c1c2a ("batman-adv: use get_random_u32_below() instead of deprecated function") replaced the prandom.h function prandom_u32_max with the random.h function get_random_u32_below. There is no need to still include prandom.h. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 94578ebbc722fbdb0e960745f270fed83d80390c compat-include/linux/prandom.h | 25 ------------------------- net/batman-adv/bat_iv_ogm.c | 1 - net/batman-adv/bat_v_elp.c | 1 - net/batman-adv/bat_v_ogm.c | 1 - net/batman-adv/network-coding.c | 1 - 5 files changed, 29 deletions(-) diff --git a/compat-include/linux/prandom.h b/compat-include/linux/prandom.h deleted file mode 100644 index dc227e61..00000000 --- a/compat-include/linux/prandom.h +++ /dev/null @@ -1,25 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) B.A.T.M.A.N. contributors: - * - * Marek Lindner, Simon Wunderlich - * - * This file contains macros for maintaining compatibility with older versions - * of the Linux kernel. - */ - -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_PRANDOM_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_PRANDOM_H_ - -#include <linux/version.h> -#if LINUX_VERSION_IS_GEQ(5, 8, 1) || \ - (LINUX_VERSION_IS_GEQ(4, 9, 233) && LINUX_VERSION_IS_LESS(4, 10, 0)) || \ - (LINUX_VERSION_IS_GEQ(4, 14, 193) && LINUX_VERSION_IS_LESS(4, 15, 0)) || \ - (LINUX_VERSION_IS_GEQ(4, 19, 138) && LINUX_VERSION_IS_LESS(4, 20, 0)) || \ - (LINUX_VERSION_IS_GEQ(5, 4, 57) && LINUX_VERSION_IS_LESS(5, 5, 0)) || \ - (LINUX_VERSION_IS_GEQ(5, 7, 14) && LINUX_VERSION_IS_LESS(5, 8, 0)) -#include_next <linux/prandom.h> -#else -#include <linux/random.h> -#endif - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_PRANDOM_H_ */ diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 114ee5da..828fb393 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -27,7 +27,6 @@ #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/pkt_sched.h> -#include <linux/prandom.h> #include <linux/printk.h> #include <linux/random.h> #include <linux/rculist.h> diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index f9a58fb5..acff5658 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -21,7 +21,6 @@ #include <linux/minmax.h> #include <linux/netdevice.h> #include <linux/nl80211.h> -#include <linux/prandom.h> #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index addfd8c4..96e02736 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -21,7 +21,6 @@ #include <linux/minmax.h> #include <linux/mutex.h> #include <linux/netdevice.h> -#include <linux/prandom.h> #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index bf29fba4..5e1f422b 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -25,7 +25,6 @@ #include <linux/lockdep.h> #include <linux/net.h> #include <linux/netdevice.h> -#include <linux/prandom.h> #include <linux/printk.h> #include <linux/rculist.h> #include <linux/rcupdate.h>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2022