The commit is pushed to "branch-rh8-4.18.0-240.1.1.vz8.5.x-ovz" and will appear
at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-240.1.1.vz8.5.26
------>
commit b6e8275430472a5f5de5f531ebe7f46cb947ad9e
Author: Andrey Ryabinin <[email protected]>
Date: Thu May 6 00:55:03 2021 +0300
ve/kstat/alloc_lat: Don't separate GFP_HIGHMEM and !GFP_HIGHMEM allocation
latencies
We use mostly 64-bit systems this days. Since they don't have highmem
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 <[email protected]>
https://jira.sw.ru/browse/PSBM-127780
(cherry-picked from vz7 commit 1fcbaf6d1fb2 ("ve/kstat/alloc_lat: Don't
separate
GFP_HIGHMEM and !GFP_HIGHMEM allocation latencies"))
Signed-off-by: Pavel Tikhomirov <[email protected]>
---
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 28f06ac65096..2f5c6d156fbf 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();
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
