提交 fc2036b9 编写于 作者: C Caspar Zhang

mm, memcg: add missing memory stall section in mem_cgroup_handle_over_high

When backporting commit 0e4b01df8659 ("mm, memcg: throttle allocators
when failing reclaim over memory.high"), memory stall section was
inadvertently missing. Fix this issue by adding it back.

Fixes: eda29cc0 ("mm, memcg: throttle allocators when failing reclaim over memory.high")
Signed-off-by: NCaspar Zhang <caspar@linux.alibaba.com>
Acked-by: NJoseph Qi <joseph.qi@linux.alibaba.com>
上级 c9f8166a
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
#include <linux/lockdep.h> #include <linux/lockdep.h>
#include <linux/file.h> #include <linux/file.h>
#include <linux/tracehook.h> #include <linux/tracehook.h>
#include <linux/psi.h>
#include "internal.h" #include "internal.h"
#include <net/sock.h> #include <net/sock.h>
#include <net/ip.h> #include <net/ip.h>
...@@ -2235,6 +2236,7 @@ static void high_work_func(struct work_struct *work) ...@@ -2235,6 +2236,7 @@ static void high_work_func(struct work_struct *work)
void mem_cgroup_handle_over_high(void) void mem_cgroup_handle_over_high(void)
{ {
unsigned long usage, high, clamped_high; unsigned long usage, high, clamped_high;
unsigned long pflags;
unsigned long penalty_jiffies, overage; unsigned long penalty_jiffies, overage;
unsigned int nr_pages = current->memcg_nr_pages_over_high; unsigned int nr_pages = current->memcg_nr_pages_over_high;
struct mem_cgroup *memcg; struct mem_cgroup *memcg;
...@@ -2307,7 +2309,9 @@ void mem_cgroup_handle_over_high(void) ...@@ -2307,7 +2309,9 @@ void mem_cgroup_handle_over_high(void)
* schedule_timeout_killable sets TASK_KILLABLE). This means we don't * schedule_timeout_killable sets TASK_KILLABLE). This means we don't
* need to account for any ill-begotten jiffies to pay them off later. * need to account for any ill-begotten jiffies to pay them off later.
*/ */
psi_memstall_enter(&pflags);
schedule_timeout_killable(penalty_jiffies); schedule_timeout_killable(penalty_jiffies);
psi_memstall_leave(&pflags);
out: out:
css_put(&memcg->css); css_put(&memcg->css);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册