[PATCH v2] mm: memcontrol: fix missing wakeup polling thread

[PATCH v2] mm: memcontrol: fix missing wakeup polling thread

[Muchun Song]

When wen poll the swap.events, we can miss being waked up when the swap
event occurs. Because we didn't notify.

Fixes: f3a53a3a1e5b ("mm, memcontrol: implement memory.swap.events")
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
---
 changelog in v2:
 - Fix problem, thanks Johannes.

 include/linux/memcontrol.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 0f4dd7829fb2..4f7821be5561 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -1074,12 +1074,19 @@ static inline void count_memcg_event_mm(struct mm_struct *mm,
 static inline void memcg_memory_event(struct mem_cgroup *memcg,
 				      enum memcg_memory_event event)
 {
+	bool swap_event = event == MEMCG_SWAP_HIGH || event == MEMCG_SWAP_MAX ||
+			  event == MEMCG_SWAP_FAIL;
+
 	atomic_long_inc(&memcg->memory_events_local[event]);
-	cgroup_file_notify(&memcg->events_local_file);
+	if (!swap_event)
+		cgroup_file_notify(&memcg->events_local_file);
 
 	do {
 		atomic_long_inc(&memcg->memory_events[event]);
-		cgroup_file_notify(&memcg->events_file);
+		if (swap_event)
+			cgroup_file_notify(&memcg->swap_events_file);
+		else
+			cgroup_file_notify(&memcg->events_file);
 
 		if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))
 			break;
-- 
2.20.1

Re: [PATCH v2] mm: memcontrol: fix missing wakeup polling thread

[Johannes Weiner]

On Fri, Nov 06, 2020 at 12:19:36AM +0800, Muchun Song wrote:
> When wen poll the swap.events, we can miss being waked up when the swap
> event occurs. Because we didn't notify.
> 
> Fixes: f3a53a3a1e5b ("mm, memcontrol: implement memory.swap.events")
> Signed-off-by: Muchun Song <songmuchun@bytedance.com>

Cool, thanks!

Acked-by: Johannes Weiner <hannes@cmpxchg.org>

Re: [PATCH v2] mm: memcontrol: fix missing wakeup polling thread

[Shakeel Butt]

On Thu, Nov 5, 2020 at 8:20 AM Muchun Song <songmuchun@bytedance.com> wrote:
>
> When wen poll the swap.events,

we*

> we can miss being waked up when the swap

being woken up

> event occurs. Because we didn't notify.
>
> Fixes: f3a53a3a1e5b ("mm, memcontrol: implement memory.swap.events")
> Signed-off-by: Muchun Song <songmuchun@bytedance.com>

Reviewed-by: Shakeel Butt <shakeelb@google.com>