From nobody Mon Feb 9 03:46:36 2026 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 CE193EB64DD for ; Tue, 25 Jul 2023 22:36:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232335AbjGYWgG (ORCPT ); Tue, 25 Jul 2023 18:36:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232662AbjGYWfp (ORCPT ); Tue, 25 Jul 2023 18:35:45 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8706E7EFE; Tue, 25 Jul 2023 15:29:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690324153; x=1721860153; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rx9dwk2lAPW9PMmwKd6pOhDzr4Hbk1uw/BKlfzz6TM0=; b=g52T9Dq0bSDdwG4lZ4hr1VB/id4qO7XeixDmO7O0/+XErqCs3uE6cdvx r0IXWyoOXK84G01IVwBUaq5bu0wdCdC1rHxcEcnKMeupb543q5MpLVqp6 PJZ1fBa0tZMymuk7750ZahzH8z3aNglUoMk1vNYdYdf/IUDbEQ3nt1IND XyDayPpgyusZv7qp9iH/ckv3uvpTOvfpc/0UpdiLL2+5wFBcKzirvvNQa DigF58kyoBz984XpvLEZhea8E8HuFfrCYUM+ThKMUmoFljcp4lztjIdie 8VqIFeRONhcIqSlaEwlD2rE1UEQ58vK3B8YI+zl1u3doy29hrORLr36zV Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10782"; a="371467097" X-IronPort-AV: E=Sophos;i="6.01,231,1684825200"; d="scan'208";a="371467097" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2023 15:24:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10782"; a="972855781" X-IronPort-AV: E=Sophos;i="6.01,231,1684825200"; d="scan'208";a="972855781" Received: from ls.sc.intel.com (HELO localhost) ([172.25.112.31]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2023 15:24:08 -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 , David Matlack , Kai Huang , Zhi Wang , chen.bo@intel.com, hang.yuan@intel.com, tina.zhang@intel.com, Xiaoyao Li Subject: [RFC PATCH v4 01/16] KVM: TDP_MMU: Go to next level if smaller private mapping exists Date: Tue, 25 Jul 2023 15:23:47 -0700 Message-Id: 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 95ba78944712..a9f0f4ade2d0 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -1293,7 +1293,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