From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752453AbbDNGKA (ORCPT ); Tue, 14 Apr 2015 02:10:00 -0400 Received: from mga09.intel.com ([134.134.136.24]:4855 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750992AbbDNGJx (ORCPT ); Tue, 14 Apr 2015 02:09:53 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,574,1422950400"; d="scan'208";a="694868521" From: Wanpeng Li To: Paolo Bonzini Cc: Andres Lagar-Cavilla , Xiao Guangrong , Eric Northup , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Wanpeng Li Subject: [PATCH 1/2] kvm: mmu: fix catch transparent huge page backing Date: Tue, 14 Apr 2015 13:51:29 +0800 Message-Id: <1428990690-20119-1-git-send-email-wanpeng.li@linux.intel.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org PageTransCompound() can't guarantee the page is a transparent huge page since it returns true for both transparent huge and hugetlbfs pages. This patch fixes it by checking the page is also !hugetlbfs page. Signed-off-by: Wanpeng Li --- arch/x86/kvm/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 146f295..2a0d77e 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -4487,7 +4487,8 @@ static bool kvm_mmu_zap_collapsible_spte(struct kvm *kvm, */ if (sp->role.direct && !kvm_is_reserved_pfn(pfn) && - PageTransCompound(pfn_to_page(pfn))) { + !PageHuge(pfn_to_page(pfn)) && + PageTransHuge(pfn_to_page(pfn))) { drop_spte(kvm, sptep); sptep = rmap_get_first(*rmapp, &iter); need_tlb_flush = 1; -- 1.9.1