Skip to content

Commit 6092f72

Browse files
committed
bpf/cgroup: Replace rcu_swap_protected() with rcu_replace_pointer()
This commit replaces the use of rcu_swap_protected() with the more intuitively appealing rcu_replace_pointer() as a step towards removing rcu_swap_protected(). Link: https://lore.kernel.org/lkml/CAHk-=wiAsJLw1egFEE=Z7-GGtM6wcvtyytXZA1+BHqta4gg6Hw@mail.gmail.com/ Reported-by: Linus Torvalds <[email protected]> [ paulmck: From rcu_replace() to rcu_replace_pointer() per Ingo Molnar. ] Signed-off-by: Paul E. McKenney <[email protected]> Acked-by: Andrii Nakryiko <[email protected]> Acked-by: Song Liu <[email protected]> Cc: Alexei Starovoitov <[email protected]> Cc: Daniel Borkmann <[email protected]> Cc: Martin KaFai Lau <[email protected]> Cc: Yonghong Song <[email protected]> Cc: <[email protected]> Cc: <[email protected]>
1 parent 62860da commit 6092f72

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kernel/bpf/cgroup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ static void activate_effective_progs(struct cgroup *cgrp,
180180
enum bpf_attach_type type,
181181
struct bpf_prog_array *old_array)
182182
{
183-
rcu_swap_protected(cgrp->bpf.effective[type], old_array,
184-
lockdep_is_held(&cgroup_mutex));
183+
old_array = rcu_replace_pointer(cgrp->bpf.effective[type], old_array,
184+
lockdep_is_held(&cgroup_mutex));
185185
/* free prog array after grace period, since __cgroup_bpf_run_*()
186186
* might be still walking the array
187187
*/

0 commit comments

Comments
 (0)