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

!14648 memcg: fix soft lockup in the OOM process 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Ridong <chenridong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/U7P5TUUI5QCRB53LM7JSWUA3IHWLLV36/ 
 
https://gitee.com/openeuler/kernel/issues/IBE42N 
 
Link:https://gitee.com/openeuler/kernel/pulls/14648

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents aae2f80e d05e98f5

mm/memcontrol.c

+6 −1
Original line number Diff line number Diff line
@@ -1322,6 +1322,7 @@ void mem_cgroup_scan_tasks(struct mem_cgroup *memcg, 
{

	struct mem_cgroup *iter;

	int ret = 0;

	int i = 0;



	BUG_ON(mem_cgroup_is_root(memcg));
@@ -1330,8 +1331,12 @@ void mem_cgroup_scan_tasks(struct mem_cgroup *memcg, 
		struct task_struct *task;



		css_task_iter_start(&iter->css, CSS_TASK_ITER_PROCS, &it);

		while (!ret && (task = css_task_iter_next(&it)))

		while (!ret && (task = css_task_iter_next(&it))) {

			/* Avoid potential softlockup warning */

			if ((++i & 1023) == 0)

				cond_resched();

			ret = fn(task, arg);

		}

		css_task_iter_end(&it);

		if (ret) {

			mem_cgroup_iter_break(memcg, iter);

mm/oom_kill.c

+7 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <linux/kthread.h>

#include <linux/init.h>

#include <linux/mmu_notifier.h>

#include <linux/nmi.h>



#include <asm/tlb.h>

#include "internal.h"
@@ -482,10 +483,15 @@ static void dump_tasks(struct oom_control *oc) 
		memcg_print_bad_task(oc);

	} else {

		struct task_struct *p;

		int i = 0;



		rcu_read_lock();

		for_each_process(p)

		for_each_process(p) {

			/* Avoid potential softlockup warning */

			if ((++i & 1023) == 0)

				touch_softlockup_watchdog();

			dump_task(p, oc);

		}

		rcu_read_unlock();

	}

}