From nobody Mon Sep 15 11:36:04 2025 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 42510C61DB3 for ; Thu, 12 Jan 2023 17:09:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240133AbjALRJq (ORCPT ); Thu, 12 Jan 2023 12:09:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240977AbjALRJJ (ORCPT ); Thu, 12 Jan 2023 12:09:09 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 312FF27183; Thu, 12 Jan 2023 08:47:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673542039; x=1705078039; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lN2sQKQJw+fvb4BXvuf9J5Yol5hJrcIFcz4ejYm1oT4=; b=ngXnomQlVKnBsNdwhxKf++UkUySDbW6mcS+d/kUgROxSgv5VaBJGcIzF 994Cmw4MnXz+oNNbuRzP/AWj7MUP+drSQCaaBHDGw72DNRAO9av+RLLXM ZJvNIYdavP+WJnpmQ+LlQtz2SHAzbZ3+gs0npCzcxDSYDTlPcgG25HnXW Ir9JLWLwKhk5iuHT7WR7jjm47noXXj+sXnGipmFZAnkBn8pHc51c9APn1 2LZ4JnuwHzQbrlcGnRqpj6apw3+iZqDBthO9k0StF72Ami7dPZaFAPDiU gB7yuTq2gPLH6qFK/OBiHaLM6+BeCwwJkb8iqy79+4CzH3+vxLVieCK18 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="323816274" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="323816274" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 08:44:16 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="986658318" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="986658318" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 08:44:16 -0800 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 , David Matlack , Xiaoyao Li Subject: [RFC PATCH v3 01/16] KVM: TDP_MMU: Go to next level if smaller private mapping exists Date: Thu, 12 Jan 2023 08:43:53 -0800 Message-Id: <588de42a732a068bdcff46494865c0345d289bb2.1673541292.git.isaku.yamahata@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Xiaoyao Li Cannot map a private page as large page if any smaller mapping exists. It has to wait for all the not-mapped smaller page to be mapped and promote it to larger mapping. Signed-off-by: Xiaoyao Li Signed-off-by: Isaku Yamahata --- arch/x86/kvm/mmu/tdp_mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c index 69e202bd1897..5c2c7e8ea62e 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -1394,7 +1394,8 @@ int kvm_tdp_mmu_map(struct kvm_vcpu *vcpu, struct kvm= _page_fault *fault) tdp_mmu_for_each_pte(iter, mmu, is_private, raw_gfn, raw_gfn + 1) { int r; =20 - if (fault->nx_huge_page_workaround_enabled) + if (fault->nx_huge_page_workaround_enabled || + kvm_gfn_shared_mask(vcpu->kvm)) disallowed_hugepage_adjust(fault, iter.old_spte, iter.level); =20 /* --=20 2.25.1