inet: ping: use hlist_nulls rcu iterator during lookup
Subsystems (3)
PATCH 1/1 inet: ping: use hlist_nulls rcu iterator during lookup
ping_lookup() does not acquire the table spinlock, so iteration should use hlist_nulls_for_each_entry_rcu().
Spotted during code review.
Fixes dbca1596bbb0 ("ping: convert to RCU lookups, get rid of rwlock")
Cc Eric Dumazet <[email protected]>
Signed-off-by Florian Westphal <[email protected]>
--- .clang-format | 1 + include/net/ping.h | 3 --- net/ipv4/ping.c | 7 ++++++- 3 files changed, 7 insertions(+), 4 deletions(-)
.clang-format +1 -0
@@ -535,6 +535,7 @@ ForEachMacros: - 'perf_hpp_list__for_each_sort_list_safe' - 'perf_pmu__for_each_hybrid_pmu' - 'ping_portaddr_for_each_entry' + - 'ping_portaddr_for_each_entry_rcu' - 'plist_for_each' - 'plist_for_each_continue' - 'plist_for_each_entry'
include/net/ping.h +0 -3
@@ -16,9 +16,6 @@#define PING_HTABLE_SIZE 64#define PING_HTABLE_MASK (PING_HTABLE_SIZE-1) -#define ping_portaddr_for_each_entry (__sk, node, list) \ - hlist_nulls_for_each_entry(__sk, node, list, sk_nulls_node) -/* * gid_t is either uint or ushort. We want to pass it to * proc_dointvec_minmax(), so it must not be larger than MAX_INT
net/ipv4/ping.c +6 -1
@@ -49,6 +49,11 @@#include <net/transp_v6.h> #endif +#define ping_portaddr_for_each_entry (__sk, node, list) \ + hlist_nulls_for_each_entry(__sk, node, list, sk_nulls_node) +#define ping_portaddr_for_each_entry_rcu (__sk, node, list) \ + hlist_nulls_for_each_entry_rcu(__sk, node, list, sk_nulls_node) +struct ping_table {struct hlist_nulls_head hash[PING_HTABLE_SIZE ];spinlock_t lock;
@@ -192,7 +197,7 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident)return NULL ; } -ping_portaddr_for_each_entry (sk, hnode, hslot) { +ping_portaddr_for_each_entry_rcu (sk, hnode, hslot) { isk =inet_sk (sk);pr_debug ("iterate\n" );
Signature · 1 line
2.37.4
This patch was applied to netdev/net.git (master) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Paolo Abeni <[email protected]>:
Quoted 10 lines · On Tue, 29 Nov 2022 15:06:44 +0100 you wrote:
ping_lookup()does not acquire the table spinlock, so iteration should usehlist_nulls_for_each_entry_rcu().Spotted during code review.
Fixes dbca1596bbb0 ("ping: convert to RCU lookups, get rid of rwlock")Cc Eric Dumazet <[email protected]>Signed-off-by Florian Westphal <[email protected]>[...]
Here is the summary with links:
- [net] inet: ping: use hlist_nulls rcu iterator during lookup
https://git.kernel.org/netdev/net/c/c25b7a7a565e
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html