linux-merge March 2017

linux-merge@lists.open-mesh.org

2 participants
40 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20170306
by batman＠open-mesh.org 06 Mar '17

06 Mar '17

The following commit has been merged in the master branch: commit 51c6b429c0c95e67edd1cb0b548c5cf6a6604763 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Mon Feb 13 20:44:31 2017 +0100 batman-adv: Fix transmission of final, 16th fragment Trying to split and transmit a unicast packet in 16 parts will fail for the final fragment: After having sent the 15th one with a frag_packet.no index of 14, we will increase the the index to 15 - and return with an error code immediately, even though one more fragment is due for transmission and allowed. Fixing this issue by moving the check before incrementing the index. While at it, adding an unlikely(), because the check is actually more of an assertion. Fixes: ee75ed88879a ("batman-adv: Fragment and send skbs larger than mtu") 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/fragmentation.c b/net/batman-adv/fragmentation.c index 31e97e9..11149e5 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -501,6 +501,12 @@ int batadv_frag_send_packet(struct sk_buff *skb, /* Eat and send fragments from the tail of skb */ while (skb->len > max_fragment_size) { + /* The initial check in this function should cover this case */ + if (unlikely(frag_header.no == BATADV_FRAG_MAX_FRAGMENTS - 1)) { + ret = -EINVAL; + goto put_primary_if; + } + skb_fragment = batadv_frag_create(skb, &frag_header, mtu); if (!skb_fragment) { ret = -ENOMEM; @@ -517,12 +523,6 @@ int batadv_frag_send_packet(struct sk_buff *skb, } frag_header.no++; - - /* The initial check in this function should cover this case */ - if (frag_header.no == BATADV_FRAG_MAX_FRAGMENTS - 1) { - ret = -EINVAL; - goto put_primary_if; - } } /* Make room for the fragment header. */ -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20170306
by batman＠open-mesh.org 06 Mar '17

06 Mar '17

The following commit has been merged in the master branch: commit 6ab2b999e7babba1ae20c64a90889723c07ade72 Merge: f1304f7ba3981e71dcf2ac7db92949eeab49b1bf 51c6b429c0c95e67edd1cb0b548c5cf6a6604763 Author: David S. Miller <davem(a)davemloft.net> Date: Thu Mar 2 13:16:08 2017 -0800 Merge tag 'batadv-net-for-davem-20170301' of git://git.open-mesh.org/linux-merge Simon Wunderlich says: ==================== Here are two batman-adv bugfixes: - fix a potential double free when fragment merges fail, by Sven Eckelmann - fix failing tranmission of the 16th (last) fragment if that exists, by Linus Lüssing ==================== Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --combined net/batman-adv/fragmentation.c index ead18ca,11149e5..11a23fd --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@@ -1,4 -1,4 +1,4 @@@ -/* Copyright (C) 2013-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: * * Martin Hundebøll <martin(a)hundeboll.net> * @@@ -239,8 -239,10 +239,10 @@@ err_unlock spin_unlock_bh(&chain->lock); err: - if (!ret) + if (!ret) { kfree(frag_entry_new); + kfree_skb(skb); + } return ret; } @@@ -313,7 -315,7 +315,7 @@@ free * * There are three possible outcomes: 1) Packet is merged: Return true and * set *skb to merged packet; 2) Packet is buffered: Return true and set *skb - * to NULL; 3) Error: Return false and leave skb as is. + * to NULL; 3) Error: Return false and free skb. * * Return: true when packet is merged or buffered, false when skb is not not * used. @@@ -338,9 -340,9 +340,9 @@@ bool batadv_frag_skb_buffer(struct sk_b goto out_err; out: - *skb = skb_out; ret = true; out_err: + *skb = skb_out; return ret; } @@@ -499,6 -501,12 +501,12 @@@ int batadv_frag_send_packet(struct sk_b /* Eat and send fragments from the tail of skb */ while (skb->len > max_fragment_size) { + /* The initial check in this function should cover this case */ + if (unlikely(frag_header.no == BATADV_FRAG_MAX_FRAGMENTS - 1)) { + ret = -EINVAL; + goto put_primary_if; + } + skb_fragment = batadv_frag_create(skb, &frag_header, mtu); if (!skb_fragment) { ret = -ENOMEM; @@@ -515,12 -523,6 +523,6 @@@ } frag_header.no++; - - /* The initial check in this function should cover this case */ - if (frag_header.no == BATADV_FRAG_MAX_FRAGMENTS - 1) { - ret = -EINVAL; - goto put_primary_if; - } } /* Make room for the fragment header. */ -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20170306
by batman＠open-mesh.org 06 Mar '17

06 Mar '17

The following commit has been merged in the master branch: commit 248e23b50e2da0753f3b5faa068939cbe9f8a75a Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 12 11:26:33 2017 +0100 batman-adv: Fix double free during fragment merge error The function batadv_frag_skb_buffer was supposed not to consume the skbuff on errors. This was followed in the helper function batadv_frag_insert_packet when the skb would potentially be inserted in the fragment queue. But it could happen that the next helper function batadv_frag_merge_packets would try to merge the fragments and fail. This results in a kfree_skb of all the enqueued fragments (including the just inserted one). batadv_recv_frag_packet would detect the error in batadv_frag_skb_buffer and try to free the skb again. The behavior of batadv_frag_skb_buffer (and its helper batadv_frag_insert_packet) must therefore be changed to always consume the skbuff to have a common behavior and avoid the double kfree_skb. Fixes: 610bfc6bc99b ("batman-adv: Receive fragmented packets and merge") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 0854ebd..31e97e9 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -239,8 +239,10 @@ err_unlock: spin_unlock_bh(&chain->lock); err: - if (!ret) + if (!ret) { kfree(frag_entry_new); + kfree_skb(skb); + } return ret; } @@ -313,7 +315,7 @@ free: * * There are three possible outcomes: 1) Packet is merged: Return true and * set *skb to merged packet; 2) Packet is buffered: Return true and set *skb - * to NULL; 3) Error: Return false and leave skb as is. + * to NULL; 3) Error: Return false and free skb. * * Return: true when packet is merged or buffered, false when skb is not not * used. @@ -338,9 +340,9 @@ bool batadv_frag_skb_buffer(struct sk_buff **skb, goto out_err; out: - *skb = skb_out; ret = true; out_err: + *skb = skb_out; return ret; } -- LinuxNextTracking

