From cd172d0e4f191a280404fc4972e4b1becb8c7f94 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Sun, 6 Mar 2022 15:44:54 +0800 Subject: [PATCH] mm: do some clean up of accounting ReliableTaskUsed hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I4PM0X CVE: NA ----------------------------------------- Clean up redundant code of accounting ReliableTaskUsed. Signed-off-by: Peng Wu Reviewed-by: Kefeng Wang Reviewed-by: Xie XiuQi Reviewed-by: Wei Li Signed-off-by: Yang Yingliang --- include/linux/mem_reliable.h | 5 +---- mm/mem_reliable.c | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/linux/mem_reliable.h b/include/linux/mem_reliable.h index 3d25770e95cd..ba5d41edbc44 100644 --- a/include/linux/mem_reliable.h +++ b/include/linux/mem_reliable.h @@ -15,7 +15,6 @@ extern struct static_key_false mem_reliable; extern bool reliable_enabled; -extern atomic_long_t reliable_task_used_nr_page; extern unsigned long task_reliable_limit __read_mostly; extern bool reliable_allow_fallback; extern bool shmem_reliable; @@ -76,10 +75,8 @@ static inline bool skip_none_movable_zone(gfp_t gfp, struct zoneref *z) static inline void reliable_page_counter(struct page *page, struct mm_struct *mm, int val) { - if (page_reliable(page)) { + if (page_reliable(page)) atomic_long_add(val, &mm->reliable_nr_page); - atomic_long_add(val, &reliable_task_used_nr_page); - } } static inline bool reliable_mem_limit_check(unsigned long nr_page) diff --git a/mm/mem_reliable.c b/mm/mem_reliable.c index d1d05b32c6ef..62df78657ff9 100644 --- a/mm/mem_reliable.c +++ b/mm/mem_reliable.c @@ -24,7 +24,6 @@ DEFINE_STATIC_KEY_FALSE(mem_reliable); bool reliable_enabled; static atomic_long_t total_reliable_mem; -atomic_long_t reliable_task_used_nr_page; /* reliable user limit for user tasks with reliable flag */ unsigned long task_reliable_limit = ULONG_MAX; bool reliable_allow_fallback __read_mostly = true; -- GitLab