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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00144C4345F for ; Thu, 2 May 2024 23:12:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6F38E6B0095; Thu, 2 May 2024 19:12:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6A35F6B0096; Thu, 2 May 2024 19:12:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 56A586B0098; Thu, 2 May 2024 19:12:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 37DF26B0095 for ; Thu, 2 May 2024 19:12:11 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id DD3CA1C0838 for ; Thu, 2 May 2024 23:12:10 +0000 (UTC) X-FDA: 82075006020.17.1E94453 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by imf29.hostedemail.com (Postfix) with ESMTP id 72A14120029 for ; Thu, 2 May 2024 23:11:44 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=RBf8xsQj; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf29.hostedemail.com: domain of isaku.yamahata@intel.com designates 192.198.163.14 as permitted sender) smtp.mailfrom=isaku.yamahata@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714691505; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=XFk7zrZsj/9UzSZQBqwqZuGpER7uUVq/SofGLAKdiG4=; b=TclvXMQc+YR0EDDz5tXIjUIbR6uwBjoOGv778S+YFYst4hVVcYm8zdd0fzqdkMeDv4tJbd kjMVTzL216iA5LJu7z7rdfFfTjpauNBwZUQmisMZDrrFmIfe2OTX3qOb1uTZXXEFA3sfpe SNVUb+PKXe5NnAiop9uvZgAUpRfnWtU= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=RBf8xsQj; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf29.hostedemail.com: domain of isaku.yamahata@intel.com designates 192.198.163.14 as permitted sender) smtp.mailfrom=isaku.yamahata@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714691505; a=rsa-sha256; cv=none; b=CrRzEsmk0Gc4R7jSaku8xF5lT8tQ1XFx4QRPO2vz+WDjXgZCjEf8K097RKIJLDWim77Hij b3BUbgX66Pp9BOCMMjs15qnIidPWQ6nZIR2p5F3/FX4Y0jUka0+1/IsIiSEV6BFJR4lX4m MQq23Wg9E/MTxihXeryMkI05unG2rfA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714691504; x=1746227504; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=BCu5DjqXcmPG//vCsbZOiiWzxlLCpxGZ01rex1Oz3Sw=; b=RBf8xsQjTfHsQGycHT0jzl0i53McCO9c/WW37Fcwxi5Y+tkWFeDW48UY 539Lc5kX8aE2ZsMEawEaPNJT7NNuMBsUAJlQBFnNlRPMh+6nNr30UlrGG 37h2bS7NztOIqTPQvkBJSWtcc8qT9F0V8IYfhrqZGi1hGEs1KC991daQd GnuBgfJeU4Bb3w0t5ZBCoLnKu1Faaz7w1av0EdX8AJIeIv3zV3HsZ2fF8 RsoJe9HuQuC42nDgj3ymaTDQvSxu/xjX24BhbieBZqLwIxQBc5pjNdthf 0zgCMXB5+O46YJI/cqZHiQitP59WwWrpby+pie0NXacne23jpucSGCO+u g==; X-CSE-ConnectionGUID: zAhSQPWORIyjCpBNbVh1Rw== X-CSE-MsgGUID: tlgEmthiTDeKMEGL4e8G/w== X-IronPort-AV: E=McAfee;i="6600,9927,11062"; a="10709732" X-IronPort-AV: E=Sophos;i="6.07,247,1708416000"; d="scan'208";a="10709732" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 May 2024 16:11:42 -0700 X-CSE-ConnectionGUID: pZ7LHjPERy2vcF7eAyPTwQ== X-CSE-MsgGUID: wVxZ/QkLRjizm+OBuZjfCg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,247,1708416000"; d="scan'208";a="31777977" Received: from ls.sc.intel.com (HELO localhost) ([172.25.112.31]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 May 2024 16:11:41 -0700 Date: Thu, 2 May 2024 16:11:40 -0700 From: Isaku Yamahata To: Michael Roth Cc: kvm@vger.kernel.org, linux-coco@lists.linux.dev, linux-mm@kvack.org, linux-crypto@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, jroedel@suse.de, thomas.lendacky@amd.com, hpa@zytor.com, ardb@kernel.org, pbonzini@redhat.com, seanjc@google.com, vkuznets@redhat.com, jmattson@google.com, luto@kernel.org, dave.hansen@linux.intel.com, slp@redhat.com, pgonda@google.com, peterz@infradead.org, srinivas.pandruvada@linux.intel.com, rientjes@google.com, dovmurik@linux.ibm.com, tobin@ibm.com, bp@alien8.de, vbabka@suse.cz, kirill@shutemov.name, ak@linux.intel.com, tony.luck@intel.com, sathyanarayanan.kuppuswamy@linux.intel.com, alpergun@google.com, jarkko@kernel.org, ashish.kalra@amd.com, nikunj.dadhania@amd.com, pankaj.gupta@amd.com, liam.merwick@oracle.com, isaku.yamahata@intel.com, isaku.yamahata@linux.intel.com, rick.p.edgecombe@intel.com Subject: Re: [PATCH v15 02/20] KVM: x86: Add hook for determining max NPT mapping level Message-ID: <20240502231140.GC13783@ls.amr.corp.intel.com> References: <20240501085210.2213060-1-michael.roth@amd.com> <20240501085210.2213060-3-michael.roth@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20240501085210.2213060-3-michael.roth@amd.com> X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 72A14120029 X-Stat-Signature: w5gu5w7e1pnq8uwp7x9petk3x6484hyn X-HE-Tag: 1714691504-943550 X-HE-Meta: U2FsdGVkX1/7YRkHuD/MCX/6bfQX45KvouRiK/Aa8WqYx9VVXhkPd9w7+z4abMBcFAybSL/btpd/nanyzTjG+pUSDEXE+OO+PZRm0g/DfK3nu0VAl55RsvxNjeJo+jsCbhUETUVkj1zUfWd7kobHrO6MQTLwV15ZL7uAZCNzquWVWxW4ye4NsVCCaMx6FjTu+d8ytpEZWZ7jTlxpC6za0bjqGb6zcl3brtDaQO0DoHZe8COsSvQd6iwdyekcspx/f3CYhaCQha8xoMXyECku8FNzOQxpXtl5DtcjiCQoa88bTVS1YlXg/aSNAooQcl1RGAGjrmkpjCgItY027W52ngk2mwc7T/6mbsQijoN5Zefk2ypx7wRCfD8J0Vf+OqVnZ+pewyznLkDPHiZVv/oZXnmO+tg72yFbFFI/mHsDfyHx8eFjwpECIoaiYvi3LB7PbcBHBnoPuc37tznDL58vhTe7duUr47+XNxKL8NZT/dBFnjfJ0Vn/rHoW6ODu/Yb16PxfFd+hGqzSi6CnTUvcjyUlA/mNtccZ31nCdBFJeCrGY6lHcWgBKh44Iw9kRQ8RdFh+kvfhpged4L9Fxgq9dJDzzjaz0K0C6rmEikxLyeoRvbV4Wka3YQlT/KK7UyyYSrf61ZEmGK0z3jwyEGV+m3THh10cLCXXBTfViV4Snv5uM8QHAX/wU183PeYWHksLS9skfUp5BwebOiWt6LvAJdN9lK9LJoVDKGHqWIXWSLKrjVj63GHh4m6mbzORRFp1Q1q2872UhI1cIZrEFsl9i5mpMXd/nJJK4wY6lyuw3i08Xslski1BlJ7WTkKQAXYawN4Yy43RsjjrR/BWpSUPB0krZrN7ZrWUI0bo3lVS+fyv24p7yK2xWYagT7IsAOPJOCYW9VsJmYkljxiz0Wqz1vFmCCtCYaiXZHhmAA+YIbt8+UKkgRcJAJonCQdWPFxU4gGfqS4e11JoqDM2uk7 +OSzOqhg evxzHpBv9cOd3UVgbcY2G5G8tP/Gvr8GACZwXHgw3DdFaAYoDRaJaLaEREUdh4CX1pjkSu6egJ45AXlmbs7YFKhr3LejIbjR8nXshGl1f+iUWrsv1x/CUq0MCV6BD1RoB+P2+A0xT3PWAfYmCWugu3UQqHM5HEivll979Mz/uYa26NgF2IxVhciPjfMq3mo1xHZeD X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Wed, May 01, 2024 at 03:51:52AM -0500, Michael Roth wrote: ... > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h > index c6c5018376be..87265b73906a 100644 > --- a/arch/x86/include/asm/kvm_host.h > +++ b/arch/x86/include/asm/kvm_host.h > @@ -1816,6 +1816,7 @@ struct kvm_x86_ops { > void *(*alloc_apic_backing_page)(struct kvm_vcpu *vcpu); > int (*gmem_prepare)(struct kvm *kvm, kvm_pfn_t pfn, gfn_t gfn, int max_order); > void (*gmem_invalidate)(kvm_pfn_t start, kvm_pfn_t end); > + int (*private_max_mapping_level)(struct kvm *kvm, kvm_pfn_t pfn); Explicit private prefix is nice. > }; > > struct kvm_x86_nested_ops { > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index 510eb1117012..0d556da052f6 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -4271,6 +4271,20 @@ static inline u8 kvm_max_level_for_order(int order) > return PG_LEVEL_4K; > } > > +static u8 kvm_max_private_mapping_level(struct kvm *kvm, kvm_pfn_t pfn, > + u8 max_level, int gmem_order) > +{ > + if (max_level == PG_LEVEL_4K) > + return PG_LEVEL_4K; > + > + max_level = min(kvm_max_level_for_order(gmem_order), max_level); > + if (max_level == PG_LEVEL_4K) > + return PG_LEVEL_4K; > + > + return min(max_level, > + static_call(kvm_x86_private_max_mapping_level)(kvm, pfn)); If we don't implement this hook, OPTIONAL_RET0 causes always PG_LEVEL_NONE. Anyway when TDX implements the hook, we can remove OPTIONAL_RET0. This hook works for TDX by "return PG_LEVEL_4K;". Reviewed-by: Isaku Yamahata -- Isaku Yamahata