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 E9D24E9B36D for ; Mon, 2 Mar 2026 12:02:36 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 9FD893D787F for ; Mon, 2 Mar 2026 13:02:35 +0100 (CET) Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [IPv6:2001:4b78:1:20::5]) (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 63B113CF08F for ; Mon, 2 Mar 2026 13:02:15 +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-5.smtp.seeweb.it (Postfix) with ESMTPS id 13595600CFC for ; Mon, 2 Mar 2026 13:02:12 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 D533A5BD34; Mon, 2 Mar 2026 12:02:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772452931; 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=sjreuB1iPszrQFZzy+OTG27loSEnkdW1D0BLLvoMYaM=; b=BHyI0K285yVPadBNetL/MxGP4+GKcRlBM8cBNfRwBmJex8b3dwB6HMx8ID8AaZFgCXmLiB NXwUE1oFFI9QukIEZNsmwnFfP0cHB44MbxdcoK6+PujVCZWeBNGhKvYNFsmlmXpynYwqVb nuP6nYJMGRiQf4aCUD9dBqTIyZu212Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772452931; 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=sjreuB1iPszrQFZzy+OTG27loSEnkdW1D0BLLvoMYaM=; b=tJtqdjIw62aMVCb1FLFVYqA1zsMvIgphMfjjpxjOU//Q/UfpmJ8CzTeoDeZfyrd+8CTm2c QdPVoQKdZ7GwS2AQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=DH4SLsB+; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=QVyNSgkW DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772452930; 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=sjreuB1iPszrQFZzy+OTG27loSEnkdW1D0BLLvoMYaM=; b=DH4SLsB+uzLucH0Kti+MHTbgN53syZZCAjRdr1u7M362j6w8rcqEsYx4DKmwrUvoZgtQh3 xoL3nkg5g19IuXFZfFw/INn5srcXF6LTiQUS0AB8239nAskoKD+hlad30gqD7rGOxgKx40 gWr6ycKkx9nPhzs3SNaDsqFjFLCRVgk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772452930; 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=sjreuB1iPszrQFZzy+OTG27loSEnkdW1D0BLLvoMYaM=; b=QVyNSgkWa99oOEbWzOPDMBhefhpPSwJ2FsrGzkLJaurg/WHiQNk/wB5Gd6PrTGgWcXe2oM d6wxey0/21GLtWDQ== 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 B5FA53EA69; Mon, 2 Mar 2026 12:02:10 +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 Sl+zKkJ8pWkbGwAAD6G6ig (envelope-from ); Mon, 02 Mar 2026 12:02:10 +0000 From: Ricardo Branco To: ltp@lists.linux.it Date: Mon, 2 Mar 2026 13:02:03 +0100 Message-ID: <20260302120207.170340-1-rbranco@suse.de> X-Mailer: git-send-email 2.53.0 MIME-Version: 1.0 X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 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)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:dkim,suse.de:mid,suse.de:email,suse.com:email]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Queue-Id: D533A5BD34 X-Virus-Scanned: clamav-milter 1.0.9 at in-5.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH v8] 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 ++ runtest/syscalls | 1 + .../kernel/syscalls/userfaultfd/.gitignore | 1 + .../kernel/syscalls/userfaultfd/Makefile | 1 + .../syscalls/userfaultfd/userfaultfd06.c | 144 ++++++++++++++++++ 6 files changed, 161 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/runtest/syscalls b/runtest/syscalls index 05bb3ceb1..b76c3890f 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -1775,6 +1775,7 @@ userfaultfd02 userfaultfd02 userfaultfd03 userfaultfd03 userfaultfd04 userfaultfd04 userfaultfd05 userfaultfd05 +userfaultfd06 userfaultfd06 ustat01 ustat01 ustat02 ustat02 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..5b1252c35 --- /dev/null +++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd06.c @@ -0,0 +1,144 @@ +// 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 int poison_fault_seen; +static volatile int sigbus_seen; +static sigjmp_buf jmpbuf; + +static void sigbus_handler(int sig) +{ + if (sig == SIGBUS) { + sigbus_seen = 1; + siglongjmp(jmpbuf, 1); + } +} + +static void setup(void) +{ + struct sigaction sa = {}; + + sa.sa_handler = sigbus_handler; + sigemptyset(&sa.sa_mask); + SAFE_SIGACTION(SIGBUS, &sa, NULL); +} + +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; + + 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); + + tst_atomic_store(1, &poison_fault_seen); + + /* 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; + char dummy; + + poison_fault_seen = 0; + sigbus_seen = 0; + 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); + + if (!(uffdio_api.features & UFFD_FEATURE_POISON)) + tst_brk(TCONF, "UFFD_FEATURE_POISON not supported"); + + 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_CREATE(&thr, NULL, (void *) handle_thread, NULL); + + /* Try to read from the page: should trigger fault, get poisoned, then SIGBUS */ + if (sigsetjmp(jmpbuf, 1) == 0) { + LTP_VAR_USED(dummy) = page[0]; + } + + SAFE_PTHREAD_JOIN(thr, NULL); + reset_pages(); + + int poisoned = tst_atomic_load(&poison_fault_seen); + + if (poisoned && sigbus_seen) + tst_res(TPASS, "POISON successfully triggered SIGBUS"); + else if (poisoned && !sigbus_seen) + tst_res(TFAIL, "POISON fault seen but no SIGBUS received"); + else if (!poisoned && 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, + .setup = setup, + .cleanup = reset_pages, +}; -- 2.53.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp