The patch titled
Subject: x86-mm-use-max-memory-block-size-on-bare-metal-v3
has been removed from the -mm tree. Its filename was
x86-mm-use-max-memory-block-size-on-bare-metal-v3.patch
This patch was dropped because it was folded into x86-mm-use-max-memory-block-size-on-bare-metal.patch
------------------------------------------------------
From: Daniel Jordan <daniel.m.jordan@xxxxxxxxxx>
Subject: x86-mm-use-max-memory-block-size-on-bare-metal-v3
Add more accurate hypervisor check. Someone kindly pointed me to
517c3ba00916 ("x86/speculation/mds: Apply more accurate check on
hypervisor platform"), and v2 had the same issue.
Link: http://lkml.kernel.org/r/20200714205450.945834-1-daniel.m.jordan@xxxxxxxxxx
Signed-off-by: Daniel Jordan <daniel.m.jordan@xxxxxxxxxx>
Cc: Andy Lutomirski <luto@xxxxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Steven Sistare <steven.sistare@xxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/mm/init_64.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/arch/x86/mm/init_64.c~x86-mm-use-max-memory-block-size-on-bare-metal-v3
+++ a/arch/x86/mm/init_64.c
@@ -54,7 +54,6 @@
#include <asm/uv/uv.h>
#include <asm/setup.h>
#include <asm/ftrace.h>
-#include <asm/hypervisor.h>
#include "mm_internal.h"
@@ -1410,7 +1409,7 @@ static unsigned long probe_memory_block_
* Use max block size to minimize overhead on bare metal, where
* alignment for memory hotplug isn't a concern.
*/
- if (hypervisor_is_type(X86_HYPER_NATIVE)) {
+ if (!boot_cpu_has(X86_FEATURE_HYPERVISOR)) {
bz = MAX_BLOCK_SIZE;
goto done;
}
_
Patches currently in -mm which might be from daniel.m.jordan@xxxxxxxxxx are
x86-mm-use-max-memory-block-size-on-bare-metal.patch
