linux-merge January 2016

linux-merge@lists.open-mesh.org

3 participants
124 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20160118
by batman＠open-mesh.org 18 Jan '16

18 Jan '16

The following commit has been merged in the master branch: commit 2baa753c276f27f8e844637561ad597867aa6fb6 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jan 5 12:06:22 2016 +0100 batman-adv: Drop immediate batadv_neigh_node free function It is not allowed to free the memory of an object which is part of a list which is protected by rcu-read-side-critical sections without making sure that no other context is accessing the object anymore. This usually happens by removing the references to this object and then waiting until the rcu grace period is over and no one (allowedly) accesses it anymore. But the _now functions ignore this completely. They free the object directly even when a different context still tries to access it. This has to be avoided and thus these functions must be removed and all functions have to use batadv_neigh_node_free_ref. Fixes: 89652331c00f ("batman-adv: split tq information in neigh_node struct") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Antonio Quartulli <a(a)unstable.cc> diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 6929acc..78fd4ea 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -285,20 +285,8 @@ static void batadv_neigh_node_free_rcu(struct rcu_head *rcu) } /** - * batadv_neigh_node_free_ref_now - decrement the neighbors refcounter - * and possibly free it (without rcu callback) - * @neigh_node: neigh neighbor to free - */ -static void -batadv_neigh_node_free_ref_now(struct batadv_neigh_node *neigh_node) -{ - if (atomic_dec_and_test(&neigh_node->refcount)) - batadv_neigh_node_free_rcu(&neigh_node->rcu); -} - -/** * batadv_neigh_node_free_ref - decrement the neighbors refcounter - * and possibly free it + * and possibly release it * @neigh_node: neigh neighbor to free */ void batadv_neigh_node_free_ref(struct batadv_neigh_node *neigh_node) @@ -733,24 +721,23 @@ int batadv_hardif_neigh_seq_print_text(struct seq_file *seq, void *offset) } /** - * batadv_orig_ifinfo_free_rcu - free the orig_ifinfo object - * @rcu: rcu pointer of the orig_ifinfo object + * batadv_orig_ifinfo_release - release orig_ifinfo from lists and queue for + * free after rcu grace period + * @orig_ifinfo: the orig_ifinfo object to release */ -static void batadv_orig_ifinfo_free_rcu(struct rcu_head *rcu) +static void batadv_orig_ifinfo_release(struct batadv_orig_ifinfo *orig_ifinfo) { - struct batadv_orig_ifinfo *orig_ifinfo; struct batadv_neigh_node *router; - orig_ifinfo = container_of(rcu, struct batadv_orig_ifinfo, rcu); - if (orig_ifinfo->if_outgoing != BATADV_IF_DEFAULT) - batadv_hardif_free_ref_now(orig_ifinfo->if_outgoing); + batadv_hardif_free_ref(orig_ifinfo->if_outgoing); /* this is the last reference to this object */ router = rcu_dereference_protected(orig_ifinfo->router, true); if (router) - batadv_neigh_node_free_ref_now(router); - kfree(orig_ifinfo); + batadv_neigh_node_free_ref(router); + + kfree_rcu(orig_ifinfo, rcu); } /** @@ -761,7 +748,7 @@ static void batadv_orig_ifinfo_free_rcu(struct rcu_head *rcu) void batadv_orig_ifinfo_free_ref(struct batadv_orig_ifinfo *orig_ifinfo) { if (atomic_dec_and_test(&orig_ifinfo->refcount)) - call_rcu(&orig_ifinfo->rcu, batadv_orig_ifinfo_free_rcu); + batadv_orig_ifinfo_release(orig_ifinfo); } /** -- LinuxNextTracking

1 0

Noticed difference in packet.h in next.diff
by postmaster＠open-mesh.org 18 Jan '16

18 Jan '16

--- batman-adv_next.packet.h 2016-01-19 00:05:01.395991251 +0100 +++ batctl_next.packet.h 2016-01-19 00:05:01.399991517 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found: 2016-01-18
by postmaster＠open-mesh.org 18 Jan '16

18 Jan '16

Name of failed tests ==================== * difference between net-next and batadv next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- net/batman-adv/bat_iv_ogm.c | 18 - net/batman-adv/bitarray.c | 12 - net/batman-adv/bitarray.h | 12 - net/batman-adv/bridge_loop_avoidance.c | 238 ++++++---------------- net/batman-adv/debugfs.c | 6 net/batman-adv/distributed-arp-table.c | 41 +-- net/batman-adv/fragmentation.c | 18 - net/batman-adv/fragmentation.h | 2 net/batman-adv/gateway_client.c | 14 - net/batman-adv/gateway_common.c | 2 net/batman-adv/hard-interface.c | 20 - net/batman-adv/hard-interface.h | 18 + net/batman-adv/hash.h | 22 -- net/batman-adv/main.c | 28 +- net/batman-adv/main.h | 17 - net/batman-adv/multicast.c | 35 +-- net/batman-adv/multicast.h | 2 net/batman-adv/network-coding.c | 74 +++---- net/batman-adv/originator.c | 250 ++++++++++++++---------- net/batman-adv/originator.h | 1 net/batman-adv/packet.h | 17 - net/batman-adv/routing.c | 36 +-- net/batman-adv/send.c | 29 +- net/batman-adv/send.h | 4 net/batman-adv/soft-interface.c | 18 - net/batman-adv/sysfs.c | 15 - net/batman-adv/translation-table.c | 145 +++++-------- net/batman-adv/types.h | 28 +- 28 files changed, 488 insertions(+), 634 deletions(-)

1 0

Noticed difference in packet.h in next.diff
by postmaster＠open-mesh.org 17 Jan '16

17 Jan '16

--- batman-adv_next.packet.h 2016-01-18 00:05:01.206591574 +0100 +++ batctl_next.packet.h 2016-01-18 00:05:01.218592372 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found: 2016-01-17
by postmaster＠open-mesh.org 17 Jan '16

17 Jan '16

1 0

Noticed difference in packet.h in next.diff
by postmaster＠open-mesh.org 16 Jan '16

16 Jan '16

--- batman-adv_next.packet.h 2016-01-17 00:05:01.463241324 +0100 +++ batctl_next.packet.h 2016-01-17 00:05:01.471241857 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found (B.A.T.M.A.N. V): 2016-01-16
by postmaster＠open-mesh.org 16 Jan '16

16 Jan '16

Name of failed tests ==================== * Comment ending without space batman_v Output of different failed tests ================================ Comment ending without space batman_v ------------------------------------- ./net/batman-adv/bat_v_ogm.c:549: /* don't forward the same seqno twice on one interface*/

