public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Lai Jiangshan <jiangshanlai@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: kvm@vger.kernel.org, Lai Jiangshan <laijs@linux.alibaba.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Sean Christopherson <seanjc@google.com>,
	Vitaly Kuznetsov <vkuznets@redhat.com>,
	Wanpeng Li <wanpengli@tencent.com>,
	Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH 08/15] KVM: SVM: Rename get_max_npt_level() to get_npt_level()
Date: Thu, 18 Nov 2021 19:08:07 +0800	[thread overview]
Message-ID: <20211118110814.2568-9-jiangshanlai@gmail.com> (raw)
In-Reply-To: <20211118110814.2568-1-jiangshanlai@gmail.com>

From: Lai Jiangshan <laijs@linux.alibaba.com>

It returns the only proper NPT level, so the "max" in the name
is not appropriate.

Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com>
---
 arch/x86/kvm/svm/svm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 943da8a7d850..33b434fd5d9b 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -265,7 +265,7 @@ u32 svm_msrpm_offset(u32 msr)
 
 #define MAX_INST_SIZE 15
 
-static int get_max_npt_level(void)
+static int get_npt_level(void)
 {
 #ifdef CONFIG_X86_64
 	return pgtable_l5_enabled() ? PT64_ROOT_5LEVEL : PT64_ROOT_4LEVEL;
@@ -1029,9 +1029,9 @@ static __init int svm_hardware_setup(void)
 	if (!boot_cpu_has(X86_FEATURE_NPT))
 		npt_enabled = false;
 
-	/* Force VM NPT level equal to the host's max NPT level */
-	kvm_configure_mmu(npt_enabled, get_max_npt_level(),
-			  get_max_npt_level(), PG_LEVEL_1G);
+	/* Force VM NPT level equal to the host's paging level */
+	kvm_configure_mmu(npt_enabled, get_npt_level(),
+			  get_npt_level(), PG_LEVEL_1G);
 	pr_info("kvm: Nested Paging %sabled\n", npt_enabled ? "en" : "dis");
 
 	/* Note, SEV setup consumes npt_enabled. */
-- 
2.19.1.6.gb485710b


  parent reply	other threads:[~2021-11-18 11:11 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-18 11:07 [PATCH 00/15] KVM: X86: Miscellaneous cleanups Lai Jiangshan
2021-11-18 11:08 ` [PATCH 01/15] KVM: VMX: Use x86 core API to access to fs_base and inactive gs_base Lai Jiangshan
2021-11-18 16:05   ` Paolo Bonzini
2021-11-21 15:17   ` Thomas Gleixner
2021-11-22  3:27     ` Lai Jiangshan
2021-11-18 11:08 ` [PATCH 02/15] KVM: VMX: Avoid to rdmsrl(MSR_IA32_SYSENTER_ESP) Lai Jiangshan
2021-11-18 11:18   ` Paolo Bonzini
2021-11-18 14:17     ` Lai Jiangshan
2021-11-18 14:38       ` Paolo Bonzini
2021-11-18 11:08 ` [PATCH 03/15] KVM: VMX: Update msr value after kvm_set_user_return_msr() succeeds Lai Jiangshan
2021-11-18 11:08 ` [PATCH 04/15] KVM: VMX: Save HOST_CR3 in vmx_prepare_switch_to_guest() Lai Jiangshan
2021-11-18 11:08 ` [PATCH 05/15] KVM: VMX: Add document to state that write to uret msr should always be intercepted Lai Jiangshan
2021-11-18 16:05   ` Paolo Bonzini
2021-12-07 20:38     ` Sean Christopherson
2021-11-18 11:08 ` [PATCH 06/15] KVM: VMX: Use kvm_set_msr_common() for MSR_IA32_TSC_ADJUST in the default way Lai Jiangshan
2021-11-18 11:08 ` [PATCH 07/15] KVM: VMX: Change comments about vmx_get_msr() Lai Jiangshan
2021-11-18 11:08 ` Lai Jiangshan [this message]
2021-11-18 11:08 ` [PATCH 09/15] KVM: SVM: Allocate sd->save_area with __GFP_ZERO Lai Jiangshan
2021-11-18 11:08 ` [PATCH 10/15] KVM: X86: Skip allocating pae_root for vcpu->arch.guest_mmu when !tdp_enabled Lai Jiangshan
2021-11-18 11:08 ` [PATCH 11/15] KVM: X86: Fix comment in __kvm_mmu_create() Lai Jiangshan
2021-11-18 11:08 ` [PATCH 12/15] KVM: X86: Remove unused declaration of __kvm_mmu_free_some_pages() Lai Jiangshan
2021-11-18 11:08 ` [PATCH 13/15] KVM: X86: Remove useless code to set role.gpte_is_8_bytes when role.direct Lai Jiangshan
2021-11-18 11:08 ` [PATCH 14/15] KVM: X86: Calculate quadrant when !role.gpte_is_8_bytes Lai Jiangshan
2021-11-18 11:08 ` [PATCH 15/15] KVM: X86: Always set gpte_is_8_bytes when direct map Lai Jiangshan
2021-11-18 11:12   ` Paolo Bonzini
2021-11-18 14:34     ` Lai Jiangshan
2021-11-18 15:01       ` Paolo Bonzini
2021-11-19 10:30         ` Lai Jiangshan
2021-11-19 10:34           ` Paolo Bonzini
2021-11-19 10:42             ` Lai Jiangshan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211118110814.2568-9-jiangshanlai@gmail.com \
    --to=jiangshanlai@gmail.com \
    --cc=bp@alien8.de \
    --cc=dave.hansen@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=jmattson@google.com \
    --cc=joro@8bytes.org \
    --cc=kvm@vger.kernel.org \
    --cc=laijs@linux.alibaba.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=seanjc@google.com \
    --cc=tglx@linutronix.de \
    --cc=vkuznets@redhat.com \
    --cc=wanpengli@tencent.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox