From 6c4e1cc32b4523d3f73b137336189764adc2d909 Mon Sep 17 00:00:00 2001 From: Xu Yu Date: Tue, 12 Nov 2019 17:00:58 +0800 Subject: [PATCH 0876/2944] alinux: mm, memcg: account throttle over memory.high for memcg direct reclaim to #26424368 Commit 6202ab24c9666b2f5c3335ec573ff290cb7322e2 ("mm, memcg: throttle allocators when failing reclaim over memory.high") introduces explicit throttling when reclaim is failing to keep memcg size contained at the memory.high setting. Just account this latency on memcg direct reclaim latency histogram. Signed-off-by: Xu Yu Reviewed-by: Xunlei Pang Reviewed-by: Yang Shi --- mm/memcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 8f88aed..fb7bb65 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2463,8 +2463,6 @@ void mem_cgroup_handle_over_high(void) memcg = get_mem_cgroup_from_mm(current->mm); start = ktime_get_ns(); reclaim_high(memcg, nr_pages, GFP_KERNEL); - memcg_lat_stat_update(MEM_LAT_MEMCG_DIRECT_RECLAIM, - (ktime_get_ns() - start)); current->memcg_nr_pages_over_high = 0; /* @@ -2533,6 +2531,8 @@ void mem_cgroup_handle_over_high(void) psi_memstall_leave(&pflags); out: + memcg_lat_stat_update(MEM_LAT_MEMCG_DIRECT_RECLAIM, + (ktime_get_ns() - start)); css_put(&memcg->css); } -- 1.8.3.1