Commit 1af4a119 authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Paolo Bonzini

KVM: SVM: Rename get_max_npt_level() to get_npt_level()

It returns the only proper NPT level, so the "max" in the name
is not appropriate.
Signed-off-by: default avatarLai Jiangshan <laijs@linux.alibaba.com>
Message-Id: <20211118110814.2568-9-jiangshanlai@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent fe26f91d
...@@ -269,7 +269,7 @@ u32 svm_msrpm_offset(u32 msr) ...@@ -269,7 +269,7 @@ u32 svm_msrpm_offset(u32 msr)
#define MAX_INST_SIZE 15 #define MAX_INST_SIZE 15
static int get_max_npt_level(void) static int get_npt_level(void)
{ {
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
return pgtable_l5_enabled() ? PT64_ROOT_5LEVEL : PT64_ROOT_4LEVEL; return pgtable_l5_enabled() ? PT64_ROOT_5LEVEL : PT64_ROOT_4LEVEL;
...@@ -1037,9 +1037,9 @@ static __init int svm_hardware_setup(void) ...@@ -1037,9 +1037,9 @@ static __init int svm_hardware_setup(void)
if (!boot_cpu_has(X86_FEATURE_NPT)) if (!boot_cpu_has(X86_FEATURE_NPT))
npt_enabled = false; npt_enabled = false;
/* Force VM NPT level equal to the host's max NPT level */ /* Force VM NPT level equal to the host's paging level */
kvm_configure_mmu(npt_enabled, get_max_npt_level(), kvm_configure_mmu(npt_enabled, get_npt_level(),
get_max_npt_level(), PG_LEVEL_1G); get_npt_level(), PG_LEVEL_1G);
pr_info("kvm: Nested Paging %sabled\n", npt_enabled ? "en" : "dis"); pr_info("kvm: Nested Paging %sabled\n", npt_enabled ? "en" : "dis");
/* Note, SEV setup consumes npt_enabled. */ /* Note, SEV setup consumes npt_enabled. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment