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 6A5E3C197A0 for ; Fri, 17 Nov 2023 01:05:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345603AbjKQBF2 (ORCPT ); Thu, 16 Nov 2023 20:05:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229437AbjKQBF0 (ORCPT ); Thu, 16 Nov 2023 20:05:26 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12FC3129; Thu, 16 Nov 2023 17:05:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700183123; x=1731719123; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=ZyZe8XVOWfINF/HMRNgqPyY01tqqlcNLwl5nCO+VM18=; b=Csa+cC9FY4NvZWVfvAZPa1KG0b4TCEO7wFi1dNJ69XtOJ+fJlE1vvEMP AccI/EwZL7whWKFm+q8mFxrz5djQfddveGqy/5x0qZO0Yx8i4G7MtsnSQ NqsDal1fhczvLZjvsWLUUe56/UR7D2Np9CFHU2mx97PxylTjscftVwmhf g0sZDh74FGoUbPH861+ypkz1Pr3hfknzmZu/z1t4w8PDVjuce2mWwTksH 1w/kYZlH1hbjcBcrTjmoVOBkZ8kQf4HsPXeZkgMAIyLspsPkdBN5CAsNF Qj8/2VkoHFgQKGO8m78HH94sTUxioZgmxSKwCUXlNFbX59f2SA4mlRuCC A==; X-IronPort-AV: E=McAfee;i="6600,9927,10896"; a="12761721" X-IronPort-AV: E=Sophos;i="6.04,205,1695711600"; d="scan'208";a="12761721" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2023 17:05:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10896"; a="741931030" X-IronPort-AV: E=Sophos;i="6.04,205,1695711600"; d="scan'208";a="741931030" Received: from ls.sc.intel.com (HELO localhost) ([172.25.112.31]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2023 17:05:22 -0800 Date: Thu, 16 Nov 2023 17:05:21 -0800 From: Isaku Yamahata To: Binbin Wu Cc: isaku.yamahata@intel.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, 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 , isaku.yamahata@linux.intel.com Subject: Re: [PATCH v6 01/16] KVM: TDP_MMU: Go to next level if smaller private mapping exists Message-ID: <20231117010521.GE1277973@ls.amr.corp.intel.com> References: <439c7be59c35a03bced88a44567431e721fab3da.1699368363.git.isaku.yamahata@intel.com> <52b01c03-15eb-4151-b94b-2433a117cf3d@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <52b01c03-15eb-4151-b94b-2433a117cf3d@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 16, 2023 at 09:32:22AM +0800, Binbin Wu wrote: > > > On 11/7/2023 11:00 PM, isaku.yamahata@intel.com wrote: > > 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 > > --- > > 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 2c5257628881..d806574f7f2d 100644 > > --- a/arch/x86/kvm/mmu/tdp_mmu.c > > +++ b/arch/x86/kvm/mmu/tdp_mmu.c > > @@ -1287,7 +1287,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; > > - if (fault->nx_huge_page_workaround_enabled) > > + if (fault->nx_huge_page_workaround_enabled || > > + kvm_gfn_shared_mask(vcpu->kvm)) > As I mentioned in https://lore.kernel.org/kvm/fef75d54-e319-5170-5f76-f5abc4856315@linux.intel.com/, > The change of this patch will not take effect. > If "fault->nx_huge_page_workaround_enabled" is false, the condition > "spte_to_child_sp(spte)->nx_huge_page_disallowed" will not be true. > > IIUC, the function disallowed_hugepage_adjust() currently is only to handle > nx_huge_page_workaround, it seems no special handling needed for TD. > > disallowed_hugepage_adjust(fault, iter.old_spte, iter.level); > > /* You're correct. Now guest memfd memory attributes takes care of large page mapping, this patch is uncessary. Will drop this patch. -- Isaku Yamahata