linux-merge May 2018

linux-merge@lists.open-mesh.org

3 participants
48 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20180529

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit f26e4e98b15322522bc6221325bf14cbead65d1b Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Sun Mar 25 00:32:04 2018 +0100 batman-adv: Avoid old nodes disabling multicast optimizations completely Instead of disabling multicast optimizations mesh-wide once a node with no multicast optimizations capabilities joins the mesh, do the following: Just insert such nodes into the WANT_ALL_IPV4/IPV6 lists. This is sufficient to avoid multicast packet loss to such unsupportive nodes. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index a11d3d89f012..36fd7b06c7cc 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -815,9 +815,6 @@ static int batadv_mcast_forw_mode_check(struct batadv_priv *bat_priv, if (!atomic_read(&bat_priv->multicast_mode)) return -EINVAL; - if (atomic_read(&bat_priv->mcast.num_disabled)) - return -EINVAL; - switch (ntohs(ethhdr->h_proto)) { case ETH_P_IP: return batadv_mcast_forw_mode_check_ipv4(bat_priv, skb, @@ -1183,33 +1180,23 @@ static void batadv_mcast_tvlv_ogm_handler(struct batadv_priv *bat_priv, { bool orig_mcast_enabled = !(flags & BATADV_TVLV_HANDLER_OGM_CIFNOTFND); u8 mcast_flags = BATADV_NO_FLAGS; - bool orig_initialized; if (orig_mcast_enabled && tvlv_value && tvlv_value_len >= sizeof(mcast_flags)) mcast_flags = *(u8 *)tvlv_value; + if (!orig_mcast_enabled) { + mcast_flags |= BATADV_MCAST_WANT_ALL_IPV4; + mcast_flags |= BATADV_MCAST_WANT_ALL_IPV6; + } + spin_lock_bh(&orig->mcast_handler_lock); - orig_initialized = test_bit(BATADV_ORIG_CAPA_HAS_MCAST, - &orig->capa_initialized); - /* If mcast support is turned on decrease the disabled mcast node - * counter only if we had increased it for this node before. If this - * is a completely new orig_node no need to decrease the counter. - */ if (orig_mcast_enabled && !test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities)) { - if (orig_initialized) - atomic_dec(&bat_priv->mcast.num_disabled); set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities); - /* If mcast support is being switched off or if this is an initial - * OGM without mcast support then increase the disabled mcast - * node counter. - */ } else if (!orig_mcast_enabled && - (test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities) || - !orig_initialized)) { - atomic_inc(&bat_priv->mcast.num_disabled); + test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities)) { clear_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities); } @@ -1595,10 +1582,6 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig) spin_lock_bh(&orig->mcast_handler_lock); - if (!test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities) && - test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capa_initialized)) - atomic_dec(&bat_priv->mcast.num_disabled); - batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS); batadv_mcast_want_ipv4_update(bat_priv, orig, BATADV_NO_FLAGS); batadv_mcast_want_ipv6_update(bat_priv, orig, BATADV_NO_FLAGS); diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index edeffcb9f3a2..67065e35de51 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -796,7 +796,6 @@ static int batadv_softif_init_late(struct net_device *dev) bat_priv->mcast.querier_ipv6.shadowing = false; bat_priv->mcast.flags = BATADV_NO_FLAGS; atomic_set(&bat_priv->multicast_mode, 1); - atomic_set(&bat_priv->mcast.num_disabled, 0); 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); diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 476b052ad982..0174f79e955a 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1212,9 +1212,6 @@ struct batadv_priv_mcast { /** @bridged: whether the soft interface has a bridge on top */ bool bridged; - /** @num_disabled: number of nodes that have no mcast tvlv */ - atomic_t num_disabled; - /** * @num_want_all_unsnoopables: number of nodes wanting unsnoopable IP * traffic -- LinuxNextTracking

4 years, 10 months

[linux-next] LinuxNextTracking branch, master, updated. next-20180529

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit 6486379d8716ea6e68576b6d81d85d9a60f71a87 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Apr 19 21:01:07 2018 +0200 batman-adv: Avoid bool in structures Using the bool type for structure member is considered inappropriate [1] for the kernel. Its size is not well defined (but usually 1 byte but maybe also 4 byte). [1] https://lkml.org/lkml/2017/11/21/384 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 0174f79e955a..3b3fc146b30d 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1160,13 +1160,13 @@ struct batadv_priv_dat { */ struct batadv_mcast_querier_state { /** @exists: whether a querier exists in the mesh */ - bool exists; + unsigned char exists:1; /** * @shadowing: if a querier exists, whether it is potentially shadowing * multicast listeners (i.e. querier is behind our own bridge segment) */ - bool shadowing; + unsigned char shadowing:1; }; /** @@ -1207,10 +1207,10 @@ struct batadv_priv_mcast { u8 flags; /** @enabled: whether the multicast tvlv is currently enabled */ - bool enabled; + unsigned char enabled:1; /** @bridged: whether the soft interface has a bridge on top */ - bool bridged; + unsigned char bridged:1; /** * @num_want_all_unsnoopables: number of nodes wanting unsnoopable IP @@ -1389,7 +1389,7 @@ struct batadv_tp_vars { atomic_t dup_acks; /** @fast_recovery: true if in Fast Recovery mode */ - bool fast_recovery; + unsigned char fast_recovery:1; /** @recover: last sent seqno when entering Fast Recovery */ u32 recover; @@ -2046,10 +2046,10 @@ struct batadv_skb_cb { * @decoded: Marks a skb as decoded, which is checked when searching for * coding opportunities in network-coding.c */ - bool decoded; + unsigned char decoded:1; /** @num_bcasts: Counter for broadcast packet retransmissions */ - unsigned int num_bcasts; + unsigned char num_bcasts; }; /** -- LinuxNextTracking

4 years, 10 months

[linux-next] LinuxNextTracking branch, master, updated. next-20180529

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit dc06338df9a8443dcff6c7be03ab792ea682d9ab Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Apr 19 21:01:08 2018 +0200 batman-adv: Remove unused dentry without DEBUGFS The debug_dir variable in the main structures is only accessed when CONFIG_BATMAN_ADV_DEBUGFS is enabled. It can be dropped to potentially save some bytes of memory. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 3b3fc146b30d..360357f83f20 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -215,10 +215,12 @@ struct batadv_hard_iface { struct batadv_hard_iface_bat_v bat_v; #endif +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * @debug_dir: dentry for nc subdir in batman-adv directory in debugfs */ struct dentry *debug_dir; +#endif /** * @neigh_list: list of unique single hop neighbors via this interface @@ -1242,10 +1244,12 @@ struct batadv_priv_nc { /** @work: work queue callback item for cleanup */ struct delayed_work work; +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * @debug_dir: dentry for nc subdir in batman-adv directory in debugfs */ struct dentry *debug_dir; +#endif /** * @min_tq: only consider neighbors for encoding if neigh_tq > min_tq @@ -1598,8 +1602,10 @@ struct batadv_priv { /** @mesh_obj: kobject for sysfs mesh subdirectory */ struct kobject *mesh_obj; +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** @debug_dir: dentry for debugfs batman-adv subdirectory */ struct dentry *debug_dir; +#endif /** @forw_bat_list: list of aggregated OGMs that will be forwarded */ struct hlist_head forw_bat_list; -- LinuxNextTracking

4 years, 10 months

[linux-next] LinuxNextTracking branch, master, updated. next-20180529

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit f546a99d62e5d4550a73c2ca0af51212a4fd46df Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Apr 19 19:23:35 2018 +0200 batman-adv: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 057a28a9fe88..8da3c9336111 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -25,7 +25,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2018.1" +#define BATADV_SOURCE_VERSION "2018.2" #endif /* B.A.T.M.A.N. parameters */ -- LinuxNextTracking

4 years, 10 months

[linux-next] LinuxNextTracking branch, master, updated. next-20180529

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit 65cc02a8e1d4449daedf3a84e9dfdda2e44a5d97 Author: Colin Ian King <colin.king(a)canonical.com> Date: Fri Mar 23 22:53:50 2018 +0000 batman-adv: don't pass a NULL hard_iface to batadv_hardif_put In the case where hard_iface is NULL, the error path may pass a null pointer to batadv_hardif_put causing a null pointer dereference error. Avoid this by only calling the function if hard_iface not null. Detected by CoverityScan, CID#1466456 ("Explicit null dereferenced") Fixes: 53dd9a68ba68 ("batman-adv: add multicast flags netlink support") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index a11d3d89f012..a35f597e8c8b 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -1536,7 +1536,7 @@ out: if (!ret && primary_if) *primary_if = hard_iface; - else + else if (hard_iface) batadv_hardif_put(hard_iface); return ret; -- LinuxNextTracking

4 years, 10 months

Build check errors found: 2018-05-27

by postmaster＠open-mesh.org

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/multicast.c | 2 netnext/net/batman-adv/translation-table.c | 84 ++++---------------- 2 files changed, 18 insertions(+), 68 deletions(-) Statistics ========== maint ----- Failed tests: 0 Started build tests: 61 Tested Linux versions: 28 Tested configs: 55 master ------ Failed tests: 1 Started build tests: 57 Tested Linux versions: 30 Tested configs: 45

4 years, 10 months

Build check errors found: 2018-05-26

by postmaster＠open-mesh.org

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/multicast.c | 2 netnext/net/batman-adv/translation-table.c | 84 ++++---------------- 2 files changed, 18 insertions(+), 68 deletions(-) Statistics ========== maint ----- Failed tests: 0 Started build tests: 59 Tested Linux versions: 30 Tested configs: 45 master ------ Failed tests: 1 Started build tests: 57 Tested Linux versions: 29 Tested configs: 53

4 years, 10 months

Build check errors found: 2018-05-25

by postmaster＠open-mesh.org

Name of failed tests ==================== maint ----- * difference between net and batadv maint master ------ * difference between net-next and batadv master Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/multicast.c | 2 net/net/batman-adv/translation-table.c | 84 ++++-------------------- 2 files changed, 18 insertions(+), 68 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/multicast.c | 2 netnext/net/batman-adv/translation-table.c | 84 ++++---------------- 2 files changed, 18 insertions(+), 68 deletions(-) Statistics ========== maint ----- Failed tests: 1 Started build tests: 57 Tested Linux versions: 31 Tested configs: 44 master ------ Failed tests: 1 Started build tests: 61 Tested Linux versions: 32 Tested configs: 49

4 years, 10 months

Build check errors found: 2018-05-24

by postmaster＠open-mesh.org

Name of failed tests ==================== master ------ * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/multicast.c | 2 net/net/batman-adv/translation-table.c | 84 ++++-------------------- 2 files changed, 18 insertions(+), 68 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/Kconfig | 6 - netnext/net/batman-adv/bat_v_elp.c | 15 --- netnext/net/batman-adv/main.h | 2 netnext/net/batman-adv/multicast.c | 31 +++++-- netnext/net/batman-adv/soft-interface.c | 5 - netnext/net/batman-adv/translation-table.c | 84 ++++---------------- netnext/net/batman-adv/types.h | 23 ++--- 7 files changed, 59 insertions(+), 107 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 54 Tested Linux versions: 29 Tested configs: 46 maint ----- Failed tests: 1 Started build tests: 61 Tested Linux versions: 27 Tested configs: 50

4 years, 10 months

Build check errors found: 2018-05-23

by postmaster＠open-mesh.org

Name of failed tests ==================== master ------ * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/multicast.c | 2 net/net/batman-adv/translation-table.c | 84 ++++-------------------- 2 files changed, 18 insertions(+), 68 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/Kconfig | 6 - netnext/net/batman-adv/bat_v_elp.c | 15 --- netnext/net/batman-adv/main.h | 2 netnext/net/batman-adv/multicast.c | 31 +++++-- netnext/net/batman-adv/soft-interface.c | 5 - netnext/net/batman-adv/translation-table.c | 84 ++++---------------- netnext/net/batman-adv/types.h | 23 ++--- 7 files changed, 59 insertions(+), 107 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 63 Tested Linux versions: 29 Tested configs: 50 maint ----- Failed tests: 1 Started build tests: 60 Tested Linux versions: 28 Tested configs: 47

4 years, 10 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge May 2018