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 picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 37E2DEE20B1 for ; Fri, 6 Feb 2026 15:53:19 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id A120F3CD508 for ; Fri, 6 Feb 2026 16:53:17 +0100 (CET) Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [217.194.8.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 4421B3CC812 for ; Fri, 6 Feb 2026 16:52:59 +0100 (CET) Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) (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 in-7.smtp.seeweb.it (Postfix) with ESMTPS id 16383200DBC for ; Fri, 6 Feb 2026 16:52:57 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id C8B275BCC5; Fri, 6 Feb 2026 15:52:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1770393177; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fJ7pXiZfmVzJkmp19ndb2Nq9uG+33xziPXYQlxgO0Yc=; b=ZlxjUsa8Ja68FscyuJQmTvghM0VgsV48DycyLXOmZf8Jv8iZ4qp2uP93LkZ4uJN4s8Do9o qJ3prSQMzIWorfayZIlXj8JFv03VyOHdjpTrvVCGfRj/jWoQ34/eudgPvrZC6BwZswxO+8 UxhIjTykSDxc3EgNfYI2fhhd5LCvKZE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1770393177; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fJ7pXiZfmVzJkmp19ndb2Nq9uG+33xziPXYQlxgO0Yc=; b=JHkOzkF0a57MMc6ohXWTcEVFtNvcSBXSUNit1QP0VZvIGInyMw8U/QSJFOlQlvKKDTBuL8 kvkI514WD3YQbOAw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1770393176; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fJ7pXiZfmVzJkmp19ndb2Nq9uG+33xziPXYQlxgO0Yc=; b=IXTMxGR8AwILpFABeiWYqYxxPWSHKAD/GJF3bhHhMXICI1oe4AJZJeHhgreJ+hj3uaPLCj AZyt3o0qxpnZTtP4RN8HMPoQio5O2kF4ngNi5j9vwNKKJq2encmlT2Jr5ocCqIiqr2akxO lY8vpRTec++RIR2aEY/CuHaqD5c/IVc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1770393176; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fJ7pXiZfmVzJkmp19ndb2Nq9uG+33xziPXYQlxgO0Yc=; b=rAQnTA026eUuvS3ifFkIc/gPBn0SZWoGtFo2asvwYGTipNwfRfZfPXvMvT/iwxF6e+Cd9y Ezo5gCez2tMkRqAw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id A04703EA63; Fri, 6 Feb 2026 15:52:56 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id U/KxJVgOhmmWGAAAD6G6ig (envelope-from ); Fri, 06 Feb 2026 15:52:56 +0000 From: Ricardo Branco To: ltp@lists.linux.it Date: Fri, 6 Feb 2026 16:52:40 +0100 Message-ID: <20260206155244.243291-1-rbranco@suse.de> X-Mailer: git-send-email 2.53.0 MIME-Version: 1.0 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.997]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.com:email,suse.de:mid,suse.de:email]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCPT_COUNT_TWO(0.00)[2]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Virus-Scanned: clamav-milter 1.0.9 at in-7.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH v2] userfaultfd: Add test using UFFDIO_POISON X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" Signed-off-by: Ricardo Branco --- configure.ac | 1 + include/lapi/userfaultfd.h | 13 ++ .../kernel/syscalls/userfaultfd/.gitignore | 1 + .../kernel/syscalls/userfaultfd/Makefile | 1 + .../syscalls/userfaultfd/userfaultfd06.c | 141 ++++++++++++++++++ 5 files changed, 157 insertions(+) create mode 100644 testcases/kernel/syscalls/userfaultfd/userfaultfd06.c diff --git a/configure.ac b/configure.ac index 7fa614dcb..94bcbcc98 100644 --- a/configure.ac +++ b/configure.ac @@ -278,6 +278,7 @@ AC_CHECK_TYPES([struct sockaddr_vm],,,[ ]) AC_CHECK_TYPES([struct uffdio_move],,,[#include ]) +AC_CHECK_TYPES([struct uffdio_poison],,,[#include ]) AC_CHECK_TYPES([struct uffdio_writeprotect],,,[#include ]) # Tools knobs diff --git a/include/lapi/userfaultfd.h b/include/lapi/userfaultfd.h index 0c9e34c84..aab3890b7 100644 --- a/include/lapi/userfaultfd.h +++ b/include/lapi/userfaultfd.h @@ -233,6 +233,19 @@ struct uffdio_writeprotect { }; #endif /* HAVE_STRUCT_UFFDIO_WRITEPROTECT */ +#ifndef HAVE_STRUCT_UFFDIO_POISON +#define UFFD_FEATURE_POISON (1<<14) +#define _UFFDIO_POISON (0x08) +#define UFFDIO_POISON _IOWR(UFFDIO, _UFFDIO_POISON, \ + struct uffdio_poison) +struct uffdio_poison { + struct uffdio_range range; +#define UFFDIO_POISON_MODE_DONTWAKE ((__u64)1<<0) + __u64 mode; + __s64 updated; +}; +#endif /* HAVE_STRUCT_UFFDIO_POISON */ + #define SAFE_USERFAULTFD(flags, retry) \ safe_userfaultfd(__FILE__, __LINE__, (flags), (retry)) diff --git a/testcases/kernel/syscalls/userfaultfd/.gitignore b/testcases/kernel/syscalls/userfaultfd/.gitignore index fb2ae243b..bc32fdf3b 100644 --- a/testcases/kernel/syscalls/userfaultfd/.gitignore +++ b/testcases/kernel/syscalls/userfaultfd/.gitignore @@ -3,3 +3,4 @@ /userfaultfd03 /userfaultfd04 /userfaultfd05 +/userfaultfd06 diff --git a/testcases/kernel/syscalls/userfaultfd/Makefile b/testcases/kernel/syscalls/userfaultfd/Makefile index 96650a65a..3252e47df 100644 --- a/testcases/kernel/syscalls/userfaultfd/Makefile +++ b/testcases/kernel/syscalls/userfaultfd/Makefile @@ -16,3 +16,4 @@ userfaultfd02: CFLAGS += -pthread userfaultfd03: CFLAGS += -pthread userfaultfd04: CFLAGS += -pthread userfaultfd05: CFLAGS += -pthread +userfaultfd06: CFLAGS += -pthread diff --git a/testcases/kernel/syscalls/userfaultfd/userfaultfd06.c b/testcases/kernel/syscalls/userfaultfd/userfaultfd06.c new file mode 100644 index 000000000..213ba77d7 --- /dev/null +++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd06.c @@ -0,0 +1,141 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2026 SUSE LLC + * Author: Ricardo Branco + */ + +/*\ + * Force a pagefault event and handle it using :manpage:`userfaultfd(2)` + * from a different thread testing UFFDIO_POISON. + */ + +#include "config.h" +#include +#include +#include +#include +#include "tst_test.h" +#include "tst_safe_macros.h" +#include "tst_safe_pthread.h" +#include "lapi/userfaultfd.h" + +static int page_size; +static char *page; +static int uffd; +static volatile int poison_fault_seen; +static volatile int sigbus_seen; +static sigjmp_buf jmpbuf; +static pthread_barrier_t barrier; + +static void sigbus_handler(int sig) +{ + if (sig == SIGBUS) { + sigbus_seen = 1; + siglongjmp(jmpbuf, 1); + } +} + +static void set_pages(void) +{ + page_size = sysconf(_SC_PAGE_SIZE); + page = SAFE_MMAP(NULL, page_size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); +} + +static void reset_pages(void) +{ + if (page) { + SAFE_MUNMAP(page, page_size); + page = NULL; + } +} + +static void *handle_thread(void) +{ + static struct uffd_msg msg; + struct uffdio_poison uffdio_poison = {}; + struct pollfd pollfd; + int nready; + + SAFE_PTHREAD_BARRIER_WAIT(&barrier); + + pollfd.fd = uffd; + pollfd.events = POLLIN; + nready = poll(&pollfd, 1, -1); + if (nready == -1) + tst_brk(TBROK | TERRNO, "Error on poll"); + + SAFE_READ(1, uffd, &msg, sizeof(msg)); + + if (msg.event != UFFD_EVENT_PAGEFAULT) + tst_brk(TFAIL, "Received unexpected UFFD_EVENT %d", msg.event); + + poison_fault_seen = 1; + + /* Poison the page that triggered the fault */ + uffdio_poison.range.start = msg.arg.pagefault.address & ~(page_size - 1); + uffdio_poison.range.len = page_size; + + SAFE_IOCTL(uffd, UFFDIO_POISON, &uffdio_poison); + + close(uffd); + return NULL; +} + +static void run(void) +{ + pthread_t thr; + struct uffdio_api uffdio_api = {}; + struct uffdio_register uffdio_register; + struct sigaction sa = {}; + volatile char dummy; + + sa.sa_handler = sigbus_handler; + sigemptyset(&sa.sa_mask); + SAFE_SIGACTION(SIGBUS, &sa, NULL); + + set_pages(); + + uffd = SAFE_USERFAULTFD(O_CLOEXEC | O_NONBLOCK, false); + + uffdio_api.api = UFFD_API; + uffdio_api.features = UFFD_FEATURE_POISON; + + SAFE_IOCTL(uffd, UFFDIO_API, &uffdio_api); + + uffdio_register.range.start = (unsigned long) page; + uffdio_register.range.len = page_size; + uffdio_register.mode = UFFDIO_REGISTER_MODE_MISSING; + + SAFE_IOCTL(uffd, UFFDIO_REGISTER, &uffdio_register); + + SAFE_PTHREAD_BARRIER_INIT(&barrier, NULL, 2); + SAFE_PTHREAD_CREATE(&thr, NULL, (void *) handle_thread, NULL); + + SAFE_PTHREAD_BARRIER_WAIT(&barrier); + + /* Try to read from the page: should trigger fault, get poisoned, then SIGBUS */ + if (sigsetjmp(jmpbuf, 1) == 0) { + dummy = page[0]; + (void)dummy; + } + + SAFE_PTHREAD_JOIN(thr, NULL); + SAFE_PTHREAD_BARRIER_DESTROY(&barrier); + reset_pages(); + + if (poison_fault_seen && sigbus_seen) { + tst_res(TPASS, "POISON successfully triggered SIGBUS"); + } else if (poison_fault_seen && !sigbus_seen) { + tst_res(TFAIL, "POISON fault seen but no SIGBUS received"); + } else if (!poison_fault_seen && sigbus_seen) { + tst_res(TFAIL, "SIGBUS received but no poison fault seen"); + } else { + tst_res(TFAIL, "No poison fault or SIGBUS observed"); + } +} + +static struct tst_test test = { + .test_all = run, + .min_kver = "6.6", +}; -- 2.53.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp