From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F5A7C19F2A for ; Sun, 7 Aug 2022 22:05:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237480AbiHGWFp (ORCPT ); Sun, 7 Aug 2022 18:05:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234424AbiHGWCu (ORCPT ); Sun, 7 Aug 2022 18:02:50 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A930659C; Sun, 7 Aug 2022 15:02:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659909759; x=1691445759; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=paWoV8vUP0AomUkaEVAHF3tFMPkBIX0/rPM1U6g0wYs=; b=DqscltnqfqDn91TBWFBJAyHCH591tkw4q7wItC6cMAix5g/AY6eM9rQt Nbj93HUK8TWtz7Zm8J6TVBcZZYA14ifGHmOlw6Bi2WEO6nUxDf0THBv89 bPc7jI+IxxyJuPxe2PZYabDvrZB47WzHsAoVGa5+b6UaUHZ7HebWZcuNW dd4KInyf/XU91TrpqX4DnhJZeXD7+ftKcM7WXQn4E7NJcUOIfDbH71Svs Yo5IJdwMb+6xoB7vdxa93wEFpnJJhP8hP/3LJi5yoU/4Ff4CrJFfXtC88 hiRi34y3VVZIVfHc71rTDGiYu0K5PLKJ1r+HNuwUgaVlw6eUQNNlrCT3W A==; X-IronPort-AV: E=McAfee;i="6400,9594,10432"; a="354465750" X-IronPort-AV: E=Sophos;i="5.93,220,1654585200"; d="scan'208";a="354465750" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Aug 2022 15:02:38 -0700 X-IronPort-AV: E=Sophos;i="5.93,220,1654585200"; d="scan'208";a="663682628" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Aug 2022 15:02:37 -0700 From: isaku.yamahata@intel.com To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: isaku.yamahata@intel.com, isaku.yamahata@gmail.com, Paolo Bonzini , erdemaktas@google.com, Sean Christopherson , Sagi Shahar Subject: [PATCH v8 056/103] KVM: x86/mmu: Let vcpu re-try when faulting page type conflict Date: Sun, 7 Aug 2022 15:01:41 -0700 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiaoyao Li When it gets a private page fault on a shared page, or vice verse, let vcpu retry and vcpu will keep faulting until other vcpu maps the gpa to matched page type. Signed-off-by: Xiaoyao Li Signed-off-by: Isaku Yamahata --- arch/x86/kvm/mmu/mmu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 27deaf44ee80..c9c27945ed44 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4230,6 +4230,10 @@ static int kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) return RET_PF_EMULATE; } + if (kvm_gfn_shared_mask(vcpu->kvm) && + (kvm_mem_is_private(vcpu->kvm, fault->gfn) != fault->is_private)) + return RET_PF_RETRY; + async = false; fault->pfn = __gfn_to_pfn_memslot(slot, fault->gfn, false, &async, fault->write, &fault->map_writable, -- 2.25.1