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 2D50FC4167B for ; Mon, 6 Nov 2023 11:26:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AA4A06B01F1; Mon, 6 Nov 2023 06:26:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A54246B01F2; Mon, 6 Nov 2023 06:26:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 91BC26B01F3; Mon, 6 Nov 2023 06:26:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 82DC96B01F1 for ; Mon, 6 Nov 2023 06:26:52 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 50DD71A06FD for ; Mon, 6 Nov 2023 11:26:52 +0000 (UTC) X-FDA: 81427302264.16.180BF87 Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) by imf13.hostedemail.com (Postfix) with ESMTP id 98DD92001B for ; Mon, 6 Nov 2023 11:26:50 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=JffY7e3y; spf=pass (imf13.hostedemail.com: domain of tabba@google.com designates 209.85.219.48 as permitted sender) smtp.mailfrom=tabba@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699270010; a=rsa-sha256; cv=none; b=b3d0qVoVIvML+RTX7k+b3/UzCNtTytcofF6OJFKd4O25KtSOIN0h1voKynmh5NUfjHH3r3 bvJlzKtF1hTkcgsunv+nJiva5EkMzJFyWrWyVPWjaLMaW5G75uO86r8UJX4I/A/PYL2QfW Kv8j+aYQK7UutQRragKP2aKtI5xcor0= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=JffY7e3y; spf=pass (imf13.hostedemail.com: domain of tabba@google.com designates 209.85.219.48 as permitted sender) smtp.mailfrom=tabba@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699270010; 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=bcdCS6aA0hU/P/1Lxpxkfas8L67FF+zkKmd2vDLbKHk=; b=Lie4OxZi3vbYE/FQoPw/uwrfvfBtC5IxK5ECcUNOrEPYDwfYhovk2cZFARjfKbTzZDBILl N613sPj2b2cYX5ZeI9VBnCZZiPU9sTq5+j99enL70I9nlNpuos/tt3eb7htqUQRRe3iXUL z6TNCiFPu9X7yYaf7rvf+C8ZzblGBN4= Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-66fa16092c0so30688216d6.0 for ; Mon, 06 Nov 2023 03:26:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1699270010; x=1699874810; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=bcdCS6aA0hU/P/1Lxpxkfas8L67FF+zkKmd2vDLbKHk=; b=JffY7e3yN1thnGSJu8T15y3QCrfFoNQJN/HQCYoSwsvmJKj2rVhVbhgWwqvgfH1OIe glSOhi3ou5umI+mkhvmg6Q/uNT57nDvd7c5oDxWKdRc85pGOCB7TlXx/tgrrmtctRH2x gJl7BWwhjyos7r2ynCwidJ8+jpgmPnlxy/6vvUBMwQALs9nJp7r1Q87I89fxp8C7Y/CI YYayNv8zfON8HSVrh8NHY7iUkbc/vDlnARDwgVhwOvhP4ZVuDgTwzFvp/tBibsxkGESX QFlBJwYqtTYOwXiL7B7D7b76ITwnZNrisyTjnbdbPmhYOL0gmwFxSqHka/k26TvJjZHk RmNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699270010; x=1699874810; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bcdCS6aA0hU/P/1Lxpxkfas8L67FF+zkKmd2vDLbKHk=; b=hwanOdAnZQrwqJHG+YZH6w/ikj+iiGpg1VYnyob8EtEoN9wx2k6n0W3YNVPLxrm95G wx3+do6DokbYB/sghZCVlTUOWSWq+Ez2fVfnbE+g3UL+KM4HVx4QZeZbsPEYemYJDX4r fTblrZpEnjDQ7VnbxFtgHTMSj2cmR7LqE2TRDSEpMLaDf2ZfseSIavKhKe0c76Nw7nc8 t0LNXiC/iEvakhm7caYRl63B/KiEYYpJeLdmOF7PRf9g88e0E7R+B1aXkTdzM/qukDvB yeSM5BHzfH6nqradBZFH62KABzL35I6PB97jIyUSHIaVCOqpB1N5EOy5sBUca6nduPQ9 6Neg== X-Gm-Message-State: AOJu0Yxqr+Y3NP7Y2HM4zbIVm5fFNKn1vMrcSTyv7vtLRcZIcT0+c1Zc Lg2d5WdO9KCx+UHmB1ZnyGrJtQkF8J8dX33qiX3sfA== X-Google-Smtp-Source: AGHT+IFasxLYHHudhBN/+4eIX1OsOhIRfSB2CWnjQO7Y6r4dz1/Ca+R2Pv6YHi7+A5fsQfNYO2/OlOsYvWwG9CsrzMM= X-Received: by 2002:a05:6214:2506:b0:658:26d7:72e0 with SMTP id gf6-20020a056214250600b0065826d772e0mr20208405qvb.4.1699270009660; Mon, 06 Nov 2023 03:26:49 -0800 (PST) MIME-Version: 1.0 References: <20231027182217.3615211-1-seanjc@google.com> <20231027182217.3615211-28-seanjc@google.com> In-Reply-To: <20231027182217.3615211-28-seanjc@google.com> From: Fuad Tabba Date: Mon, 6 Nov 2023 11:26:13 +0000 Message-ID: Subject: Re: [PATCH v13 27/35] KVM: selftests: Add helpers to convert guest memory b/w private and shared To: Sean Christopherson Cc: Paolo Bonzini , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexander Viro , Christian Brauner , "Matthew Wilcox (Oracle)" , Andrew Morton , kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Xiaoyao Li , Xu Yilun , Chao Peng , Jarkko Sakkinen , Anish Moorthy , David Matlack , Yu Zhang , Isaku Yamahata , =?UTF-8?B?TWlja2HDq2wgU2FsYcO8bg==?= , Vlastimil Babka , Vishal Annapurve , Ackerley Tng , Maciej Szmigiero , David Hildenbrand , Quentin Perret , Michael Roth , Wang , Liam Merwick , Isaku Yamahata , "Kirill A . Shutemov" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 98DD92001B X-Stat-Signature: gmj8j7gynk87mhkh4o6xwiei4rhokcpe X-Rspam-User: X-HE-Tag: 1699270010-435332 X-HE-Meta: U2FsdGVkX19OBXaArea4Zaefs+OToY/6AAW8poWCslfd9ZkU21aFF7Jfxwd3MYI/wLZbA4SiA5sboc9ZO3GzorM9unqCvx+ZinyLdQLmuie8xl6ceMbxNiZl9Nyy0L2We0n/cl9fuXFvVfCt4GfgNUcX5OqifIQKb4yUZPqiMsu4bsn5xEFJ3Q3oo2nba45HYvc4d5L62wcLjO7Gs2/T8tHyesBAnUh4Rrkl0OvLLKomvTIrJvEZ/otrtEWhGSW+CIQHIfCPwMZ+ciN3c33koxq9GisvMnjU7+8IbseKiq4OfZWu1hOQWRVjmMnAGuWxCoNqC78e9gwBG78qYOBC6AURR2Ju1qGE4FnBZOgNRqru7Crmeg8jInVBtV5BaMYDUGoVAbYx8hgucYxxlu2sAb1OXBxbdQG57fMh1o17j5QSx4/ohKMOR+1lDgCZvuA2L6evEBap5QNVEgAEQrrz8zolx614MwDpjig9rDDs+hj0gFvC0dgLpP9ozxkqCeYq2UTPQRnmMChzUPQH50E1EDF5uFdWHcKdi0OGPLucZZRWUrdS9vEaadB3nQyMSJgAKm00KkLxWoTp/cACey1B13kjNI/FTLpmsM2eHL6W1GryUuQBZs6fE8ZveMf1bPBa2s5Utroq6PpJGC21Uyi/gmyvRQmziib59vxyVmgW0EICMWrXs6b32jYKoPxLtu/oUNTP1talNg71h7t/S090HlzaXqGZCTNPXEeIKc5+JulJd/1eHowJFml7fhVakE+qv/b+3IDPrngfvsjOMSSSc0agNWe6z7d0yUS4iXHhmsBvcyWuVaaWG1M36F7OYN/5rY5V0Xw/A25NjR2mdOVBhDsJvW+kj5KeGuiwBXiVOJCwmyMo76mgNOhK1WkledUzn5e0dPmmKTnxkIweqJ0MzStVwdTx2CXFWpl9k2YHokDl4YoCzpmBb7xJj7D6J2JdGkPUKfaHjBStOTR5cwl EgZ6a1dN aWR+fTdYmzY6xX5xJGaZUUYm6JFH0aCqde1UNJhbGfu8Xr8IdG4C0x3vzaZ+249U2+cN5v7LKVs9f1qSORaH+RYVIm06p6J8sRC10mpgxIgL+DMwQnJSSOXs8gyzZy84emH/vxdrYhxGOxs0/xt2YUw3r+v5/mnYHT9UJcjYzWcydmWMYNfI2hs73HsNMC/NwELwSd5iPQCH/JLgkohoJMzw3/zDDdKsl1/wBtmm6Iw2Cej5KvhWA7yVL0KdgDEa7QZONCny6CvksWg0= 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 Fri, Oct 27, 2023 at 7:23=E2=80=AFPM Sean Christopherson wrote: > > From: Vishal Annapurve > > Add helpers to convert memory between private and shared via KVM's > memory attributes, as well as helpers to free/allocate guest_memfd memory > via fallocate(). Userspace, i.e. tests, is NOT required to do fallocate(= ) > when converting memory, as the attributes are the single source of true. true->truth > Provide allocate() helpers so that tests can mimic a userspace that frees > private memory on conversion, e.g. to prioritize memory usage over > performance. > > Signed-off-by: Vishal Annapurve > Co-developed-by: Sean Christopherson > Signed-off-by: Sean Christopherson > --- > .../selftests/kvm/include/kvm_util_base.h | 48 +++++++++++++++++++ > tools/testing/selftests/kvm/lib/kvm_util.c | 28 +++++++++++ > 2 files changed, 76 insertions(+) > > diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/= testing/selftests/kvm/include/kvm_util_base.h > index 9f861182c02a..1441fca6c273 100644 > --- a/tools/testing/selftests/kvm/include/kvm_util_base.h > +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h > @@ -333,6 +333,54 @@ static inline void vm_enable_cap(struct kvm_vm *vm, = uint32_t cap, uint64_t arg0) > vm_ioctl(vm, KVM_ENABLE_CAP, &enable_cap); > } > > +static inline void vm_set_memory_attributes(struct kvm_vm *vm, uint64_t = gpa, > + uint64_t size, uint64_t attri= butes) > +{ > + struct kvm_memory_attributes attr =3D { > + .attributes =3D attributes, > + .address =3D gpa, > + .size =3D size, > + .flags =3D 0, > + }; > + > + /* > + * KVM_SET_MEMORY_ATTRIBUTES overwrites _all_ attributes. These = flows > + * need significant enhancements to support multiple attributes. > + */ > + TEST_ASSERT(!attributes || attributes =3D=3D KVM_MEMORY_ATTRIBUTE= _PRIVATE, > + "Update me to support multiple attributes!"); > + > + vm_ioctl(vm, KVM_SET_MEMORY_ATTRIBUTES, &attr); > +} > + > + > +static inline void vm_mem_set_private(struct kvm_vm *vm, uint64_t gpa, > + uint64_t size) > +{ > + vm_set_memory_attributes(vm, gpa, size, KVM_MEMORY_ATTRIBUTE_PRIV= ATE); > +} > + > +static inline void vm_mem_set_shared(struct kvm_vm *vm, uint64_t gpa, > + uint64_t size) > +{ > + vm_set_memory_attributes(vm, gpa, size, 0); > +} > + > +void vm_guest_mem_fallocate(struct kvm_vm *vm, uint64_t gpa, uint64_t si= ze, > + bool punch_hole); > + > +static inline void vm_guest_mem_punch_hole(struct kvm_vm *vm, uint64_t g= pa, > + uint64_t size) > +{ > + vm_guest_mem_fallocate(vm, gpa, size, true); > +} > + > +static inline void vm_guest_mem_allocate(struct kvm_vm *vm, uint64_t gpa= , > + uint64_t size) > +{ > + vm_guest_mem_fallocate(vm, gpa, size, false); > +} > + > void vm_enable_dirty_ring(struct kvm_vm *vm, uint32_t ring_size); > const char *vm_guest_mode_string(uint32_t i); > > diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/s= elftests/kvm/lib/kvm_util.c > index 45050f54701a..a140aee8d0f5 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -1176,6 +1176,34 @@ void vm_mem_region_delete(struct kvm_vm *vm, uint3= 2_t slot) > __vm_mem_region_delete(vm, memslot2region(vm, slot), true); > } > > +void vm_guest_mem_fallocate(struct kvm_vm *vm, uint64_t base, uint64_t s= ize, > + bool punch_hole) > +{ > + const int mode =3D FALLOC_FL_KEEP_SIZE | (punch_hole ? FALLOC_FL_= PUNCH_HOLE : 0); > + struct userspace_mem_region *region; > + uint64_t end =3D base + size; > + uint64_t gpa, len; > + off_t fd_offset; > + int ret; > + > + for (gpa =3D base; gpa < end; gpa +=3D len) { > + uint64_t offset; > + > + region =3D userspace_mem_region_find(vm, gpa, gpa); > + TEST_ASSERT(region && region->region.flags & KVM_MEM_PRIV= ATE, > + "Private memory region not found for GPA 0x%l= x", gpa); > + > + offset =3D (gpa - region->region.guest_phys_addr); nit: why the parentheses? > + fd_offset =3D region->region.guest_memfd_offset + offset; > + len =3D min_t(uint64_t, end - gpa, region->region.memory_= size - offset); > + > + ret =3D fallocate(region->region.guest_memfd, mode, fd_of= fset, len); > + TEST_ASSERT(!ret, "fallocate() failed to %s at %lx (len = =3D %lu), fd =3D %d, mode =3D %x, offset =3D %lx\n", > + punch_hole ? "punch hole" : "allocate", gpa, = len, > + region->region.guest_memfd, mode, fd_offset); > + } > +} > + Nits aside: Reviewed-by: Fuad Tabba Tested-by: Fuad Tabba Cheers, /fuad > /* Returns the size of a vCPU's kvm_run structure. */ > static int vcpu_mmap_sz(void) > { > -- > 2.42.0.820.g83a721a137-goog >