diff mbox series

[v2,15/27] KVM: x86/mmu: Remove is_obsolete() call

Message ID	20190205210137.1377-15-sean.j.christopherson@intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> From: Sean Christopherson <sean.j.christopherson@intel.com> To: Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com> Cc: kvm@vger.kernel.org, Xiao Guangrong <guangrong.xiao@gmail.com> Subject: [PATCH v2 15/27] KVM: x86/mmu: Remove is_obsolete() call Date: Tue, 5 Feb 2019 13:01:25 -0800 Message-Id: <20190205210137.1377-15-sean.j.christopherson@intel.com> In-Reply-To: <20190205205443.1059-1-sean.j.christopherson@intel.com> References: <20190205205443.1059-1-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk
Series	KVM: x86/mmu: Remove fast invalidate mechanism \| expand [v2,00/27] KVM: x86/mmu: Remove fast invalidate mechanism [v2,01/27] KVM: Call kvm_arch_memslots_updated() before updating memslots [v2,02/27] KVM: x86/mmu: Detect MMIO generation wrap in any address space [v2,03/27] KVM: x86/mmu: Do not cache MMIO accesses while memslots are in flux [v2,04/27] KVM: Explicitly define the "memslot update in-progress" bit [v2,05/27] KVM: x86: Use a u64 when passing the MMIO gen around [v2,06/27] KVM: x86: Refactor the MMIO SPTE generation handling [v2,07/27] KVM: Remove the hack to trigger memslot generation wraparound [v2,08/27] KVM: Move the memslot update in-progress flag to bit 63 [v2,09/27] KVM: x86/mmu: Move slot_level_*() helper functions up a few lines [v2,10/27] KVM: x86/mmu: Split remote_flush+zap case out of kvm_mmu_flush_or_zap() [v2,11/27] KVM: x86/mmu: Zap only the relevant pages when removing a memslot [v2,12/27] Revert "KVM: MMU: document fast invalidate all pages" [v2,13/27] Revert "KVM: MMU: drop kvm_mmu_zap_mmio_sptes" [v2,14/27] KVM: x86/mmu: Voluntarily reschedule as needed when zapping MMIO sptes [v2,15/27] KVM: x86/mmu: Remove is_obsolete() call [v2,16/27] Revert "KVM: MMU: reclaim the zapped-obsolete page first" [v2,17/27] Revert "KVM: MMU: collapse TLB flushes when zap all pages" [v2,18/27] Revert "KVM: MMU: zap pages in batch" [v2,19/27] Revert "KVM: MMU: add tracepoint for kvm_mmu_invalidate_all_pages" [v2,20/27] Revert "KVM: MMU: show mmu_valid_gen in shadow page related tracepoints" [v2,21/27] Revert "KVM: x86: use the fast way to invalidate all pages" [v2,22/27] KVM: x86/mmu: skip over invalid root pages when zapping all sptes [v2,23/27] KVM: x86/mmu: Voluntarily reschedule as needed when zapping all sptes [v2,24/27] Revert "KVM: MMU: fast invalidate all pages" [v2,25/27] KVM: x86/mmu: Differentiate between nr zapped and list unstable [v2,26/27] KVM: x86/mmu: WARN if zapping a MMIO spte results in zapping children [v2,27/27] KVM: x86/mmu: Consolidate kvm_mmu_zap_all() and kvm_mmu_zap_mmio_sptes()

Commit Message

Sean Christopherson Feb. 5, 2019, 9:01 p.m. UTC

Unwinding usage of is_obsolete() is a step towards removing x86's fast
invalidate mechanism, i.e. this is one part of a revert all patches from
the series that introduced the mechanism[1].

This is a partial revert of commit 05988d728dcd ("KVM: MMU: reduce
KVM_REQ_MMU_RELOAD when root page is zapped").

[1] https://lkml.kernel.org/r/1369960590-14138-1-git-send-email-xiaoguangrong@linux.vnet.ibm.com

Cc: Xiao Guangrong <guangrong.xiao@gmail.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
 arch/x86/kvm/mmu.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff mbox series

Patch

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 3c093fdb210d..cc00f85cf5ba 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2711,11 +2711,7 @@  static int kvm_mmu_prepare_zap_page(struct kvm *kvm, struct kvm_mmu_page *sp,
 	} else {
 		list_move(&sp->link, &kvm->arch.active_mmu_pages);
 
-		/*
-		 * The obsolete pages can not be used on any vcpus.
-		 * See the comments in kvm_mmu_invalidate_zap_all_pages().
-		 */
-		if (!sp->role.invalid && !is_obsolete_sp(kvm, sp))
+		if (!sp->role.invalid)
 			kvm_reload_remote_mmus(kvm);
 	}