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

!1709 Backport cgroup: fix missing cpus_read_{lock,unlock}() in cgroup_transfer_tasks() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Cai Xinchen <caixinchen1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/U43E5CYQW2P4BHGZV2XOJ7ZIXTTO6VVL/ 
Backport cgroup: fix missing cpus_read_{lock,unlock}() in cgroup_transfer_tasks()
and cgroup: Use cgroup_attach_{lock,unlock}() from cgroup_attach_task_all()

Qi Zheng (1):
  cgroup: fix missing cpus_read_{lock,unlock}() in
    cgroup_transfer_tasks()

Tetsuo Handa (1):
  cgroup: Use cgroup_attach_{lock,unlock}() from
    cgroup_attach_task_all()


-- 
2.17.1
 
https://gitee.com/openeuler/kernel/issues/I7RPDX 
 
Link:https://gitee.com/openeuler/kernel/pulls/1709

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 42640b04 fe36de42

kernel/cgroup/cgroup-internal.h

+2 −0
Original line number Diff line number Diff line
@@ -250,6 +250,8 @@ int cgroup_migrate(struct task_struct *leader, bool threadgroup, 


int cgroup_attach_task(struct cgroup *dst_cgrp, struct task_struct *leader,

		       bool threadgroup);

void cgroup_attach_lock(bool lock_threadgroup);

void cgroup_attach_unlock(bool lock_threadgroup);

struct task_struct *cgroup_procs_write_start(char *buf, bool threadgroup,

					     bool *locked)

	__acquires(&cgroup_threadgroup_rwsem);

kernel/cgroup/cgroup-v1.c

+4 −6
Original line number Diff line number Diff line
@@ -57,8 +57,7 @@ int cgroup_attach_task_all(struct task_struct *from, struct task_struct *tsk) 
	int retval = 0;



	mutex_lock(&cgroup_mutex);

	cpus_read_lock();

	percpu_down_write(&cgroup_threadgroup_rwsem);

	cgroup_attach_lock(true);

	for_each_root(root) {

		struct cgroup *from_cgrp;
@@ -73,8 +72,7 @@ int cgroup_attach_task_all(struct task_struct *from, struct task_struct *tsk) 
		if (retval)

			break;

	}

	percpu_up_write(&cgroup_threadgroup_rwsem);

	cpus_read_unlock();

	cgroup_attach_unlock(true);

	mutex_unlock(&cgroup_mutex);



	return retval;
@@ -109,7 +107,7 @@ int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from) 


	mutex_lock(&cgroup_mutex);



	percpu_down_write(&cgroup_threadgroup_rwsem);

	cgroup_attach_lock(true);



	/* all tasks in @from are being moved, all csets are source */

	spin_lock_irq(&css_set_lock);
@@ -145,7 +143,7 @@ int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from) 
	} while (task && !ret);

out_err:

	cgroup_migrate_finish(&mgctx);

	percpu_up_write(&cgroup_threadgroup_rwsem);

	cgroup_attach_unlock(true);

	mutex_unlock(&cgroup_mutex);

	return ret;

}

kernel/cgroup/cgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -2367,7 +2367,7 @@ EXPORT_SYMBOL_GPL(task_cgroup_path); 
 * write-locking cgroup_threadgroup_rwsem. This allows ->attach() to assume that

 * CPU hotplug is disabled on entry.

 */

static void cgroup_attach_lock(bool lock_threadgroup)

void cgroup_attach_lock(bool lock_threadgroup)

{

	cpus_read_lock();

	if (lock_threadgroup)
@@ -2378,7 +2378,7 @@ static void cgroup_attach_lock(bool lock_threadgroup) 
 * cgroup_attach_unlock - Undo cgroup_attach_lock()

 * @lock_threadgroup: whether to up_write cgroup_threadgroup_rwsem

 */

static void cgroup_attach_unlock(bool lock_threadgroup)

void cgroup_attach_unlock(bool lock_threadgroup)

{

	if (lock_threadgroup)

		percpu_up_write(&cgroup_threadgroup_rwsem);