1 0

Build check errors found: 2017-03-06
by postmaster＠open-mesh.org 06 Mar '17

06 Mar '17

Name of failed tests ==================== master ------ * difference between net 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/types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) master: difference between net and batadv master ------------------------------------------------ netnext/net/batman-adv/bridge_loop_avoidance.c | 38 +++++++------- netnext/net/batman-adv/distributed-arp-table.c | 6 +- netnext/net/batman-adv/fragmentation.c | 20 ++----- netnext/net/batman-adv/log.h | 5 - netnext/net/batman-adv/main.h | 20 +------ netnext/net/batman-adv/multicast.c | 12 ++-- netnext/net/batman-adv/translation-table.c | 42 +++++++--------- netnext/net/batman-adv/types.h | 2 8 files changed, 63 insertions(+), 82 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 49 Tested Linux versions: 25 Tested configs: 43 maint ----- Failed tests: 1 Started build tests: 54 Tested Linux versions: 26 Tested configs: 45

1 0

Build check errors found: 2017-03-05
by postmaster＠open-mesh.org 05 Mar '17

05 Mar '17

Name of failed tests ==================== master ------ * difference between net 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/types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) master: difference between net and batadv master ------------------------------------------------ netnext/net/batman-adv/bridge_loop_avoidance.c | 38 +++++++------- netnext/net/batman-adv/distributed-arp-table.c | 6 +- netnext/net/batman-adv/fragmentation.c | 20 ++----- netnext/net/batman-adv/log.h | 5 - netnext/net/batman-adv/main.h | 20 +------ netnext/net/batman-adv/multicast.c | 12 ++-- netnext/net/batman-adv/translation-table.c | 42 +++++++--------- netnext/net/batman-adv/types.h | 2 8 files changed, 63 insertions(+), 82 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 46 Tested Linux versions: 23 Tested configs: 37 maint ----- Failed tests: 1 Started build tests: 51 Tested Linux versions: 26 Tested configs: 42

1 0

Build check errors found: 2017-03-04
by postmaster＠open-mesh.org 04 Mar '17

04 Mar '17

Name of failed tests ==================== master ------ * difference between net 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/types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) master: difference between net and batadv master ------------------------------------------------ netnext/net/batman-adv/bridge_loop_avoidance.c | 38 +++++++------- netnext/net/batman-adv/distributed-arp-table.c | 6 +- netnext/net/batman-adv/fragmentation.c | 20 ++----- netnext/net/batman-adv/log.h | 5 - netnext/net/batman-adv/main.h | 20 +------ netnext/net/batman-adv/multicast.c | 12 ++-- netnext/net/batman-adv/translation-table.c | 42 +++++++--------- netnext/net/batman-adv/types.h | 2 8 files changed, 63 insertions(+), 82 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 51 Tested Linux versions: 23 Tested configs: 42 maint ----- Failed tests: 1 Started build tests: 50 Tested Linux versions: 22 Tested configs: 43

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20170303
by batman＠open-mesh.org 03 Mar '17

03 Mar '17

