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 D416CC4332F for ; Mon, 6 Nov 2023 11:03:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 756D68D001B; Mon, 6 Nov 2023 06:03:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6DFAC8D0002; Mon, 6 Nov 2023 06:03:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 533678D001B; Mon, 6 Nov 2023 06:03:51 -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 3A2D38D0002 for ; Mon, 6 Nov 2023 06:03:51 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 0D6EA1A0697 for ; Mon, 6 Nov 2023 11:03:51 +0000 (UTC) X-FDA: 81427244262.12.BE3CBB9 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by imf17.hostedemail.com (Postfix) with ESMTP id 29D7440011 for ; Mon, 6 Nov 2023 11:03:49 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="d/40aYIF"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf17.hostedemail.com: domain of tabba@google.com designates 209.85.219.44 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=1699268629; 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=MQ8TONDIpPhmTy6Gjm0dgeV6egeVVxfnh06xkrQleLY=; b=noee4IzOFPfAnJXvB1t3hNfC0Sr7MBoPTj4s5sXuhCA45K7LexD22u42czWvHflX7l4Y6/ P7SYhqc+1w2eQZe8y4uvARN0aiGLxGh1xInWa30mns7DfseTGQ9Z14I0j2zc2KlCTXXf2Y vnw34CWO4o7PvdjIHyrE4kOCcB88VuM= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="d/40aYIF"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf17.hostedemail.com: domain of tabba@google.com designates 209.85.219.44 as permitted sender) smtp.mailfrom=tabba@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699268629; a=rsa-sha256; cv=none; b=OBVBEA/L/kjf/WwnjLBJ1l/Rt+rxk5NGxsnn8wUYzsvXCO+EoGaW1N5c0ZlU3ctGCF7mr9 LzlfKnAucBox4CekByaaicHRU9ZGld8KZNl/cx+nS3IrtsaukfE5ptzCe+2ThQDcf77hDC Og1qSjCgS82dGj8qrnsN/TszOGzJD7o= Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-66d134a019cso30970536d6.3 for ; Mon, 06 Nov 2023 03:03:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1699268628; x=1699873428; 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=MQ8TONDIpPhmTy6Gjm0dgeV6egeVVxfnh06xkrQleLY=; b=d/40aYIF+iW/whzKpeVGSvta7tzqHtsI5sVhdd9geYw7Su3Dzw8mMPv3ZR/8ujyVQL 0+b+Y8xZW7kMOxEV/e2BAeX44qLsN2HfPGJ0KWtkQRKJlW/AWXWj3I5UHX9PRe1EV8XN YNLDOdQ03K70DroeES5rbo+Ru0SZo+AYMQp/x4L5l+PpMHCmXmdrgxb2S4buU8OYfsf8 Hro5yTY3OcNCnaw79Y2fpti94peYmop88I3RPFIqpdsOlBnrKXwgbKX0e+TeR/ohJkcC 78WRRDTyULu/1Jvj5FazUDU7UwvJ+Naig+A828/pmFQu1Aa8EWD0bbkhqonycPp2LWir cNaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699268628; x=1699873428; 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=MQ8TONDIpPhmTy6Gjm0dgeV6egeVVxfnh06xkrQleLY=; b=iUXT9EO3DJJeAPRyEPbCf8e+uxBTN/zhusUZT6vAAATb5FdfBVIqm3ZWaus3VvoaND GmYMnQc0WBMU6WeJ7wP7Cv+RkMs+FDL8Qp4CGg5t1hxnUccIy6y+XXavaXWEMK/BaTcW ArL9CxSS4Wi/OIKdSclR+c/Qom6miVDA5AAb7nSD5wruiDxK7Z7OdOszDOgFdo39/M40 zLQzkavZ8/rm5xvYb4BHnBtoyFagO5gd+sJXW3v15rc2aYH4BAPqPbi44MTwoYr5vA1/ /Q3yMtQLVNcFtsPHYcV/8H8cs8FN2Z8RSdPUM7ECb7YxOuFNKGyWkxiuwN0ooQa65zab 8L1A== X-Gm-Message-State: AOJu0YwIIqnrmSt0Hu68IcJUMbS438RUrbedi1A8KYS1gUvfxhk7/clX IjGVDPnYq+6ZJVW8+EpQb34PXK9nel9Tf4FTelyCNg== X-Google-Smtp-Source: AGHT+IHHh4fCnCxDMnJOn7/R0pkHJKwXr6C+d2r8s0u73YKLv4MHtUig5I9yHuaqDmXCQ/Y0QVlMeO42z9uduKCvqDI= X-Received: by 2002:a0c:f1ca:0:b0:66d:28a5:d153 with SMTP id u10-20020a0cf1ca000000b0066d28a5d153mr26974988qvl.47.1699268628158; Mon, 06 Nov 2023 03:03:48 -0800 (PST) MIME-Version: 1.0 References: <20231105163040.14904-1-pbonzini@redhat.com> <20231105163040.14904-24-pbonzini@redhat.com> In-Reply-To: <20231105163040.14904-24-pbonzini@redhat.com> From: Fuad Tabba Date: Mon, 6 Nov 2023 11:03:12 +0000 Message-ID: Subject: Re: [PATCH 23/34] KVM: selftests: Convert lib's mem regions to KVM_SET_USER_MEMORY_REGION2 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-Rspam-User: X-Stat-Signature: 1m4ipkkrkpui6k5nzqcgbfzwuxtwjd7c X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 29D7440011 X-HE-Tag: 1699268629-541180 X-HE-Meta: U2FsdGVkX1/T7n0pFDgD0Jmtq/LIOV9K9JqdqGcLA2Vq9N+bO7v0m+qDHMuVkfOmSK7IjwOhBHXx2GuiavXgS3YbkVHmMmVrUpXJcWyG6MlBe7QtkJUpIktBLs25Hog40l22M/y1zFPrpVfcOo+B412gMkvWRg3ZwGj/u1UJ8MOsa7534zzZ4BM/7dTdMNrLcsyrKWqcPbr/xZzbZzt2JUQ0l6Ou/Cj/HK9FO5YWkzp+Um0+/+DB8pRn8VDa0zxOYIJVgkle5urLJppaq/S3nBQlLgowe3vnVf4tvA0pgLmswPXrGwsJ6tOPyG0pdzO+FWHxlspozFYzA+Gj5vPjmvwJqnbxlh5o8EZumJfn9ONUwyORRxqzfPj+jEYUrV+lQVTftf91TdkEb+UClH4Z71qKx8y+eXHSih0wmKBaHVTS3scVqtPO9JJSzqpQRV/gT9xbmm9CEMY0i3uasd1ZZtcXSvpuJTEm5kjuCAWTBlWa6LY2YmadumcRN2sQgokxmzIL7pHtbjfcSyvdPOPTStfjtQPZgULv8DVsj3mm6jBLr6AIu0Ux2zQ2rnGZS1R6008ebJcFXGOh5Sibay/2y2DWSWlO1xqWJD25Z+vXbfmJJCvHxLrIZ6dTiGK4I5IPMcYrcZUqkzDuLV5LYvywFweQEgarYWDSOPYc0Wcu8NMYwqZyh/ny91ep11eaMuFSf4OnDYXk17mY1J6ZfKlMvN2kOAK0l/R3PlgI6mRKuU/QkgK1xDLdvR2W2i+uuwujy2fh/uoilQ1rdP7z1neIFjMEBgVTkuB8yeCu5JWg1SXGqGnKB9YsGBBsJmCn6aXoVAeAkl7/UWoE47reNrUeuM4/bC4IQ9hyvLineqQO5jSyjzPXfdI7G4hlFbgFh6mW445gnHs1D50jwgaE+GOnNpWQT5UqSlp4B5S4EBLTYbentgbzg1eiwpNfbZRlOdd72xVx5rVbe2Ve9s9VOxP 1tAd2tpg gav4739qmQ0VOhDnSxLgreGa0N1/ULUVch3VaJMZxdaVaMjAL2I5MeDzMovfcQtgGDTRHKnUga5FPM8zdp7wEp45lGzIJARxegxuoK/ksIMxxCCsu9dclgEDX6YFGHX2l8eK6ounYtqgCkZWOXn+HPDr41MUdT5Gos+qFzQxaxlHZyyxegeCOsSSRP3OVz+92gsOFpztPAoCPg2bVHnrxjND2KIsbv0NyUh8bBrYOQj6saa0X8N909EHyMIe+ldSyMdm8j5u/lZbzC/rasvUhsoRIAcD9FxjcZhbHtyrTDZWAGqqX2u3g42fBc7EVjRuf3wSrIrv5/Se0BsuEHEBx/AviFPQTZnFJlZ0ejRFI/mLw579TmedxvSaDm4wbj5fwkyglEGFKdKgQd1Q= 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:33=E2=80=AFPM Paolo Bonzini = wrote: > > From: Sean Christopherson > > Use KVM_SET_USER_MEMORY_REGION2 throughout KVM's selftests library so tha= t > support for guest private memory can be added without needing an entirely > separate set of helpers. > > Note, this obviously makes selftests backwards-incompatible with older KV= M > versions from this point forward. > > Signed-off-by: Sean Christopherson > Message-Id: <20231027182217.3615211-26-seanjc@google.com> > Signed-off-by: Paolo Bonzini > --- Reviewed-by: Fuad Tabba Tested-by: Fuad Tabba Cheers, /fuad > .../selftests/kvm/include/kvm_util_base.h | 2 +- > tools/testing/selftests/kvm/lib/kvm_util.c | 19 ++++++++++--------- > 2 files changed, 11 insertions(+), 10 deletions(-) > > diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/= testing/selftests/kvm/include/kvm_util_base.h > index 967eaaeacd75..9f144841c2ee 100644 > --- a/tools/testing/selftests/kvm/include/kvm_util_base.h > +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h > @@ -44,7 +44,7 @@ typedef uint64_t vm_paddr_t; /* Virtual Machine (Guest)= physical address */ > typedef uint64_t vm_vaddr_t; /* Virtual Machine (Guest) virtual address = */ > > struct userspace_mem_region { > - struct kvm_userspace_memory_region region; > + struct kvm_userspace_memory_region2 region; > struct sparsebit *unused_phy_pages; > int fd; > off_t offset; > diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/s= elftests/kvm/lib/kvm_util.c > index f09295d56c23..3676b37bea38 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -453,8 +453,9 @@ void kvm_vm_restart(struct kvm_vm *vmp) > vm_create_irqchip(vmp); > > hash_for_each(vmp->regions.slot_hash, ctr, region, slot_node) { > - int ret =3D ioctl(vmp->fd, KVM_SET_USER_MEMORY_REGION, &r= egion->region); > - TEST_ASSERT(ret =3D=3D 0, "KVM_SET_USER_MEMORY_REGION IOC= TL failed,\n" > + int ret =3D ioctl(vmp->fd, KVM_SET_USER_MEMORY_REGION2, &= region->region); > + > + TEST_ASSERT(ret =3D=3D 0, "KVM_SET_USER_MEMORY_REGION2 IO= CTL failed,\n" > " rc: %i errno: %i\n" > " slot: %u flags: 0x%x\n" > " guest_phys_addr: 0x%llx size: 0x%llx", > @@ -657,7 +658,7 @@ static void __vm_mem_region_delete(struct kvm_vm *vm, > } > > region->region.memory_size =3D 0; > - vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION, ®ion->region); > + vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION2, ®ion->region); > > sparsebit_free(®ion->unused_phy_pages); > ret =3D munmap(region->mmap_start, region->mmap_size); > @@ -1014,8 +1015,8 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, > region->region.guest_phys_addr =3D guest_paddr; > region->region.memory_size =3D npages * vm->page_size; > region->region.userspace_addr =3D (uintptr_t) region->host_mem; > - ret =3D __vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION, ®ion->regio= n); > - TEST_ASSERT(ret =3D=3D 0, "KVM_SET_USER_MEMORY_REGION IOCTL faile= d,\n" > + ret =3D __vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION2, ®ion->regi= on); > + TEST_ASSERT(ret =3D=3D 0, "KVM_SET_USER_MEMORY_REGION2 IOCTL fail= ed,\n" > " rc: %i errno: %i\n" > " slot: %u flags: 0x%x\n" > " guest_phys_addr: 0x%lx size: 0x%lx", > @@ -1097,9 +1098,9 @@ void vm_mem_region_set_flags(struct kvm_vm *vm, uin= t32_t slot, uint32_t flags) > > region->region.flags =3D flags; > > - ret =3D __vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION, ®ion->regio= n); > + ret =3D __vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION2, ®ion->regi= on); > > - TEST_ASSERT(ret =3D=3D 0, "KVM_SET_USER_MEMORY_REGION IOCTL faile= d,\n" > + TEST_ASSERT(ret =3D=3D 0, "KVM_SET_USER_MEMORY_REGION2 IOCTL fail= ed,\n" > " rc: %i errno: %i slot: %u flags: 0x%x", > ret, errno, slot, flags); > } > @@ -1127,9 +1128,9 @@ void vm_mem_region_move(struct kvm_vm *vm, uint32_t= slot, uint64_t new_gpa) > > region->region.guest_phys_addr =3D new_gpa; > > - ret =3D __vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION, ®ion->regio= n); > + ret =3D __vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION2, ®ion->regi= on); > > - TEST_ASSERT(!ret, "KVM_SET_USER_MEMORY_REGION failed\n" > + TEST_ASSERT(!ret, "KVM_SET_USER_MEMORY_REGION2 failed\n" > "ret: %i errno: %i slot: %u new_gpa: 0x%lx", > ret, errno, slot, new_gpa); > } > -- > 2.39.1 > >