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 5CB22C54E58 for ; Mon, 11 Mar 2024 05:50:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 65C826B006E; Mon, 11 Mar 2024 01:50:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 60A436B0072; Mon, 11 Mar 2024 01:50:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4AB526B0074; Mon, 11 Mar 2024 01:50:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 376E06B006E for ; Mon, 11 Mar 2024 01:50:29 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9DC0E14048B for ; Mon, 11 Mar 2024 05:50:28 +0000 (UTC) X-FDA: 81883683336.18.FCC0867 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by imf16.hostedemail.com (Postfix) with ESMTP id 44A27180002 for ; Mon, 11 Mar 2024 05:50:25 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JHZn5z9Z; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf16.hostedemail.com: domain of binbin.wu@linux.intel.com has no SPF policy when checking 198.175.65.9) smtp.mailfrom=binbin.wu@linux.intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710136226; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=92U7bxG5xviHuug+pT8vYOWYwDu0BdumN7Vs4euHuPI=; b=IA8hdNnjYJyKkksF/9/C6I3xmOw1Pt6tHfiTOVElVLcIWpUAuVtqZsfMn4oFug80d4H6Bn j49oIN3vCMnxadkqHU7KYaBYx5pe7DAAHufFQdO8231gx1E6Mk1cZm8kp61CrFkRYeJT0l ZxaDBYFBHYlwA0lye2IqEFLbe3UY6eU= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JHZn5z9Z; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf16.hostedemail.com: domain of binbin.wu@linux.intel.com has no SPF policy when checking 198.175.65.9) smtp.mailfrom=binbin.wu@linux.intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710136226; a=rsa-sha256; cv=none; b=ySo3z5qMCJUknivQJ8aUzXVGr5YTRtnyxg3spL0BjsfePUgQ+1T/wXsACEMDoWh73nwHMC W70fYzuOuGqzm6J6YTTtPwxZ8Df+zIHaOE7uwpx0oKqoDaYVgB4UmNoCdYfgVMSSbEfFhc 3n3hmE3dlRm81IctthMxXe7OwTORZG8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710136226; x=1741672226; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=tFTkwIHFbMWF1tG+3qp3PfDm3XDtdHkyKYz9/9EFam0=; b=JHZn5z9ZBOpNDk1dCtrZLwq4t0H7xfNkviSGCWNigC4cxF+lJZ3lxJFW JwPkjHEZLuYWwMWHD6IV/qicg0C1gt8KYGdey9webNUeHfH1aXqunMVOy foTGMNWc6r2FvJsriKnyicHh/qxDCfWmGi0VPvN4lDmtzCflkmO1USNe1 VlCzJ+OQkQAzCxzoAmUN+nWCZU6ntwBOVKmuF286AtDHFnD9ZfqaRpVo/ FKX4/v1E+6T1EOOY8AJZeZxE/LcYT7orqLeiDTVruMM0DxYuJkKRseHcy 6MIvzhcPGXu5vWZFGQbUi4BOs2RmzvagngObLobFHH0Zno/pSpxepuElM w==; X-IronPort-AV: E=McAfee;i="6600,9927,11009"; a="27252743" X-IronPort-AV: E=Sophos;i="6.07,115,1708416000"; d="scan'208";a="27252743" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2024 22:50:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,115,1708416000"; d="scan'208";a="15757161" Received: from binbinwu-mobl.ccr.corp.intel.com (HELO [10.238.8.198]) ([10.238.8.198]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2024 22:50:16 -0700 Message-ID: <75151ba8-87fe-444a-b855-0d2e21b36e05@linux.intel.com> Date: Mon, 11 Mar 2024 13:50:13 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v11 28/35] KVM: SEV: Implement gmem hook for initializing private pages 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, zhi.a.wang@intel.com References: <20231230172351.574091-1-michael.roth@amd.com> <20231230172351.574091-29-michael.roth@amd.com> From: Binbin Wu In-Reply-To: <20231230172351.574091-29-michael.roth@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 44A27180002 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: iafpnpjgj6rhsb8693mqxh5dp5cjq8s4 X-HE-Tag: 1710136225-245864 X-HE-Meta: U2FsdGVkX18VUvhGxqCDCp81MflSsnXIx51+jtNO1RUhIGDHKDNwWygutO0KtUtSxDQdQ5cLYJMzDhAgLQ+svGrYIljNbXNt/GbX9/XHMq5jdFCIfXQuWxNZTrx/S/nqy7FP6kiLEfuflj+zrXL+Cb1gcATiLRaLNAXPP59bNrPhYGLQmU077/d18w49blF4ebNYDqtpPFmmWKH/X4DdKPVxcVUGgBTFExsuUjojAle8xx+VlFytbYsEFydDjXxBN/xJTw5W4XvMV7O3LQujEv0wum3V5k8C1qIV3UVC8W2OuozWoyJetG4e6dx9T80gf6X1o/aoOiSdIeXsAKYXQQpnW9wAhm30loKZwMTPCIDpbvN2Sfd6FuATSNVEHeXFLG4BvcQuGhQwFmjVcF/xS85K7K90UPXFpPkI3MopZbXBogHnR6YWHd0OQrT4qs9jwrClqogCehj5rYyS3X7LP5zdMK97/ZoXuc01XoSxZ/9+wBgD2cKhNUaDUPyUz8M+cG1st5yH5F492QyRv8nYwb3I9ckzspfFVc0tiL5hZBVOIqckXAMTb+URjcIG5VKbiU8oMIh4s/SS0Do7H/qWUCbFic9QqrIKOQVZANVCkIRb5ls52aWQS3n/tQrjVsgxwaqUY9k2OcyvqFXcYdOsvKlsrSaknDqiyV2yegSFLcyaqTRx5fxLDyRCEn5twszWX2gCWqiPJYDG/87JvCTcrRHLvqCIm362QmkRuE+2uF2Yk7vFhTIAXDi1a4bSeNJUniPKeqld4Iim8xbDHX0Wz0QNDKxiOR0+JQC8vxYWV/D1TLfpXuqShXp2WHpBreXcLCUUt1aAMQXFs3vJBgKtUQpNIko3gCqnVc4qBXQXWd7t4TYWdQo/uw== 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 12/31/2023 1:23 AM, Michael Roth wrote: > This will handle RMP table updates and direct map changes needed to put > a page into a private state before mapping it into an SEV-SNP guest. > > Signed-off-by: Michael Roth > --- > arch/x86/kvm/Kconfig | 1 + > arch/x86/kvm/svm/sev.c | 98 ++++++++++++++++++++++++++++++++++++++++++ > arch/x86/kvm/svm/svm.c | 2 + > arch/x86/kvm/svm/svm.h | 1 + > virt/kvm/guest_memfd.c | 4 +- > 5 files changed, 104 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig > index 4ec53d6d5773..79c002e1bb5c 100644 > --- a/arch/x86/kvm/Kconfig > +++ b/arch/x86/kvm/Kconfig > @@ -125,6 +125,7 @@ config KVM_AMD_SEV > depends on KVM_AMD && X86_64 > depends on CRYPTO_DEV_SP_PSP && !(KVM_AMD=y && CRYPTO_DEV_CCP_DD=m) > select KVM_GENERIC_PRIVATE_MEM > + select HAVE_KVM_GMEM_PREPARE > help > Provides support for launching Encrypted VMs (SEV) and Encrypted VMs > with Encrypted State (SEV-ES) on AMD processors. > diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c > index b2ac696c436a..91f53f4a6059 100644 > --- a/arch/x86/kvm/svm/sev.c > +++ b/arch/x86/kvm/svm/sev.c > @@ -4154,3 +4154,101 @@ void handle_rmp_page_fault(struct kvm_vcpu *vcpu, gpa_t gpa, u64 error_code) > out: > put_page(pfn_to_page(pfn)); > } > + > +static bool is_pfn_range_shared(kvm_pfn_t start, kvm_pfn_t end) > +{ > + kvm_pfn_t pfn = start; > + > + while (pfn < end) { > + int ret, rmp_level; > + bool assigned; > + > + ret = snp_lookup_rmpentry(pfn, &assigned, &rmp_level); > + if (ret) { > + pr_warn_ratelimited("SEV: Failed to retrieve RMP entry: PFN 0x%llx GFN start 0x%llx GFN end 0x%llx RMP level %d error %d\n", > + pfn, start, end, rmp_level, ret); > + return false; > + } > + > + if (assigned) { > + pr_debug("%s: overlap detected, PFN 0x%llx start 0x%llx end 0x%llx RMP level %d\n", > + __func__, pfn, start, end, rmp_level); > + return false; > + } > + > + pfn++; rmp_level can be got from snp_lookup_rmpentry(). I think the pfn can be updated according to rmp_level to avoid unnecessary loops for 2MB large page, right? > + } > + > + return true; > +} > + > +static u8 max_level_for_order(int order) > +{ > + if (order >= KVM_HPAGE_GFN_SHIFT(PG_LEVEL_2M)) > + return PG_LEVEL_2M; > + > + return PG_LEVEL_4K; > +} > + > +static bool is_large_rmp_possible(struct kvm *kvm, kvm_pfn_t pfn, int order) > +{ > + kvm_pfn_t pfn_aligned = ALIGN_DOWN(pfn, PTRS_PER_PMD); > + > + /* > + * If this is a large folio, and the entire 2M range containing the > + * PFN is currently shared, then the entire 2M-aligned range can be > + * set to private via a single 2M RMP entry. > + */ > + if (max_level_for_order(order) > PG_LEVEL_4K && > + is_pfn_range_shared(pfn_aligned, pfn_aligned + PTRS_PER_PMD)) > + return true; > + > + return false; > +} > + > +int sev_gmem_prepare(struct kvm *kvm, kvm_pfn_t pfn, gfn_t gfn, int max_order) > +{ > + struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; > + kvm_pfn_t pfn_aligned; > + gfn_t gfn_aligned; > + int level, rc; > + bool assigned; > + > + if (!sev_snp_guest(kvm)) > + return 0; > + > + rc = snp_lookup_rmpentry(pfn, &assigned, &level); > + if (rc) { > + pr_err_ratelimited("SEV: Failed to look up RMP entry: GFN %llx PFN %llx error %d\n", > + gfn, pfn, rc); > + return -ENOENT; > + } > + > + if (assigned) { > + pr_debug("%s: already assigned: gfn %llx pfn %llx max_order %d level %d\n", > + __func__, gfn, pfn, max_order, level); > + return 0; > + } > + > + if (is_large_rmp_possible(kvm, pfn, max_order)) { > + level = PG_LEVEL_2M; > + pfn_aligned = ALIGN_DOWN(pfn, PTRS_PER_PMD); > + gfn_aligned = ALIGN_DOWN(gfn, PTRS_PER_PMD); > + } else { > + level = PG_LEVEL_4K; > + pfn_aligned = pfn; > + gfn_aligned = gfn; > + } > + > + rc = rmp_make_private(pfn_aligned, gfn_to_gpa(gfn_aligned), level, sev->asid, false); > + if (rc) { > + pr_err_ratelimited("SEV: Failed to update RMP entry: GFN %llx PFN %llx level %d error %d\n", > + gfn, pfn, level, rc); > + return -EINVAL; > + } > + > + pr_debug("%s: updated: gfn %llx pfn %llx pfn_aligned %llx max_order %d level %d\n", > + __func__, gfn, pfn, pfn_aligned, max_order, level); > + > + return 0; > +} > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c > index 240518f8d6c7..32cef8626b57 100644 > --- a/arch/x86/kvm/svm/svm.c > +++ b/arch/x86/kvm/svm/svm.c > @@ -5065,6 +5065,8 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { > .vcpu_deliver_sipi_vector = svm_vcpu_deliver_sipi_vector, > .vcpu_get_apicv_inhibit_reasons = avic_vcpu_get_apicv_inhibit_reasons, > .alloc_apic_backing_page = svm_alloc_apic_backing_page, > + > + .gmem_prepare = sev_gmem_prepare, > }; > > /* > diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h > index d953ae41c619..9ece9612dbb9 100644 > --- a/arch/x86/kvm/svm/svm.h > +++ b/arch/x86/kvm/svm/svm.h > @@ -725,6 +725,7 @@ void sev_es_unmap_ghcb(struct vcpu_svm *svm); > struct page *snp_safe_alloc_page(struct kvm_vcpu *vcpu); > void handle_rmp_page_fault(struct kvm_vcpu *vcpu, gpa_t gpa, u64 error_code); > void sev_snp_init_protected_guest_state(struct kvm_vcpu *vcpu); > +int sev_gmem_prepare(struct kvm *kvm, kvm_pfn_t pfn, gfn_t gfn, int max_order); > > /* vmenter.S */ > > diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c > index feec0da93d98..ddea45279fef 100644 > --- a/virt/kvm/guest_memfd.c > +++ b/virt/kvm/guest_memfd.c > @@ -66,8 +66,8 @@ static int kvm_gmem_prepare_folio(struct inode *inode, pgoff_t index, struct fol > gfn = slot->base_gfn + index - slot->gmem.pgoff; > rc = kvm_arch_gmem_prepare(kvm, gfn, pfn, compound_order(compound_head(page))); > if (rc) { > - pr_warn_ratelimited("gmem: Failed to prepare folio for index %lx, error %d.\n", > - index, rc); > + pr_warn_ratelimited("gmem: Failed to prepare folio for index %lx GFN %llx PFN %llx error %d.\n", > + index, gfn, pfn, rc); > return rc; > } > }