From 88b64c32007e927a9bdb3be89e6a8d2b73d98e28 Mon Sep 17 00:00:00 2001 From: Ma Wupeng Date: Fri, 6 May 2022 12:14:40 +0000 Subject: [PATCH] mm: Fix reliable task used problem shown in meminfo hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I4SK3S CVE: NA -------------------------------- Previous reliable task used does not contains reliable pagecache pages if pagecache use reliable memory feature is disabled. This will lead to incorrect result because reliable task's pagecache is allocated from mirrored region. With this patch, reliable task used will always contains reliable anon pages and reliable pagecache pages. Signed-off-by: Ma Wupeng Reviewed-by: Kefeng Wang Signed-off-by: Yongqiang Liu --- mm/mem_reliable.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mm/mem_reliable.c b/mm/mem_reliable.c index bca569412685..82a0486ea697 100644 --- a/mm/mem_reliable.c +++ b/mm/mem_reliable.c @@ -196,7 +196,6 @@ static void show_val_kb(struct seq_file *m, const char *s, unsigned long num) void reliable_report_meminfo(struct seq_file *m) { - bool pagecache_enabled = pagecache_reliable_is_enabled(); s64 nr_pagecache_pages = 0; s64 nr_anon_pages = 0; long nr_buddy_pages = 0; @@ -209,8 +208,7 @@ void reliable_report_meminfo(struct seq_file *m) nr_buddy_pages += per_cpu(nr_reliable_buddy_pages, cpu); nr_anon_pages = percpu_counter_sum_positive(&anon_reliable_pages); - if (pagecache_enabled) - nr_pagecache_pages = percpu_counter_sum_positive(&pagecache_reliable_pages); + nr_pagecache_pages = percpu_counter_sum_positive(&pagecache_reliable_pages); show_val_kb(m, "ReliableTotal: ", total_reliable_mem_sz() >> PAGE_SHIFT); @@ -224,7 +222,7 @@ void reliable_report_meminfo(struct seq_file *m) percpu_counter_sum(&reliable_shmem_used_nr_page)); } - if (pagecache_enabled) { + if (pagecache_reliable_is_enabled()) { unsigned long num = 0; num += global_node_page_state(NR_LRU_BASE + LRU_ACTIVE_FILE); -- GitLab