diff mbox series

[06/21] KVM: x86/mmu: Get rid of is_cpuid_PSE36()

Message ID	20230202182809.1929122-7-bgardon@google.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Date: Thu, 2 Feb 2023 18:27:54 +0000 In-Reply-To: <20230202182809.1929122-1-bgardon@google.com> Mime-Version: 1.0 References: <20230202182809.1929122-1-bgardon@google.com> Message-ID: <20230202182809.1929122-7-bgardon@google.com> Subject: [PATCH 06/21] KVM: x86/mmu: Get rid of is_cpuid_PSE36() From: Ben Gardon <bgardon@google.com> To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini <pbonzini@redhat.com>, Peter Xu <peterx@redhat.com>, Sean Christopherson <seanjc@google.com>, David Matlack <dmatlack@google.com>, Vipin Sharma <vipinsh@google.com>, Ricardo Koller <ricarkol@google.com>, Ben Gardon <bgardon@google.com> Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	KVM: x86/MMU: Formalize the Shadow MMU \| [00/21] KVM: x86/MMU: Formalize the Shadow MMU [01/21] KVM: x86/mmu: Rename slot rmap walkers to add clarity and clean up code [02/21] KVM: x86/mmu: Replace comment with an actual lockdep assertion on mmu_lock [03/21] KVM: x86/mmu: Clean up mmu.c functions that put return type on separate line [04/21] KVM: x86/MMU: Add shadow_mmu.(c\|h) [05/21] KVM: x86/MMU: Expose functions for the Shadow MMU [06/21] KVM: x86/mmu: Get rid of is_cpuid_PSE36() [07/21] KVM: x86/MMU: Move the Shadow MMU implementation to shadow_mmu.c [08/21] KVM: x86/MMU: Expose functions for paging_tmpl.h [09/21] KVM: x86/MMU: Move paging_tmpl.h includes to shadow_mmu.c [10/21] KVM: x86/MMU: Clean up Shadow MMU exports [11/21] KVM: x86/MMU: Cleanup shrinker interface with Shadow MMU [12/21] KVM: x86/MMU: Clean up naming of exported Shadow MMU functions [13/21] KVM: x86/MMU: Fix naming on prepare / commit zap page functions [14/21] KVM: x86/MMU: Factor Shadow MMU wrprot / clear dirty ops out of mmu.c [15/21] KVM: x86/MMU: Remove unneeded exports from shadow_mmu.c [16/21] KVM: x86/MMU: Wrap uses of kvm_handle_gfn_range in mmu.c [17/21] KVM: x86/MMU: Add kvm_shadow_mmu_ to the last few functions in shadow_mmu.h [18/21] KVM: x86/mmu: Move split cache topup functions to shadow_mmu.c [19/21] KVM: x86/mmu: Move Shadow MMU part of kvm_mmu_zap_all() to shadow_mmu.h [20/21] KVM: x86/mmu: Move Shadow MMU init/teardown to shadow_mmu.c [21/21] KVM: x86/mmu: Split out Shadow MMU lockless walk begin/end

Commit Message

Ben Gardon Feb. 2, 2023, 6:27 p.m. UTC

  is_cpuid_PSE36() always returns 1 and is never overridden, so just get
rid of the function. This saves having to export it in a future commit
in order to move the include of paging_tmpl.h out of mmu.c.

No functional change intended.

Suggested-by: David Matlack <dmatlack@google.com>

Signed-off-by: Ben Gardon <bgardon@google.com>
---
 arch/x86/kvm/mmu/mmu.c         | 13 ++-----------
 arch/x86/kvm/mmu/paging_tmpl.h |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

Comments

Sean Christopherson March 20, 2023, 6:51 p.m. UTC | #1

On Thu, Feb 02, 2023, Ben Gardon wrote:
> is_cpuid_PSE36() always returns 1 and is never overridden, so just get
> rid of the function. This saves having to export it in a future commit
> in order to move the include of paging_tmpl.h out of mmu.c.

Probably won't matter as I suspect this series is going to end up a burner way
in the back, but FWIW I'd prefer to preserve is_cpuid_PSE36() in some capacity.
I 100% agree the helper is silly, but the mere existice of the flag is so esoteric
these days that I like having obvious/obnoxious code to call it out.

diff mbox series

Patch

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 12d38a8772a80..35cb59737c0a3 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -304,11 +304,6 @@  static bool check_mmio_spte(struct kvm_vcpu *vcpu, u64 spte)
 	return likely(kvm_gen == spte_gen);
 }
 
-static int is_cpuid_PSE36(void)
-{
-	return 1;
-}
-
 #ifdef CONFIG_X86_64
 static void __set_spte(u64 *sptep, u64 spte)
 {
@@ -4661,12 +4656,8 @@  static void __reset_rsvds_bits_mask(struct rsvd_bits_validate *rsvd_check,
 			break;
 		}
 
-		if (is_cpuid_PSE36())
-			/* 36bits PSE 4MB page */
-			rsvd_check->rsvd_bits_mask[1][1] = rsvd_bits(17, 21);
-		else
-			/* 32 bits PSE 4MB page */
-			rsvd_check->rsvd_bits_mask[1][1] = rsvd_bits(13, 21);
+		/* 36bits PSE 4MB page */
+		rsvd_check->rsvd_bits_mask[1][1] = rsvd_bits(17, 21);
 		break;
 	case PT32E_ROOT_LEVEL:
 		rsvd_check->rsvd_bits_mask[0][2] = rsvd_bits(63, 63) |
diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h
index e5662dbd519c4..730b413eebfde 100644
--- a/arch/x86/kvm/mmu/paging_tmpl.h
+++ b/arch/x86/kvm/mmu/paging_tmpl.h
@@ -426,7 +426,7 @@  static int FNAME(walk_addr_generic)(struct guest_walker *walker,
 	gfn += (addr & PT_LVL_OFFSET_MASK(walker->level)) >> PAGE_SHIFT;
 
 #if PTTYPE == 32
-	if (walker->level > PG_LEVEL_4K && is_cpuid_PSE36())
+	if (walker->level > PG_LEVEL_4K)
 		gfn += pse36_gfn_delta(pte);
 #endif