1 files changed, 8 insertions, 3 deletions

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 217cec4e22c6..ef9cfbfc82a9 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -4955,8 +4955,6 @@ static void css_release_work_fn(struct work_struct *work)
                 if (cgrp->kn)
                         RCU_INIT_POINTER(*(void __rcu __force **)&cgrp->kn->priv,
                                          NULL);
-
-                cgroup_bpf_put(cgrp);
         }
 
         mutex_unlock(&cgroup_mutex);
@@ -5482,6 +5480,8 @@ static int cgroup_destroy_locked(struct cgroup *cgrp)
 
         cgroup1_check_for_release(parent);
 
+        cgroup_bpf_offline(cgrp);
+
         /* put the base reference */
         percpu_ref_kill(&cgrp->self.refcnt);
 
@@ -6221,6 +6221,7 @@ void cgroup_sk_alloc(struct sock_cgroup_data *skcd)
                  * Don't use cgroup_get_live().
                  */
                 cgroup_get(sock_cgroup_ptr(skcd));
+                cgroup_bpf_get(sock_cgroup_ptr(skcd));
                 return;
         }
 
@@ -6232,6 +6233,7 @@ void cgroup_sk_alloc(struct sock_cgroup_data *skcd)
                 cset = task_css_set(current);
                 if (likely(cgroup_tryget(cset->dfl_cgrp))) {
                         skcd->val = (unsigned long)cset->dfl_cgrp;
+                        cgroup_bpf_get(cset->dfl_cgrp);
                         break;
                 }
                 cpu_relax();
@@ -6242,7 +6244,10 @@ void cgroup_sk_alloc(struct sock_cgroup_data *skcd)
 
 void cgroup_sk_free(struct sock_cgroup_data *skcd)
 {
-        cgroup_put(sock_cgroup_ptr(skcd));
+        struct cgroup *cgrp = sock_cgroup_ptr(skcd);
+
+        cgroup_bpf_put(cgrp);
+        cgroup_put(cgrp);
 }
 
 #endif  /* CONFIG_SOCK_CGROUP_DATA */