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 0C879C4332F for ; Mon, 6 Nov 2023 11:25:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E9146B01B3; Mon, 6 Nov 2023 06:25:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 597E86B01F0; Mon, 6 Nov 2023 06:25:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 461876B01F1; Mon, 6 Nov 2023 06:25:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 362E46B01B3 for ; Mon, 6 Nov 2023 06:25:34 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D852240782 for ; Mon, 6 Nov 2023 11:25:33 +0000 (UTC) X-FDA: 81427298946.20.1FCFF51 Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by imf15.hostedemail.com (Postfix) with ESMTP id 16081A000A for ; Mon, 6 Nov 2023 11:25:31 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=uxw5E7gQ; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf15.hostedemail.com: domain of tabba@google.com designates 209.85.222.173 as permitted sender) smtp.mailfrom=tabba@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699269932; 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=8FgFIIfzRIOk5S3UyWAM1hrnYX4eHCPdXXTgA8O3M1A=; b=CxK7I8O5iZ7+9HgXML6PohqWzYyTJNW+uXFaRyyWNRr1Z3yzTkmD0LCtT6kg0GWHlRL/S2 aTzl8McgEvmYPFf5/sLGEcqO3qMvsL8HxOYRn8Q0P16JCxAuPohgX876nq9KpJxqaQ6ce1 FHKrR2pSEniYqlpkAGTZqzQiJccQh+I= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=uxw5E7gQ; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf15.hostedemail.com: domain of tabba@google.com designates 209.85.222.173 as permitted sender) smtp.mailfrom=tabba@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699269932; a=rsa-sha256; cv=none; b=KekZ2gabeHRWrCiSUavgqMA7xZRzFui+7VMX0xKJeSqMrqI3AYEBiPIIKgaKUicjf0PWdx XnInCblXy1dswoQQK8jSMProl9GeEwTKlzCHStf+A7VJQma2j+2s1V/T8Ac4DT61Jx1bXd S0hg/Gx/ProDv90UuW09T44TuupSATc= Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-778999c5ecfso283869885a.2 for ; Mon, 06 Nov 2023 03:25:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1699269931; x=1699874731; 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=8FgFIIfzRIOk5S3UyWAM1hrnYX4eHCPdXXTgA8O3M1A=; b=uxw5E7gQQyok8RL9g+KuPUWKAzWk6geOcna2LWcGG1EV+tyWBES+c4hXxp3cq0dNQ6 QgqLV7Qawc7v+Vk47xeJWyv5rcZX0ks0D5XqAQjWSp3AkYo93vyE4A4ICcXulyQLxzOA I0bkUu59jgbMPqHPslm7dSqcqAti8wW4A3ZsF+xQ+lh1EO50utNeRYsmNFikkXuwriWU zWnLnOt0nEDWRtwaYgJc2IRsUAxuOSgGJKwDiH8twKjbli4lMXTQ7VCgM27K8AF6dJdA WBKZjmqjs/CQSJqWDc4vcN+LuscOJZGrPX+8S2cMZDR2/8lUHAp3vI/2KHQPNk5oTzc+ iJVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699269931; x=1699874731; 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=8FgFIIfzRIOk5S3UyWAM1hrnYX4eHCPdXXTgA8O3M1A=; b=qp9IvtK8sFFt7xwGSGQeg94xbFyozpYL3BZM/0cBPnjEXMt+h4xeyzDtWhgTKVnJ0V Hnmsux/T9lbGRTNSsR6MDSUhRVAVqmxBba0i252X3r6hw3ouoqaGOnwjM1Q4REAFUF/1 MAlSKW8bm+dFOigD8ADfyIquoBqT5jSj+ZFGaufZgJg+Mk4wSODiGmqIhhHFhtIJC2+N 5tI0JpnRcOjDAqBrSYjKQqWYtLOJuG7PSjYUHPysUniycCBLsmvStHfc6T//A4VX6fum fW7cou58+VL1om438YkofcepG3RpTjn8YzP6P0OWsAaDmjEdg8W0OQqozt24s51zhpV4 litA== X-Gm-Message-State: AOJu0YzKuyCNRplDfgowRI781M+EjjI0RrktStWMToywYAToqW3BtNqG ONMV/r6uBKTi+E9ZbxRLhaLuX1CRZci2c9IsBL0A8A== X-Google-Smtp-Source: AGHT+IF4yL2/LL4u2aXRMHdIO4tBxiGnD2Sg0p8AaFV/BRnT///c7YsCa6iLfBADu8SZkPGs+0c1ElvE1cEBNyIvvIQ= X-Received: by 2002:a05:6214:ac9:b0:671:7312:bf5 with SMTP id g9-20020a0562140ac900b0067173120bf5mr32557664qvi.17.1699269931062; Mon, 06 Nov 2023 03:25:31 -0800 (PST) MIME-Version: 1.0 References: <20231105163040.14904-1-pbonzini@redhat.com> <20231105163040.14904-26-pbonzini@redhat.com> In-Reply-To: <20231105163040.14904-26-pbonzini@redhat.com> From: Fuad Tabba Date: Mon, 6 Nov 2023 11:24:54 +0000 Message-ID: Subject: Re: [PATCH 25/34] KVM: selftests: Add helpers to convert guest memory b/w private and shared To: Paolo Bonzini Cc: Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Sean Christopherson , 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-Queue-Id: 16081A000A X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: ia64t33t3nxejuayxcqwk86kcbz6nhu7 X-HE-Tag: 1699269931-536149 X-HE-Meta: U2FsdGVkX1+ZmIfz/P1xmss8LB21JY6W6y3tIZEqdt8Fy5G/YaBJTS3mm01+xKZ7fE2o+VYq9Cv89GYCMoHiWzzRm7PXaocm5+TnnN4glbX2ZmY3QdxFcviF7lM3IDmu4SYbmLfqxctw8CX3vc+2LVwi2STCagJFqrbM9zoQKlY28QW3bYB0dg434+rwFfx/GszVTSw8K8S32KCsIhR21Pu7i0lztvlotGJ0nF17SX+dfX2M00M/d2hSVW2Fs0Too1b6K0HpZupMP7wX31Y0rfT4z7MbyvRLJBa4kPcVqPFK6PzIOvvi/YvegxZWXfwJ3L9VdEjVX0y6sAYOX9MAE2LRPZy8VZ1v8G+LeEei0DTonxZBloY733cDyPu2QtODOFGKZXVjxWx8nYBVlwU0Rvm82xzgzC/o6GaSYgtJAaiNTOJxnbjX0z6g4vjTKqMyY7C5Wp/ProcxBrt87bQHy14B/qQJiLKCuY35V8gzgbxyQGfnl0ubHcLSAbhEXquCqboZSD3lZXw2wg2nLZVOJLm0pptMj9lzliu8yw41TwAMGPA0AsnQ+TWrbG4tyGeBfrhyuZPN7TxTqM3p7Mm/cfknmYwAy9zUldQCeVx4g0CmmvV1HeOnANDTSJRa3KLVGqHFljYGaEWgwjOT4VD4DCsbnBv2wIyXv2dcwGb8m/+gzwXjtyGUjtHri0Lhb2uzgSQQHVKB1pOKEryQybOwj9sLn4wFnvoD80oGqsDbbcBf9f3BOy0e3jWrbxLNcsKdSRjmoSAb926hwKOe706LjI3GrGUwpVZuVlZbZnCOKQaJc+FGfvWuaPErsI/Myj3jsVheerWvpyRq5YzR1VBIWiuuqkLBwhvvZexh4SD4gWuTBBc8b7SbwEE+IzYN0tJW0VQqU2gC0sBMAxR+7ca+E+n8KQuKx9BKn2EJpuNvj8SpFKIr6wWt7mxSBG3KYrJJXwU/zJKC5sNccQrLwmO h4TYpxwg DE8kefrCnJWBqwwsuJVLlDsbQTwJtZzLW8sUht0HVVZuxUdVBpvMLXk+xzCNS7Gy66ktrrdgmouUbxPtqP0yk2/5atMptVUlqKJCwJF8DVxZNobbAg3A3tGz7PMVfl0myZrIaSddz9ZUhK+idUOkx6YfH3Dc2Oc897vjNvP77gehJLXZHyNUk6m1SUrsOvuUjyqBCkCgHIX6z0h0EvpzkOwS2FHUfkjYJVSUCPqPs2FXJ86H5APmCFE/A5ziish9KpJxVSf6ImkwVFF5/4V1vvejwB9Ht9wtAgWMcxm6nJcCp9X40rTm32HbyE15NGLVUXPXdlLah3UgKooqxyqlrt0uDAJKrK1i//jge 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 Sun, Nov 5, 2023 at 4:34=E2=80=AFPM Paolo Bonzini = 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. nit: 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 > Message-Id: <20231027182217.3615211-28-seanjc@google.com> > Signed-off-by: Paolo Bonzini > --- > .../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 b63500fca627..95a553400ea9 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -1167,6 +1167,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_GUES= T_MEMFD, > + "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); > + } > +} > + > /* Returns the size of a vCPU's kvm_run structure. */ > static int vcpu_mmap_sz(void) > { Nits aside: Reviewed-by: Fuad Tabba Tested-by: Fuad Tabba Cheers, /fuad > -- > 2.39.1 > >