bpf: fix rcu lockdep warning for lpm_trie map_free callback
Subsystems (3)
PATCH v2 1/1 bpf: fix rcu lockdep warning for lpm_trie map_free callback
Commit 9a3efb6b661f ("bpf: fix memory leak in lpm_trie map_free callback function") fixed a memory leak and removed unnecessary locks in map_free callback function. Unfortrunately, it introduced a lockdep warning. When lockdep checking is turned on, running tools/testing/selftests/bpf/test_lpm_map will have:
[ 98.294321] =============================
[ 98.294807] WARNING: suspicious RCU usage
[ 98.295359] 4.16.0-rc2+ #193 Not tainted
[ 98.295907] -----------------------------
[ 98.296486] /home/yhs/work/bpf/kernel/bpf/lpm_trie.c:572 suspicious rcu_dereference_check() usage!
[ 98.297657]
[ 98.297657] other info that might help us debug this:
[ 98.297657]
[ 98.298663]
[ 98.298663] rcu_scheduler_active = 2, debug_locks = 1
[ 98.299536] 2 locks held by kworker/2:1/54:
[ 98.300152] #0: ((wq_completion)"events"){+.+.}, at: [<00000000196bc1f0>] process_one_work+0x157/0x5c0
[ 98.301381] #1: ((work_completion)(&map->work)){+.+.}, at: [<00000000196bc1f0>] process_one_work+0x157/0x5c0Since actual trie tree removal happens only after no other accesses to the tree are possible, replacing
rcu_dereference_protected(*slot, lockdep_is_held(&trie->lock))
with
rcu_dereference_protected(*slot, 1)
fixed the issue.
--- kernel/bpf/lpm_trie.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
v1 -> v2:
. fix sparse warning which is introduced by v1, suggested by Eric.
kernel/bpf/lpm_trie.c +1 -2
@@ -569,8 +569,7 @@ static void trie_free(struct bpf_map *map) slot = &trie->root;for (;;) { - node =rcu_dereference_protected (*slot, -lockdep_is_held (&trie->lock)); + node =rcu_dereference_protected (*slot,1 );if (!node) goto out;
Signature · 1 line
2.9.5
Quoted 22 lines · Yonghong Song
Commit
9a3efb6b661f("bpf: fix memory leak inlpm_triemap_freecallback function") fixed a memory leak and removed unnecessary locks inmap_freecallback function. Unfortrunately, it introduced a lockdep warning. When lockdep checking is turned on, runningtools/testing/selftests/bpf/test_lpm_mapwill have:Fixes 9a3efb6b661f ("bpf: fix memory leak in lpm_trie map_free callback function")Reported-by Eric Dumazet <[email protected]>Suggested-by Eric Dumazet <[email protected]>Signed-off-by Yonghong Song <[email protected]>--- kernel/bpf/lpm_trie.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)v1 -> v2:
. fix sparse warning which is introduced by v1, suggested by Eric.kernel/bpf/lpm_trie.c +0
-0
kernel/bpf/lpm_trie.c static void trie_free(struct bpf_map *map) · line 574
Quoted 8 lines
kernel/bpf/lpm_trie.c +1
-2@@ -569,8 +569,7 @@ static void trie_free(struct bpf_map *map) slot = &trie->root;for (;;) { - node =rcu_dereference_protected (*slot, -lockdep_is_held (&trie->lock)); + node =rcu_dereference_protected (*slot,1 );if (!node) goto out;
SGTM, thanks !
From: Yonghong Song <[email protected]>
Date: Thu, 22 Feb 2018 10:10:35 -0800
Quoted 26 lines
Commit
9a3efb6b661f("bpf: fix memory leak inlpm_triemap_freecallback function") fixed a memory leak and removed unnecessary locks inmap_freecallback function. Unfortrunately, it introduced a lockdep warning. When lockdep checking is turned on, runningtools/testing/selftests/bpf/test_lpm_mapwill have:[ 98.294321] ============================= [ 98.294807] WARNING: suspicious RCU usage [ 98.295359] 4.16.0-rc2+ #193 Not tainted [ 98.295907] ----------------------------- [ 98.296486] /home/yhs/work/bpf/kernel/bpf/lpm_trie.c:572 suspicious rcu_dereference_check() usage! [ 98.297657] [ 98.297657] other info that might help us debug this: [ 98.297657] [ 98.298663] [ 98.298663] rcu_scheduler_active = 2, debug_locks = 1 [ 98.299536] 2 locks held by kworker/2:1/54: [ 98.300152] #0: ((wq_completion)"events"){+.+.}, at: [<00000000196bc1f0>] process_one_work+0x157/0x5c0 [ 98.301381] #1: ((work_completion)(&map->work)){+.+.}, at: [<00000000196bc1f0>] process_one_work+0x157/0x5c0Since actual trie tree removal happens only after no other accesses to the tree are possible, replacing
rcu_dereference_protected(*slot, lockdep_is_held(&trie->lock))
with
rcu_dereference_protected(*slot, 1)
fixed the issue.
Quoted 4 lines
Fixes 9a3efb6b661f ("bpf: fix memory leak in lpm_trie map_free callback function")Reported-by Eric Dumazet <[email protected]>Suggested-by Eric Dumazet <[email protected]>Signed-off-by Yonghong Song <[email protected]>
Quoted 26 lines · Yonghong Song
Commit
9a3efb6b661f("bpf: fix memory leak inlpm_triemap_freecallback function") fixed a memory leak and removed unnecessary locks inmap_freecallback function. Unfortrunately, it introduced a lockdep warning. When lockdep checking is turned on, runningtools/testing/selftests/bpf/test_lpm_mapwill have:[ 98.294321] ============================= [ 98.294807] WARNING: suspicious RCU usage [ 98.295359] 4.16.0-rc2+ #193 Not tainted [ 98.295907] ----------------------------- [ 98.296486] /home/yhs/work/bpf/kernel/bpf/lpm_trie.c:572 suspicious rcu_dereference_check() usage! [ 98.297657] [ 98.297657] other info that might help us debug this: [ 98.297657] [ 98.298663] [ 98.298663] rcu_scheduler_active = 2, debug_locks = 1 [ 98.299536] 2 locks held by kworker/2:1/54: [ 98.300152] #0: ((wq_completion)"events"){+.+.}, at: [<00000000196bc1f0>] process_one_work+0x157/0x5c0 [ 98.301381] #1: ((work_completion)(&map->work)){+.+.}, at: [<00000000196bc1f0>] process_one_work+0x157/0x5c0Since actual trie tree removal happens only after no other accesses to the tree are possible, replacing
rcu_dereference_protected(*slot, lockdep_is_held(&trie->lock))
with
rcu_dereference_protected(*slot, 1)
fixed the issue.
Quoted 4 lines
Fixes 9a3efb6b661f ("bpf: fix memory leak in lpm_trie map_free callback function")Reported-by Eric Dumazet <[email protected]>Suggested-by Eric Dumazet <[email protected]>Signed-off-by Yonghong Song <[email protected]>
Applied to bpf tree, thanks everyone!