The following commit has been merged in the master branch: commit eb1e011a14748a1d9df9a7d7df9a5711721a1bdb Author: Johannes Berg <johannes.berg(a)intel.com> Date: Wed Feb 15 09:49:26 2017 +0100 average: change to declare precision, not factor Declaring the factor is counter-intuitive, and people are prone to using small(-ish) values even when that makes no sense. Change the DECLARE_EWMA() macro to take the fractional precision, in bits, rather than a factor, and update all users. While at it, add some more documentation. Acked-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Johannes Berg <johannes.berg(a)intel.com> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index bf95016..e9d7e2b 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -51,7 +51,7 @@ module_param(gso, bool, 0444); * at once, the weight is chosen so that the EWMA will be insensitive to short- * term, transient changes in packet size. */ -DECLARE_EWMA(pkt_len, 1, 64) +DECLARE_EWMA(pkt_len, 0, 64) /* With mergeable buffers we align buffer address and use the low bits to * encode its true size. Buffer size is up to 1 page so we need to align to diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h index 67fedb6..979800c 100644 --- a/drivers/net/wireless/ath/ath5k/ath5k.h +++ b/drivers/net/wireless/ath/ath5k/ath5k.h @@ -1252,7 +1252,7 @@ struct ath5k_statistics { #define ATH5K_TXQ_LEN_MAX (ATH_TXBUF / 4) /* bufs per queue */ #define ATH5K_TXQ_LEN_LOW (ATH5K_TXQ_LEN_MAX / 2) /* low mark */ -DECLARE_EWMA(beacon_rssi, 1024, 8) +DECLARE_EWMA(beacon_rssi, 10, 8) /* Driver state associated with an instance of a device */ struct ath5k_hw { diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h index 26869b3..3407878 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h @@ -257,7 +257,7 @@ struct link_qual { int tx_failed; }; -DECLARE_EWMA(rssi, 1024, 8) +DECLARE_EWMA(rssi, 10, 8) /* * Antenna settings about the currently active link. diff --git a/include/linux/average.h b/include/linux/average.h index d04aa58..7ddaf34 100644 --- a/include/linux/average.h +++ b/include/linux/average.h @@ -1,45 +1,66 @@ #ifndef _LINUX_AVERAGE_H #define _LINUX_AVERAGE_H -/* Exponentially weighted moving average (EWMA) */ +/* + * Exponentially weighted moving average (EWMA) + * + * This implements a fixed-precision EWMA algorithm, with both the + * precision and fall-off coefficient determined at compile-time + * and built into the generated helper funtions. + * + * The first argument to the macro is the name that will be used + * for the struct and helper functions. + * + * The second argument, the precision, expresses how many bits are + * used for the fractional part of the fixed-precision values. + * + * The third argument, the weight reciprocal, determines how the + * new values will be weighed vs. the old state, new values will + * get weight 1/weight_rcp and old values 1-1/weight_rcp. Note + * that this parameter must be a power of two for efficiency. + */ -#define DECLARE_EWMA(name, _factor, _weight) \ +#define DECLARE_EWMA(name, _precision, _weight_rcp) \ struct ewma_##name { \ unsigned long internal; \ }; \ static inline void ewma_##name##_init(struct ewma_##name *e) \ { \ - BUILD_BUG_ON(!__builtin_constant_p(_factor)); \ - BUILD_BUG_ON(!__builtin_constant_p(_weight)); \ - BUILD_BUG_ON_NOT_POWER_OF_2(_factor); \ - BUILD_BUG_ON_NOT_POWER_OF_2(_weight); \ + BUILD_BUG_ON(!__builtin_constant_p(_precision)); \ + BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp)); \ + /* \ + * Even if you want to feed it just 0/1 you should have \ + * some bits for the non-fractional part... \ + */ \ + BUILD_BUG_ON((_precision) > 30); \ + BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp); \ e->internal = 0; \ } \ static inline unsigned long \ ewma_##name##_read(struct ewma_##name *e) \ { \ - BUILD_BUG_ON(!__builtin_constant_p(_factor)); \ - BUILD_BUG_ON(!__builtin_constant_p(_weight)); \ - BUILD_BUG_ON_NOT_POWER_OF_2(_factor); \ - BUILD_BUG_ON_NOT_POWER_OF_2(_weight); \ - return e->internal >> ilog2(_factor); \ + BUILD_BUG_ON(!__builtin_constant_p(_precision)); \ + BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp)); \ + BUILD_BUG_ON((_precision) > 30); \ + BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp); \ + return e->internal >> (_precision); \ } \ static inline void ewma_##name##_add(struct ewma_##name *e, \ unsigned long val) \ { \ unsigned long internal = ACCESS_ONCE(e->internal); \ - unsigned long weight = ilog2(_weight); \ - unsigned long factor = ilog2(_factor); \ + unsigned long weight_rcp = ilog2(_weight_rcp); \ + unsigned long precision = _precision; \ \ - BUILD_BUG_ON(!__builtin_constant_p(_factor)); \ - BUILD_BUG_ON(!__builtin_constant_p(_weight)); \ - BUILD_BUG_ON_NOT_POWER_OF_2(_factor); \ - BUILD_BUG_ON_NOT_POWER_OF_2(_weight); \ + BUILD_BUG_ON(!__builtin_constant_p(_precision)); \ + BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp)); \ + BUILD_BUG_ON((_precision) > 30); \ + BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp); \ \ ACCESS_ONCE(e->internal) = internal ? \ - (((internal << weight) - internal) + \ - (val << factor)) >> weight : \ - (val << factor); \ + (((internal << weight_rcp) - internal) + \ + (val << precision)) >> weight_rcp : \ + (val << precision); \ } #endif /* _LINUX_AVERAGE_H */ diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 8f64a5c..66b25e4 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -402,7 +402,7 @@ struct batadv_gw_node { struct rcu_head rcu; }; -DECLARE_EWMA(throughput, 1024, 8) +DECLARE_EWMA(throughput, 10, 8) /** * struct batadv_hardif_neigh_node_bat_v - B.A.T.M.A.N. V private neighbor diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 159a1a7..0e71843 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -428,7 +428,7 @@ struct ieee80211_sta_tx_tspec { bool downgraded; }; -DECLARE_EWMA(beacon_signal, 16, 4) +DECLARE_EWMA(beacon_signal, 4, 4) struct ieee80211_if_managed { struct timer_list timer; diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 15599c7..e65cda3 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -372,7 +372,7 @@ struct mesh_sta { unsigned int fail_avg; }; -DECLARE_EWMA(signal, 1024, 8) +DECLARE_EWMA(signal, 10, 8) struct ieee80211_sta_rx_stats { unsigned long packets; -- LinuxNextTracking

