From patchwork Tue Jul 18 23:45:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13317888 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 B1AEFC04A6A for ; Tue, 18 Jul 2023 23:49:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 128F6280011; Tue, 18 Jul 2023 19:49:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D8778D0012; Tue, 18 Jul 2023 19:49:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6D918D002E; Tue, 18 Jul 2023 19:49:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D21948D0012 for ; Tue, 18 Jul 2023 19:49:11 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 918931404BE for ; Tue, 18 Jul 2023 23:49:11 +0000 (UTC) X-FDA: 81026376102.29.5ADF047 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf08.hostedemail.com (Postfix) with ESMTP id A4ABA160005 for ; Tue, 18 Jul 2023 23:49:09 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=QGe2TDZH; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf08.hostedemail.com: domain of 39CS3ZAYKCEc1njwslpxxpun.lxvurw36-vvt4jlt.x0p@flex--seanjc.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=39CS3ZAYKCEc1njwslpxxpun.lxvurw36-vvt4jlt.x0p@flex--seanjc.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689724149; h=from:from:sender:reply-to: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=Op8HHmnUgwupsWBaRFuhvxYPW8xnNAPNdjQWsU6sjr4=; b=k4ggnFeXpTB6kSID8R7gUVxvLhIqIRlj2LzPjW7frIPgTQBaoXcKbivNvDc8dBIg7e8N3J xdGMq2OiWGhTCsHJAQbAAKK6ji7qeH7kHbLb4sDB8vAzZq5ocE081tUwX2KjTxxjuShmEn /UJKeeMoIAoy2a0EH/P2Hh/nxMxT/Vk= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=QGe2TDZH; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf08.hostedemail.com: domain of 39CS3ZAYKCEc1njwslpxxpun.lxvurw36-vvt4jlt.x0p@flex--seanjc.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=39CS3ZAYKCEc1njwslpxxpun.lxvurw36-vvt4jlt.x0p@flex--seanjc.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689724149; a=rsa-sha256; cv=none; b=PmV9D5kIoskZQ0oOu2Oaf+22kvIRhY/deX5Fv00j67WR1kp//mJN/xlWxmo+VEM6Rsu76c fcvMb2P4LvMdGx816tcWtO93I3rdnx+CmnGDDebQCd5pfgewKrartrn8qCVoK0PLig4ePS a+Xg2ejDJALgWldyj9I0CQ/fcWQpsHQ= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-1b8a7734734so32266005ad.2 for ; Tue, 18 Jul 2023 16:49:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689724148; x=1692316148; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=Op8HHmnUgwupsWBaRFuhvxYPW8xnNAPNdjQWsU6sjr4=; b=QGe2TDZHOQa4Dl//VYNCOYShcTza/1woeu2375n0rkVScAi+cbY/3o7kv0BRcH2AMJ +c/iqHZ3q4qoWQp2d3aei0T6E53l+ZqCNd2m04n3+R0wSNZlGOK1LSjxlHNXzCcomxJY E8j4TlQATKeS/E+fNB5tnRwv8C8AcACbuwNfJJ4GFsEgr7shqPyCnrSeiwO4qSSrmzt7 efORpwkrylJDYPQpjxrM/NpVjNFpNVPE0Qd0lMQKpfpNX9QNZ2W1IrXiVTqmpPMaOQWI k1X5M4hUDGgW+QX9Vf1eWMvk3OJKrPnVnj02NJetvqw5q8wS599WGmVh+Grx/YjjjUXB v1/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689724148; x=1692316148; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Op8HHmnUgwupsWBaRFuhvxYPW8xnNAPNdjQWsU6sjr4=; b=aNKzVMdAaD94Lpm3D4vWPqjJhe/dQ8FPo4uMC/d80TpbwkdxH28T9z/tll2rmK+ubi Z5dCj8uehIB39GXXRZAvSsBJnDYXIChUi+HveUClrE5M5S0TvtihmYEAczvHPGlxkDtl 8X7A3HKcr6E9jcqPbuuMpaaVWitOazw1OKNuWYjXoGf5GSmWMqiUZtq6Bhnhk0ilTkiK H9VO2dRFnaigUFwMKorTocMfJAlqH3pBZenVJV2WnD9aZwOCFgHBD1eqUXImWEXcClTb +ZNASpdOIvV02yuX/ESKqHXezZfJN/ECsmj3vKo39HIQxcUcvKfvf3Ut6XvebdRSlDGF 7zEQ== X-Gm-Message-State: ABy/qLYBzWs2aDNiyQuikfoGiRf4z1dwdaVjpk6pfHXYTDDD5JNqr6Wv 2FNi371WaxHHLsZjQmwBHkIuAH9tKBE= X-Google-Smtp-Source: APBJJlGOkej0m8Idb/suY4iXY9qip/Dep68m1+USICpK/8IAat1dD7w7AsEo2fC/HRINs5tpOYMC/rDWeUE= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:ec88:b0:1b9:df8f:888c with SMTP id x8-20020a170902ec8800b001b9df8f888cmr16357plg.8.1689724148112; Tue, 18 Jul 2023 16:49:08 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 18 Jul 2023 16:45:02 -0700 In-Reply-To: <20230718234512.1690985-1-seanjc@google.com> Mime-Version: 1.0 References: <20230718234512.1690985-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230718234512.1690985-20-seanjc@google.com> Subject: [RFC PATCH v11 19/29] KVM: selftests: Convert lib's mem regions to KVM_SET_USER_MEMORY_REGION2 From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Sean Christopherson , "Matthew Wilcox (Oracle)" , Andrew Morton , Paul Moore , James Morris , "Serge E. Hallyn" Cc: 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-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Chao Peng , Fuad Tabba , Jarkko Sakkinen , Yu Zhang , Vishal Annapurve , Ackerley Tng , Maciej Szmigiero , Vlastimil Babka , David Hildenbrand , Quentin Perret , Michael Roth , Wang , Liam Merwick , Isaku Yamahata , "Kirill A . Shutemov" X-Rspam-User: X-Stat-Signature: 1f9t1rqzhcmqqyf4ei39o9twbou9wg1o X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: A4ABA160005 X-HE-Tag: 1689724149-228100 X-HE-Meta: U2FsdGVkX18qDzmmh02wD/WxzXI1BkdorIybJq1iDVKryiaQt3FrlDyXx28baNmhfrb9QXIONKJToMvKmBEo6LztYR7PqP48jB2wZsXzTWK9IkPspHCj2tS1uMiFVpaSHQX2S4uHN2RMnK2x6OgAq4f/gopCcqb/IUZtqaB/W9rHJ9+64JuDIhR96k1TyfHEHqS5ShkyMsOSbJLkyi5ohCDj5fRMKNWGST4pZf2LFVcyLF4qgJWeId8tTyUGI6sxRX7YHkiv1VAsLxTceC9Q0aRYK5OrmrmRp1M4YQLk8gFbCUsLDWxQbkrg7ZGaWCclJfJcKlGYmsR/Yn2MByZp4nZKG2JTW0RCiYM9DGfpjBgX8qqfNlwRdfh1evhuzA+zqOED9JBfW6jE09VrHbdAxIu2gH4Obo1zdVeNj4Ro7qz/APXF2sOr7sZFjiss2Oy+Fq3aonlEve1GOtTH+Ti+Pk9fDB2EjsmiKIRWPMsEdjUhxtdF86SGVAgZBOfm/emcTWoxO8BkPcmzJ+CUgG1f3MHPwKSrWozQY8n27RsRNzWRe2Mingd/dIVEHEVppEqkFVW6b1I/pNoH9mSG/sorylw2ASvC327I5nYEQmpbCSvwGLIi4d38sHdyoQEMJFy7iN8PQBvqISqsdLylVC+VNReCn1eTxA2VtvY/tfSvKe5tsfo3f/tjYbM94UdP/zgum8yCXADWEiVnK2QiLwUhsOQ6Sq/W6GYuRrrhvQwRAS5wsryVHE+xVbwACBTBqnmBYP9S24v3/5gAar+bfMKlopMzrlk9YB1whE0Oq4f3qK5FR5s1s+aOOej4J8O3GAznTifpZl+0XtZy4vEGlIxH8+Cz2u1BVQg+ru8739jeWAnWb1dZpeDfRs3VfEGrZxsh/ST1JpvsVYGaZpvHreh/+gqtLL0+Sm/oFp0mUhOVh8hteDB1Bnujg512zyv3g0eZ5FTS7rTm3SWjCSbQiCT Yq2W/Vs3 SFgg6t4PkagWXGee3VyDuMoRdj4jc+g1KRKAHkuEPxw9FUDq613EjRTXGP1vd7XgnAndu4LXpDd4Yl+rF2Rlin7/97z1HZfXxL5E7kczqJOaW8ipJ7tVNBEbMaRYJYGqXIGrFVrNf91BKff3afyhOZaHGLmyfKRzq9oIPI6RIe8fIxToY4sfpaeijyIOQ7rzBJVZdbDh46BXd00ecNK6eX4e/Jq6XUkR12hf7aFheoQ5g5F3hRPaaQUw+gYt/BFQZvybhvu06PIN5VK+DFvnn9fVmQfgms981Uxzkq/Oaw+vx+oJyfvtLZvK6cy+6EdSt9TLWN5K63zkloBvn+26LSvVBA3ISMmjILO3Nu3kgXALJZcA/8du0iE4GM0Z6OJJZywLDPdh8kK5IcKaKtjrdegtrLh86hziTCs3sUZzFS8Klfk2ZUSsxMOKQKcdcHLnqS5qzQxEEdIwjEDVGsgrkxF6cyn4LATsI+SEIzcpU0wRdkezDEAZXiJNSnTQPEqrpzVxMrAhqoxu5MyrKwdV1F3C196DxHFLelP3uyNK46rACTq48YIzGWfoh5RicsWIz07OlSXfBSR0T5ICdbTXVTzg91SfRszF05GedrQK1Kbe/w8rPNPMgZfeY6usoKx5siEuK2r32w3aWUFdvsJZyu9srtvwNzDecV1nGMSH9g+ARnDG390Ww9yZtRtti6fACGEC8cxFwJn2miOUG/0324N7gQHAja0ZEdIj08hJTODQnDJnZxNnn/CEf0ubwFcuESOQAgPey+fiG/sF4YyUuITPGJhPQtI/jZkbHstYQN2BSKJ5uDG2m40h/9TGJjFlyRwlX 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: Signed-off-by: Sean Christopherson --- .../selftests/kvm/include/kvm_util_base.h | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 18 +++++++++--------- 2 files changed, 10 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 6aeb008dd668..d4a9925d6815 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -43,7 +43,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/selftests/kvm/lib/kvm_util.c index 45d21e052db0..c1e4de53d082 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -449,8 +449,8 @@ 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 = ioctl(vmp->fd, KVM_SET_USER_MEMORY_REGION, ®ion->region); - TEST_ASSERT(ret == 0, "KVM_SET_USER_MEMORY_REGION IOCTL failed,\n" + int ret = ioctl(vmp->fd, KVM_SET_USER_MEMORY_REGION2, ®ion->region); + TEST_ASSERT(ret == 0, "KVM_SET_USER_MEMORY_REGION2 IOCTL failed,\n" " rc: %i errno: %i\n" " slot: %u flags: 0x%x\n" " guest_phys_addr: 0x%llx size: 0x%llx", @@ -653,7 +653,7 @@ static void __vm_mem_region_delete(struct kvm_vm *vm, } region->region.memory_size = 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 = munmap(region->mmap_start, region->mmap_size); @@ -1010,8 +1010,8 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, region->region.guest_phys_addr = guest_paddr; region->region.memory_size = npages * vm->page_size; region->region.userspace_addr = (uintptr_t) region->host_mem; - ret = __vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION, ®ion->region); - TEST_ASSERT(ret == 0, "KVM_SET_USER_MEMORY_REGION IOCTL failed,\n" + ret = __vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION2, ®ion->region); + TEST_ASSERT(ret == 0, "KVM_SET_USER_MEMORY_REGION2 IOCTL failed,\n" " rc: %i errno: %i\n" " slot: %u flags: 0x%x\n" " guest_phys_addr: 0x%lx size: 0x%lx", @@ -1093,9 +1093,9 @@ void vm_mem_region_set_flags(struct kvm_vm *vm, uint32_t slot, uint32_t flags) region->region.flags = flags; - ret = __vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION, ®ion->region); + ret = __vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION2, ®ion->region); - TEST_ASSERT(ret == 0, "KVM_SET_USER_MEMORY_REGION IOCTL failed,\n" + TEST_ASSERT(ret == 0, "KVM_SET_USER_MEMORY_REGION2 IOCTL failed,\n" " rc: %i errno: %i slot: %u flags: 0x%x", ret, errno, slot, flags); } @@ -1123,9 +1123,9 @@ void vm_mem_region_move(struct kvm_vm *vm, uint32_t slot, uint64_t new_gpa) region->region.guest_phys_addr = new_gpa; - ret = __vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION, ®ion->region); + ret = __vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION2, ®ion->region); - 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); }