commits January 2018

commits@lists.open-mesh.org

1 participants
9 discussions

[linux-merge]linux integration; annotated tag, v4.15, created. v4.15
by postmaster＠open-mesh.org 28 Jan '18

28 Jan '18

The annotated tag, v4.15 has been created at f5b7ec87f701326704545ebfc8fe4a2aa42086aa (tag) tagging d8a5b80568a9cb66810e75b182018e9edb68e8ff (commit) replaces v4.15-rc9 tagged by Linus Torvalds on Sun Jan 28 13:20:41 2018 -0800 - Shortlog ------------------------------------------------------------ Linux 4.15 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJabj6pAAoJEHm+PkMAQRiGs8cIAJQFkCWnbz86e3vG4DuWhyA8 CMGHCQdUOxxFGa/ixhIiuetbC0x+JVHAjV2FwVYbAQfaZB3pfw2iR1ncQxpAP1AI oLU9vBEqTmwKMPc9CM5rRfnLFWpGcGwUNzgPdxD5yYqGDtcM8K840mF6NdkYe5AN xU8rv1wlcFPF4A5pvHCH0pvVmK4VxlVFk/2H67TFdxBs4PyJOnSBnf+bcGWgsKO6 hC8XIVtcKCH2GfFxt5d0Vgc5QXJEpX1zn2mtCa1MwYRjN2plgYfD84ha0xE7J0B0 oqV/wnjKXDsmrgVpncr3txd4+zKJFNkdNRE4eLAIupHo2XHTG4HvDJ5dBY2NhGU= =sOml -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] maint's head updated: batman-adv: Fix DECLARE_EWMA compat with newer kernels (e08aac0)
by postmaster＠open-mesh.org 23 Jan '18

23 Jan '18

Repository : ssh://git@open-mesh.org/batman-adv Branch 'maint' now includes: 798174b batman-adv: fix packet checksum in receive path 2c1bce0 batman-adv: invalidate checksum on fragment reassembly e08aac0 batman-adv: Fix DECLARE_EWMA compat with newer kernels

1 0

[batman-adv] master: Merge branch 'maint' (66a1f2a)
by postmaster＠open-mesh.org 23 Jan '18

23 Jan '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 66a1f2a973ec0e5d24a00b5ca552630719586d5f Merge: 68e1946 e08aac0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jan 23 13:13:02 2018 +0100 Merge branch 'maint' >--------------------------------------------------------------- 66a1f2a973ec0e5d24a00b5ca552630719586d5f compat-include/linux/average.h | 8 +++++--- compat-include/linux/{seq_file.h => compiler.h} | 20 ++++++++++---------- net/batman-adv/fragmentation.c | 3 ++- net/batman-adv/soft-interface.c | 8 +------- 4 files changed, 18 insertions(+), 21 deletions(-)

1 0

[batman-adv] master: batman-adv: Fix DECLARE_EWMA compat with newer kernels (e08aac0)
by postmaster＠open-mesh.org 23 Jan '18

23 Jan '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit e08aac0e4d20bb21d821a98b43afd47dd0708528 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jan 19 09:34:45 2018 +0100 batman-adv: Fix DECLARE_EWMA compat with newer kernels Newer kernels removed the ACCESS_ONCE macro and are now using the more specialized forms READ_ONCE and WRITE_ONCE. The DECLARE_EWMA compat code used ACCESS_ONCE and fails to build against kernels which include the commit b899a850431e ("compiler.h: Remove ACCESS_ONCE()"). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- e08aac0e4d20bb21d821a98b43afd47dd0708528 compat-include/linux/average.h | 8 +++++--- compat-include/linux/{seq_file.h => compiler.h} | 17 +++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/compat-include/linux/average.h b/compat-include/linux/average.h index a1e3c25..ce847d5 100644 --- a/compat-include/linux/average.h +++ b/compat-include/linux/average.h @@ -25,6 +25,8 @@ #include_next <linux/average.h> #include <linux/bug.h> +#include <linux/compiler.h> +#include <linux/log2.h> #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) #undef DECLARE_EWMA @@ -77,7 +79,7 @@ static inline void ewma_##name##_add(struct ewma_##name *e, \ unsigned long val) \ { \ - unsigned long internal = ACCESS_ONCE(e->internal); \ + unsigned long internal = READ_ONCE(e->internal); \ unsigned long weight_rcp = ilog2(_weight_rcp); \ unsigned long precision = _precision; \ \ @@ -86,10 +88,10 @@ BUILD_BUG_ON((_precision) > 30); \ BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp); \ \ - ACCESS_ONCE(e->internal) = internal ? \ + WRITE_ONCE(e->internal, internal ? \ (((internal << weight_rcp) - internal) + \ (val << precision)) >> weight_rcp : \ - (val << precision); \ + (val << precision)); \ } #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_AVERAGE_H */ diff --git a/compat-include/linux/seq_file.h b/compat-include/linux/compiler.h similarity index 76% copy from compat-include/linux/seq_file.h copy to compat-include/linux/compiler.h index 3e8dbb4..62b6a2f 100644 --- a/compat-include/linux/seq_file.h +++ b/compat-include/linux/compiler.h @@ -18,19 +18,20 @@ * of the Linux kernel. */ -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_SEQ_FILE_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_SEQ_FILE_H_ +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ #include <linux/version.h> -#include_next <linux/seq_file.h> +#include_next <linux/compiler.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) -static inline bool seq_has_overflowed(struct seq_file *m) -{ - return m->count == m->size; -} +#define READ_ONCE(x) ACCESS_ONCE(x) + +#define WRITE_ONCE(x, val) ({ \ + ACCESS_ONCE(x) = (val); \ +}) #endif /* < KERNEL_VERSION(3, 19, 0) */ -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_SEQ_FILE_H_ */ +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ */

