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 EA675C4167B for ; Sun, 5 Nov 2023 16:33:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 83E52440168; Sun, 5 Nov 2023 11:33:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7C773440150; Sun, 5 Nov 2023 11:33:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 642F7440168; Sun, 5 Nov 2023 11:33:59 -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 502A8440150 for ; Sun, 5 Nov 2023 11:33:59 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 26CDFB5531 for ; Sun, 5 Nov 2023 16:33:59 +0000 (UTC) X-FDA: 81424447398.06.793EE8A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf25.hostedemail.com (Postfix) with ESMTP id 7449BA0009 for ; Sun, 5 Nov 2023 16:33:57 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DkdwK2TN; spf=pass (imf25.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699202037; a=rsa-sha256; cv=none; b=mASUcagfvJ1vaDGyQ6YbSE46dL2/keuNMArSOLW5TcOwHKpZ3r3F57dSbDsOKHQvotVLmQ 0iQ2x0FglMb2xPNHo7BEyNF8nMpXMHL+sDeO1iJsoFazUo6L3yNJZzlAWv7dRnnyhh7YLj ss95J+u40FVzmEHxVRzcMHGSoia367E= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DkdwK2TN; spf=pass (imf25.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699202037; 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=CpAyzch4SMhVm07huny7JwIkxifLeCPTk8Ue/HnXSEE=; b=xad18/DGT1w+sO3Zzp4w+YJbBNvtvhNX5OcArQTgAAiL/Y+B0wnklERCkY+qb5Lbe3a90K eLGtshv46P4ofwYnCtwNFTFk0NSv2LrFjeFDWgp5HHN6GhhS3Rk6vOtv5WJKgbs5R5RuQZ jdCqbBaHPjrmfGofDDUV1bQYo3OAwZ4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699202036; h=from:from: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; bh=CpAyzch4SMhVm07huny7JwIkxifLeCPTk8Ue/HnXSEE=; b=DkdwK2TNSGUPyBq8ssR9tMxBK4/Tr2AYNwq5qIuHnwQF4Lk/i8updyEqg9Zjm6z2uD9IC5 yYtpAiFGnj1H0MMssuMRHzELpJd3sp2ZlTiVYPI687MSiiaTCycEUfiCpGAxNNsLANG0Um +ofZqhVwi02pzV+a8u7NSN0QpHoN7fk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-260-od76qxppNEesJ1zoRU0obA-1; Sun, 05 Nov 2023 11:33:52 -0500 X-MC-Unique: od76qxppNEesJ1zoRU0obA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6CEF2810FC1; Sun, 5 Nov 2023 16:33:50 +0000 (UTC) Received: from avogadro.redhat.com (unknown [10.39.192.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id 626972166B26; Sun, 5 Nov 2023 16:33:43 +0000 (UTC) From: Paolo Bonzini 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" Subject: [PATCH 23/34] KVM: selftests: Convert lib's mem regions to KVM_SET_USER_MEMORY_REGION2 Date: Sun, 5 Nov 2023 17:30:26 +0100 Message-ID: <20231105163040.14904-24-pbonzini@redhat.com> In-Reply-To: <20231105163040.14904-1-pbonzini@redhat.com> References: <20231105163040.14904-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 7449BA0009 X-Stat-Signature: 4bnrexhpcqxadk8cm15ay3ewi5y1u39e X-Rspam-User: X-HE-Tag: 1699202037-378673 X-HE-Meta: U2FsdGVkX1+13W2t8EWqcp+okY76y2ompRVfDOyZXH/lqW7Q/eRNL8feSApDAxLHGJ0Mrzb0EiPuLWFwYFxCSnrNS2p6gbt9z/CR4wEKcMG4pKMY3y8LUEXFBRXtQ4P5uw0mgSVRRsVWflmA7zBCTm3faexXYVd+g8ddwgxrexeLQlW7XvNNNyLm82ZNsDm38Km5KYDgnj6NxgZI/yjG9tu+V9pnwwL5HUKqy+xiauGtPoh0/xam9Z5q1ZoYC4P7D/kBADrDnVSF7Oj7OP57qjjON8S1hPzFykziu+8dNR5mT0QCkWRKovIjCKJ6sYb05OoP1BV7Kg/RRxNisIR1e3NWklBNvd5lMbZJ9a2nklzi4KJMRzJAN/rJDnZuYf3WBi7WEgQ7LMSqOjA9EyntQCCvTSJampOUebxJ++FgcuHzHhsUPj4Y6BmzsKpDJ4PjW72+rqkrGFIBFNkE4xtXZKoQstk7FSr6L2a0rsjyaKM7QYYOxIBer+QMFCSzeB97+ek7nbOnQLy/IJOdEtfhNaEnJ7s2d+MWtT50u6gctByXb0Z396cZbK54t7XrgQGKiAFttdP5pxVfaB/7u+AneQaSMDeAIFbMhkR8uPfk5THBWimSOJf1ExRPfOIHnBuyaEZe7KjU37RlYyaEw5LpqIyDSRNh0zhXWZCbwecX821EWaq+wMtcuEh9I0hP8FrQqXp278YtTpYuTs4dTDB3fb9AjIQ5933tQRrILEIiyijKtDZMUnj/F/wiPfEB/qFyf451tl/6JAiMBGB3P75jfv1ZoSv1vk62y7juI3bWK+slxLPRaUGjYktf5vkzTm8fb4r8Li4C1eTqH5LQ3m5WEXH6tFTJ62APpBaDJHCwhcF9Q29cvpi7DeGBPXHagcM9YaqBp/TdIpohRXfkxPBEaH26bcwyVTgWQecTpsxht06Gq1JGlzEFzuwm5Mqi4rnM94Emmi+WHKhakm0o4VY Be6eZDPz rB5itBvS2iAYI8wVFh5sJnTZ5MEugWtJz8niUzxg7octHgh9ABWShQomVN8UeFF+u+X7vGS4UxBlggINObg4Uvf8mR8nxreJFZEYPcHj+kOliaXyVfTABv/3EECFgzCkV6Pqs3eX4K15q6VEZ4Pot6ZUJZUaQiGtnM735Q4y0B2QVKH5LGn+SjTCy60yoVe8dGiaMa/yv0UCA4QyBjrWMMojN1WmoTuMk9DQNBNlnEbdqu8T/w2uRiBOupDex+QKb9iuwIsJma39bUg1Xx5/QyuR/yU/By/kitsw2hwkQgr3qf0A9uZbHihscPDVasaWTDvOl 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: From: Sean Christopherson 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 Message-Id: <20231027182217.3615211-26-seanjc@google.com> Signed-off-by: Paolo Bonzini --- .../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.39.1