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 B16D3C4332F for ; Sun, 5 Nov 2023 16:34:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4959D440170; Sun, 5 Nov 2023 11:34:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 44496440150; Sun, 5 Nov 2023 11:34:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2BECC440170; Sun, 5 Nov 2023 11:34:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 1775A440150 for ; Sun, 5 Nov 2023 11:34:49 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id DA101160413 for ; Sun, 5 Nov 2023 16:34:48 +0000 (UTC) X-FDA: 81424449456.18.9C88306 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 3470F18000F for ; Sun, 5 Nov 2023 16:34:47 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699202087; a=rsa-sha256; cv=none; b=0xNUUpouPui2c6KYCC/IGIinFpUMChxa8oXeIou3ssYDscqkyGcPIucEcYU5emM4PRQkoS dLYmFzwmIFbQfRuaPuvVJ2LAgkQd95poBNyiykPBRSsTMpZoR04Av87bPaLb/NKalUM8IF jA1I3OAEPOtnysyZqAwpWOex3inrkEg= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699202087; 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; bh=w6Yxa9MSsZ8N3H0JDDBq80QCW5wtuVY46hruYnL608k=; b=59AkNuIltPXcJD8bhi4i/dntaW66TXs7MHlo09/tD2D++B+bgUhK258IBHVeJoYSkH9rTw w16TjiQwIvF0y66hThbmNTpRUU0ceYVvVkyN2YyrqifUggJeuNtY3qU5OkZiicrpd4Ekmu pQB8pmJlmGlTHrLLaZ22ViNMnNlhujM= 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-75-movnItozOMmwEXWg-YFLhg-1; Sun, 05 Nov 2023 11:34:42 -0500 X-MC-Unique: movnItozOMmwEXWg-YFLhg-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 940DE185A780; Sun, 5 Nov 2023 16:34:40 +0000 (UTC) Received: from avogadro.redhat.com (unknown [10.39.192.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id D126B2166B26; Sun, 5 Nov 2023 16:34:33 +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 30/34] KVM: selftests: Add KVM_SET_USER_MEMORY_REGION2 helper Date: Sun, 5 Nov 2023 17:30:33 +0100 Message-ID: <20231105163040.14904-31-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: 3470F18000F X-Stat-Signature: gwxxn9nut3io41mbe95homws4xqogoop X-Rspam-User: X-HE-Tag: 1699202087-64031 X-HE-Meta: U2FsdGVkX18yTw60+k8sEnOWPqkRxK8zbyOvOvzY9KNlnDXmuZ2leFPbAc6LbDIPVJdn7+YwqR1+6/w0mM6LUTE5CmZM6DgrKrc083QjX2noxRJfCHckJbFIwhBqIdOZmcZ/+ViG/EbC/Hmcws49poC136jxMi+xK0xN22gcYmtVGxtUbdHJJEag2kFPaRu4XbBhGkfsFCqtkFX0MfIKThoH3/HHh3OrB/6+2tGrw4jeuLVrDICBr0vU7E0lNsmihTNlj3/L84ya6Lja6uoamZE7FT/DXO6f+oy7bkf1xksRHmSAiklgnAUrqO2HsVW3d6fLwiIqGZ6QBY5heFMUiEqv+KW5ZvD5zwfSUSUWwlhHb4ihqr/utHEQ++aljM0r6LYQe6GnQTH8KtkHG4iLDUDSAlUfTWgWYvv70Pwxcqwiqof2AZbUhxysP99+5oH+tjcrXKApKyoXam7NYsG8dsu8O3oZadRhq5j6DTONQLwiQbuDrk3th5at3wyTuTXMCq6AC0Td/EPs9obyCw8KfouLw8wD0xfzDfyeH97nF0ANlj5gytjf+OcMV4ltrsK3rYWcu/VRM2P4FYm76SlOgFz+0bhKw/c4Jz/qP5/PFkFd0pbX7HOScokizJZCraEl3xTSegeJTPa8AdOPohbfYX4lEikmg+M9FSB/dnFxlFhp4BGIg6xdpmuNjCUbMsVjFBVfJx6s9xAyfjHY3vT10A+djZBgu+AxsqsENaACJP+0+uGTZ+s6w61NMd24d2KrekBB/eOh0b65xR/ZGxDbsOfIoXS8PX3Aly2eWR/4JJFmwio/gSFrMgNs+7uaW7f0FUDvXr1F0qVCNPmI01+rEZw/hP0RD9iyj2Vk3pxVNRmDXNzPBoDXF3PFNN/fMcwUu3lw8VUDGnPy0Y/3qWqS+BXMVevEapBByHOuDtb/Z3zGQNAXjllidshYL/nfGPB0y8glNhjyLb0Zy15gZq4 D8YL6YT8 74U+Y6pkEiRD8Md6/wDQFGwUrxtmsEcwlMKhKmtyGzBnmLZvtHg2zXr9JqCTMFs7nDe+V0bt8oHOk2WWpEc4+smRlgatC/TSv3yVm6NyBCo7PgyWZd3rxnisI++L5JTf2YFqHm+w5vvi3NX3BsqQKaWqh3R9KfqbCECyr51RX2NnrkCuRc4daV4YExOUvJs5ll+FIe819zbg0j1m1UeyQ72aGWvr2WshZjGthffyL5jjgcpiJe5ZdpTJ3Ng== 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: Chao Peng Add helpers to invoke KVM_SET_USER_MEMORY_REGION2 directly so that tests can validate of features that are unique to "version 2" of "set user memory region", e.g. do negative testing on gmem_fd and gmem_offset. Provide a raw version as well as an assert-success version to reduce the amount of boilerplate code need for basic usage. Signed-off-by: Chao Peng Signed-off-by: Ackerley Tng Signed-off-by: Sean Christopherson Message-Id: <20231027182217.3615211-33-seanjc@google.com> Signed-off-by: Paolo Bonzini --- .../selftests/kvm/include/kvm_util_base.h | 7 +++++ tools/testing/selftests/kvm/lib/kvm_util.c | 29 +++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index 157508c071f3..8ec122f5fcc8 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -522,6 +522,13 @@ void vm_set_user_memory_region(struct kvm_vm *vm, uint32_t slot, uint32_t flags, uint64_t gpa, uint64_t size, void *hva); int __vm_set_user_memory_region(struct kvm_vm *vm, uint32_t slot, uint32_t flags, uint64_t gpa, uint64_t size, void *hva); +void vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flags, + uint64_t gpa, uint64_t size, void *hva, + uint32_t guest_memfd, uint64_t guest_memfd_offset); +int __vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flags, + uint64_t gpa, uint64_t size, void *hva, + uint32_t guest_memfd, uint64_t guest_memfd_offset); + void vm_userspace_mem_region_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, uint64_t guest_paddr, uint32_t slot, uint64_t npages, diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 1c74310f1d44..d05d95cc3693 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -873,6 +873,35 @@ void vm_set_user_memory_region(struct kvm_vm *vm, uint32_t slot, uint32_t flags, errno, strerror(errno)); } +int __vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flags, + uint64_t gpa, uint64_t size, void *hva, + uint32_t guest_memfd, uint64_t guest_memfd_offset) +{ + struct kvm_userspace_memory_region2 region = { + .slot = slot, + .flags = flags, + .guest_phys_addr = gpa, + .memory_size = size, + .userspace_addr = (uintptr_t)hva, + .guest_memfd = guest_memfd, + .guest_memfd_offset = guest_memfd_offset, + }; + + return ioctl(vm->fd, KVM_SET_USER_MEMORY_REGION2, ®ion); +} + +void vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flags, + uint64_t gpa, uint64_t size, void *hva, + uint32_t guest_memfd, uint64_t guest_memfd_offset) +{ + int ret = __vm_set_user_memory_region2(vm, slot, flags, gpa, size, hva, + guest_memfd, guest_memfd_offset); + + TEST_ASSERT(!ret, "KVM_SET_USER_MEMORY_REGION2 failed, errno = %d (%s)", + errno, strerror(errno)); +} + + /* FIXME: This thing needs to be ripped apart and rewritten. */ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, uint64_t guest_paddr, uint32_t slot, uint64_t npages, -- 2.39.1