1 0

[batman-adv] master: batman-adv: invalidate checksum on fragment reassembly (2c1bce0)
by postmaster＠open-mesh.org 23 Jan '18

23 Jan '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 2c1bce065baa688bc1eca4116f83ca3b790432a5 Author: Matthias Schiffer <mschiffer(a)universe-factory.net> Date: Tue Jan 23 10:59:50 2018 +0100 batman-adv: invalidate checksum on fragment reassembly A more sophisticated implementation could try to combine fragment checksums when all fragments have CHECKSUM_COMPLETE and are split at even offsets. For now, we just set ip_summed to CHECKSUM_NONE to avoid "hw csum failure" warnings in the kernel log when fragmented frames are received. In consequence, skb_pull_rcsum() can be replaced with skb_pull(). Note that in usual setups, packets don't reach batman-adv with CHECKSUM_COMPLETE (I assume NICs bail out of checksumming when they see batadv's ethtype?), which is why the log messages do not occur on every system using batman-adv. I could reproduce this issue by stacking batman-adv on top of a VXLAN interface. Fixes: 9b3eab61754d ("batman-adv: Receive fragmented packets and merge") Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 2c1bce065baa688bc1eca4116f83ca3b790432a5 net/batman-adv/fragmentation.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index ebe6e38..1bb2b43 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -287,7 +287,8 @@ batadv_frag_merge_packets(struct hlist_head *chain) /* Move the existing MAC header to just before the payload. (Override * the fragment header.) */ - skb_pull_rcsum(skb_out, hdr_size); + skb_pull(skb_out, hdr_size); + skb_out->ip_summed = CHECKSUM_NONE; memmove(skb_out->data - ETH_HLEN, skb_mac_header(skb_out), ETH_HLEN); skb_set_mac_header(skb_out, -ETH_HLEN); skb_reset_network_header(skb_out);

1 0

[batman-adv] master: batman-adv: fix packet checksum in receive path (798174b)
by postmaster＠open-mesh.org 23 Jan '18

23 Jan '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 798174b15153afd88268f2f87811602f68b3f2c6 Author: Matthias Schiffer <mschiffer(a)universe-factory.net> Date: Tue Jan 23 10:59:49 2018 +0100 batman-adv: fix packet checksum in receive path eth_type_trans() internally calls skb_pull(), which does not adjust the skb checksum; skb_postpull_rcsum() is necessary to avoid log spam of the form "bat0: hw csum failure" when packets with CHECKSUM_COMPLETE are received. Note that in usual setups, packets don't reach batman-adv with CHECKSUM_COMPLETE (I assume NICs bail out of checksumming when they see batadv's ethtype?), which is why the log messages do not occur on every system using batman-adv. I could reproduce this issue by stacking batman-adv on top of a VXLAN interface. Fixes: fe28a94c01e1 ("batman-adv: receive packets directly using skbs") Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 798174b15153afd88268f2f87811602f68b3f2c6 net/batman-adv/soft-interface.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 9f673cd..6f7ce7a 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -451,13 +451,7 @@ void batadv_interface_rx(struct net_device *soft_iface, /* skb->dev & skb->pkt_type are set here */ skb->protocol = eth_type_trans(skb, soft_iface); - - /* should not be necessary anymore as we use skb_pull_rcsum() - * TODO: please verify this and remove this TODO - * -- Dec 21st 2009, Simon Wunderlich - */ - - /* skb->ip_summed = CHECKSUM_UNNECESSARY; */ + skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN); batadv_inc_counter(bat_priv, BATADV_CNT_RX); batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,

1 0

[linux-merge]linux integration; annotated tag, v4.15-rc9, created. v4.15-rc9
by postmaster＠open-mesh.org 22 Jan '18

22 Jan '18

The annotated tag, v4.15-rc9 has been created at 7d05020f7ea88483dde607796a072b97611c37f5 (tag) tagging 0c5b9b5d9adbad4b60491f9ba0d2af38904bb4b9 (commit) replaces v4.15-rc8 tagged by Linus Torvalds on Sun Jan 21 13:51:33 2018 -0800 - Shortlog ------------------------------------------------------------ Linux 4.15-rc9 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJaZQtlAAoJEHm+PkMAQRiGdQUH/RqftFXAIEFHvv3g4uLNVH9B wZQA+Fz1taJIgju2DBU/JIPDQiZ8cMQp/HEOBR+Sn7wfIH6nJO+whmf67pR27Jp1 FyYb3JqdV9kfQMn8Ca8sg5NenGSOYCdgHpD5iilPyfqErv56558xppMBnsSxBhVY KIvdRP4GWbLSvSPKFscqgpsKDQd9WvXG/VQoUoLM5FBode+M/LWPnQXaTzlFVzLV EpdrxrtFaObsouBljLQZMM67x6FcxkY6LqB4/dPyUFWhru0q97l6EFkyEMwZ7zLJ s7AMT1ilUFHYZdy+APTAFPiuqeLds8O2tdxy5rxGuw2mFepsLZQNaC6Fm1I7BB8= =0Mix -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.15-rc8, created. v4.15-rc8
by postmaster＠open-mesh.org 15 Jan '18

15 Jan '18

The annotated tag, v4.15-rc8 has been created at 9870bc69c9a9974f71b3063efc7d55397359d845 (tag) tagging a8750ddca918032d6349adbf9a4b6555e7db20da (commit) replaces v4.15-rc7 tagged by Linus Torvalds on Sun Jan 14 15:32:37 2018 -0800 - Shortlog ------------------------------------------------------------ Linux 4.15-rc8 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJaW+iVAAoJEHm+PkMAQRiGCDsIAJALNpX7odTx/8y+yCSWbpBH E57iwr4rmnI6tXJY6gqBUWTYnjAcf4b8IsHGCO6q3WIE3l/kt+m3eA21a32mF2Db /bfPGTOWu5LoOnFqzgH2kiFuC3Y474toxpld2YtkQWYxi5W7SUtIHi/jGgkUprth g15yPfwYgotJd/gpmPfBDMPlYDYvLlnPYbTG6ZWdMbg39m2RF2m0BdQ6aBFLHvbJ IN0tjCM6hrLFBP0+6Zn60pevUW9/AFYotZn2ankNTk5QVCQm14rgQIP+Pfoa5WpE I25r0DbkG2jKJCq+tlgIJjxHKD37GEDMc4T8/5Y8CNNeT9Q8si9EWvznjaAPazw= =o5gx -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.15-rc7, created. v4.15-rc7
by postmaster＠open-mesh.org 07 Jan '18

07 Jan '18

The annotated tag, v4.15-rc7 has been created at e43ec6ccc6aa9628bf2563eec17b9ce8ba9b30f7 (tag) tagging b2cd1df66037e7c4697c7e40496bf7e4a5e16a2d (commit) replaces v4.15-rc6 tagged by Linus Torvalds on Sun Jan 7 14:22:50 2018 -0800 - Shortlog ------------------------------------------------------------ Linux 4.15-rc7 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJaUp26AAoJEHm+PkMAQRiGY38H/RtjfCYUXcn0ToYrTMGHbon5 Q1vggZbNTpvCb4FJtzYTe+Wj+KYZWmfFKtv8a54U7beNmu/nEIBgQjNydYRZYkLv 2MTN0H/mI+Rzi5vfEbypQQfzyLm6FOgOHftDVMiNT0/ZOhSOrsin0KsxVEpCfUKT FZnX7m9KAfMI8Q9sWz5GWFTFj/NtgkA+IkgmBqJ82b/rbtrJszbPWS09g9dS1ZWv 3x5ksPGKbRjPd1LJgi4xOjCv9NZCDtC5Dpi8RVxvsP8ng5ohUyEr6rFaIkEy3cQp bqokG6/tpFHUHNqkNJaTgjIhjF9u4J4M26hJ9HgXuyyzu7x8OVpLKPLoL1v7zL4= =8kT3 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits January 2018