[Devel] [PATCH RH8 3/3] ve/kstat/alloc_lat: Don't separate GFP_HIGHMEM and !GFP_HIGHMEM allocation latencies

[Pavel Tikhomirov]

From: Andrey Ryabinin <aryabinin at virtuozzo.com>

We use mostly 64-bit systems this days. Since they don't have higmem
it's better to not segregate GFP_HIGHMEM and !GFP_HIGHMEM latencies.
For backward compatibility we still output alochigh/alochighmp fields
in /proc/vz/latency but show only zeroes.

https://jira.sw.ru/browse/PSBM-81395
Signed-off-by: Andrey Ryabinin <aryabinin at virtuozzo.com>

https://jira.sw.ru/browse/PSBM-127780
(cherry-picked from commit 1fcbaf6d1fb218104b0e0f0b7958a384fdb4c075)

Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
---
 mm/page_alloc.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 0200cc8c43cf8..4f99e43cbfc94 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4527,16 +4527,11 @@ static void __alloc_collect_stats(gfp_t gfp_mask, unsigned int order,
 	time = jiffies_to_usecs(jiffies - time) * 1000;
 	if (!(gfp_mask & __GFP_RECLAIM))
 		ind = KSTAT_ALLOCSTAT_ATOMIC;
-	else if (!(gfp_mask & __GFP_HIGHMEM))
+	else
 		if (order > 0)
 			ind = KSTAT_ALLOCSTAT_LOW_MP;
 		else
 			ind = KSTAT_ALLOCSTAT_LOW;
-	else
-		if (order > 0)
-			ind = KSTAT_ALLOCSTAT_HIGH_MP;
-		else
-			ind = KSTAT_ALLOCSTAT_HIGH;
 
 	local_irq_save(flags);
 	cpu = smp_processor_id();
-- 
2.30.2