1 0

Build check errors found: 2017-03-03
by postmaster＠open-mesh.org 03 Mar '17

03 Mar '17

Name of failed tests ==================== master ------ * difference between net 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/types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) master: difference between net and batadv master ------------------------------------------------ netnext/net/batman-adv/bridge_loop_avoidance.c | 38 +++++++------- netnext/net/batman-adv/distributed-arp-table.c | 6 +- netnext/net/batman-adv/fragmentation.c | 20 ++----- netnext/net/batman-adv/log.h | 5 - netnext/net/batman-adv/main.h | 20 +------ netnext/net/batman-adv/multicast.c | 12 ++-- netnext/net/batman-adv/translation-table.c | 42 +++++++--------- netnext/net/batman-adv/types.h | 2 8 files changed, 63 insertions(+), 82 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 49 Tested Linux versions: 24 Tested configs: 38 maint ----- Failed tests: 1 Started build tests: 51 Tested Linux versions: 23 Tested configs: 43

1 0

Build check errors found: 2017-03-02
by postmaster＠open-mesh.org 02 Mar '17

02 Mar '17

Name of failed tests ==================== master ------ * difference between net 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/fragmentation.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) master: difference between net and batadv master ------------------------------------------------ netnext/net/batman-adv/bridge_loop_avoidance.c | 38 +++++++------- netnext/net/batman-adv/distributed-arp-table.c | 6 +- netnext/net/batman-adv/fragmentation.c | 40 ++++++--------- netnext/net/batman-adv/log.h | 5 - netnext/net/batman-adv/main.h | 20 +------ netnext/net/batman-adv/multicast.c | 12 ++-- netnext/net/batman-adv/translation-table.c | 42 +++++++--------- 7 files changed, 71 insertions(+), 92 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 43 Tested Linux versions: 23 Tested configs: 41 maint ----- Failed tests: 1 Started build tests: 60 Tested Linux versions: 26 Tested configs: 51

1 0

Build check errors found: 2017-03-01
by postmaster＠open-mesh.org 01 Mar '17

01 Mar '17

Name of failed tests ==================== master ------ * difference between net 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/fragmentation.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) master: difference between net and batadv master ------------------------------------------------ netnext/net/batman-adv/bridge_loop_avoidance.c | 38 +++++++------- netnext/net/batman-adv/distributed-arp-table.c | 6 +- netnext/net/batman-adv/fragmentation.c | 40 ++++++--------- netnext/net/batman-adv/log.h | 5 - netnext/net/batman-adv/main.h | 20 +------ netnext/net/batman-adv/multicast.c | 16 +++--- netnext/net/batman-adv/translation-table.c | 42 +++++++--------- 7 files changed, 74 insertions(+), 93 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 54 Tested Linux versions: 25 Tested configs: 40 maint ----- Failed tests: 1 Started build tests: 56 Tested Linux versions: 24 Tested configs: 45

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge March 2017