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 4E58CC00A5A for ; Tue, 17 Jan 2023 23:31:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7BC576B0072; Tue, 17 Jan 2023 18:31:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 76C6A6B0074; Tue, 17 Jan 2023 18:31:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 633E16B0075; Tue, 17 Jan 2023 18:31:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 5300A6B0072 for ; Tue, 17 Jan 2023 18:31:07 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 17FB41A0BED for ; Tue, 17 Jan 2023 23:31:07 +0000 (UTC) X-FDA: 80365888974.29.A77354C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf05.hostedemail.com (Postfix) with ESMTP id 6DAE7100008 for ; Tue, 17 Jan 2023 23:31:05 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ixzAcMag; spf=pass (imf05.hostedemail.com: domain of jarkko@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jarkko@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673998265; 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=OF6BEn02cOBvJVWWYHaASGLdGxJwZHQldldUPzo3x+U=; b=bqGzrkEtFRBwwFsE+ypAaknZGT5cQMyZcoklci6b7Wx2fLLdmvf/MVZ+Dadbtx8Y9GK95d jWMmUIEQwIzmaK+SAmbnilQa3bMiBr3RsBsZO+Z4RjGEwNgLifResuoQjhT3y0uuIZmx3N cmd0RiQ1PKKGJ8g9gLJXk6Yx1oLw9HM= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ixzAcMag; spf=pass (imf05.hostedemail.com: domain of jarkko@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jarkko@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673998265; a=rsa-sha256; cv=none; b=s5tcQDKmXFaVRnlN73TUoao+PUynZ8v88iOwolXq1qQGKn/jthCw3IxwXppneYFnYKMJHU iIpc9kGJqe5cRzX05TqacG80vKIjRNUo/JGGhAxAryx7jEPJvSJwNVQgCgK2z9zu927/H4 I1yFlVKOpVg3/LzYJEbCAz+0jWTuH7k= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 71BE3614BE; Tue, 17 Jan 2023 23:31:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E87AC433EF; Tue, 17 Jan 2023 23:31:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673998263; bh=gX7M02TttoCc8S5RPwEXyV27eIRgsayZQ2pGPcyLZ3M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ixzAcMagECl/baI4IaKYNOpGdQJOJkjkfXvuJn87XqFVcXiosbOzAmy96L8R0nGiD 9+zsVxepnnCJhKPfWv3acTFjNcVBYfSWEaLGw0TcWDtuafprlLKoH8L2ZZOyTqeIQl +yl/lDlTOuGpnQiS/0o5KBF1BwW73ZnoJAJtdRzZR1mnKqjrkANaZN6L9XrwfH0ANP k02FE2C3dEuYdsmcWUc73EdzYdLH/Ln5GuOhk37qqYeZYTAZISbRt5f1FEBTrTuM2I je/v+iTB/IvQ4ppRIdzhyFIGT6CZ4JTNstc9MyXk9gtXYiXTRGjz4vHKK68XqKGQG3 +DtD30WIT6xig== Date: Wed, 18 Jan 2023 01:30:57 +0200 From: Jarkko Sakkinen 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, wanpengli@tencent.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, marcorr@google.com, sathyanarayanan.kuppuswamy@linux.intel.com, alpergun@google.com, dgilbert@redhat.com, ashish.kalra@amd.com, harald@profian.com, Nikunj A Dadhania Subject: Re: [PATCH RFC v7 11/64] KVM: SEV: Support private pages in LAUNCH_UPDATE_DATA Message-ID: References: <20221214194056.161492-1-michael.roth@amd.com> <20221214194056.161492-12-michael.roth@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221214194056.161492-12-michael.roth@amd.com> X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 6DAE7100008 X-Stat-Signature: qcrzzoehc91cqg97ir3bcsebmzw3tb5j X-Rspam-User: X-HE-Tag: 1673998265-657958 X-HE-Meta: U2FsdGVkX18o6npYL0Q15T7dqFgHKzcIuUs9jDcVbg2q4dRjwCQ5iauu5rIC9GOfgol8E68iNitoCZ12nwO6xgePUUNTgLKEdWz7i36DTa23Uf23sqiAmxyhy5IT0OqdTQv8qc7hXhQiVLh8AevJDO3eIMEYF0FiWwXqvzgPsYOXsiCyOKjpFQPltiR9sTyjE3J+3+o5DwwuWE942tmu7ZiXwXurqdsNDSWgfkKPRNoinKFN9ZsAg+1BGjCQuzxHACXR5omQjwGS2vEqr+XEXxuFhyWVUAZ6YrL5bG9MaPGbicjB3e/8E0X9h7dHzhuCym1rlezsVxFReh05YKaCjp0uNUT9lQv8Vb4UomHT0M/JsqwILOQbLf5kTr4db8Em1RBf+IFA+gzwGZyQgIeGWI3FKka9B00zavj0Zpr030v0EMZ91X1YQFSLQGpHU7xtezCnSTwtUFVQnEg7CeTtSct/vHoP01w/bAnGNprZRaBfgGpr020dshmzwucHrvsucRQF/DCZ62JW07rVuS6rhhxN9WbUR4iH6trH7eo44Uom5BX7ajrzWwsfKtFM87synW7FJy5rxSRxfvqKLeP7411yMUB3ObHMdvcfw9Z4ikzWY/3Nj50BtziWJNQOif5NipdFjy00gYwXdfcMaQX9+D34NVOOl4zIZtyVp4XeO6gJhoTtJIjF/YqMR3i3SlPtQyeezcj050d1r4E4BNKeVTC4RFtxBd3rxFCZz7cjbMgxSvVH7OGJukkaK+l5GedD5l2N40Hchu0OsYeugE2RCGQz/CDV8SKcJTHj45TCtiq9Ouu6nRZnIqJ880WXHUDEPSUPxSNNf4bg+jfZLuyjZdB1A2CT57V4De9lt36Mh+Gc8uup5SH1pvqV9/sqXKkKcnq19qi+qsxwS1LCjZKQDJpsHauYHRsqLoHIddD5s3Fc4rKmFa/1ybD3cWv6z3iMAG9P++Nyk4rC4xJZb6s CaAEjOwQ yq9VbV6eiq135K5dh+Cv05lOqjD70Tct/0btVD5GELp08GJVHhe0QYgmXVUwK+JV2+8lBoLAmEmfEWnOX4bCFZkzHLw== 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: On Wed, Dec 14, 2022 at 01:40:03PM -0600, Michael Roth wrote: > From: Nikunj A Dadhania > > Pre-boot guest payload needs to be encrypted and VMM has copied it > over to the private-fd. Add support to get the pfn from the memfile fd > for encrypting the payload in-place. > > Signed-off-by: Nikunj A Dadhania > Signed-off-by: Michael Roth > --- > arch/x86/kvm/svm/sev.c | 79 ++++++++++++++++++++++++++++++++++-------- > 1 file changed, 64 insertions(+), 15 deletions(-) > > diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c > index a7e4e3005786..ae4920aeb281 100644 > --- a/arch/x86/kvm/svm/sev.c > +++ b/arch/x86/kvm/svm/sev.c > @@ -107,6 +107,11 @@ static inline bool is_mirroring_enc_context(struct kvm *kvm) > return !!to_kvm_svm(kvm)->sev_info.enc_context_owner; > } > > +static bool kvm_is_upm_enabled(struct kvm *kvm) > +{ > + return kvm->arch.upm_mode; > +} > + > /* Must be called with the sev_bitmap_lock held */ > static bool __sev_recycle_asids(int min_asid, int max_asid) > { > @@ -382,6 +387,38 @@ static int sev_launch_start(struct kvm *kvm, struct kvm_sev_cmd *argp) > return ret; > } > > +static int sev_get_memfile_pfn_handler(struct kvm *kvm, struct kvm_gfn_range *range, void *data) > +{ > + struct kvm_memory_slot *memslot = range->slot; > + struct page **pages = data; > + int ret = 0, i = 0; > + kvm_pfn_t pfn; > + gfn_t gfn; > + > + for (gfn = range->start; gfn < range->end; gfn++) { > + int order; > + > + ret = kvm_restricted_mem_get_pfn(memslot, gfn, &pfn, &order); > + if (ret) > + return ret; > + > + if (is_error_noslot_pfn(pfn)) > + return -EFAULT; > + > + pages[i++] = pfn_to_page(pfn); > + } > + > + return ret; > +} > + > +static int sev_get_memfile_pfn(struct kvm *kvm, unsigned long addr, > + unsigned long size, unsigned long npages, > + struct page **pages) > +{ > + return kvm_vm_do_hva_range_op(kvm, addr, size, > + sev_get_memfile_pfn_handler, pages); > +} > + > static struct page **sev_pin_memory(struct kvm *kvm, unsigned long uaddr, > unsigned long ulen, unsigned long *n, > int write) > @@ -424,16 +461,25 @@ static struct page **sev_pin_memory(struct kvm *kvm, unsigned long uaddr, > if (!pages) > return ERR_PTR(-ENOMEM); > > - /* Pin the user virtual address. */ > - npinned = pin_user_pages_fast(uaddr, npages, write ? FOLL_WRITE : 0, pages); > - if (npinned != npages) { > - pr_err("SEV: Failure locking %lu pages.\n", npages); > - ret = -ENOMEM; > - goto err; > + if (kvm_is_upm_enabled(kvm)) { > + /* Get the PFN from memfile */ > + if (sev_get_memfile_pfn(kvm, uaddr, ulen, npages, pages)) { > + pr_err("%s: ERROR: unable to find slot for uaddr %lx", __func__, uaddr); > + ret = -ENOMEM; > + goto err; > + } > + } else { > + /* Pin the user virtual address. */ > + npinned = pin_user_pages_fast(uaddr, npages, write ? FOLL_WRITE : 0, pages); > + if (npinned != npages) { > + pr_err("SEV: Failure locking %lu pages.\n", npages); > + ret = -ENOMEM; > + goto err; > + } > + sev->pages_locked = locked; > } > > *n = npages; > - sev->pages_locked = locked; > > return pages; > > @@ -514,6 +560,7 @@ static int sev_launch_update_shared_gfn_handler(struct kvm *kvm, > > size = (range->end - range->start) << PAGE_SHIFT; > vaddr_end = vaddr + size; > + WARN_ON(size < PAGE_SIZE); > > /* Lock the user memory. */ > inpages = sev_pin_memory(kvm, vaddr, size, &npages, 1); > @@ -554,13 +601,16 @@ static int sev_launch_update_shared_gfn_handler(struct kvm *kvm, > } > > e_unpin: > - /* content of memory is updated, mark pages dirty */ > - for (i = 0; i < npages; i++) { > - set_page_dirty_lock(inpages[i]); > - mark_page_accessed(inpages[i]); > + if (!kvm_is_upm_enabled(kvm)) { > + /* content of memory is updated, mark pages dirty */ > + for (i = 0; i < npages; i++) { > + set_page_dirty_lock(inpages[i]); > + mark_page_accessed(inpages[i]); > + } > + /* unlock the user pages */ > + sev_unpin_memory(kvm, inpages, npages); > } > - /* unlock the user pages */ > - sev_unpin_memory(kvm, inpages, npages); > + > return ret; > } > > @@ -609,9 +659,8 @@ static int sev_launch_update_priv_gfn_handler(struct kvm *kvm, > goto e_ret; > kvm_release_pfn_clean(pfn); > } > - kvm_vm_set_region_attr(kvm, range->start, range->end, > - true /* priv_attr */); > > + kvm_vm_set_region_attr(kvm, range->start, range->end, KVM_MEMORY_ATTRIBUTE_PRIVATE); > e_ret: > return ret; > } > -- > 2.25.1 > kvm_vm_set_region_attr() should be fixed already in: https://lore.kernel.org/all/20221214194056.161492-11-michael.roth@amd.com/ BR, Jarkko