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 98571C36010 for ; Fri, 4 Apr 2025 15:45:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D3F55280004; Fri, 4 Apr 2025 11:45:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CEEB8280001; Fri, 4 Apr 2025 11:45:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BB52C280004; Fri, 4 Apr 2025 11:45:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 97D7C280001 for ; Fri, 4 Apr 2025 11:45:27 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 88C72B757C for ; Fri, 4 Apr 2025 15:45:28 +0000 (UTC) X-FDA: 83296785936.19.7FC96C8 Received: from smtp-fw-80006.amazon.com (smtp-fw-80006.amazon.com [99.78.197.217]) by imf09.hostedemail.com (Postfix) with ESMTP id 5AEF1140012 for ; Fri, 4 Apr 2025 15:45:26 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=VyJgAqww; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf09.hostedemail.com: domain of "prvs=182d669d3=kalyazin@amazon.co.uk" designates 99.78.197.217 as permitted sender) smtp.mailfrom="prvs=182d669d3=kalyazin@amazon.co.uk" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743781526; 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=yc6GH0/dKmQ7WSv9wb3vUThoZ6MNVvGsszSJT/iNJmY=; b=vhJpNw3OsQuNhTnK6Q1u1Bf0fnpaVtrMrnZaBp2Hna2MNvOsdzkS8dvVZn/MjscMZDtb/M vZFxqLLnr3OBkh0tdvP66GvkqbWAvOcIhk6elxxwk0zGhx8qk+PtONhCYAhNxbNFYF8kAT lYA1zgT3B+zTeIpfLplgLtNWJ8Wf4nc= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=VyJgAqww; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf09.hostedemail.com: domain of "prvs=182d669d3=kalyazin@amazon.co.uk" designates 99.78.197.217 as permitted sender) smtp.mailfrom="prvs=182d669d3=kalyazin@amazon.co.uk" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743781526; a=rsa-sha256; cv=none; b=2ZrLojkF7Rw8ZrsPCJtACRSm3cJxkCBNm7WwmwDh6g7V3Jh+mm1Q5+NzpqI5HNXa4CQb6C cTSSUfD05eeH6M07l8WCFacWEgHQDY4RJOmIyWW50t14WtdZ6KNWzxeN5TM0+5kQxM0cI8 Xx375mU19kA7fdG18zCuVHe1LhhiK5k= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1743781527; x=1775317527; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yc6GH0/dKmQ7WSv9wb3vUThoZ6MNVvGsszSJT/iNJmY=; b=VyJgAqwwvChJ8r34jPBAd4W8rL5T0Dw6TrU9bZQlr1uRDtN7cF66W9PB ZMRuI94AZu9CrVUM1Gj/4kjpa3pO4p+46IjNo6aWnsZ5WGmWBYJ3++VrL skb19LD2kY6LmHppZKJn5fsdI9jXfFyphi28KlPzZAl4NlUXYON1JO8U0 4=; X-IronPort-AV: E=Sophos;i="6.15,188,1739836800"; d="scan'208";a="37863645" Received: from pdx4-co-svc-p1-lb2-vlan3.amazon.com (HELO smtpout.prod.us-east-1.prod.farcaster.email.amazon.dev) ([10.25.36.214]) by smtp-border-fw-80006.pdx80.corp.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2025 15:45:22 +0000 Received: from EX19MTAEUB002.ant.amazon.com [10.0.43.254:25779] by smtpin.naws.eu-west-1.prod.farcaster.email.amazon.dev [10.0.18.64:2525] with esmtp (Farcaster) id bc1466b6-dabf-4c34-ba00-853571b00927; Fri, 4 Apr 2025 15:45:20 +0000 (UTC) X-Farcaster-Flow-ID: bc1466b6-dabf-4c34-ba00-853571b00927 Received: from EX19D030EUB002.ant.amazon.com (10.252.61.16) by EX19MTAEUB002.ant.amazon.com (10.252.51.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14; Fri, 4 Apr 2025 15:45:16 +0000 Received: from EX19MTAUEA002.ant.amazon.com (10.252.134.9) by EX19D030EUB002.ant.amazon.com (10.252.61.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14; Fri, 4 Apr 2025 15:45:16 +0000 Received: from email-imr-corp-prod-pdx-all-2b-dbd438cc.us-west-2.amazon.com (10.43.8.2) by mail-relay.amazon.com (10.252.134.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1544.14 via Frontend Transport; Fri, 4 Apr 2025 15:45:15 +0000 Received: from dev-dsk-kalyazin-1a-a12e27e2.eu-west-1.amazon.com (dev-dsk-kalyazin-1a-a12e27e2.eu-west-1.amazon.com [172.19.103.116]) by email-imr-corp-prod-pdx-all-2b-dbd438cc.us-west-2.amazon.com (Postfix) with ESMTPS id CCF7BA047C; Fri, 4 Apr 2025 15:45:11 +0000 (UTC) From: Nikita Kalyazin To: , , , , , , CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v3 6/6] KVM: selftests: test userfaultfd minor for guest_memfd Date: Fri, 4 Apr 2025 15:43:52 +0000 Message-ID: <20250404154352.23078-7-kalyazin@amazon.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250404154352.23078-1-kalyazin@amazon.com> References: <20250404154352.23078-1-kalyazin@amazon.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 5AEF1140012 X-Stat-Signature: arryd59nkxf5hsgfdcbiyyp3fp4e6mqy X-Rspam-User: X-HE-Tag: 1743781526-771801 X-HE-Meta: U2FsdGVkX1/Xu2NPExf3pb8wbwEI6lHvgfd9wu0YIil4YXQDrU/qWsYyhJI+czJRa4ghquZyxkmaw2zJp1xSxdV8vneqt6/QaIcsuBNlAvAEzF6PEqx3yc3vl1Fa4KWo4Zy6q3vYl6EBE+NzujVWNtIpOXTCuG3Nyhz7O2X4RC69VUQBBOf2b8RQ4IQzYIkjYTLSzsis894o5NvFF5IMVEpDx/ovDNn4YxGJYOS1M2dh5+KpwsB+X1rPu2hSPfrDXBx+WKNs8C6sFbaM9ICCKHTnQmfLzRw6UlKpOyjNMT5JsqLfKFm/PxyQldD2w3DX8VGzau5G0MgNBZNIpkZw1ly7CLEjcnvFfWA3MLlVH0lnQb+KfJ2sTiQ0Nt3YtVkJJopRNT2nDTfh9jhc1gKz+pk0bzu7LaY947DpLxaTYyD7fW3/EwPuxV6XaUBpBNJCdXCg15kWmr5DoVI5DmPuHxjADtQZdT3WG+RZbXq1h8Qvir2Vy+10lfYKkN0Ra2AuoS7g8j3DFRs9mlGpJ7m/H7A9p7BAiChKTRInI/QR+izn+MK3uE70P4BHa6+dNwHcforOVlcei4Uy2ijcknMtWNIpYo9GkAVsz//3B1rOMY9rK1Y/EOSQYCztBmqpsZmaCjrXhSt2dpBYyIBsRsLJoLIHfHr2Q/Dyq5RL2VtMTWe9/Q+YSzSQfB8spDlkOZVVGbtjBkW/P0wvo6GTJgxMVjzAmNPPA31oECAuYqeRX6aO37C6Y15RrVi6hyho1jUg8eZTv8pLtkwV/qMdbzarLezgsKjnL7aKGu7Q+BEWWKdtLnKMeXjlSMZemurRdq0yJ8TH+ppUXTGLRrqNMHzeCtBoMiOH7LxhoecTbFzF/hVEP34TiumdOaBUN629gSG/gUoHPWH8TMxkKPHm/XHYEOgNN8trf9T/9DEO+D7J4qwJrXcT4CrPfK2VcbFKJbi0FN2GxmeRoqbMOWUZxc9 VLcdyZ5Z PfWI3MQ/Xv9CJF5Jg/XDnCYkc0HgOYbcw903MjoRFwQTWMnpDqULtvUGXTLS5lSyy/BEpUpHghU4PFQVZPicheDoZwSDkIq+ZAlmH2OACCb0z2Cg4Zp+bmuEQmG4tJQnc9JeeY4I/7Ewbwv3KBaZHeAaAEIh0lk1ylB3qJiI6+wmsvt2dUMYeqdvqdKyFfsFlJ76R60GRCs8SqAZswS2oPW72y7co1IpAc1jiV6w/L66Ef+ve2zF78Y8qarrt472Rfeq3t/oXiI67otgLjUGYf83+lyHS9Ay+kQVAlxxz9ioaPdf4+k99fHdgOmebfmVFhRfpzjVl/ijcsrRYXJDkkos1zmsOw4IYuO9QpOyILE2IoP46h01pfXZxMfkzktB4on1lmdRfKP8FGy55g7tygPUGtniLWdhAuV7GVRPaw7LYA2PJ2wNwquY6TZ69pLu1SJYcXSkNmEmUPoDzh/RnX0YczjDE0xQvkBt+XTUjzcxkj6tT0HRLqjSB+y5NiQROjRER8WaJwVC9/qRMeCcr3EobwCwyu9RIvndcaKRZQkxXcGk= 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: The test demonstrates that a minor userfaultfd event in guest_memfd can be resolved via a memcpy followed by a UFFDIO_CONTINUE ioctl. Signed-off-by: Nikita Kalyazin --- .../testing/selftests/kvm/guest_memfd_test.c | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing/selftests/kvm/guest_memfd_test.c index 38c501e49e0e..9a06c2486218 100644 --- a/tools/testing/selftests/kvm/guest_memfd_test.c +++ b/tools/testing/selftests/kvm/guest_memfd_test.c @@ -10,12 +10,16 @@ #include #include #include +#include #include #include +#include #include #include #include +#include +#include #include "kvm_util.h" #include "test_util.h" @@ -206,6 +210,98 @@ static void test_create_guest_memfd_multiple(struct kvm_vm *vm) close(fd1); } +struct fault_args { + char *addr; + volatile char value; +}; + +static void *fault_thread_fn(void *arg) +{ + struct fault_args *args = arg; + + /* Trigger page fault */ + args->value = *args->addr; + return NULL; +} + +static void test_uffd_minor(int fd, size_t page_size, size_t total_size) +{ + struct uffdio_register uffd_reg; + struct uffdio_continue uffd_cont; + struct uffd_msg msg; + struct fault_args args; + pthread_t fault_thread; + void *mem, *mem_nofault, *buf = NULL; + int uffd, ret; + off_t offset = page_size; + void *fault_addr; + + ret = posix_memalign(&buf, page_size, total_size); + TEST_ASSERT_EQ(ret, 0); + + uffd = syscall(__NR_userfaultfd, O_CLOEXEC); + TEST_ASSERT(uffd != -1, "userfaultfd creation should succeed"); + + struct uffdio_api uffdio_api = { + .api = UFFD_API, + .features = UFFD_FEATURE_MINOR_GUEST_MEMFD, + }; + ret = ioctl(uffd, UFFDIO_API, &uffdio_api); + TEST_ASSERT(ret != -1, "ioctl(UFFDIO_API) should succeed"); + + mem = mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + TEST_ASSERT(mem != MAP_FAILED, "mmap should succeed"); + + mem_nofault = mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + TEST_ASSERT(mem_nofault != MAP_FAILED, "mmap should succeed"); + + uffd_reg.range.start = (unsigned long)mem; + uffd_reg.range.len = total_size; + uffd_reg.mode = UFFDIO_REGISTER_MODE_MINOR; + ret = ioctl(uffd, UFFDIO_REGISTER, &uffd_reg); + TEST_ASSERT(ret != -1, "ioctl(UFFDIO_REGISTER) should succeed"); + + ret = fallocate(fd, FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE, + offset, page_size); + TEST_ASSERT(!ret, "fallocate(PUNCH_HOLE) should succeed"); + + fault_addr = mem + offset; + args.addr = fault_addr; + + ret = pthread_create(&fault_thread, NULL, fault_thread_fn, &args); + TEST_ASSERT(ret == 0, "pthread_create should succeed"); + + ret = read(uffd, &msg, sizeof(msg)); + TEST_ASSERT(ret != -1, "read from userfaultfd should succeed"); + TEST_ASSERT(msg.event == UFFD_EVENT_PAGEFAULT, "event type should be pagefault"); + TEST_ASSERT((void *)(msg.arg.pagefault.address & ~(page_size - 1)) == fault_addr, + "pagefault should occur at expected address"); + + memcpy(mem_nofault + offset, buf + offset, page_size); + + uffd_cont.range.start = (unsigned long)fault_addr; + uffd_cont.range.len = page_size; + uffd_cont.mode = 0; + ret = ioctl(uffd, UFFDIO_CONTINUE, &uffd_cont); + TEST_ASSERT(ret != -1, "ioctl(UFFDIO_CONTINUE) should succeed"); + + TEST_ASSERT(args.value == *(char *)(mem_nofault + offset), + "memory should contain the value that was copied"); + TEST_ASSERT(args.value == *(char *)(mem + offset), + "no further fault is expected"); + + ret = pthread_join(fault_thread, NULL); + TEST_ASSERT(ret == 0, "pthread_join should succeed"); + + ret = munmap(mem_nofault, total_size); + TEST_ASSERT(!ret, "munmap should succeed"); + + ret = munmap(mem, total_size); + TEST_ASSERT(!ret, "munmap should succeed"); + free(buf); + close(uffd); +} + unsigned long get_shared_type(void) { #ifdef __x86_64__ @@ -244,6 +340,9 @@ void test_vm_type(unsigned long type, bool is_shared) test_fallocate(fd, page_size, total_size); test_invalid_punch_hole(fd, page_size, total_size); + if (is_shared) + test_uffd_minor(fd, page_size, total_size); + close(fd); kvm_vm_release(vm); } -- 2.47.1