From 538170d53c1eee701d82bb02abfd7e501167a455 Mon Sep 17 00:00:00 2001
From: Zhiping du <zhipingdu@tencent.com>
Date: Wed, 13 Oct 2021 22:14:15 +0800
Subject: [PATCH] Revert "bpf/cgroup: Replace rcu_swap_protected() with
 rcu_replace_pointer()"

This reverts commit 41c91d0251017135e3ea9cdf5909449546862a0d.
---
 kernel/bpf/cgroup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
index 54de831fe..6fd95f4ca 100644
--- a/kernel/bpf/cgroup.c
+++ b/kernel/bpf/cgroup.c
@@ -183,8 +183,8 @@ static void activate_effective_progs(struct cgroup *cgrp,
 				     enum bpf_attach_type type,
 				     struct bpf_prog_array *old_array)
 {
-	old_array = rcu_replace_pointer(cgrp->bpf.effective[type], old_array,
-					lockdep_is_held(&cgroup_mutex));
+	rcu_swap_protected(cgrp->bpf.effective[type], old_array,
+			   lockdep_is_held(&cgroup_mutex));
 	/* free prog array after grace period, since __cgroup_bpf_run_*()
 	 * might be still walking the array
 	 */