Unverified Commit cf9b8671 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9839 cgroup: Fix AA deadlock caused by cgroup_bpf_release 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Ridong <chenridong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4QRBRK4XD5AJGJF2C3TKWSCDRPCH7YJF/ 
*** BLURB HERE ***

Chen Ridong (1):
  cgroup: Fix AA deadlock caused by cgroup_bpf_release


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/IA4VMT 
 
Link:https://gitee.com/openeuler/kernel/pulls/9839

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents e8ba87cb af4dfe95

kernel/bpf/cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static void cgroup_bpf_release_fn(struct percpu_ref *ref) 
	struct cgroup *cgrp = container_of(ref, struct cgroup, bpf.refcnt);



	INIT_WORK(&cgrp->bpf.release_work, cgroup_bpf_release);

	queue_work(system_wq, &cgrp->bpf.release_work);

	queue_work(cgroup_destroy_wq, &cgrp->bpf.release_work);

}



/* Get underlying bpf_prog of bpf_prog_list entry, regardless if it's through

kernel/cgroup/cgroup-internal.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ extern spinlock_t trace_cgroup_path_lock; 
extern char trace_cgroup_path[TRACE_CGROUP_PATH_LEN];

extern bool cgroup_debug;

extern void __init enable_debug_cgroup(void);

extern struct workqueue_struct *cgroup_destroy_wq;



/*

 * cgroup_path() takes a spin lock. It is good practice not to take

kernel/cgroup/cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ DEFINE_PERCPU_RWSEM(cgroup_threadgroup_rwsem); 
 * destruction work items don't end up filling up max_active of system_wq

 * which may lead to deadlock.

 */

static struct workqueue_struct *cgroup_destroy_wq;

struct workqueue_struct *cgroup_destroy_wq;



/* generate an array of cgroup subsystem pointers */

#define SUBSYS(_x) [_x ## _cgrp_id] = &_x ## _cgrp_subsys,