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 4E5D5CD1288 for ; Sat, 30 Mar 2024 21:05:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8F9B76B0088; Sat, 30 Mar 2024 17:05:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8826F6B0089; Sat, 30 Mar 2024 17:05:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6D5286B008A; Sat, 30 Mar 2024 17:05:37 -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 473EC6B0088 for ; Sat, 30 Mar 2024 17:05:37 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CC29D403FB for ; Sat, 30 Mar 2024 21:05:36 +0000 (UTC) X-FDA: 81954936672.20.7EB288A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf06.hostedemail.com (Postfix) with ESMTP id B7126180007 for ; Sat, 30 Mar 2024 21:05:34 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=iMz1hl2M; spf=pass (imf06.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711832734; 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=zvlmNpxIDJrnhPj/YKT8a7uMmKqBTvBD1u10rPEnCzE=; b=QrJAzy+jZ65O417qZyKnhDBkUAX6tFant3X5FyqGFC36pcn1acfq+3xfbM2ymWSn6yVHN1 Qa3LDoVoQYTJ9Ix96IXh4Tm4BgJl/auj/e02vwkbWiJd39Zop2gwAsGWg/a2PmWqpdJef6 OSIL60axb92jKfr3n6Yz9xtsEmutNzU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711832734; a=rsa-sha256; cv=none; b=bsgDPJ0atHD0rJJJwcvC9958T+dBoPJMqur2viY1JNrCqaPefoT0rdlIm8tIMrwCUYos+6 557gBYstOjs+jTHPzDjtKbEH0ofhIpXzNHOFu7Vp+U4X8mDy2CHBfB6njv1alqVcnqvJQr eXRaYfkYVlz3q+esJYRMiMm5VfYpAeY= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=iMz1hl2M; spf=pass (imf06.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711832734; h=from:from: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:autocrypt:autocrypt; bh=zvlmNpxIDJrnhPj/YKT8a7uMmKqBTvBD1u10rPEnCzE=; b=iMz1hl2Mf/psN5Od7gln/fDHfKpEbYKAoJhvY6cNexwhZrtJjVZGFsdCoZU3kWgWk1RIwh LKspXOWtfajfLA4pTm8k/VRcwb5l74UdyiTt8ptTmcNAW0OGRYJqcF18jP49JFR4Zcw1uK +iZjx/537Gyk0TR70Zvl0/odzcpHB4c= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-256-M-eHOPn5PPS0Phd1cyG2Qw-1; Sat, 30 Mar 2024 17:05:32 -0400 X-MC-Unique: M-eHOPn5PPS0Phd1cyG2Qw-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a474ac232e9so130330166b.2 for ; Sat, 30 Mar 2024 14:05:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711832731; x=1712437531; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :from:references:cc:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zvlmNpxIDJrnhPj/YKT8a7uMmKqBTvBD1u10rPEnCzE=; b=h7kVcjvjGd3MGYjrfgCiL1TPCUreoey8lj0+1fsnfeDVZaWvkDm9/sy3bKdfgi/PQi 4+omba13dT8KpqQXP8Vt55esjRenVJE3ljIjAO6rQz8ZsGRsQhANB9pq7b22cj2qW/R2 mpAu/ZCmELMBGKPHuqiXGeRQDmRvCGlZQeB+aChyVo9IC3Cd6vZp6eQ+ITMdZLloW+z5 9LDKIEAVsZq4MK4Xv7DUFwbVmoFKtARCVoXAD2+BR7cJ4axIzFwnUlrzwAU/uLhZs1Xk 1Zh+/+0EbEcD2p+GzRiz1w3eI+pgK+6bhCVFHDbxbjoD00/t7JWxXLw+uXh4BzVDegfW EvvA== X-Forwarded-Encrypted: i=1; AJvYcCWzZlMbhy0TpY4bsAy4e4XXmgJ4LeFX+x1LuQcRBlocExLwcXhCD7tL5e37vOBF0FXmU4hVWS5YxVECU6bFYgp4ld8= X-Gm-Message-State: AOJu0YzEbsA/6nJY+Ps2xeriKHcJ3HP077O5AMJyBPsgb6EJ3UzSzBxP KI4M5Sqt0lK4ToiBqmgOjqhMx6AMYClYmrs2dQwunxEfJR/4g2QW7cyGyxlF2UMoevCmntD5v4I A1ocVzRRKQLhjZYVxAeVv41rjNv/t9BrHi18cn0e4Y38pB2qj X-Received: by 2002:a17:906:a40d:b0:a4e:253d:9641 with SMTP id l13-20020a170906a40d00b00a4e253d9641mr4204850ejz.8.1711832731489; Sat, 30 Mar 2024 14:05:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFTeU1CiYPB2ByqnXfgbHYLBnkSUxAq1ZyFzRHCPzV8G1WZItagAlUo3C1OjOvbzmRD+zOCDA== X-Received: by 2002:a17:906:a40d:b0:a4e:253d:9641 with SMTP id l13-20020a170906a40d00b00a4e253d9641mr4204815ejz.8.1711832731102; Sat, 30 Mar 2024 14:05:31 -0700 (PDT) Received: from [192.168.10.4] ([151.95.49.219]) by smtp.googlemail.com with ESMTPSA id lb14-20020a170906adce00b00a4e57805d79sm513857ejb.181.2024.03.30.14.05.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 30 Mar 2024 14:05:30 -0700 (PDT) Message-ID: Date: Sat, 30 Mar 2024 22:05:28 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v12 21/29] KVM: SEV: Implement gmem hook for initializing private pages To: Michael Roth , kvm@vger.kernel.org Cc: 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, 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 References: <20240329225835.400662-1-michael.roth@amd.com> <20240329225835.400662-22-michael.roth@amd.com> From: Paolo Bonzini Autocrypt: addr=pbonzini@redhat.com; keydata= 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 In-Reply-To: <20240329225835.400662-22-michael.roth@amd.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: zq8m1nsyn4pjy9i7z64t96zysxk1qmwc X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: B7126180007 X-Rspam-User: X-HE-Tag: 1711832734-907031 X-HE-Meta: U2FsdGVkX18jTYDCE0MjHWLJ/Wmb3K+pr+GVUbF2NdfoviwZmoYPI08KUzBdRKQF7U8Bip7I8QDdQeivIoH5KMNtGUer0q482uLFrF/42/dMIv5o3ojMmv2eTTrPgiMiRLC2UZvORyL8RXd4rEpZw9X7yZrhZtuO8IfXCwnoVrHh9TFjPCtPbILe4IANsg+PcBqqULSD3PiXhID8dbxPjBbu3JgYC2SEn2nMb+cFJgC8P0lBk21eFEB5VV3t6d2t/LnV/bn67G3aXeCd/JB4KNTKjNEHk+qT/VyhmIAJLaEZsIa94FCpxjmLCA2PavIbZ4XPzQCAmd1TDvzqlTpScT0T+4Y5orL15oRDI457osM5mpHhMqucKBNV+jv3t2q8lYEHY8kP++0ZOzJEzfMOflma+zzz1DrNEc4oOcy7DyMaHTfG6/o9RXNCicyGCt/wU4E0pS5vqaYsPrg+qSi4ZqdTgj1ALAeRwkvINIQYKLbgt1DEwFAQ4VOx9qwNGU/f2F+zZTwfuhU1LlXwHqA91LGnxOxtdrwAksTmgUZFVuN+UI5NcvdEMq9qY4nVXXzteasG6NLIyneE+vJprBeBMrPl+P+X24DGKkWpxUICVKwiCb9XeqqjKgPBZ5hDJqZLJUzgWfFqZESg/MOMilySbIhS5ETx60SRwytwvoOzoLLQbQ1ZpFHdwNg+FcDNuzP9UzJWW2HAAmjP22UwUjeYgWhT7Gi95L/Uo+ds1Y5pebujSIZKnPkKC23p5lePBLQITNPMO0zaav+t8LEXukjXuqc/L4Ub5LiKHL70iGY+u6oRTgb0+EroLKF+wMS548D3RMWqGEBAjIX2IkBcVBNGa4gqDilBl7JrB7qCojvITM9eig1g1kD3ygiFy3bdC6nSKCgEX5rExv6XLJxeofc6xssdiLzzsMEEa7+kJdsi7sm5PqRM0+L9H1cTFLxF5EWKQn+j5gHKENMf9gdLJWO efat+pnF ZZtgvQwZFVSLwvocIkWqYFbuJH9CLxCgZOQoI+CdQuisBTLSAZqVpWF9pu6K5u/esKRgR9lREwX3fNAlxc6wdpAnyH8ngKF/PDDIiIe7izakJqi27yArkyofgIvqT5sk9rwilQkjPXigOnPiiZEDsAeKJZLZAmh2CuO1FcXD4hckOntMZku0bVsDYqKeHh5x5L1O2 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 3/29/24 23:58, Michael Roth wrote: > This will handle the RMP table updates 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 | 5 +++ > arch/x86/kvm/x86.c | 5 +++ > virt/kvm/guest_memfd.c | 4 +- > 6 files changed, 113 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig > index d0bb0e7a4e80..286b40d0b07c 100644 > --- a/arch/x86/kvm/Kconfig > +++ b/arch/x86/kvm/Kconfig > @@ -124,6 +124,7 @@ config KVM_AMD_SEV > depends on CRYPTO_DEV_SP_PSP && !(KVM_AMD=y && CRYPTO_DEV_CCP_DD=m) > select ARCH_HAS_CC_PLATFORM > 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 9ea13c2de668..e1f8be1df219 100644 > --- a/arch/x86/kvm/svm/sev.c > +++ b/arch/x86/kvm/svm/sev.c > @@ -4282,3 +4282,101 @@ void sev_handle_rmp_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++; > + } > + > + 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 a895d3f07cb8..c099154e326a 100644 > --- a/arch/x86/kvm/svm/svm.c > +++ b/arch/x86/kvm/svm/svm.c > @@ -5078,6 +5078,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 0cdcd0759fe0..53618cfc2b89 100644 > --- a/arch/x86/kvm/svm/svm.h > +++ b/arch/x86/kvm/svm/svm.h > @@ -730,6 +730,7 @@ extern unsigned int max_sev_asid; > void sev_handle_rmp_fault(struct kvm_vcpu *vcpu, gpa_t gpa, u64 error_code); > void sev_vcpu_unblocking(struct kvm_vcpu *vcpu); > 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); > #else > static inline struct page *snp_safe_alloc_page(struct kvm_vcpu *vcpu) { > return alloc_page(GFP_KERNEL_ACCOUNT | __GFP_ZERO); > @@ -746,6 +747,10 @@ static inline int sev_dev_get_attr(u64 attr, u64 *val) { return -ENXIO; } > static inline void sev_handle_rmp_fault(struct kvm_vcpu *vcpu, gpa_t gpa, u64 error_code) {} > static inline void sev_vcpu_unblocking(struct kvm_vcpu *vcpu) {} > static inline void sev_snp_init_protected_guest_state(struct kvm_vcpu *vcpu) {} > +static inline int sev_gmem_prepare(struct kvm *kvm, kvm_pfn_t pfn, gfn_t gfn, int max_order) > +{ > + return 0; > +} > > #endif > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 617c38656757..d05922684005 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -13615,6 +13615,11 @@ bool kvm_arch_no_poll(struct kvm_vcpu *vcpu) > EXPORT_SYMBOL_GPL(kvm_arch_no_poll); > > #ifdef CONFIG_HAVE_KVM_GMEM_PREPARE > +bool kvm_arch_gmem_prepare_needed(struct kvm *kvm) > +{ > + return kvm->arch.vm_type == KVM_X86_SNP_VM; > +} > + > int kvm_arch_gmem_prepare(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn, int max_order) > { > return static_call(kvm_x86_gmem_prepare)(kvm, pfn, gfn, max_order); > diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c > index 3e3c4b7fff3b..11952254ae48 100644 > --- a/virt/kvm/guest_memfd.c > +++ b/virt/kvm/guest_memfd.c > @@ -46,8 +46,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; > } > } Reviewed-by: Paolo Bonzini Paolo