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 49CEEC25B48 for ; Fri, 27 Oct 2023 18:23:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4035580021; Fri, 27 Oct 2023 14:23:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3861280018; Fri, 27 Oct 2023 14:23:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1B50180021; Fri, 27 Oct 2023 14:23:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id F243280018 for ; Fri, 27 Oct 2023 14:23:17 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id CF075B5F1D for ; Fri, 27 Oct 2023 18:23:17 +0000 (UTC) X-FDA: 81392063634.26.1E3DA05 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf17.hostedemail.com (Postfix) with ESMTP id EE21F40008 for ; Fri, 27 Oct 2023 18:23:15 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="P3Y/qcOr"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf17.hostedemail.com: domain of 3EgA8ZQYKCDMhTPcYRVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--seanjc.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3EgA8ZQYKCDMhTPcYRVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--seanjc.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698430996; 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=ZNZtzA/linIp+2GMXA1XUg0X+u1GFwKPof82zA2ctug=; b=iDdYodT/SkUiA5WYGEs16mQwDkSjZqwEr3xtdV2qc+bb7yZieeoLzTE8DzNuUVaBlDNzIz BbCCHJA7mZjCWU1ZlHXLFpJA8AHldNgw5LHauAGNV1VSF2UP46SbevMkNZjciCUPiBkwyw SfqIDwVl0eAesGMGVLAPxdLiaCFrYvo= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="P3Y/qcOr"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf17.hostedemail.com: domain of 3EgA8ZQYKCDMhTPcYRVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--seanjc.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3EgA8ZQYKCDMhTPcYRVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--seanjc.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698430996; a=rsa-sha256; cv=none; b=gvKZu1Xx7eHnhL2POt2jAKjgC/GcB/4iYYzaSRNzTnpnHuN+iao04c7owssT74VNMEUmVV KNzi96zreO+tKk8M4zzd5t/UHmaJlCQwzE9ANINKmBMu+L+fFfXOZ34GkVh6FJEIOoNjti 5tSZ8lL80umzkmOFg6foVvH1FfjZo0g= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-1caaaa873efso23355005ad.3 for ; Fri, 27 Oct 2023 11:23:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698430995; x=1699035795; darn=kvack.org; 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=ZNZtzA/linIp+2GMXA1XUg0X+u1GFwKPof82zA2ctug=; b=P3Y/qcOrCnAHUHSCKRl/1rWbeqnC9TOWLQjIcNvWdmiudX43Epv595unqj5ydHVmUB IpaBHNoYuTz0tWJBoMYPoeAIuYM0LX1tUmMDOscD0m0GZdnv6ArlazrttxpneGmB7uTQ Zb7XdtO/btoNMBtUJh/lXS6QRIYlwOKVbP9tibeFecys/w+1PQ34tv6TQ+3wn0bCpXyW RNZ27kc3aLxJSSibYVR+kK73ka3TrEQ6D8xhVqfvwpWCyingIAptJTsHd35NJhQzgQhW e/4jYFZmsLjysJlFKAzrclvOlFlRFvj2LDAHGvfHZ7/PN7eVstNqoY2fTYsABZGZE+Kg OApg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698430995; x=1699035795; 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=ZNZtzA/linIp+2GMXA1XUg0X+u1GFwKPof82zA2ctug=; b=cGas6ZtDLG0i1tnTmLQjD1wOIlgUh57HOciBhZVTpMGrQiL3Y3xquykrVnwDv65bML y1VZS2E8VJjZPapMuOAj4IcCR9MjyxzgfA0UsnT8mpCZp50S9dpEfNoZUhma8R7B2xxT 9mA7dveX5jJ75gaHbi9PGO9T6vUoMmmxp2QIpGtiDHtXnRhPYnbb0NsgA5R4+CVn04oa 8KeUQZFuJErA5h0BrBZPKwaIGJ1f4a554FmoP7ZmigyTMYH42+VhKfnljmG4CAeNUkbD tmObTpkTuaYDMeyFgWIcsPtoRt23EIXVBBsQ6fdgLholHH7tjC0fJjhnBSWwI7QqSO+u CFVg== X-Gm-Message-State: AOJu0YyVbewT8K4tzLWrLSvyCNhLSqD5Sdr97VG+d32bhjD1EgT3ACQH Z0/qBI7hSBQP4S53WlVqpfrOJ/VHPuw= X-Google-Smtp-Source: AGHT+IFgEK+vNYv/vNHgA3JkDytYkMCwP8RspbM7NAIhoWJ8dWWtLUmat77zU+/1XadLWoCAT7TkthpzXqU= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:f809:b0:1cc:2a6f:ab91 with SMTP id ix9-20020a170902f80900b001cc2a6fab91mr26127plb.0.1698430994917; Fri, 27 Oct 2023 11:23:14 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 27 Oct 2023 11:22:07 -0700 In-Reply-To: <20231027182217.3615211-1-seanjc@google.com> Mime-Version: 1.0 References: <20231027182217.3615211-1-seanjc@google.com> X-Mailer: git-send-email 2.42.0.820.g83a721a137-goog Message-ID: <20231027182217.3615211-26-seanjc@google.com> Subject: [PATCH v13 25/35] 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 , Alexander Viro , Christian Brauner , "Matthew Wilcox (Oracle)" , Andrew Morton 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-kernel@vger.kernel.org, Xiaoyao Li , Xu Yilun , Chao Peng , Fuad Tabba , Jarkko Sakkinen , Anish Moorthy , David Matlack , Yu Zhang , Isaku Yamahata , "=?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?=" , 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" X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: EE21F40008 X-Stat-Signature: mrbd5n5ddeqyk4369chc7xmafybsb943 X-Rspam-User: X-HE-Tag: 1698430995-418831 X-HE-Meta: U2FsdGVkX1/MGzcANfSgpKygxat1Tk3FK7tS5Syf9eCoCMoYqrRpyhY9IRshwepz1EZpTQ/tdm9ZDofWFhetCO57SaiNg50yWPElA1TluNmEDQM9Npm8nbfzbdrPIzSCpqQxGFHSWf4oB85y7vpHwt4mkLYt1VuY0cpTgPih+YLxJ+ctcMbJgVKg+iot+d0Kj8gAjwl5RlMwDDYgTy4rZzG6mbhFuAYPKoO8oe1sB8t0PUz9Sb+whb26BC/u5OMskflOpuwZBaI2AHgtZjZXcfT/U+G6oxMWxh2gSP0C61885V754xscOPYSoDZc6hxeD9qQ+rhB0P0xqeL/f4IzQi920ygXqORqbn3fzVAQUcy9aMR/N1Pg/WpDzI1ggEtjr0tqAxUwxnwvQep+E7FeluhkzJj09k3SR6IixRh/sNOQ6Eo+zQ3x2JDN3q8Fqzn/72uag4eOcPszlw/5LN4L1Vlm7CQ2E8cg2Y3P4AGrKtvlkgbkaKEupME5tOZOVYUZsjJ0foCzZlOVwwqY/gWVoRfgvRNxA0c4xhrk2/AE6aCmfPzdaiuuNeBHL4KlJRiKJOKFMHj3VkFNGifM+A0Pd5KrEBWu+jpeel18ntDbtIA/lld8m2gGRyJVLG/ihhcmPIOExe0Vis9LQ1P/ieQWPn7Vjl7/WRtpSMXlYKgWg483xqMGLwtOtu9QYFIE+82XreigmrfCqXzTCf0xMBYR90ROsO7fwftVaNMZeOeRxCEKOb15GsNIFs9T1p2UNRlGNITML9q7xXCLicgy3vGB2dDGk9dhsYOsSziR5B5QQUQelpUtYElTylc1H8fydj5ZR3GbBYzcB/oPAFJfP3E09HPZmqSe6UT+xwwS5AKQGmiXxhfHmGI9rbrpODWZCCDPIAxE20CdTd9NNFxRghQ9XX03geefNZLtKDwUOJcfbzKOS3tgeHhSwutXf32bBf0R4YofR6ItvvAdgsn/DF1 6OO+zOjD ejLZAFpy6MC61zRrjPywqlulP+d+S3IC7MA5KcObTWYlbW+0OXF8/WQCa1cFSIp1Jv7Qm9hd7JaSZyvKlPYwgPz6CvQOHMwnPoadbBN3K02e0GdWOZc/XvOrbG6uLQxHKvRzO4oIFDbgW4/Fh0+2i8b0z2zD36atpUgR2HawO6z3CYHpsImUqQExf9klVdCQpOrQ0RCi7ie48MNdndMeW8NdCJI7MNETLoh38QVHRXnjMRHOFgDiMtXGqpjV695utKOMqcTGyV9d493XXC/O04kkLO++/4yL3LgkteDO3kRs8BZ6MYhvWtuLVtnZY2l6roAe5KB7ZFrSD6SMmAFrJWe1RlwPPcl3Vfe9J0kysZZvRNkzElfZ49RWUSQ0P4sc2WLE6YWZl3Pk0SqG7kJPUSN9f63fw7uqDfPf/hh1o/fYA+FPAza+eXXlWGkADXsLAQEc0o3G/XFLXW4i0L2QlJnUXdupFtixGSvjZaZ3jn1sn7TsAEutKS+GCgahIT590qrpwk0HvpNGcU9ceH4z2uj8tl5l8Rnup3VyOL5JYK+HDZg2MCzezNM9zwW5HxnQCW0H9l4xBMshhLIqwSSTVbf0FC2835FkSqrk18tdjAgcW6IxMf1uuQWK/AeauBspHtO/symO1BIsZAFuf9evQewnve3hCVRHhRpB43kNQxANdVhcdCTSgwi/vgLV3csCZ8hwY1nXtuCtaWeuSqQS+o4SzbHp8M6pdBo62WL2enbcukQePUstJPyMxDxUeRHi0TYq9+67mbbPAVBTZ1doOAa4pl4PnLuto/urHe6tiObr9txSRAIrkjIydBd9aRgNT++Wj 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: Use KVM_SET_USER_MEMORY_REGION2 throughout KVM's selftests library so that 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 KVM versions from this point forward. Signed-off-by: Sean Christopherson --- .../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/selftests/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 = 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", @@ -657,7 +658,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); @@ -1014,8 +1015,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", @@ -1097,9 +1098,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); } @@ -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 = 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); } -- 2.42.0.820.g83a721a137-goog