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 D3E7DC74A5B for ; Thu, 23 Mar 2023 00:41:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D90546B0072; Wed, 22 Mar 2023 20:41:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D195A6B0074; Wed, 22 Mar 2023 20:41:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BBA116B0075; Wed, 22 Mar 2023 20:41:36 -0400 (EDT) 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 A58BC6B0072 for ; Wed, 22 Mar 2023 20:41:36 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 6E19C401B7 for ; Thu, 23 Mar 2023 00:41:36 +0000 (UTC) X-FDA: 80598309792.17.974DC81 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by imf17.hostedemail.com (Postfix) with ESMTP id 916064000F for ; Thu, 23 Mar 2023 00:41:34 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=EgHbbrk1; spf=pass (imf17.hostedemail.com: domain of isaku.yamahata@gmail.com designates 209.85.216.46 as permitted sender) smtp.mailfrom=isaku.yamahata@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679532094; 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=Nli6dQUADXkCT93kaRog0dXznCLZzv1eET9HwLL1Hk0=; b=lhGQcZ+fyP+g68srwzdLdKnCeiI+etJ2zYOHA8heNHLLhrcQXFPnLDRF+5Ljjiy1npscOO Xu/mRccUxTraN7C0WsyBww65f+m4RKVuYPzDzNHTjHAiT4jyFlqYZhm4xh9MXjOmGjh/1U edani3xfriFcs71XtIonZ7o1nE42fG8= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=EgHbbrk1; spf=pass (imf17.hostedemail.com: domain of isaku.yamahata@gmail.com designates 209.85.216.46 as permitted sender) smtp.mailfrom=isaku.yamahata@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679532094; a=rsa-sha256; cv=none; b=jipneEgS5nzqgTdAniDl6Xf9DSsyZ4jbTPFgNaVZ0aRrdCY74l0G0n+RlF7ByYWrQPd9Mp VtZ6zVL57E7R/ci0b8uY7ledR8KLaqzJAXmRVp0F0ZFWwMPnHTqZ6iK0dNFY3Sz3QV7aLX 6tWoqzhDJ4/cmwUDmZZuyqzY+otPw5U= Received: by mail-pj1-f46.google.com with SMTP id j13so20044319pjd.1 for ; Wed, 22 Mar 2023 17:41:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679532093; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=Nli6dQUADXkCT93kaRog0dXznCLZzv1eET9HwLL1Hk0=; b=EgHbbrk1aauBVwgIaxEGTuMprK1xZNCus6XfsR6fTEbDOFj+ziwreVSGEj/LVGbLgt fpWHEknmI6xPnkL3vhPFM8JUBHK+9DFF2XRnJm2G899AmfDNW5psqAw0j1PgntSJmXKs OaBchepVlSLISwFFVP/DMUdk/Vy9A9+2NtoMqDw7qbw/4InBCaIA9A3AP5CMb7a5rMlP Z0yQiLGinRUrkZV0SfLN2APGES4i35hk6ePSUkjZaTVtkPG1YyZ7rgYx5oJQOyuw/E6b H3NTfoUnIpteFYPhEQmsJE48AKcWflqd9VeHjIWIlcgh99q5GI8HZWlel8dFjcqwWv1A 0Qlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679532093; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Nli6dQUADXkCT93kaRog0dXznCLZzv1eET9HwLL1Hk0=; b=OC4nVKmMrmowYlU3CIB5p5T6jPyJDJOIYupIodaerotllRR4q8ipe2ivyGbBsDqx9f PboWBrcvDTc+rmaYyl+vH5aNhaB6hXFe9shFaccPKD6ktYmuYvDhsrCoEhwl2cAfg0KT gPM/DnlVOQ04Wb0IMOYEYknhANzoVmcDuaf3lcczouIZAXU9u+RZSuZXiKqAZr7dNZyX 4ejXHVO3MgRBKc4NsbsA9CErBvu6fxAva00tR8VycrcBlr970eRrPpuwff673kqerjjU Db2qQm1jGC9c5h9Uz20ENZVuF5PFOqGMiIs28wjBMNjCgPDWgfe4+6aHW0Gl5tuz+oQs HqwA== X-Gm-Message-State: AO0yUKUH+2OwMSnN47NcHZJxe/05bThkAmBMj/5OmUw2zbYQNfzs2btr 77r8HXhmh3DtJgxUSWWw2rQ= X-Google-Smtp-Source: AK7set8gXt+r3vrcFcNCwocuZTBvWUUZ3nPNYHgXD8Mgde+9UJkFIYJ5dt0UG9U5gaW437O/xM/diQ== X-Received: by 2002:a17:90b:384b:b0:23d:5196:eca8 with SMTP id nl11-20020a17090b384b00b0023d5196eca8mr6076318pjb.20.1679532093114; Wed, 22 Mar 2023 17:41:33 -0700 (PDT) Received: from localhost ([192.55.54.55]) by smtp.gmail.com with ESMTPSA id q61-20020a17090a17c300b00233db0db3dfsm123775pja.7.2023.03.22.17.41.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 17:41:32 -0700 (PDT) Date: Wed, 22 Mar 2023 17:41:31 -0700 From: Isaku Yamahata To: Chao Peng Cc: Ackerley Tng , seanjc@google.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, linux-doc@vger.kernel.org, qemu-devel@nongnu.org, pbonzini@redhat.com, corbet@lwn.net, vkuznets@redhat.com, wanpengli@tencent.com, jmattson@google.com, joro@8bytes.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, arnd@arndb.de, naoya.horiguchi@nec.com, linmiaohe@huawei.com, x86@kernel.org, hpa@zytor.com, hughd@google.com, jlayton@kernel.org, bfields@fieldses.org, akpm@linux-foundation.org, shuah@kernel.org, rppt@kernel.org, steven.price@arm.com, mail@maciej.szmigiero.name, vbabka@suse.cz, vannapurve@google.com, yu.c.zhang@linux.intel.com, kirill.shutemov@linux.intel.com, luto@kernel.org, jun.nakajima@intel.com, dave.hansen@intel.com, ak@linux.intel.com, david@redhat.com, aarcange@redhat.com, ddutile@redhat.com, dhildenb@redhat.com, qperret@google.com, tabba@google.com, michael.roth@amd.com, mhocko@suse.com, wei.w.wang@intel.com, isaku.yamahata@gmail.com Subject: Re: [PATCH v10 9/9] KVM: Enable and expose KVM_MEM_PRIVATE Message-ID: <20230323004131.GA214881@ls.amr.corp.intel.com> References: <20230128140030.GB700688@chaop.bj.intel.com> <20230308074026.GA2183207@chaop.bj.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230308074026.GA2183207@chaop.bj.intel.com> X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: pcndixui33uuk73ywy5dwhhy7h6cg9de X-Rspamd-Queue-Id: 916064000F X-HE-Tag: 1679532094-874536 X-HE-Meta: U2FsdGVkX18ijk4E42KSq8w45eVG7qHrwaoeES6iWmDJbdnWQpOcL+5IzxIfEw+t1HKv8mdChV7Q0ALp2zlPUtY0pi8DvbCvOfi0USRYYILaqeCMVjshctdo0svaGmtxT5aJrRTid11FaLhpF0YN3psi+VDGfJGif7evIML2U6u/hbfBbWdoLh+6S1RGZweCwyWf5EX4rSF/LMcCa7G7YRgVbfEX7YQdatSwtlgZMFm/kKyQaRKMve0VfWz6drD2E6hLC3SKmhrQG29oFLzr1sFixI+9d6TU971ASw7rqqhgGzoir6ngohgHKJd4JEr3rr4+ZqzXmBn2hCmBz6ssqG4FLB8gwMS2yl9NbU0Kxu2lMEoBxbGThaeG9RGHMuKlC4fr9+p0yHho1GlFrDN3ykQJkHl/dQkK+F+urANfGOzgmeH1pjlFAYNkBFO18DfL1h/r3C72t5o2od7twMoQGHSynD1b3WuXzWF2kOO9R/hSGwi77yRTSvP2GMQonW/djcHyOEIFOGGc4/NatTrSNd2AP6gQep+gnijgzGG+GZPdNdy7/Qr2L9wu76KtH74bsNAhWTSxkiizsgmnsE02DJREXcRisL1Z+ARA/tzDXZDyS7jMruRVnRPNfc042vB4gAcYe1RtME+KlJlIKrvQ0U6rbFrqX3b5iRO6nRFHEeNzlcGVbI0ptKQtbxOuHsHMg5YRebMpdoOYalNgB6u6MsQpu/2k9Ka/d9dwFEVdI5qwP1o0OGkDkbplJvWr73+/U5jMucWOva7rgIH1aDkxWZBCksSlDGXx2LxFartH3Xh6WdRJm/i+7V89HvSM9tiz0hB+aL/cJmnERwF9SpNfWtnLtkYbjw/1GHt4p/yNskFAQHIf+hPTKG1+mr/lKoF5SUWGf3CS/jdWOF+i8oxxLBwcXTIJS8EgHDp4nb/iATwUtrM+HjUtv2hvT98FxoIyD94ldsLz0lAm1d3V80z hTKL33ZK PKV0l8LAr/0P7VmzyTu96Jhh9NUIph5M2mp943MlnLII0V+kLIC1sBz8tra8NdkLXto6aumniM+baCwFrbvFqHZp9DnY3jdpEe9E19lGFdgH87KQPhY1aREHyNCDdAESLLs1CzJN7793ZpN4w6t8GdOjt6akGKA9KEpcSfvcLPSSDDfXUGWsDt3EhH6KXupWCP0MwGN1sT415YZjUd/LFuZy9wcpAV9Uh+Cv4PCzMOAchZldIidz8iyoDTH8I01uZkFPkpIAAjbphi/Qx3Sunr+JNmlbhXv0DvXw+C5VybDqc9D+EqUQjxzCCoC4iHttd4iTWWqo9tWgNcPSdyObYktjYoVugolkHr6AJEZ+YbsmQ6uGtzMGgdRGDtr9kFVDI6VH8vdR9Y8cg2eV8s95vgWaHPfAX4SI7eoaZ0l6pWNoGvtwScHcjCpA/jg0q5nozt7N3qmCadhcq/X2r2cEtqSjfE6ik8IGghYb7SIqOh33B0+tlUMgfMpPcageJmlGwh5aFco7EZ5sqCuG8MbmT8I0pp3e90Qh42EVc3MDUeNke/drMMEuGwm1XG6JrVwb/9kxHli8f3yglAGEGgqbUZ8CDlYfaeTbkfUWI 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, Mar 08, 2023 at 03:40:26PM +0800, Chao Peng wrote: > On Wed, Mar 08, 2023 at 12:13:24AM +0000, Ackerley Tng wrote: > > Chao Peng writes: > > > > > On Sat, Jan 14, 2023 at 12:01:01AM +0000, Sean Christopherson wrote: > > > > On Fri, Dec 02, 2022, Chao Peng wrote: > > > ... > > > > Strongly prefer to use similar logic to existing code that detects wraps: > > > > > > mem->restricted_offset + mem->memory_size < mem->restricted_offset > > > > > > This is also where I'd like to add the "gfn is aligned to offset" > > > > check, though > > > > my brain is too fried to figure that out right now. > > > > > Used count_trailing_zeros() for this TODO, unsure we have other better > > > approach. > > > > > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > > > index afc8c26fa652..fd34c5f7cd2f 100644 > > > --- a/virt/kvm/kvm_main.c > > > +++ b/virt/kvm/kvm_main.c > > > @@ -56,6 +56,7 @@ > > > #include > > > #include > > > #include > > > +#include > > > > > #include "coalesced_mmio.h" > > > #include "async_pf.h" > > > @@ -2087,6 +2088,19 @@ static bool kvm_check_memslot_overlap(struct > > > kvm_memslots *slots, int id, > > > return false; > > > } > > > > > +/* > > > + * Return true when ALIGNMENT(offset) >= ALIGNMENT(gpa). > > > + */ > > > +static bool kvm_check_rmem_offset_alignment(u64 offset, u64 gpa) > > > +{ > > > + if (!offset) > > > + return true; > > > + if (!gpa) > > > + return false; > > > + > > > + return !!(count_trailing_zeros(offset) >= count_trailing_zeros(gpa)); This check doesn't work expected. For example, offset = 2GB, gpa=4GB this check fails. I come up with the following. >From ec87e25082f0497431b732702fae82c6a05071bf Mon Sep 17 00:00:00 2001 Message-Id: From: Isaku Yamahata Date: Wed, 22 Mar 2023 15:32:56 -0700 Subject: [PATCH] KVM: Relax alignment check for restricted mem kvm_check_rmem_offset_alignment() only checks based on offset alignment and GPA alignment. However, the actual alignment for offset depends on architecture. For x86 case, it can be 1G, 2M or 4K. So even if GPA is aligned for 1G+, only 1G-alignment is required for offset. Without this patch, gpa=4G, offset=2G results in failure of memory slot creation. Fixes: edc8814b2c77 ("KVM: Require gfn be aligned with restricted offset") Signed-off-by: Isaku Yamahata --- arch/x86/include/asm/kvm_host.h | 15 +++++++++++++++ virt/kvm/kvm_main.c | 9 ++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 88e11dd3afde..03af44650f24 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -143,6 +144,20 @@ #define KVM_HPAGE_MASK(x) (~(KVM_HPAGE_SIZE(x) - 1)) #define KVM_PAGES_PER_HPAGE(x) (KVM_HPAGE_SIZE(x) / PAGE_SIZE) +#define kvm_arch_required_alignment kvm_arch_required_alignment +static inline int kvm_arch_required_alignment(u64 gpa) +{ + int zeros = count_trailing_zeros(gpa); + + WARN_ON_ONCE(!PAGE_ALIGNED(gpa)); + if (zeros >= KVM_HPAGE_SHIFT(PG_LEVEL_1G)) + return KVM_HPAGE_SHIFT(PG_LEVEL_1G); + else if (zeros >= KVM_HPAGE_SHIFT(PG_LEVEL_2M)) + return KVM_HPAGE_SHIFT(PG_LEVEL_2M); + + return PAGE_SHIFT; +} + #define KVM_MEMSLOT_PAGES_TO_MMU_PAGES_RATIO 50 #define KVM_MIN_ALLOC_MMU_PAGES 64UL #define KVM_MMU_HASH_SHIFT 12 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index c9c4eef457b0..f4ff96171d24 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2113,6 +2113,13 @@ static bool kvm_check_memslot_overlap(struct kvm_memslots *slots, int id, return false; } +#ifndef kvm_arch_required_alignment +__weak int kvm_arch_required_alignment(u64 gpa) +{ + return PAGE_SHIFT +} +#endif + /* * Return true when ALIGNMENT(offset) >= ALIGNMENT(gpa). */ @@ -2123,7 +2130,7 @@ static bool kvm_check_rmem_offset_alignment(u64 offset, u64 gpa) if (!gpa) return false; - return !!(count_trailing_zeros(offset) >= count_trailing_zeros(gpa)); + return !!(count_trailing_zeros(offset) >= kvm_arch_required_alignment(gpa)); } /* -- 2.25.1 -- Isaku Yamahata