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 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 67D68E9B356 for ; Mon, 2 Mar 2026 10:24:29 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id B04E23D77D2 for ; Mon, 2 Mar 2026 11:24:27 +0100 (CET) Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::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 4F7CF3C0372 for ; Mon, 2 Mar 2026 11:24:08 +0100 (CET) Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) (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 978E9200ACB for ; Mon, 2 Mar 2026 11:24:07 +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-out1.suse.de (Postfix) with ESMTPS id 0D4CC3F272; Mon, 2 Mar 2026 10:24:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1772447046; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=iWOyq3/6dqEmgHTKl1VRbb4Pcgo7srovXEfnsdjcHjU=; b=0EfG4oeio9nYnerb5MA9AOyAovMZdQ3NPMCMfwKbGCnmp6ZNVvZliWZA7V48xLTclysJnk FZhFo77pv1dwIWaaWAB+C12vZj6V5lqt/P2cdX16Cx17iSXNAekaIAHqt5phmutj7+hf9H X6vFTWf2vjU25ISaoE9OtjV41D4XhAk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1772447046; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=iWOyq3/6dqEmgHTKl1VRbb4Pcgo7srovXEfnsdjcHjU=; b=FhQh32bSzqxo3OPzmBGyMzcNB8MMoygfjeeoEppeF0/DniFr7c3Pr72a/I0jpDmB/8fV3S 1LBL9EIj0FA/qGBA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=0EfG4oei; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=FhQh32bS DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1772447046; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=iWOyq3/6dqEmgHTKl1VRbb4Pcgo7srovXEfnsdjcHjU=; b=0EfG4oeio9nYnerb5MA9AOyAovMZdQ3NPMCMfwKbGCnmp6ZNVvZliWZA7V48xLTclysJnk FZhFo77pv1dwIWaaWAB+C12vZj6V5lqt/P2cdX16Cx17iSXNAekaIAHqt5phmutj7+hf9H X6vFTWf2vjU25ISaoE9OtjV41D4XhAk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1772447046; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=iWOyq3/6dqEmgHTKl1VRbb4Pcgo7srovXEfnsdjcHjU=; b=FhQh32bSzqxo3OPzmBGyMzcNB8MMoygfjeeoEppeF0/DniFr7c3Pr72a/I0jpDmB/8fV3S 1LBL9EIj0FA/qGBA== 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 EFC7C3EA69; Mon, 2 Mar 2026 10:24:05 +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 NN61OUVlpWn8LQAAD6G6ig (envelope-from ); Mon, 02 Mar 2026 10:24:05 +0000 Date: Mon, 2 Mar 2026 11:24:11 +0100 From: Cyril Hrubis To: Ricardo Branco , et@yuki.lan Message-ID: References: <20260226115427.58459-1-rbranco@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20260226115427.58459-1-rbranco@suse.de> X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-4.51 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.com:email]; DKIM_TRACE(0.00)[suse.cz:+] X-Rspamd-Queue-Id: 0D4CC3F272 X-Virus-Scanned: clamav-milter 1.0.9 at in-7.smtp.seeweb.it X-Virus-Status: Clean Subject: Re: [LTP] [PATCH v7] 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: , Cc: ltp@lists.linux.it Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" Hi! > +#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..4803fa3d9 > --- /dev/null > +++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd06.c > @@ -0,0 +1,142 @@ > +// 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; We still need to reset the poison_fault_seen and sigbus_seen flags here for the case we run the test with -i 2 > + 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 (poison_fault_seen && !sigbus_seen) ^ poisoned? > + tst_res(TFAIL, "POISON fault seen but no SIGBUS received"); > + else if (!poison_fault_seen && sigbus_seen) ^ poisoned > + 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 -- Cyril Hrubis chrubis@suse.cz -- Mailing list info: https://lists.linux.it/listinfo/ltp