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 58E1310F2846 for ; Fri, 27 Mar 2026 16:02:22 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id B3CCB3D9F02 for ; Fri, 27 Mar 2026 17:02:20 +0100 (CET) Received: from in-3.smtp.seeweb.it (in-3.smtp.seeweb.it [217.194.8.3]) (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 130373D0197 for ; Fri, 27 Mar 2026 17:02:01 +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-3.smtp.seeweb.it (Postfix) with ESMTPS id 4C4321A00A4D for ; Fri, 27 Mar 2026 17:02:00 +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-out1.suse.de (Postfix) with ESMTPS id AC65C4D3A2; Fri, 27 Mar 2026 16:01:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1774627319; 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=uhu5O2LBrxhfjkyaaHs1pmd23u+HOVOw4Hlh/6EvOdc=; b=J8WH3eQGdyqQrRxiIU64EPUjcm9B448TpWNCocOgDSz3b0emfhpTydP6Ec7HMVdr93DKw3 UFIoWUET6yPe5HEjmyKA9txJewGfpp+KwEGUkwhswt22H4BdrliqofLYd/BrOIhfEuX4qp czX/wg2T+JUwb6ArL784iymUuobwWzM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1774627319; 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=uhu5O2LBrxhfjkyaaHs1pmd23u+HOVOw4Hlh/6EvOdc=; b=niJAHFdYhFRVrLwYtzEsFo/Xm5Ivn9MGXbXwjPVK2FZOQLEhaC5jG+unraxx6A+ODkmgH9 9hjQLm00zJVjPCBA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1774627319; 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=uhu5O2LBrxhfjkyaaHs1pmd23u+HOVOw4Hlh/6EvOdc=; b=J8WH3eQGdyqQrRxiIU64EPUjcm9B448TpWNCocOgDSz3b0emfhpTydP6Ec7HMVdr93DKw3 UFIoWUET6yPe5HEjmyKA9txJewGfpp+KwEGUkwhswt22H4BdrliqofLYd/BrOIhfEuX4qp czX/wg2T+JUwb6ArL784iymUuobwWzM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1774627319; 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=uhu5O2LBrxhfjkyaaHs1pmd23u+HOVOw4Hlh/6EvOdc=; b=niJAHFdYhFRVrLwYtzEsFo/Xm5Ivn9MGXbXwjPVK2FZOQLEhaC5jG+unraxx6A+ODkmgH9 9hjQLm00zJVjPCBA== 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 89E314A0A2; Fri, 27 Mar 2026 16:01:59 +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 FLwlIPepxmmWMQAAD6G6ig (envelope-from ); Fri, 27 Mar 2026 16:01:59 +0000 From: Ricardo Branco To: ltp@lists.linux.it Date: Fri, 27 Mar 2026 17:01:55 +0100 Message-ID: <20260327160157.76906-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)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_THREE(0.00)[3]; RCVD_TLS_ALL(0.00)[] X-Virus-Scanned: clamav-milter 1.0.9 at in-3.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH v3] userfaultfd: Minor fixes 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" - Use POSIX semantics for thread function - Set cleanup to call reset_pages Signed-off-by: Ricardo Branco Reviewed-by: Petr Vorel --- .../kernel/syscalls/userfaultfd/userfaultfd01.c | 13 ++++++++++--- .../kernel/syscalls/userfaultfd/userfaultfd02.c | 13 ++++++++++--- .../kernel/syscalls/userfaultfd/userfaultfd03.c | 15 +++++++++++---- .../kernel/syscalls/userfaultfd/userfaultfd04.c | 8 ++++++-- .../kernel/syscalls/userfaultfd/userfaultfd05.c | 12 ++++++++---- .../kernel/syscalls/userfaultfd/userfaultfd06.c | 4 ++-- 6 files changed, 47 insertions(+), 18 deletions(-) diff --git a/testcases/kernel/syscalls/userfaultfd/userfaultfd01.c b/testcases/kernel/syscalls/userfaultfd/userfaultfd01.c index 7368d3863..c3a37370e 100644 --- a/testcases/kernel/syscalls/userfaultfd/userfaultfd01.c +++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd01.c @@ -53,11 +53,17 @@ static void set_pages(void) static void reset_pages(void) { - SAFE_MUNMAP(page, page_size); - SAFE_MUNMAP(copy_page, page_size); + if (page) { + SAFE_MUNMAP(page, page_size); + page = NULL; + } + if (copy_page) { + SAFE_MUNMAP(copy_page, page_size); + copy_page = NULL; + } } -static void *handle_thread(void) +static void *handle_thread(void *arg LTP_ATTRIBUTE_UNUSED) { static struct uffd_msg msg; struct uffdio_copy uffdio_copy = {}; @@ -129,4 +135,5 @@ static struct tst_test test = { .setup = setup, .test = run, .tcnt = ARRAY_SIZE(tcases), + .cleanup = reset_pages, }; diff --git a/testcases/kernel/syscalls/userfaultfd/userfaultfd02.c b/testcases/kernel/syscalls/userfaultfd/userfaultfd02.c index 2fd5ba5d8..7450c443b 100644 --- a/testcases/kernel/syscalls/userfaultfd/userfaultfd02.c +++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd02.c @@ -32,11 +32,17 @@ static void set_pages(void) static void reset_pages(void) { - SAFE_MUNMAP(page, page_size); - SAFE_MUNMAP(move_page, page_size); + if (page) { + SAFE_MUNMAP(page, page_size); + page = NULL; + } + if (move_page) { + SAFE_MUNMAP(move_page, page_size); + move_page = NULL; + } } -static void *handle_thread(void) +static void *handle_thread(void *arg LTP_ATTRIBUTE_UNUSED) { static struct uffd_msg msg; struct uffdio_move uffdio_move = {}; @@ -94,4 +100,5 @@ static void run(void) static struct tst_test test = { .test_all = run, .min_kver = "6.8", + .cleanup = reset_pages, }; diff --git a/testcases/kernel/syscalls/userfaultfd/userfaultfd03.c b/testcases/kernel/syscalls/userfaultfd/userfaultfd03.c index b65f39eca..727e551f6 100644 --- a/testcases/kernel/syscalls/userfaultfd/userfaultfd03.c +++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd03.c @@ -57,11 +57,17 @@ static void set_pages(void) static void reset_pages(void) { - SAFE_MUNMAP(page, page_size); - SAFE_MUNMAP(copy_page, page_size); + if (page) { + SAFE_MUNMAP(page, page_size); + page = NULL; + } + if (copy_page) { + SAFE_MUNMAP(copy_page, page_size); + copy_page = NULL; + } } -static void *handle_thread(void) +static void *handle_thread(void *arg LTP_ATTRIBUTE_UNUSED) { static struct uffd_msg msg; struct uffdio_copy uffdio_copy = {}; @@ -132,5 +138,6 @@ static struct tst_test test = { .needs_kconfigs = (const char *[]) { "CONFIG_USERFAULTFD=y", NULL - } + }, + .cleanup = reset_pages, }; diff --git a/testcases/kernel/syscalls/userfaultfd/userfaultfd04.c b/testcases/kernel/syscalls/userfaultfd/userfaultfd04.c index 4eb811e45..3273d20cb 100644 --- a/testcases/kernel/syscalls/userfaultfd/userfaultfd04.c +++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd04.c @@ -30,10 +30,13 @@ static void set_pages(void) static void reset_pages(void) { - SAFE_MUNMAP(page, page_size); + if (page) { + SAFE_MUNMAP(page, page_size); + page = NULL; + } } -static void *handle_thread(void) +static void *handle_thread(void *arg LTP_ATTRIBUTE_UNUSED) { static struct uffd_msg msg; struct uffdio_zeropage uffdio_zeropage = {}; @@ -98,4 +101,5 @@ static void run(void) static struct tst_test test = { .test_all = run, + .cleanup = reset_pages, }; diff --git a/testcases/kernel/syscalls/userfaultfd/userfaultfd05.c b/testcases/kernel/syscalls/userfaultfd/userfaultfd05.c index e25a227cf..eadb2f8c3 100644 --- a/testcases/kernel/syscalls/userfaultfd/userfaultfd05.c +++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd05.c @@ -33,10 +33,13 @@ static void set_pages(void) static void reset_pages(void) { - SAFE_MUNMAP(page, page_size); + if (page) { + SAFE_MUNMAP(page, page_size); + page = NULL; + } } -static void *handle_thread(void) +static void *handle_thread(void *arg LTP_ATTRIBUTE_UNUSED) { static struct uffd_msg msg; struct uffdio_writeprotect uffdio_writeprotect = {}; @@ -53,7 +56,7 @@ static void *handle_thread(void) SAFE_READ(1, uffd, &msg, sizeof(msg)); if (msg.event != UFFD_EVENT_PAGEFAULT) - tst_brk(TFAIL, "Received unexpected UFFD_EVENT %d", msg.event); + tst_brk(TFAIL | TERRNO, "Received unexpected UFFD_EVENT %d", msg.event); if (!(msg.arg.pagefault.flags & UFFD_PAGEFAULT_FLAG_WP) || !(msg.arg.pagefault.flags & UFFD_PAGEFAULT_FLAG_WRITE)) { @@ -127,5 +130,6 @@ static struct tst_test test = { .needs_kconfigs = (const char *[]) { "CONFIG_HAVE_ARCH_USERFAULTFD_WP=y", NULL - } + }, + .cleanup = reset_pages, }; diff --git a/testcases/kernel/syscalls/userfaultfd/userfaultfd06.c b/testcases/kernel/syscalls/userfaultfd/userfaultfd06.c index 5b1252c35..bc12bc5f2 100644 --- a/testcases/kernel/syscalls/userfaultfd/userfaultfd06.c +++ b/testcases/kernel/syscalls/userfaultfd/userfaultfd06.c @@ -58,7 +58,7 @@ static void reset_pages(void) } } -static void *handle_thread(void) +static void *handle_thread(void *arg LTP_ATTRIBUTE_UNUSED) { static struct uffd_msg msg; struct uffdio_poison uffdio_poison = {}; @@ -74,7 +74,7 @@ static void *handle_thread(void) SAFE_READ(1, uffd, &msg, sizeof(msg)); if (msg.event != UFFD_EVENT_PAGEFAULT) - tst_brk(TFAIL, "Received unexpected UFFD_EVENT %d", msg.event); + tst_brk(TFAIL | TERRNO, "Received unexpected UFFD_EVENT %d", msg.event); tst_atomic_store(1, &poison_fault_seen); -- 2.53.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp