linux-merge May 2020

linux-merge@lists.open-mesh.org

3 participants
40 discussions

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

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit 2092c910e2399c9e13b199c07421133681b9eaff Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed May 6 22:13:30 2020 +0200 batman-adv: Revert "Drop lockdep.h include for soft-interface.c" The commit 1a33e10e4a95 ("net: partially revert dynamic lockdep key changes") reverts the commit ab92d68fc22f ("net: core: add generic lockdep keys"). But it forgot to also revert the commit 5759af0682b3 ("batman-adv: Drop lockdep.h include for soft-interface.c") which depends on the latter. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 822af540b854..0ddd80130ea3 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -22,6 +22,7 @@ #include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> +#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/percpu.h> -- LinuxNextTracking

3 years

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

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit cf78bb0bbcef3fbe1abf118f14b81dad36eaa94e Author: Antonio Quartulli <a(a)unstable.cc> Date: Wed May 20 10:41:40 2020 +0200 batman-adv: use rcu_replace_pointer() where appropriate In commit a63fc6b75cca ("rcu: Upgrade rcu_swap_protected() to rcu_replace_pointer()") a new helper macro named rcu_replace_pointer() was introduced to simplify code requiring to switch an rcu pointer to a new value while extracting the old one. Use rcu_replace_pointer() where appropriate to make code slimer. Signed-off-by: Antonio Quartulli <a(a)unstable.cc> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index e22e49289677..a18dcc686dc3 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -146,8 +146,8 @@ static void batadv_gw_select(struct batadv_priv *bat_priv, if (new_gw_node) kref_get(&new_gw_node->refcount); - curr_gw_node = rcu_dereference_protected(bat_priv->gw.curr_gw, 1); - rcu_assign_pointer(bat_priv->gw.curr_gw, new_gw_node); + curr_gw_node = rcu_replace_pointer(bat_priv->gw.curr_gw, new_gw_node, + true); if (curr_gw_node) batadv_gw_node_put(curr_gw_node); diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index c7e98a40dd33..3a256af92784 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -473,8 +473,8 @@ static void batadv_primary_if_select(struct batadv_priv *bat_priv, if (new_hard_iface) kref_get(&new_hard_iface->refcount); - curr_hard_iface = rcu_dereference_protected(bat_priv->primary_if, 1); - rcu_assign_pointer(bat_priv->primary_if, new_hard_iface); + curr_hard_iface = rcu_replace_pointer(bat_priv->primary_if, + new_hard_iface, 1); if (!new_hard_iface) goto out; diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 3632bd976c56..d343382e9664 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -71,13 +71,13 @@ static void _batadv_update_route(struct batadv_priv *bat_priv, * the code needs to ensure the curr_router variable contains a pointer * to the replaced best neighbor. */ - curr_router = rcu_dereference_protected(orig_ifinfo->router, true); /* increase refcount of new best neighbor */ if (neigh_node) kref_get(&neigh_node->refcount); - rcu_assign_pointer(orig_ifinfo->router, neigh_node); + curr_router = rcu_replace_pointer(orig_ifinfo->router, neigh_node, + true); spin_unlock_bh(&orig_node->neigh_list_lock); batadv_orig_ifinfo_put(orig_ifinfo); -- LinuxNextTracking

3 years

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

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit 9ad346c90509ebd983f60da7d082f261ad329507 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 25 10:46:50 2019 +0100 batman-adv: Revert "disable ethtool link speed detection when auto negotiation off" The commit 8c46fcd78308 ("batman-adv: disable ethtool link speed detection when auto negotiation off") disabled the usage of ethtool's link_ksetting when auto negotation was enabled due to invalid values when used with tun/tap virtual net_devices. According to the patch, automatic measurements should be used for these kind of interfaces. But there are major flaws with this argumentation: * automatic measurements are not implemented * auto negotiation has nothing to do with the validity of the retrieved values The first point has to be fixed by a longer patch series. The "validity" part of the second point must be addressed in the same patch series by dropping the usage of ethtool's link_ksetting (thus always doing automatic measurements over ethernet). Drop the patch again to have more default values for various net_device types/configurations. The user can still overwrite them using the batadv_hardif's BATADV_ATTR_THROUGHPUT_OVERRIDE. Reported-by: Matthias Schiffer <mschiffer(a)universe-factory.net> 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_elp.c b/net/batman-adv/bat_v_elp.c index 353e49c40e7f..0bdefa35da98 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -127,20 +127,7 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) rtnl_lock(); ret = __ethtool_get_link_ksettings(hard_iface->net_dev, &link_settings); rtnl_unlock(); - - /* Virtual interface drivers such as tun / tap interfaces, VLAN, etc - * tend to initialize the interface throughput with some value for the - * sake of having a throughput number to export via ethtool. This - * exported throughput leaves batman-adv to conclude the interface - * throughput is genuine (reflecting reality), thus no measurements - * are necessary. - * - * Based on the observation that those interface types also tend to set - * the link auto-negotiation to 'off', batman-adv shall check this - * setting to differentiate between genuine link throughput information - * and placeholders installed by virtual interfaces. - */ - if (ret == 0 && link_settings.base.autoneg == AUTONEG_ENABLE) { + if (ret == 0) { /* link characteristics might change over time */ if (link_settings.base.duplex == DUPLEX_FULL) hard_iface->bat_v.flags |= BATADV_FULL_DUPLEX; -- LinuxNextTracking

3 years

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

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit fb8ddaa915395c97f234340f465a4c424a7be090 Merge: 6a862a44fd0c963f1bcb2ac9299609e1d8c011c2 9ad346c90509ebd983f60da7d082f261ad329507 Author: David S. Miller <davem(a)davemloft.net> Date: Tue May 26 15:19:29 2020 -0700 Merge tag 'batadv-next-for-davem-20200526' of git://git.open-mesh.org/linux-merge Simon Wunderlich says: ==================== This cleanup patchset includes the following patches: - Fix revert dynamic lockdep key changes for batman-adv, by Sven Eckelmann - use rcu_replace_pointer() where appropriate, by Antonio Quartulli - Revert "disable ethtool link speed detection when auto negotiation off", by Sven Eckelmann ==================== Signed-off-by: David S. Miller <davem(a)davemloft.net> -- LinuxNextTracking

3 years

Build check errors found: 2020-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/bat_v_elp.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 111 Tested Linux versions: 39 Tested configs: 102 maint ----- Failed tests: 0 Started build tests: 115 Tested Linux versions: 39 Tested configs: 106

3 years

Build check errors found: 2020-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/gateway_client.c | 4 ++-- netnext/net/batman-adv/hard-interface.c | 4 ++-- netnext/net/batman-adv/routing.c | 4 ++-- netnext/net/batman-adv/soft-interface.c | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) Statistics ========== maint ----- Failed tests: 0 Started build tests: 115 Tested Linux versions: 35 Tested configs: 102 master ------ Failed tests: 1 Started build tests: 110 Tested Linux versions: 41 Tested configs: 99

3 years

Build check errors found: 2020-05-25

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/gateway_client.c | 4 ++-- netnext/net/batman-adv/hard-interface.c | 4 ++-- netnext/net/batman-adv/routing.c | 4 ++-- netnext/net/batman-adv/soft-interface.c | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) Statistics ========== maint ----- Failed tests: 0 Started build tests: 117 Tested Linux versions: 35 Tested configs: 107 master ------ Failed tests: 1 Started build tests: 111 Tested Linux versions: 39 Tested configs: 99

3 years

Build check errors found: 2020-05-24

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/gateway_client.c | 4 ++-- netnext/net/batman-adv/hard-interface.c | 4 ++-- netnext/net/batman-adv/routing.c | 4 ++-- netnext/net/batman-adv/soft-interface.c | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) Statistics ========== maint ----- Failed tests: 0 Started build tests: 113 Tested Linux versions: 40 Tested configs: 102 master ------ Failed tests: 1 Started build tests: 109 Tested Linux versions: 36 Tested configs: 100

3 years

Build check errors found: 2020-05-23

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/gateway_client.c | 4 ++-- netnext/net/batman-adv/hard-interface.c | 4 ++-- netnext/net/batman-adv/icmp_socket.c | 3 --- netnext/net/batman-adv/routing.c | 4 ++-- netnext/net/batman-adv/soft-interface.c | 1 - 5 files changed, 6 insertions(+), 10 deletions(-) Statistics ========== maint ----- Failed tests: 0 Started build tests: 114 Tested Linux versions: 38 Tested configs: 100 master ------ Failed tests: 1 Started build tests: 114 Tested Linux versions: 40 Tested configs: 97

3 years

Coverity Scan: Analysis completed for batman-adv

by scan-admin＠coverity.com

Your request for analysis of batman-adv has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/ls/click?upn=nJaKvJSIH-2FPAfmty-2BK5tYpPkl… Build ID: 315710 Analysis Summary: New defects found: 0 Defects eliminated: 0

3 years

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge May 2020