Thread (5 messages) 5 messages, 3 authors, 2021-06-09

Re: [PATCH] mm/page_alloc: fix counting of managed_pages

From: David Hildenbrand <hidden>
Date: 2021-06-09 10:29:52
Also in: lkml

On 27.05.21 14:57, Liu Shixin wrote:
quoted hunk ↗ jump to hunk
The commit f63661566fad (mm/page_alloc.c: clear out zone->lowmem_reserve[]
if the zone is empty) clear out zone->lowmem_reserve[] if zone is empty.
But when zone is not empty and sysctl_lowmem_reserve_ratio[i] is set to zero,
zone_managed_pages(zone) is not counted in the managed_pages either. This is
inconsistent with the description of lowmen_reserve, so fix it.

Fixes: f63661566fad ("mm/page_alloc.c: clear out zone->lowmem_reserve[] if the zone is empty")
Reported-by: yangerkun <redacted>
Signed-off-by: Liu Shixin <redacted>
---
  mm/page_alloc.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index aaa1655cf682..49a2efce5a84 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -8061,14 +8061,14 @@ static void setup_per_zone_lowmem_reserve(void)
  			unsigned long managed_pages = 0;
  
  			for (j = i + 1; j < MAX_NR_ZONES; j++) {
-				if (clear) {
-					zone->lowmem_reserve[j] = 0;
-				} else {
-					struct zone *upper_zone = &pgdat->node_zones[j];
+				struct zone *upper_zone = &pgdat->node_zones[j];
+
+				managed_pages += zone_managed_pages(upper_zone);
  
-					managed_pages += zone_managed_pages(upper_zone);
+				if (clear)
+					zone->lowmem_reserve[j] = 0;
+				else
  					zone->lowmem_reserve[j] = managed_pages / ratio;
-				}
  			}
  		}
  	}
Acked-by: David Hildenbrand <redacted>

-- 
Thanks,

David / dhildenb

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help