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 A215EC4332F for ; Thu, 22 Dec 2022 18:24:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1E259900003; Thu, 22 Dec 2022 13:24:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 19310900002; Thu, 22 Dec 2022 13:24:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 032AE900003; Thu, 22 Dec 2022 13:24:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id E9E12900002 for ; Thu, 22 Dec 2022 13:24:22 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 887DEA0A4A for ; Thu, 22 Dec 2022 18:24:22 +0000 (UTC) X-FDA: 80270767164.19.A19C459 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by imf06.hostedemail.com (Postfix) with ESMTP id 640D8180008 for ; Thu, 22 Dec 2022 18:24:20 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=gmx.de header.s=s31663417 header.b=FIbEaueL; dmarc=pass (policy=none) header.from=gmx.de; spf=pass (imf06.hostedemail.com: domain of erbse.13@gmx.de designates 212.227.15.15 as permitted sender) smtp.mailfrom=erbse.13@gmx.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671733460; 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=dqAyUaHaIyeft9pg/RxR9tad/5CTBHUr7hpzSocz6G4=; b=Vr3Ljf3MgeVdsZeCEB0+N60EhnEebR9xuEcpVGiml3716wU+msAX63wp1bITD1XbrAajCr 9N4t59XK8Ovl1h4SfJbiSZm83HqAjsESKx05EYUFd1w1mSxFSDgBErFBswhTefOQGdSMXQ HnsU1ApOYBqCV9tQzUGYlPAXrwZY9Rw= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=gmx.de header.s=s31663417 header.b=FIbEaueL; dmarc=pass (policy=none) header.from=gmx.de; spf=pass (imf06.hostedemail.com: domain of erbse.13@gmx.de designates 212.227.15.15 as permitted sender) smtp.mailfrom=erbse.13@gmx.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671733460; a=rsa-sha256; cv=none; b=Kw7aO8aV61O1XVwAnKJk9jSgsO0Bos2lLLn+coGk3eXHcmcuvLC4ij9nnBFgwQ0s9X1JRt 8QwvvlWmF6lsE7vNCAOEWLu2NxWy9xyx/eX8sy4JUK+Ygj4Y6kbEgozMlYHJT9YsYwrEQi VRlQ9xiquNeIvmdFyhsiPoeafuCxk64= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1671733456; bh=3C//pPReD1huiKwB+HIgGP+aYEUDdZN5HiRsK7t6BqE=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:References:In-Reply-To; b=FIbEaueLWxPWU2nVI81X+aZBJqb7pGiKZdoKgG+U+/42wzeWTFzf6iHOLbjwRHbKS aMZzYGP8gHRMOKHvL1MBsPw9wQm7ScTzhLbqAW1IOwD6kJAt/sBzJJXkcro7xzTtFd 2IKPtO3ztNsG868yBfXLbm6JnrU3PAYcrgydeAVD8/kiq7SqwykGc7pn8Ku0Q1Mm80 0ko/EnwuL32ohUPiwG0c04Co75Liy1YpueJvj9rrltmRh0ZIwg/6S3bUW5rvzlD3mw S+3O/RlnmWoqSD1a5e6mTdikoi28Qy0hxvDowJ2Oh8g3xC6T10Zy/wLSvR/GdoQeT8 ekEncX+m2UNyA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost ([62.143.90.77]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1Ma20k-1pKZqG2wdg-00Vvny; Thu, 22 Dec 2022 19:24:16 +0100 Date: Thu, 22 Dec 2022 19:24:02 +0100 From: erbse.13@gmx.de 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, jarkko@kernel.org, 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-Provags-ID: V03:K1:iVceB1ZaTzjhtQbFgMfH9Ymg2SVfhDV1qs8iVgziQpLZ9OiSFWI sN08JdZwg8iuA8yLBoaQVNwx8WhVzL/GntbJSgRtWdUJ+dV69YrUwD8vPGSvr+qBqI+rvM3 7IQ605ZNfMYdkWFdgTDF8nA3LA0A96qzMWZ7ICA/7cCXnt3WtZsxm/sU/LXGtPEQxcfSpuL q4SEojyNdmQn9qUyq7hWw== UI-OutboundReport: notjunk:1;M01:P0:mdELVBPtDLE=;IBvNb1Mqd/JKAyjgIXTx8Dll7mH ROU2y7XjKq0+oZ1bfY2w7dFcRtxeWQa8eVJ2+S0loCSdqt2xz8Hvg+ZagBUZLQg37Dt0Dc2ZD YF0+WtnJpmHVjBwzEd0AEULmciHzK5mHAvWPEBcUisv/SMfoPkzxQpq4TabH9ZbYJUgeHhr0F dzRTGl4HeUPmp9vWNwN1oDJMDdYEyqfffS/K0SaT68igm8SQdH7gjmL60nSab2fY8uxOTXklR 4m5HEuR1zhTSNHp3Ztf27Z8gVKDQYlCQMHM4ERCmPTcC0Wca5TYHg+iclVpS6V5EaB4nk/N8u WIZA2Eeft+8wzqXUW18TV6CiRkp7oocNjB1NN50akqy7kGJ33YZTMKhBJsYeVGsx9oPn4jagA YzXPsqlwrP2kPPSUomkmnV+O7jtHtVnXTIAihl934kbl40IRHsk6yMKBb9iDfI9Lnj0sPMCjN /Tx8FgwNxQuHQoWlNrk1JGDKjn4Yg1A7dDY9IsHF8ejlyBZXDJK3JcnKjBa/5kJ4PbX9E8Ngc W4gBgYrVfxd260LRebdhVupfZcmgUa2LlWHR7BGYXu2uSBNw7gbwye+l9zhdd/KGml/y7OzbJ roxc6AF378FfsfxnPQjf43niz7yHhqz1r4DSzdNiuU1PHfB1J7F4RRCIxyzjnyelcSuBQGEZe dtJiFXcsivaiT4mRDDptAqQJEqxibD+KAUrnFQxt9J4/g/AWFksHi/jFd9ypkOx6ziR0qDASL Djfb3x4uOG88TKmbb22g+FrU3FJntg3/h5xGX094wlMHv6Sy+APV+7nZVOjHeK6kfAfm4q9C3 qFawT+WGJ1h856OcOLx5qNe1MCyAq7QOPigBPzWfo3ic2vbEqs/yLTC6vZPGkyN8gd6Liti22 Tte+ZHHryGvKmvcJfFOCNXgQNahqzo0yWT6RhyS0zGY0okNfvraWBasF4gDZmXLn7FhvKj7oS LCIiDaYU51jEQPEcd8umLujuT40= Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 640D8180008 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: xy3ank9t6h4ri6b79ik6uomxxiqh3q1w X-HE-Tag: 1671733460-479188 X-HE-Meta: U2FsdGVkX1/HagvioiQlpxxBZbzWyTOJ5K3Mr/5RdevQKCCOUFBRIFVQ3FERfdyv4BmFfB/pR7Uruj5kXeM63x4YB+4yWFTdRjZmur9e/BUCi9pk+JDCwT6QOIrOha2VOR1mPD/PpNt9UMgpAFuQJYhrTGkiiZumbV+UmUcLV7RLSKfVj6/aWiccn2bEP7yb5uOue4OSv/2b/CK5SfeVJody6MY8yOLXnQ1BtvpZw0gOOMpyZ3hsqTHoSSHXiseQyceUKEtkaHVhScll2Rbog83BvGTtPg3nrQB+wca3BH5SUaBhZTirYlxnD808XHl8Tktnp106oq8P/Fo60eezPb/flUphcVislKfAqt7JtGtFGiCdyQj+njbXCmm0xenCgPfK9WZHTJg4Kkx3S2hTer3bv0sSCL+pAaSLprzAjAqQjAt9ydvM3vxmkHu7mXBjR39De6RiGkfJeNGvKVjteqGe8WRa2UnHUNY0I8XGRxtph8xtTY12hXzwyTpw/Ka/wf0x2jkN0HZvtupv+wb7cP6+R0MFd8NSsZZ914btQcvoPXQZ80Lj1sRdo9hQsQ/LxbAhIEuhL9NACaUbzIUuBKirNuX5zcMsF1NvAEZGW4DErtmQ329NK79Kgk9o6Iv2CJ6Vb75m8eFWLrS7cKjeRcSTCMAJT/xw9cKBdmvsUrOGy5iS2NPyNKcZn2z7gI7bmwl9DRhifjRBRaEIdmNHJH/NxBo/3UapbrEGEZI8lbdjtQQyJMQqpH9toWLhLGTo2HAS5aMKbXUDVFfNHtEg/f2JMzVFTfvJihp8TGnHIBZMkYqb4Z0Ts03qFV8fVrmwV9uSaacybbF8t+TSxkUNV08JgLzT0TWAnu9xARLrvNNF6zbgDvV+A64PW1Ya+qUGtBf+SXMhCKmKtfLUH/JU5MS6WYym6zIU3kaDCMr21huKeWhQ9YD4wQ== 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 =3D range->slot; > + struct page **pages =3D data; > + int ret =3D 0, i =3D 0; > + kvm_pfn_t pfn; > + gfn_t gfn; > + > + for (gfn =3D range->start; gfn < range->end; gfn++) { > + int order; > + > + ret =3D kvm_restricted_mem_get_pfn(memslot, gfn, &pfn, &order); > + if (ret) > + return ret; > + > + if (is_error_noslot_pfn(pfn)) > + return -EFAULT; > + > + pages[i++] =3D 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); > +} The third argument for the kvm_vm_do_hva_range_op call should be addr+size= ; the function expects the end of the range not the size of the range. > + > static struct page **sev_pin_memory(struct kvm *kvm, unsigned long uadd= r, > unsigned long ulen, unsigned long *n, > int write) > @@ -424,16 +461,25 @@ static struct page **sev_pin_memory(struct kvm *kv= m, unsigned long uaddr, > if (!pages) > return ERR_PTR(-ENOMEM); > > - /* Pin the user virtual address. */ > - npinned =3D pin_user_pages_fast(uaddr, npages, write ? FOLL_WRITE : 0,= pages); > - if (npinned !=3D npages) { > - pr_err("SEV: Failure locking %lu pages.\n", npages); > - ret =3D -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__, uad= dr); > + ret =3D -ENOMEM; > + goto err; > + } This branch doesn't initialize npinned. If sev_get_memfile_pfn fails, the = code following the err label passes the uninitialized value to unpin_user_pages. > + } else { > + /* Pin the user virtual address. */ > + npinned =3D pin_user_pages_fast(uaddr, npages, write ? FOLL_WRITE : 0= , pages); > + if (npinned !=3D npages) { > + pr_err("SEV: Failure locking %lu pages.\n", npages); > + ret =3D -ENOMEM; > + goto err; > + } > + sev->pages_locked =3D locked; > } > > *n =3D npages; > - sev->pages_locked =3D locked; > > return pages; > > @@ -514,6 +560,7 @@ static int sev_launch_update_shared_gfn_handler(stru= ct kvm *kvm, > > size =3D (range->end - range->start) << PAGE_SHIFT; > vaddr_end =3D vaddr + size; > + WARN_ON(size < PAGE_SIZE); > > /* Lock the user memory. */ > inpages =3D sev_pin_memory(kvm, vaddr, size, &npages, 1); > @@ -554,13 +601,16 @@ static int sev_launch_update_shared_gfn_handler(st= ruct kvm *kvm, > } > > e_unpin: > - /* content of memory is updated, mark pages dirty */ > - for (i =3D 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 =3D 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_ATTRI= BUTE_PRIVATE); > e_ret: > return ret; > } > -- > 2.25.1 > Regards, Tom