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 818D5C4167B for ; Sun, 5 Nov 2023 16:35:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1FC44440171; Sun, 5 Nov 2023 11:35:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1AD46440150; Sun, 5 Nov 2023 11:35:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 026F9440171; Sun, 5 Nov 2023 11:34:59 -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 E41E2440150 for ; Sun, 5 Nov 2023 11:34:59 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B8C2C80474 for ; Sun, 5 Nov 2023 16:34:59 +0000 (UTC) X-FDA: 81424449918.11.E1C2C52 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf26.hostedemail.com (Postfix) with ESMTP id EF259140019 for ; Sun, 5 Nov 2023 16:34:57 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=afXPNhgW; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.133.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=1699202098; 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=D/lhWGWGrQ6KTenP/DS+/XR8+yfBHvDZZ4ODppqjVMQ=; b=5InOcIdD+cNLrgcOpiEewSFf9sD2ylUNczNWmWMmjM9QJnP9nb/oyySeqj4FrjY5y4Tb6+ y//2HN6mIKg5IxhLQkwT/M0TDtnfZcnp5ovmp+9s5Dx1Kng3CYSII4UgIJhm6wEyF2xANF o0fqOkw32iFMCBMo4IAB0rKF8n+0+/0= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=afXPNhgW; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699202098; a=rsa-sha256; cv=none; b=I7atewbzqtDy97Tl62ZKIJIaE2wRKdeIPeY1Z/vZaSknYQRAh+zG3QNKIhZQqhkx2CW9uD bP8PzjI/ZR9A7rG14Zy6gqv06UgMADei8PgrizRC1FRgdrtYkbXpd6FTsLbL9ZurdMQTjy gg9RxOb/nUAkuYHYUpxqGN+l9BqEWW4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699202097; 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=D/lhWGWGrQ6KTenP/DS+/XR8+yfBHvDZZ4ODppqjVMQ=; b=afXPNhgWXOuOENe8jXZuhvBn42de6ADLiL8S7Ua4zqjeucEMpe4J3Osjpjm3NmUWoXjFqU uu5Sbsb1++XAS7zM+rB1Qbby5cqjq909Bdh0PxEvo9s+t2mz3PYlSdoVHrOOBtRzYMTpRV llAB4DFdgvjmy/19dawTh3dpDdM7JL0= 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-132-56_0juESPsatACszOU-i_w-1; Sun, 05 Nov 2023 11:34:50 -0500 X-MC-Unique: 56_0juESPsatACszOU-i_w-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 0F838810FC1; Sun, 5 Nov 2023 16:34:48 +0000 (UTC) Received: from avogadro.redhat.com (unknown [10.39.192.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id E5BED2166B26; Sun, 5 Nov 2023 16:34:40 +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 31/34] KVM: selftests: Expand set_memory_region_test to validate guest_memfd() Date: Sun, 5 Nov 2023 17:30:34 +0100 Message-ID: <20231105163040.14904-32-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: rspam09 X-Rspamd-Queue-Id: EF259140019 X-Stat-Signature: gf1byc3gwtbquow7pj3i411853od8imi X-Rspam-User: X-HE-Tag: 1699202097-257828 X-HE-Meta: U2FsdGVkX1/nK45FNIjYb+mGKD8WhR/HAjgUx1SsyImBV1I920Kv+ZxgHuHSXmfPKCu5kInjW3dEI5Kx1I5YDSxUQXNd7ixvFpU/I/fqs4ssqNyqSK9TgWWgtOnoWZoga9ITZP4JCdE08oPNZxS4b5fUEPAY4GZUhIWksMv+dGEOanfNfHx4IX92Uq84X8fixec0tMXoFE8cd0JcOKRcmTPyoUJprBT1EBhMb3hF17L/H4rLhX5yr7pbBlGu6fnlANTc5BgkqV+dTnKl/8wUz5E4/iT1mfzxF3ndUu96Czri3iIHARpVcdbODSrfLxvCXU5DM1s8y8n4qv+9a2fxQCNfP8zdKkHVF4q5aartqLhQzzq9wQi+7vGn2r9DB5itfrbbZvq2FW+rzvP1jB+zd/0CKN1GEQmnOMI/jCbEIhlzx2m7YgGTQVypc6mcOxypQDXhrFrPjua2QUvDumWU/NbO+2aUtHYoh+YqLKLGN5bBajNPqxrQUHa9WtrQF1lwEeNkAqAm3vXbHWzvuQAmvjLgMhvmHE5ufaNQrzslFS73cu/d7W+Ww6on5uHJHPEH49Qr+PoLFGSI03qSNqFA2cACKHjpboeVcIKZBiaB5CDp52wLn9DK8VTMbxobliqvjMuMUzys41PQ4OeZ8XevGH4qfsRiMjyBAnCMCy+KR3gT/uYVbiDQX4B4V7hD98vFajNIB/PjxHjD/cFoFvBpBiwSezceUDjFs5MdkeLdLgwswM6iRRWYf7m0hYBP5NQLuEa/y2HAU6T1gBRyWERz65T5ZoJIHvFyPTbeIVg3QNlrilpMR7TqyoNTfe8lsX9mPkLC+1SFJMtW7lBEBcpwWTTiZjr6ZXUp3SUpTzIPqqqgp89Qy28WQkew7EUZ961KbEziwBmefSLrrlo2AUPDAblP4DZs9GkqVRK/CLOPSbZRRCECsclqYzGsllCc3g3UUL4NGuqNbcGltlVq0EQ l0uqCd7O 6huQilA9Im5V4OV6j2SAf28mXzrIjTe/iYFz5c86FoXxkC8CWJ9pz7AQjfgY29kkqBBKmxTVyC52AI+JQLUFWjaE9u1alobtQUc/OqMqEn8cwxGHlewUts6Bfx3A4mV2jAs68aCI9rJuCUDLwKulm88tuEdW9qdyNyI7UbsKDPYtBKEUg19Dnm1R2Y8Z/90tfxd62KsMqCimgVTLjLWgaDOpwN+HklIbhbNHfQZjrwl/W9PPHrZvOt1YzZ4lPFgbG9wBawYqpJTPiqwKgcL6Jq4isIl3JobFurSPuyv0+GZaB17yx8SV99drrgq1cLcS8Lr1k/Vmenfb8NQuiKeph6BAiug== 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 Expand set_memory_region_test to exercise various positive and negative testcases for private memory. - Non-guest_memfd() file descriptor for private memory - guest_memfd() from different VM - Overlapping bindings - Unaligned bindings Signed-off-by: Chao Peng Co-developed-by: Ackerley Tng Signed-off-by: Ackerley Tng [sean: trim the testcases to remove duplicate coverage] Signed-off-by: Sean Christopherson Message-Id: <20231027182217.3615211-34-seanjc@google.com> Signed-off-by: Paolo Bonzini --- .../selftests/kvm/include/kvm_util_base.h | 10 ++ .../selftests/kvm/set_memory_region_test.c | 100 ++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index 8ec122f5fcc8..e4d2cd9218b2 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -819,6 +819,16 @@ static inline struct kvm_vm *vm_create_barebones(void) return ____vm_create(VM_SHAPE_DEFAULT); } +static inline struct kvm_vm *vm_create_barebones_protected_vm(void) +{ + const struct vm_shape shape = { + .mode = VM_MODE_DEFAULT, + .type = KVM_X86_SW_PROTECTED_VM, + }; + + return ____vm_create(shape); +} + static inline struct kvm_vm *vm_create(uint32_t nr_runnable_vcpus) { return __vm_create(VM_SHAPE_DEFAULT, nr_runnable_vcpus, 0); diff --git a/tools/testing/selftests/kvm/set_memory_region_test.c b/tools/testing/selftests/kvm/set_memory_region_test.c index b32960189f5f..1891774eb6d4 100644 --- a/tools/testing/selftests/kvm/set_memory_region_test.c +++ b/tools/testing/selftests/kvm/set_memory_region_test.c @@ -385,6 +385,98 @@ static void test_add_max_memory_regions(void) kvm_vm_free(vm); } + +static void test_invalid_guest_memfd(struct kvm_vm *vm, int memfd, + size_t offset, const char *msg) +{ + int r = __vm_set_user_memory_region2(vm, MEM_REGION_SLOT, KVM_MEM_GUEST_MEMFD, + MEM_REGION_GPA, MEM_REGION_SIZE, + 0, memfd, offset); + TEST_ASSERT(r == -1 && errno == EINVAL, "%s", msg); +} + +static void test_add_private_memory_region(void) +{ + struct kvm_vm *vm, *vm2; + int memfd, i; + + pr_info("Testing ADD of KVM_MEM_GUEST_MEMFD memory regions\n"); + + vm = vm_create_barebones_protected_vm(); + + test_invalid_guest_memfd(vm, vm->kvm_fd, 0, "KVM fd should fail"); + test_invalid_guest_memfd(vm, vm->fd, 0, "VM's fd should fail"); + + memfd = kvm_memfd_alloc(MEM_REGION_SIZE, false); + test_invalid_guest_memfd(vm, memfd, 0, "Regular memfd() should fail"); + close(memfd); + + vm2 = vm_create_barebones_protected_vm(); + memfd = vm_create_guest_memfd(vm2, MEM_REGION_SIZE, 0); + test_invalid_guest_memfd(vm, memfd, 0, "Other VM's guest_memfd() should fail"); + + vm_set_user_memory_region2(vm2, MEM_REGION_SLOT, KVM_MEM_GUEST_MEMFD, + MEM_REGION_GPA, MEM_REGION_SIZE, 0, memfd, 0); + close(memfd); + kvm_vm_free(vm2); + + memfd = vm_create_guest_memfd(vm, MEM_REGION_SIZE, 0); + for (i = 1; i < PAGE_SIZE; i++) + test_invalid_guest_memfd(vm, memfd, i, "Unaligned offset should fail"); + + vm_set_user_memory_region2(vm, MEM_REGION_SLOT, KVM_MEM_GUEST_MEMFD, + MEM_REGION_GPA, MEM_REGION_SIZE, 0, memfd, 0); + close(memfd); + + kvm_vm_free(vm); +} + +static void test_add_overlapping_private_memory_regions(void) +{ + struct kvm_vm *vm; + int memfd; + int r; + + pr_info("Testing ADD of overlapping KVM_MEM_GUEST_MEMFD memory regions\n"); + + vm = vm_create_barebones_protected_vm(); + + memfd = vm_create_guest_memfd(vm, MEM_REGION_SIZE * 4, 0); + + vm_set_user_memory_region2(vm, MEM_REGION_SLOT, KVM_MEM_GUEST_MEMFD, + MEM_REGION_GPA, MEM_REGION_SIZE * 2, 0, memfd, 0); + + vm_set_user_memory_region2(vm, MEM_REGION_SLOT + 1, KVM_MEM_GUEST_MEMFD, + MEM_REGION_GPA * 2, MEM_REGION_SIZE * 2, + 0, memfd, MEM_REGION_SIZE * 2); + + /* + * Delete the first memslot, and then attempt to recreate it except + * with a "bad" offset that results in overlap in the guest_memfd(). + */ + vm_set_user_memory_region2(vm, MEM_REGION_SLOT, KVM_MEM_GUEST_MEMFD, + MEM_REGION_GPA, 0, NULL, -1, 0); + + /* Overlap the front half of the other slot. */ + r = __vm_set_user_memory_region2(vm, MEM_REGION_SLOT, KVM_MEM_GUEST_MEMFD, + MEM_REGION_GPA * 2 - MEM_REGION_SIZE, + MEM_REGION_SIZE * 2, + 0, memfd, 0); + TEST_ASSERT(r == -1 && errno == EEXIST, "%s", + "Overlapping guest_memfd() bindings should fail with EEXIST"); + + /* And now the back half of the other slot. */ + r = __vm_set_user_memory_region2(vm, MEM_REGION_SLOT, KVM_MEM_GUEST_MEMFD, + MEM_REGION_GPA * 2 + MEM_REGION_SIZE, + MEM_REGION_SIZE * 2, + 0, memfd, 0); + TEST_ASSERT(r == -1 && errno == EEXIST, "%s", + "Overlapping guest_memfd() bindings should fail with EEXIST"); + + close(memfd); + kvm_vm_free(vm); +} + int main(int argc, char *argv[]) { #ifdef __x86_64__ @@ -401,6 +493,14 @@ int main(int argc, char *argv[]) test_add_max_memory_regions(); + if (kvm_has_cap(KVM_CAP_GUEST_MEMFD) && + (kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(KVM_X86_SW_PROTECTED_VM))) { + test_add_private_memory_region(); + test_add_overlapping_private_memory_regions(); + } else { + pr_info("Skipping tests for KVM_MEM_GUEST_MEMFD memory regions\n"); + } + #ifdef __x86_64__ if (argc > 1) loops = atoi_positive("Number of iterations", argv[1]); -- 2.39.1