B.A.T.M.A.N November 2017

b.a.t.m.a.n@lists.open-mesh.org

9 participants
20 discussions

[B.A.T.M.A.N.] [PATCH 0/2] batctl: Convert CHANGELOG/README to reStructuredText
by Sven Eckelmann 01 Dec '17

01 Dec '17

Hi, I was talking today with Simon about the "License cleanup" changes. He would prefer when the *.license files don't exist (when possible). Luckily, I already wanted to convert these files (or at least the READMEs) to reStructuredText and I've already shown in these patchsets how the SPDX annotation should be done for the lrest files. So it was just logically to immediately post the conversion to rst and integration of this tag. We've also discussed how the changelog should look like. It should be simple and we only wanted to show the date (not the time) anymore. And the actual changelog lists should be kept (mostly untouched - beside some minor format fixes to make it reStructuredText compatible). This patchset is based on the "batctl: License cleanup" patchset. Kind regards, Sven Sven Eckelmann (2): batctl: Convert CHANGELOG to reStructuredText batctl: Convert README to reStructuredText CHANGELOG | 56 ----- CHANGELOG.license | 2 - CHANGELOG.rst | 60 +++++ README | 614 ----------------------------------------------- README.license | 2 - README.rst | 694 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 754 insertions(+), 674 deletions(-) delete mode 100644 CHANGELOG delete mode 100644 CHANGELOG.license create mode 100644 CHANGELOG.rst delete mode 100644 README delete mode 100644 README.license create mode 100644 README.rst -- 2.11.0

1 3

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix check of retrieved orig_gw in batadv_v_gw_is_eligible
by Sven Eckelmann 01 Dec '17

01 Dec '17

The batadv_v_gw_is_eligible function already assumes that orig_node is not NULL. But batadv_gw_node_get may have failed to find the originator. It must therefore be checked whether the batadv_gw_node_get failed and not whether orig_node is NULL to detect this error. Fixes: 80b2d47be2c7 ("batman-adv: B.A.T.M.A.N. V - implement GW selection logic") Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> --- Cc: Antonio Quartulli <a(a)unstable.cc> --- net/batman-adv/bat_v.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 341ceab8338d829d14a48831bef805bb04af0a8f..e0e2bfcd6b3efd73f2567d23ce304951c9e2c3f0 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -814,7 +814,7 @@ static bool batadv_v_gw_is_eligible(struct batadv_priv *bat_priv, } orig_gw = batadv_gw_node_get(bat_priv, orig_node); - if (!orig_node) + if (!orig_gw) goto out; if (batadv_v_gw_throughput_get(orig_gw, &orig_throughput) < 0)

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: Always initialize fragment header priority
by Sven Eckelmann 01 Dec '17

01 Dec '17