1 0

Build check errors found: 2016-01-16
by postmaster＠open-mesh.org 16 Jan '16

16 Jan '16

Name of failed tests ==================== * difference between net-next and batadv next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- net/batman-adv/bat_iv_ogm.c | 18 - net/batman-adv/bitarray.c | 12 - net/batman-adv/bitarray.h | 12 - net/batman-adv/bridge_loop_avoidance.c | 227 ++++++------------------ net/batman-adv/debugfs.c | 6 net/batman-adv/distributed-arp-table.c | 41 +--- net/batman-adv/fragmentation.c | 18 - net/batman-adv/fragmentation.h | 2 net/batman-adv/gateway_client.c | 14 - net/batman-adv/gateway_common.c | 2 net/batman-adv/hard-interface.c | 7 net/batman-adv/hash.h | 22 -- net/batman-adv/main.c | 28 +- net/batman-adv/main.h | 17 - net/batman-adv/multicast.c | 37 +-- net/batman-adv/multicast.h | 2 net/batman-adv/network-coding.c | 55 ++--- net/batman-adv/originator.c | 72 ++----- net/batman-adv/packet.h | 17 - net/batman-adv/routing.c | 36 +-- net/batman-adv/send.c | 29 +-- net/batman-adv/send.h | 4 net/batman-adv/soft-interface.c | 18 - net/batman-adv/sysfs.c | 15 - net/batman-adv/translation-table.c | 117 ++++-------- net/batman-adv/types.h | 28 +- 26 files changed, 314 insertions(+), 542 deletions(-)

1 0

Noticed difference in packet.h in next.diff
by postmaster＠open-mesh.org 15 Jan '16

15 Jan '16

--- batman-adv_next.packet.h 2016-01-16 00:05:01.977918754 +0100 +++ batctl_next.packet.h 2016-01-16 00:05:01.985919285 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Coverity Scan: Analysis completed for alfred
by scan-admin＠coverity.com 15 Jan '16

15 Jan '16

Your request for analysis of alfred has been completed successfully. The results are available at https://scan.coverity.com/projects/alfred Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge January 2016