From: Antonio Quartulli <a@unstable.cc> To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Sven Eckelmann <sven@narfation.org>, Marek Lindner <mareklindner@neomailbox.ch>, Antonio Quartulli <a@unstable.cc> Subject: [PATCH 7/8] batman-adv: Drop immediate batadv_hard_iface free function Date: Sun, 17 Jan 2016 13:24:40 +0800 [thread overview] Message-ID: <1453008281-15396-8-git-send-email-a@unstable.cc> (raw) In-Reply-To: <1453008281-15396-1-git-send-email-a@unstable.cc> From: Sven Eckelmann <sven@narfation.org> 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_hardif_free_ref. Fixes: 89652331c00f ("batman-adv: split tq information in neigh_node struct") Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Antonio Quartulli <a@unstable.cc> --- net/batman-adv/hard-interface.h | 12 ------------ net/batman-adv/originator.c | 15 +++++++-------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h index 5a31420513e1..7b12ea8ea29d 100644 --- a/net/batman-adv/hard-interface.h +++ b/net/batman-adv/hard-interface.h @@ -75,18 +75,6 @@ batadv_hardif_free_ref(struct batadv_hard_iface *hard_iface) call_rcu(&hard_iface->rcu, batadv_hardif_free_rcu); } -/** - * batadv_hardif_free_ref_now - decrement the hard interface refcounter and - * possibly free it (without rcu callback) - * @hard_iface: the hard interface to free - */ -static inline void -batadv_hardif_free_ref_now(struct batadv_hard_iface *hard_iface) -{ - if (atomic_dec_and_test(&hard_iface->refcount)) - batadv_hardif_free_rcu(&hard_iface->rcu); -} - static inline struct batadv_hard_iface * batadv_primary_if_get_selected(struct batadv_priv *bat_priv) { diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index f68333586681..6fdef842ba2a 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -215,18 +215,17 @@ void batadv_hardif_neigh_free_ref(struct batadv_hardif_neigh_node *hardif_neigh) } /** - * batadv_neigh_node_free_rcu - free the neigh_node - * @rcu: rcu pointer of the neigh_node + * batadv_neigh_node_release - release neigh_node from lists and queue for + * free after rcu grace period + * @neigh_node: neigh neighbor to free */ -static void batadv_neigh_node_free_rcu(struct rcu_head *rcu) +static void batadv_neigh_node_release(struct batadv_neigh_node *neigh_node) { struct hlist_node *node_tmp; - struct batadv_neigh_node *neigh_node; struct batadv_hardif_neigh_node *hardif_neigh; struct batadv_neigh_ifinfo *neigh_ifinfo; struct batadv_algo_ops *bao; - neigh_node = container_of(rcu, struct batadv_neigh_node, rcu); bao = neigh_node->orig_node->bat_priv->bat_algo_ops; hlist_for_each_entry_safe(neigh_ifinfo, node_tmp, @@ -245,9 +244,9 @@ static void batadv_neigh_node_free_rcu(struct rcu_head *rcu) if (bao->bat_neigh_free) bao->bat_neigh_free(neigh_node); - batadv_hardif_free_ref_now(neigh_node->if_incoming); + batadv_hardif_free_ref(neigh_node->if_incoming); - kfree(neigh_node); + kfree_rcu(neigh_node, rcu); } /** @@ -258,7 +257,7 @@ static void batadv_neigh_node_free_rcu(struct rcu_head *rcu) void batadv_neigh_node_free_ref(struct batadv_neigh_node *neigh_node) { if (atomic_dec_and_test(&neigh_node->refcount)) - call_rcu(&neigh_node->rcu, batadv_neigh_node_free_rcu); + batadv_neigh_node_release(neigh_node); } /** -- 2.7.0
WARNING: multiple messages have this Message-ID (diff)
From: Antonio Quartulli <a@unstable.cc> To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Antonio Quartulli <a@unstable.cc>, Marek Lindner <mareklindner@neomailbox.ch> Subject: [B.A.T.M.A.N.] [PATCH 7/8] batman-adv: Drop immediate batadv_hard_iface free function Date: Sun, 17 Jan 2016 13:24:40 +0800 [thread overview] Message-ID: <1453008281-15396-8-git-send-email-a@unstable.cc> (raw) In-Reply-To: <1453008281-15396-1-git-send-email-a@unstable.cc> From: Sven Eckelmann <sven@narfation.org> 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_hardif_free_ref. Fixes: 89652331c00f ("batman-adv: split tq information in neigh_node struct") Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Antonio Quartulli <a@unstable.cc> --- net/batman-adv/hard-interface.h | 12 ------------ net/batman-adv/originator.c | 15 +++++++-------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h index 5a31420513e1..7b12ea8ea29d 100644 --- a/net/batman-adv/hard-interface.h +++ b/net/batman-adv/hard-interface.h @@ -75,18 +75,6 @@ batadv_hardif_free_ref(struct batadv_hard_iface *hard_iface) call_rcu(&hard_iface->rcu, batadv_hardif_free_rcu); } -/** - * batadv_hardif_free_ref_now - decrement the hard interface refcounter and - * possibly free it (without rcu callback) - * @hard_iface: the hard interface to free - */ -static inline void -batadv_hardif_free_ref_now(struct batadv_hard_iface *hard_iface) -{ - if (atomic_dec_and_test(&hard_iface->refcount)) - batadv_hardif_free_rcu(&hard_iface->rcu); -} - static inline struct batadv_hard_iface * batadv_primary_if_get_selected(struct batadv_priv *bat_priv) { diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index f68333586681..6fdef842ba2a 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -215,18 +215,17 @@ void batadv_hardif_neigh_free_ref(struct batadv_hardif_neigh_node *hardif_neigh) } /** - * batadv_neigh_node_free_rcu - free the neigh_node - * @rcu: rcu pointer of the neigh_node + * batadv_neigh_node_release - release neigh_node from lists and queue for + * free after rcu grace period + * @neigh_node: neigh neighbor to free */ -static void batadv_neigh_node_free_rcu(struct rcu_head *rcu) +static void batadv_neigh_node_release(struct batadv_neigh_node *neigh_node) { struct hlist_node *node_tmp; - struct batadv_neigh_node *neigh_node; struct batadv_hardif_neigh_node *hardif_neigh; struct batadv_neigh_ifinfo *neigh_ifinfo; struct batadv_algo_ops *bao; - neigh_node = container_of(rcu, struct batadv_neigh_node, rcu); bao = neigh_node->orig_node->bat_priv->bat_algo_ops; hlist_for_each_entry_safe(neigh_ifinfo, node_tmp, @@ -245,9 +244,9 @@ static void batadv_neigh_node_free_rcu(struct rcu_head *rcu) if (bao->bat_neigh_free) bao->bat_neigh_free(neigh_node); - batadv_hardif_free_ref_now(neigh_node->if_incoming); + batadv_hardif_free_ref(neigh_node->if_incoming); - kfree(neigh_node); + kfree_rcu(neigh_node, rcu); } /** @@ -258,7 +257,7 @@ static void batadv_neigh_node_free_rcu(struct rcu_head *rcu) void batadv_neigh_node_free_ref(struct batadv_neigh_node *neigh_node) { if (atomic_dec_and_test(&neigh_node->refcount)) - call_rcu(&neigh_node->rcu, batadv_neigh_node_free_rcu); + batadv_neigh_node_release(neigh_node); } /** -- 2.7.0
next prev parent reply other threads:[~2016-01-17 5:27 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-17 5:24 [B.A.T.M.A.N.] pull request [net]: batman-adv 20160117 Antonio Quartulli 2016-01-17 5:24 ` [PATCH 1/8] batman-adv: Avoid recursive call_rcu for batadv_bla_claim Antonio Quartulli 2016-01-17 5:24 ` [B.A.T.M.A.N.] " Antonio Quartulli 2016-01-17 5:24 ` [B.A.T.M.A.N.] [PATCH 2/8] batman-adv: Avoid recursive call_rcu for batadv_nc_node Antonio Quartulli 2016-01-17 5:24 ` Antonio Quartulli 2016-01-17 5:24 ` [PATCH 3/8] batman-adv: Drop immediate batadv_orig_ifinfo free function Antonio Quartulli 2016-01-17 5:24 ` [B.A.T.M.A.N.] " Antonio Quartulli 2016-01-17 5:24 ` [B.A.T.M.A.N.] [PATCH 4/8] batman-adv: Drop immediate batadv_neigh_node " Antonio Quartulli 2016-01-17 5:24 ` Antonio Quartulli 2016-01-17 5:24 ` [B.A.T.M.A.N.] [PATCH 5/8] batman-adv: Drop immediate batadv_hardif_neigh_node " Antonio Quartulli 2016-01-17 5:24 ` Antonio Quartulli 2016-01-17 5:24 ` [PATCH 6/8] batman-adv: Drop immediate neigh_ifinfo " Antonio Quartulli 2016-01-17 5:24 ` [B.A.T.M.A.N.] " Antonio Quartulli 2016-01-17 5:24 ` Antonio Quartulli [this message] 2016-01-17 5:24 ` [B.A.T.M.A.N.] [PATCH 7/8] batman-adv: Drop immediate batadv_hard_iface " Antonio Quartulli 2016-01-17 5:24 ` [PATCH 8/8] batman-adv: Drop immediate orig_node " Antonio Quartulli 2016-01-17 5:24 ` [B.A.T.M.A.N.] " Antonio Quartulli [not found] ` <1453008281-15396-1-git-send-email-a-2CpIooy/SPIKlTDg6p0iyA@public.gmane.org> 2016-01-17 6:04 ` pull request [net]: batman-adv 20160117 David Miller 2016-01-17 6:04 ` [B.A.T.M.A.N.] " David Miller 2016-01-17 6:12 ` Antonio Quartulli [not found] ` <569B30D0.2040406-2CpIooy/SPIKlTDg6p0iyA@public.gmane.org> 2016-01-17 16:39 ` David Miller 2016-01-17 16:39 ` [B.A.T.M.A.N.] " David Miller 2016-01-17 6:12 ` Antonio Quartulli
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1453008281-15396-8-git-send-email-a@unstable.cc \ --to=a@unstable.cc \ --cc=b.a.t.m.a.n@lists.open-mesh.org \ --cc=davem@davemloft.net \ --cc=mareklindner@neomailbox.ch \ --cc=netdev@vger.kernel.org \ --cc=sven@narfation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.