From: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> The batman-adv unuicast fragment header contains 3 bits for the priority of the packet. These bits will be initialized when the skb->priority contains a value between 256 and 263. But otherwise, the uninitialized bits from the stack will be used. Fixes: 4f241fcea704 ("batman-adv: Include frame priority in fragment header") Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> --- Cc: Andrew Lunn <andrew(a)lunn.ch> --- net/batman-adv/fragmentation.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index a98cf1104a30a30e66fb6018bef59dea83dc4b7a..ebe6e38934e46ed5de4d30204e791dbe40285fcc 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -499,6 +499,8 @@ int batadv_frag_send_packet(struct sk_buff *skb, */ if (skb->priority >= 256 && skb->priority <= 263) frag_header.priority = skb->priority - 256; + else + frag_header.priority = 0; ether_addr_copy(frag_header.orig, primary_if->net_dev->dev_addr); ether_addr_copy(frag_header.dest, orig_node->orig);

2 1

[B.A.T.M.A.N.] [PATCH] alfred: Handle failure during hash iterator allocation
by Sven Eckelmann 01 Dec '17

01 Dec '17

From: Sven Eckelmann <sven(a)narfation.org> The hash_iterate functions should not try to start the iteration when the iterator could not be allocated. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- hash.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hash.c b/hash.c index 5a3cdef..116e46f 100644 --- a/hash.c +++ b/hash.c @@ -116,6 +116,9 @@ struct hash_it_t *hash_iterate(struct hashtable_t *hash, if (!iter_in) { iter = debugMalloc(sizeof(struct hash_it_t), 301); + if (!iter) + return NULL; + iter->index = -1; iter->bucket = NULL; iter->prev_bucket = NULL; -- 2.11.0

2 1

[B.A.T.M.A.N.] [PATCH 00/10] batctl: Fixes and minor cleanup
by Sven Eckelmann 01 Dec '17

01 Dec '17

From: Sven Eckelmann <sven(a)narfation.org> Hi, today I had the unpleasent experience to receive [1] to a lot of PDF files which seem to contain some reports of the Klocwork static code analysis tool. Most of the stuff was nonsense about memory/resource leaks (even when it stored in some kind of structure one line before). I gathered the only interesting portions and prepared some patches for them. The last two patches are actually not really bug fixes but are about code which completely killed the static analyzer. I didn't like the code in the last patch (looked to complex for something relatively easy) and thus I've just replaced it. WARNING: these things were only compile tested Kind regards, Sven [1] not unpleasent due to some issue reports. But going through several hundred false positives wasn't my goal for today. Someone at seems to get paid by false-positives which this Klocworks analyzer produces (and there are really some braindead ones - even clang's static analyzer looks like a genius against some of these reports) Sven Eckelmann (10): batctl: Print dummy value when localtime failed batctl: Handle failure during hash_iterator allocation batctl: Handle allocation error for path_buff batctl: Handle nlmsg_alloc errors batctl: Handle nl_socket_alloc errors batctl: Handle nl_cb_alloc errors batctl: Free nl_sock on genl_ctrl_resolve error batctl: Free nl_sock when if_nametoindex failed batctl: tcpdump: Fix types for for TT v1 batctl: Simplify concatenation of pathnames bat-hosts.c | 4 +--- functions.c | 8 ++------ hash.c | 3 +++ netlink.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------- sys.c | 15 +++++++++++++++ tcpdump.c | 9 +++++++-- 6 files changed, 83 insertions(+), 19 deletions(-) -- 2.11.0

2 11

[B.A.T.M.A.N.] [RFC] batman-adv: setup_timer() -> timer_setup()
by Sven Eckelmann 01 Dec '17

01 Dec '17

From: Kees Cook <keescook(a)chromium.org> This converts all remaining cases of the old setup_timer() API into using timer_setup(), where the callback argument is the structure already holding the struct timer_list. These should have no behavioral changes, since they just change which pointer is passed into the callback with the same available pointers after conversion. It handles the following examples, in addition to some other variations. Casting from unsigned long: void my_callback(unsigned long data) { struct something *ptr = (struct something *)data; ... } ... setup_timer(&ptr->my_timer, my_callback, ptr); and forced object casts: void my_callback(struct something *ptr) { ... } ... setup_timer(&ptr->my_timer, my_callback, (unsigned long)ptr); become: void my_callback(struct timer_list *t) { struct something *ptr = from_timer(ptr, t, my_timer); ... } ... timer_setup(&ptr->my_timer, my_callback, 0); Direct function assignments: void my_callback(unsigned long data) { struct something *ptr = (struct something *)data; ... } ... ptr->my_timer.function = my_callback; have a temporary cast added, along with converting the args: void my_callback(struct timer_list *t) { struct something *ptr = from_timer(ptr, t, my_timer); ... } ... ptr->my_timer.function = (TIMER_FUNC_TYPE)my_callback; And finally, callbacks without a data assignment: void my_callback(unsigned long data) { ... } ... setup_timer(&ptr->my_timer, my_callback, 0); have their argument renamed to verify they're unused during conversion: void my_callback(struct timer_list *unused) { ... } ... timer_setup(&ptr->my_timer, my_callback, 0); The conversion is done with the following Coccinelle script: spatch --very-quiet --all-includes --include-headers \ -I ./arch/x86/include -I ./arch/x86/include/generated \ -I ./include -I ./arch/x86/include/uapi \ -I ./arch/x86/include/generated/uapi -I ./include/uapi \ -I ./include/generated/uapi --include ./include/linux/kconfig.h \ --dir . \ --cocci-file ~/src/data/timer_setup.cocci @fix_address_of@ expression e; @@ setup_timer( -&(e) +&e , ...) // Update any raw setup_timer() usages that have a NULL callback, but // would otherwise match change_timer_function_usage, since the latter // will update all function assignments done in the face of a NULL // function initialization in setup_timer(). @change_timer_function_usage_NULL@ expression _E; identifier _timer; type _cast_data; @@ ( -setup_timer(&_E->_timer, NULL, _E); +timer_setup(&_E->_timer, NULL, 0); | -setup_timer(&_E->_timer, NULL, (_cast_data)_E); +timer_setup(&_E->_timer, NULL, 0); | -setup_timer(&_E._timer, NULL, &_E); +timer_setup(&_E._timer, NULL, 0); | -setup_timer(&_E._timer, NULL, (_cast_data)&_E); +timer_setup(&_E._timer, NULL, 0); ) @change_timer_function_usage@ expression _E; identifier _timer; struct timer_list _stl; identifier _callback; type _cast_func, _cast_data; @@ ( -setup_timer(&_E->_timer, _callback, _E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, &_callback, _E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, _callback, (_cast_data)_E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, &_callback, (_cast_data)_E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, (_cast_func)_callback, _E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, (_cast_func)&_callback, _E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, (_cast_func)_callback, (_cast_data)_E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, (_cast_func)&_callback, (_cast_data)_E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E._timer, _callback, (_cast_data)_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, _callback, (_cast_data)&_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, &_callback, (_cast_data)_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, &_callback, (_cast_data)&_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)&_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)&_E); +timer_setup(&_E._timer, _callback, 0); | _E->_timer(a)_stl.function = _callback; | _E->_timer(a)_stl.function = &_callback; | _E->_timer(a)_stl.function = (_cast_func)_callback; | _E->_timer(a)_stl.function = (_cast_func)&_callback; | _E._timer(a)_stl.function = _callback; | _E._timer(a)_stl.function = &_callback; | _E._timer(a)_stl.function = (_cast_func)_callback; | _E._timer(a)_stl.function = (_cast_func)&_callback; ) // callback(unsigned long arg) @change_callback_handle_cast depends on change_timer_function_usage@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._timer; type _origtype; identifier _origarg; type _handletype; identifier _handle; @@ void _callback( -_origtype _origarg +struct timer_list *t ) { ( ... when != _origarg _handletype *_handle = -(_handletype *)_origarg; +from_timer(_handle, t, _timer); ... when != _origarg | ... when != _origarg _handletype *_handle = -(void *)_origarg; +from_timer(_handle, t, _timer); ... when != _origarg | ... when != _origarg _handletype *_handle; ... when != _handle _handle = -(_handletype *)_origarg; +from_timer(_handle, t, _timer); ... when != _origarg | ... when != _origarg _handletype *_handle; ... when != _handle _handle = -(void *)_origarg; +from_timer(_handle, t, _timer); ... when != _origarg ) } // callback(unsigned long arg) without existing variable @change_callback_handle_cast_no_arg depends on change_timer_function_usage && !change_callback_handle_cast@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._timer; type _origtype; identifier _origarg; type _handletype; @@ void _callback( -_origtype _origarg +struct timer_list *t ) { + _handletype *_origarg = from_timer(_origarg, t, _timer); + ... when != _origarg - (_handletype *)_origarg + _origarg ... when != _origarg } // Avoid already converted callbacks. @match_callback_converted depends on change_timer_function_usage && !change_callback_handle_cast && !change_callback_handle_cast_no_arg@ identifier change_timer_function_usage._callback; identifier t; @@ void _callback(struct timer_list *t) { ... } // callback(struct something *handle) @change_callback_handle_arg depends on change_timer_function_usage && !match_callback_converted && !change_callback_handle_cast && !change_callback_handle_cast_no_arg@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._timer; type _handletype; identifier _handle; @@ void _callback( -_handletype *_handle +struct timer_list *t ) { + _handletype *_handle = from_timer(_handle, t, _timer); ... } // If change_callback_handle_arg ran on an empty function, remove // the added handler. @unchange_callback_handle_arg depends on change_timer_function_usage && change_callback_handle_arg@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._timer; type _handletype; identifier _handle; identifier t; @@ void _callback(struct timer_list *t) { - _handletype *_handle = from_timer(_handle, t, _timer); } // We only want to refactor the setup_timer() data argument if we've found // the matching callback. This undoes changes in change_timer_function_usage. @unchange_timer_function_usage depends on change_timer_function_usage && !change_callback_handle_cast && !change_callback_handle_cast_no_arg && !change_callback_handle_arg@ expression change_timer_function_usage._E; identifier change_timer_function_usage._timer; identifier change_timer_function_usage._callback; type change_timer_function_usage._cast_data; @@ ( -timer_setup(&_E->_timer, _callback, 0); +setup_timer(&_E->_timer, _callback, (_cast_data)_E); | -timer_setup(&_E._timer, _callback, 0); +setup_timer(&_E._timer, _callback, (_cast_data)&_E); ) // If we fixed a callback from a .function assignment, fix the // assignment cast now. @change_timer_function_assignment depends on change_timer_function_usage && (change_callback_handle_cast || change_callback_handle_cast_no_arg || change_callback_handle_arg)@ expression change_timer_function_usage._E; identifier change_timer_function_usage._timer; identifier change_timer_function_usage._callback; type _cast_func; typedef TIMER_FUNC_TYPE; @@ ( _E->_timer.function = -_callback +(TIMER_FUNC_TYPE)_callback ; | _E->_timer.function = -&_callback +(TIMER_FUNC_TYPE)_callback ; | _E->_timer.function = -(_cast_func)_callback; +(TIMER_FUNC_TYPE)_callback ; | _E->_timer.function = -(_cast_func)&_callback +(TIMER_FUNC_TYPE)_callback ; | _E._timer.function = -_callback +(TIMER_FUNC_TYPE)_callback ; | _E._timer.function = -&_callback; +(TIMER_FUNC_TYPE)_callback ; | _E._timer.function = -(_cast_func)_callback +(TIMER_FUNC_TYPE)_callback ; | _E._timer.function = -(_cast_func)&_callback +(TIMER_FUNC_TYPE)_callback ; ) // Sometimes timer functions are called directly. Replace matched args. @change_timer_function_calls depends on change_timer_function_usage && (change_callback_handle_cast || change_callback_handle_cast_no_arg || change_callback_handle_arg)@ expression _E; identifier change_timer_function_usage._timer; identifier change_timer_function_usage._callback; type _cast_data; @@ _callback( ( -(_cast_data)_E +&_E->_timer | -(_cast_data)&_E +&_E._timer | -_E +&_E->_timer ) ) // If a timer has been configured without a data argument, it can be // converted without regard to the callback argument, since it is unused. @match_timer_function_unused_data@ expression _E; identifier _timer; identifier _callback; @@ ( -setup_timer(&_E->_timer, _callback, 0); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, _callback, 0L); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, _callback, 0UL); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E._timer, _callback, 0); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, _callback, 0L); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, _callback, 0UL); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_timer, _callback, 0); +timer_setup(&_timer, _callback, 0); | -setup_timer(&_timer, _callback, 0L); +timer_setup(&_timer, _callback, 0); | -setup_timer(&_timer, _callback, 0UL); +timer_setup(&_timer, _callback, 0); | -setup_timer(_timer, _callback, 0); +timer_setup(_timer, _callback, 0); | -setup_timer(_timer, _callback, 0L); +timer_setup(_timer, _callback, 0); | -setup_timer(_timer, _callback, 0UL); +timer_setup(_timer, _callback, 0); ) @change_callback_unused_data depends on match_timer_function_unused_data@ identifier match_timer_function_unused_data._callback; type _origtype; identifier _origarg; @@ void _callback( -_origtype _origarg +struct timer_list *unused ) { ... when != _origarg } Signed-off-by: Kees Cook <keescook(a)chromium.org> --- TODO: this requires some compat code because this functionality was added first with v4.14 (we have to check in more detail) net/batman-adv/tp_meter.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 4b90033f35a8..15cd2139381e 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -488,9 +488,9 @@ static void batadv_tp_reset_sender_timer(struct batadv_tp_vars *tp_vars) * Switch to Slow Start, set the ss_threshold to half of the current cwnd and * reset the cwnd to 3*MSS */ -static void batadv_tp_sender_timeout(unsigned long arg) +static void batadv_tp_sender_timeout(struct timer_list *t) { - struct batadv_tp_vars *tp_vars = (struct batadv_tp_vars *)arg; + struct batadv_tp_vars *tp_vars = from_timer(tp_vars, t, timer); struct batadv_priv *bat_priv = tp_vars->bat_priv; if (atomic_read(&tp_vars->sending) == 0) @@ -1020,8 +1020,7 @@ void batadv_tp_start(struct batadv_priv *bat_priv, const u8 *dst, atomic64_set(&tp_vars->tot_sent, 0); kref_get(&tp_vars->refcount); - setup_timer(&tp_vars->timer, batadv_tp_sender_timeout, - (unsigned long)tp_vars); + timer_setup(&tp_vars->timer, batadv_tp_sender_timeout, 0); tp_vars->bat_priv = bat_priv; tp_vars->start_time = jiffies; @@ -1109,9 +1108,9 @@ static void batadv_tp_reset_receiver_timer(struct batadv_tp_vars *tp_vars) * reached without received ack * @arg: address of the related tp_vars */ -static void batadv_tp_receiver_shutdown(unsigned long arg) +static void batadv_tp_receiver_shutdown(struct timer_list *t) { - struct batadv_tp_vars *tp_vars = (struct batadv_tp_vars *)arg; + struct batadv_tp_vars *tp_vars = from_timer(tp_vars, t, timer); struct batadv_tp_unacked *un, *safe; struct batadv_priv *bat_priv; @@ -1373,8 +1372,7 @@ batadv_tp_init_recv(struct batadv_priv *bat_priv, hlist_add_head_rcu(&tp_vars->list, &bat_priv->tp_list); kref_get(&tp_vars->refcount); - setup_timer(&tp_vars->timer, batadv_tp_receiver_shutdown, - (unsigned long)tp_vars); + timer_setup(&tp_vars->timer, batadv_tp_receiver_shutdown, 0); batadv_tp_reset_receiver_timer(tp_vars); -- 2.11.0

1 1

[B.A.T.M.A.N.] [PATCH] flow_dissector: Parse batman-adv unicast headers
by Sven Eckelmann 27 Nov '17

27 Nov '17

The batman-adv unicast packets contain a full layer 2 frame in encapsulated form. The flow dissector must therefore be able to parse the batman-adv unicast header to reach the layer 2+3 information to allow RPS to schedule the flow to different cores. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> --- I've played around with the RPS+XPS to better distribute traffic to different cores on modern SoCs. It was observed that the batman-adv unicast traffic stayed at one core and this limited the overall throughput. The test was done between a modern PC which was running iperf over batman-adv. Another PC was also running iperf was just transmitting the traffic over ethernet. A QCA Dakota (IPQ4018) based device was in the middle and received the ethernet traffic on one port, encapsulated it as batman-adv unicast and transferred the resulting packet via ethernet to the modern PC. $ iperf -c 192.168.23.2 -t 30 -i 1 -P16 It was observed that only the receive processing was affected. Adding this relative simple patch allowed me to increase the ethernet throughput from 689 Mbits/sec (with one core doing the interrupt processing and 1 core completely busy with the other processing) to 910 Mbits/sec (one core doing the interrupt processing and the other 3 cores were sharing the load). In theory, the device with the patch could have handled a lot more traffic than 910 Mbit/sec - at least the RPS cores were not even near 100% load. This should bring a lot more when testing with good 802.11ac WiFi links because the wifi stack/driver are usually stressing the CPU a lot more than normal ethernet drivers. The change itself is not really invasive but could be a lot cleaner when the packet header information would be available under include/... . And I don't know yet whether it would make sense to add a new flow dissector key with the batman-adv destination address. This is also the reason why I only post this to the b.a.t.m.a.n(a)lists.open-mesh.org mailing list. Anyway, maybe some other people ran into the same problem and want to test it. --- net/core/flow_dissector.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 0a977373d003..bbf894fff3fc 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -595,6 +595,39 @@ bool __skb_flow_dissect(const struct sk_buff *skb, break; } + case htons(ETH_P_BATMAN): { + /* TODO provide struct in include/uapi/... header */ + struct batadv_unicast_packet { + u8 packet_type; + u8 version; + u8 ttl; + u8 ttvn; + u8 dest[ETH_ALEN]; + }; + + struct { + struct batadv_unicast_packet batadv_unicast; + struct ethhdr eth; + } *hdr, _hdr; + + hdr = __skb_header_pointer(skb, nhoff, sizeof(_hdr), data, hlen, + &_hdr); + if (!hdr) + goto out_bad; + + if (hdr->batadv_unicast.version != 15) + break; + + if (hdr->batadv_unicast.packet_type != 0x40) + break; + + /* TODO set batman-adv dest address as flow key? */ + + proto = hdr->eth.h_proto; + nhoff += sizeof(*hdr); + + goto again; + } case htons(ETH_P_8021AD): case htons(ETH_P_8021Q): { const struct vlan_hdr *vlan; -- 2.11.0

1 1

[B.A.T.M.A.N.] Interpreting a Mem-Info Section of an OOM
by Linus Lüssing 24 Nov '17

24 Nov '17

Hi, With some larger mesh networks running Gluon some Out-of-Memory cases on 32MB RAM devices were reported [0]. For the following Mem-Info section, the number of free pages confuses me a little: [...] [ 236.529242] Mem-Info: [ 236.531561] active_anon:691 inactive_anon:9 isolated_anon:0 [ 236.531561] active_file:131 inactive_file:138 isolated_file:0 [ 236.531561] unevictable:0 dirty:0 writeback:0 unstable:0 [ 236.531561] slab_reclaimable:205 slab_unreclaimable:3105 [ 236.531561] mapped:39 shmem:28 pagetables:80 bounce:0 [ 236.531561] free:289 free_pcp:0 free_cma:0 [ 236.563259] Normal free:1156kB min:1024kB low:1280kB high:1536kB active_anon:2764kB inactive_anon:36kB active_file:524kB inactive_file:552kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:32768kB managed:27776kB mlocked:0kB dirty:0kB writeback:0kB mapped:156kB shmem:112kB slab_reclaimable:820kB slab_unreclaimable:12420kB kernel_stack:424kB pagetables:320kB unstable:0kB bounce:0kB free_pcp:0kB local_pcp:0kB free_cma:0kB writeback_tmp:0kB pages_scanned:6492 all_unreclaimable? yes [ 236.607070] lowmem_reserve[]: 0 0 [ 236.610425] Normal: 125*4kB (UME) 34*8kB (UME) 16*16kB (UME) 4*32kB (ME) 0*64kB 0*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 1156kB [ 236.623157] 297 total pagecache pages [ 236.626852] 0 pages in swap cache [ 236.630189] Swap cache stats: add 0, delete 0, find 0/0 [ 236.635455] Free swap = 0kB [ 236.638355] Total swap = 0kB [ 236.641251] 8192 pages RAM [ 236.643971] 0 pages HighMem/MovableOnly [ 236.647837] 1248 pages reserved [...] (Full log here[1], including some slabinfo; with a backport of these slabinfo related patches applied [2]) It says that only 289 pages are left. However those numbers listed in the Mem-Info section do not seem to add up to 8192 minus 1289 reserved minus 289 free pages. Any idea why it might list only 289 free pages? Regards, Linus [0]: https://github.com/freifunk-gluon/gluon/issues/1243 https://github.com/freifunk-gluon/gluon/issues/1197 [1]: https://paste.linuxlounge.net/#/GUMP_cQOKwgqQhf5_gBfPU1Vv0A!7bT80KaCMPcUC_z… [2]: https://lkml.org/lkml/2017/10/4/788

1 0

[B.A.T.M.A.N.] [PATCH 0/2] alfred: Convert CHANGELOG/README to reStructuredText
by Sven Eckelmann 20 Nov '17

20 Nov '17

Hi, I was talking today with Simon about the "License cleanup" changes. He would prefer when the *.license files don't exist (when possible). Luckily, I already wanted to convert these files (or at least the READMEs) to reStructuredText and I've already shown in these patchsets how the SPDX annotation should be done for the lrest files. So it was just logically to immediately post the conversion to rst and integration of this tag. We've also discussed how the changelog should look like. It should be simple and we only wanted to show the date (not the time) anymore. And the actual changelog lists should be kept (mostly untouched - beside some minor format fixes to make it reStructuredText compatible). This patchset is based on the "alfred: License cleanup" patchset. Kind regards, Sven Sven Eckelmann (2): alfred: Convert CHANGELOG to reStructuredText alfred: Convert README to reStructuredText CHANGELOG | 169 ---------------------------- CHANGELOG.license | 2 - CHANGELOG.rst | 175 +++++++++++++++++++++++++++++ README.license | 2 - README => README.rst | 311 +++++++++++++++++++++++++++------------------------ 5 files changed, 339 insertions(+), 320 deletions(-) delete mode 100644 CHANGELOG delete mode 100644 CHANGELOG.license create mode 100644 CHANGELOG.rst delete mode 100644 README.license rename README => README.rst (55%) -- 2.11.0

1 2

Re: [B.A.T.M.A.N.] [PATCH 3.16 076/294] batman-adv: fix TT sync flag inconsistencies
by Linus Lüssing 12 Nov '17

12 Nov '17

Hi Ben! On Mon, Nov 06, 2017 at 11:03:02PM +0000, Ben Hutchings wrote: > 3.16.50-rc1 review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Linus Lüssing <linus.luessing(a)c0d3.blue> > > commit 54e22f265e872ae140755b3318521d400a094605 upstream. [...] > [bwh: Backported to 3.16: > - Drop changes to batadv_tt_global_dump_subentry() May I ask, were there specific concerns for stable 3.16 kernel releases with this change? It's not bothering me, but I'm currently wondering whether this could cause some confusion to users. Regards, Linus

2 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N November 2017