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

[Andrey Ryabinin]

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.

https://jira.sw.ru/browse/PSBM-81395
Signed-off-by: Andrey Ryabinin <aryabinin at virtuozzo.com>
---
 include/linux/vzstat.h | 6 ++----
 kernel/ve/vzstat.c     | 6 ++----
 mm/page_alloc.c        | 9 ++-------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/include/linux/vzstat.h b/include/linux/vzstat.h
index fec88011b1d7..f8e806b29cb7 100644
--- a/include/linux/vzstat.h
+++ b/include/linux/vzstat.h
@@ -60,10 +60,8 @@ struct kstat_zone_avg {
 
 enum {
 	KSTAT_ALLOCSTAT_ATOMIC,
-	KSTAT_ALLOCSTAT_LOW,
-	KSTAT_ALLOCSTAT_HIGH,
-	KSTAT_ALLOCSTAT_LOW_MP,
-	KSTAT_ALLOCSTAT_HIGH_MP,
+	KSTAT_ALLOCSTAT,
+	KSTAT_ALLOCSTAT_MP,
 	KSTAT_ALLOCSTAT_NR,
 };
 
diff --git a/kernel/ve/vzstat.c b/kernel/ve/vzstat.c
index 69cbb38210c0..fe966eecc944 100644
--- a/kernel/ve/vzstat.c
+++ b/kernel/ve/vzstat.c
@@ -29,10 +29,8 @@ static struct task_struct *vzstat_thread_tsk;
 
 static const char *alloc_descr[KSTAT_ALLOCSTAT_NR] = {
 	"alocatomic:",
-	"aloclow:",
-	"alochigh:",
-	"aloclowmp:",
-	"alochighmp:"
+	"aloc:",
+	"alocmp:",
 };
 
 /*
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index cd8ed1f5543e..9e68b5cac28b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3147,16 +3147,11 @@ static void __alloc_collect_stats(gfp_t gfp_mask, unsigned int order,
 	time = jiffies_to_usecs(jiffies - time) * 1000;
 	if (!(gfp_mask & __GFP_WAIT))
 		ind = KSTAT_ALLOCSTAT_ATOMIC;
-	else if (!(gfp_mask & __GFP_HIGHMEM))
-		if (order > 0)
-			ind = KSTAT_ALLOCSTAT_LOW_MP;
-		else
-			ind = KSTAT_ALLOCSTAT_LOW;
 	else
 		if (order > 0)
-			ind = KSTAT_ALLOCSTAT_HIGH_MP;
+			ind = KSTAT_ALLOCSTAT_MP;
 		else
-			ind = KSTAT_ALLOCSTAT_HIGH;
+			ind = KSTAT_ALLOCSTAT;
 
 	local_irq_save(flags);
 	cpu = smp_processor_id();
-- 
2.13.6