From nobody Mon Jun 8 06:39:40 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0AC76340A6F; Mon, 1 Jun 2026 06:20:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780294829; cv=none; b=LeMj+9tcr0Y8gM0wFePAhYu3G37UEKG10plVXdhnkEGLGObd2E+TuFR8+lUwb/YrH4t4oi9yHFpCB0BMKo9bZhTUFeCBoS5cvIJwmqDt0w4sJATWpU+UCjsgmllC9FbHrOM2S/UdXXrp5BYqh+QZDLkYMF6l1Jtp3o0yFA3VZP8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780294829; c=relaxed/simple; bh=os3+srngha9DVfawmCEbQxp4SF/oR1lH3ZqdE5f0zWo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TswEJevhLWIf2ZMalNjAW9htM7G+s7tiUR/iYefsEaeYhrGTdnN/Xx26eKhNKYzT7lNdUetBbHjBBAR2NJM5rRmy313AXmT/gss/8VMYQHMWr8h6PXp/fuxwiyRUjDuZYlwuQxrrUmpIG9MN9U1s/M8/6IfHSli/cSU2CQxQSS4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: f736b9145d8111f1aa26b74ffac11d73-20260601 X-CTIC-Tags: HR_CC_COUNT, HR_CC_DOMAIN_COUNT, HR_CC_NAME, HR_CC_NO_NAME, HR_CTE_8B HR_CTT_MISS, HR_DATE_H, HR_DATE_WKD, HR_DATE_ZONE, HR_FROM_NAME HR_SJ_DIGIT_LEN, HR_SJ_LANG, HR_SJ_LEN, HR_SJ_LETTER, HR_SJ_NOR_SYM HR_SJ_PHRASE, HR_SJ_PHRASE_LEN, HR_SJ_WS, HR_TO_COUNT, HR_TO_DOMAIN_COUNT HR_TO_NO_NAME, IP_TRUSTED, SRC_TRUSTED, DN_TRUSTED, SA_TRUSTED SA_EXISTED, SN_TRUSTED, SN_EXISTED, SPF_NOPASS, DKIM_NOPASS DMARC_NOPASS, CIE_GOOD, CIE_GOOD_SPF, GTI_FG_BS, GTI_RG_INFO GTI_C_BU, AMN_GOOD, ABX_MISS_RDNS X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:e133df0b-ba28-4f8f-9909-bbd779363c9e,IP:10, URL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:5 X-CID-INFO: VERSION:1.3.12,REQID:e133df0b-ba28-4f8f-9909-bbd779363c9e,IP:10,UR L:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:5 X-CID-META: VersionHash:e7bac3a,CLOUDID:a7a41673f932672f957e96d7bd7b50d5,BulkI D:260601142021N1AJ17V5,BulkQuantity:0,Recheck:0,SF:17|19|38|66|78|81|82|10 2|127|850|865|898,TC:nil,Content:0|15|50,EDM:-3,IP:-2,URL:0,File:nil,RT:ni l,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0, BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_FAS,TF_CID_SPAM_FSD X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: f736b9145d8111f1aa26b74ffac11d73-20260601 X-User: lihongfu@kylinos.cn Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 66077499; Mon, 01 Jun 2026 14:20:20 +0800 From: Hongfu Li To: akpm@linux-foundation.org, david@kernel.org, ljs@kernel.org, liam@infradead.org, vbabka@kernel.org, rppt@kernel.org, surenb@google.com, mhocko@suse.com, shuah@kernel.org Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Hongfu Li Subject: [PATCH v5 1/4] selftests/mm: move pkey selftest helpers to pkey_util.c Date: Mon, 1 Jun 2026 14:19:50 +0800 Message-Id: <20260601061953.696844-2-lihongfu@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260601061953.696844-1-lihongfu@kylinos.cn> References: <20260601061953.696844-1-lihongfu@kylinos.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move pkey selftest debugging helpers into shared code so both pkey selftests can use the same tracing and abort-hook logic. Signed-off-by: Hongfu Li --- tools/testing/selftests/mm/pkey-helpers.h | 4 +- tools/testing/selftests/mm/pkey_util.c | 86 ++++++++++++++++++++ tools/testing/selftests/mm/protection_keys.c | 83 ------------------- 3 files changed, 89 insertions(+), 84 deletions(-) diff --git a/tools/testing/selftests/mm/pkey-helpers.h b/tools/testing/self= tests/mm/pkey-helpers.h index 2c377f4e9df1..46a8a1878dc1 100644 --- a/tools/testing/selftests/mm/pkey-helpers.h +++ b/tools/testing/selftests/mm/pkey-helpers.h @@ -68,7 +68,9 @@ static inline void sigsafe_printf(const char *format, ...) #define dprintf3(args...) dprintf_level(3, args) #define dprintf4(args...) dprintf_level(4, args) =20 -extern void abort_hooks(void); +void tracing_on(void); +void tracing_off(void); +void abort_hooks(void); #define pkey_assert(condition) do { \ if (!(condition)) { \ dprintf0("# assert() at %s::%d test_nr: %d iteration: %d\n", \ diff --git a/tools/testing/selftests/mm/pkey_util.c b/tools/testing/selftes= ts/mm/pkey_util.c index 255b332f7a08..abf708d6575e 100644 --- a/tools/testing/selftests/mm/pkey_util.c +++ b/tools/testing/selftests/mm/pkey_util.c @@ -2,9 +2,95 @@ #define __SANE_USERSPACE_TYPES__ #include #include +#include +#include +#include =20 #include "pkey-helpers.h" =20 +#if CONTROL_TRACING > 0 +static void cat_into_file(char *str, char *file) +{ + int fd =3D open(file, O_RDWR); + int ret; + + dprintf2("%s(): writing '%s' to '%s'\n", __func__, str, file); + /* + * these need to be raw because they are called under + * pkey_assert() + */ + if (fd < 0) { + fprintf(stderr, "error opening '%s'\n", str); + perror("error: "); + exit(__LINE__); + } + + ret =3D write(fd, str, strlen(str)); + if (ret !=3D strlen(str)) { + perror("write to file failed"); + fprintf(stderr, "filename: '%s' str: '%s'\n", file, str); + exit(__LINE__); + } + close(fd); +} + +static int warned_tracing; +static int tracing_root_ok(void) +{ + if (geteuid() !=3D 0) { + if (!warned_tracing) + fprintf(stderr, "WARNING: not run as root, " + "can not do tracing control\n"); + warned_tracing =3D 1; + return 0; + } + return 1; +} +#endif + +void tracing_on(void) +{ +#if CONTROL_TRACING > 0 +#define TRACEDIR "/sys/kernel/tracing" + char pidstr[32]; + + if (!tracing_root_ok()) + return; + + sprintf(pidstr, "%d", getpid()); + cat_into_file("0", TRACEDIR "/tracing_on"); + cat_into_file("\n", TRACEDIR "/trace"); + if (1) { + cat_into_file("function_graph", TRACEDIR "/current_tracer"); + cat_into_file("1", TRACEDIR "/options/funcgraph-proc"); + } else { + cat_into_file("nop", TRACEDIR "/current_tracer"); + } + cat_into_file(pidstr, TRACEDIR "/set_ftrace_pid"); + cat_into_file("1", TRACEDIR "/tracing_on"); + dprintf1("enabled tracing\n"); +#endif +} + +void tracing_off(void) +{ +#if CONTROL_TRACING > 0 + if (!tracing_root_ok()) + return; + cat_into_file("0", "/sys/kernel/tracing/tracing_on"); +#endif +} + +void abort_hooks(void) +{ + fflush(stdout); + fprintf(stderr, "running %s()...\n", __func__); + tracing_off(); +#ifdef SLEEP_ON_ABORT + sleep(SLEEP_ON_ABORT); +#endif +} + int sys_pkey_alloc(unsigned long flags, unsigned long init_val) { int ret =3D syscall(SYS_pkey_alloc, flags, init_val); diff --git a/tools/testing/selftests/mm/protection_keys.c b/tools/testing/s= elftests/mm/protection_keys.c index 9a6d954ee371..e504544e2197 100644 --- a/tools/testing/selftests/mm/protection_keys.c +++ b/tools/testing/selftests/mm/protection_keys.c @@ -62,89 +62,6 @@ noinline int read_ptr(int *ptr) return *ptr; } =20 -#if CONTROL_TRACING > 0 -static void cat_into_file(char *str, char *file) -{ - int fd =3D open(file, O_RDWR); - int ret; - - dprintf2("%s(): writing '%s' to '%s'\n", __func__, str, file); - /* - * these need to be raw because they are called under - * pkey_assert() - */ - if (fd < 0) { - fprintf(stderr, "error opening '%s'\n", str); - perror("error: "); - exit(__LINE__); - } - - ret =3D write(fd, str, strlen(str)); - if (ret !=3D strlen(str)) { - perror("write to file failed"); - fprintf(stderr, "filename: '%s' str: '%s'\n", file, str); - exit(__LINE__); - } - close(fd); -} - -static int warned_tracing; -static int tracing_root_ok(void) -{ - if (geteuid() !=3D 0) { - if (!warned_tracing) - fprintf(stderr, "WARNING: not run as root, " - "can not do tracing control\n"); - warned_tracing =3D 1; - return 0; - } - return 1; -} -#endif - -static void tracing_on(void) -{ -#if CONTROL_TRACING > 0 -#define TRACEDIR "/sys/kernel/tracing" - char pidstr[32]; - - if (!tracing_root_ok()) - return; - - sprintf(pidstr, "%d", getpid()); - cat_into_file("0", TRACEDIR "/tracing_on"); - cat_into_file("\n", TRACEDIR "/trace"); - if (1) { - cat_into_file("function_graph", TRACEDIR "/current_tracer"); - cat_into_file("1", TRACEDIR "/options/funcgraph-proc"); - } else { - cat_into_file("nop", TRACEDIR "/current_tracer"); - } - cat_into_file(pidstr, TRACEDIR "/set_ftrace_pid"); - cat_into_file("1", TRACEDIR "/tracing_on"); - dprintf1("enabled tracing\n"); -#endif -} - -static void tracing_off(void) -{ -#if CONTROL_TRACING > 0 - if (!tracing_root_ok()) - return; - cat_into_file("0", "/sys/kernel/tracing/tracing_on"); -#endif -} - -void abort_hooks(void) -{ - fflush(stdout); - fprintf(stderr, "running %s()...\n", __func__); - tracing_off(); -#ifdef SLEEP_ON_ABORT - sleep(SLEEP_ON_ABORT); -#endif -} - /* * This attempts to have roughly a page of instructions followed by a few * instructions that do a write, and another page of instructions. That --=20 2.50.1 From nobody Mon Jun 8 06:39:40 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D88E3438BF; Mon, 1 Jun 2026 06:20:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780294831; cv=none; b=IWYtZY4daNoVZsIK5w3T/5voPg8HeuoTpVNxpD7UOrgJNd8Txv5UBMenlycWz1KCX+l4dW0x9IAk7zfNCPGQYuWOX4EC/hCrSMGQlMhd8mEppXvJ4+WjbEbNeX7zJj+0fN02odajos1EKWjXL2yaIKddCH6s4CI0hrfWb/bSO94= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780294831; c=relaxed/simple; bh=DvSsLJn5a+6ILBLDqHeJsEK6zDtFYu4XO/kfQq/fHiY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AS8xUNAl19Uzy9+6cgDs8zWTeo6H6t6nnisy544wCrSDOxzwYyf/spFhRVN5VPZb7exeG6sOxUJZkuvAxjdutNUyrQov412aKH9Cr/ziSbfN8qwzf49vdOVPcQI6GO6o0IDnehTMmO9SO12JfTOmhOK2HVJySmf20ZHn6ShBezw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: f8ec852c5d8111f1aa26b74ffac11d73-20260601 X-CTIC-Tags: HR_CC_COUNT, HR_CC_DOMAIN_COUNT, HR_CC_NAME, HR_CC_NO_NAME, HR_CTE_8B HR_CTT_MISS, HR_DATE_H, HR_DATE_WKD, HR_DATE_ZONE, HR_FROM_NAME HR_SJ_DIGIT_LEN, HR_SJ_LANG, HR_SJ_LEN, HR_SJ_LETTER, HR_SJ_NOR_SYM HR_SJ_PHRASE, HR_SJ_PHRASE_LEN, HR_SJ_WS, HR_TO_COUNT, HR_TO_DOMAIN_COUNT HR_TO_NO_NAME, IP_TRUSTED, SRC_TRUSTED, DN_TRUSTED, SA_TRUSTED SA_EXISTED, SN_TRUSTED, SN_EXISTED, SPF_NOPASS, DKIM_NOPASS DMARC_NOPASS, CIE_GOOD, CIE_GOOD_SPF, GTI_FG_BS, GTI_RG_INFO GTI_C_BU, AMN_GOOD, ABX_MISS_RDNS X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:4ac39ce9-9063-431b-8cb9-a0aef2fc2f10,IP:10, URL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:-15 X-CID-INFO: VERSION:1.3.12,REQID:4ac39ce9-9063-431b-8cb9-a0aef2fc2f10,IP:10,UR L:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-15 X-CID-META: VersionHash:e7bac3a,CLOUDID:85d5c2747113625e6214af885297130d,BulkI D:260601142023NJWCVZKM,BulkQuantity:0,Recheck:0,SF:17|19|38|66|78|81|82|10 2|127|850|865|898,TC:nil,Content:0|15|50,EDM:-3,IP:-2,URL:0,File:nil,RT:ni l,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0, BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_FAS,TF_CID_SPAM_FSD X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: f8ec852c5d8111f1aa26b74ffac11d73-20260601 X-User: lihongfu@kylinos.cn Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 268857944; Mon, 01 Jun 2026 14:20:23 +0800 From: Hongfu Li To: akpm@linux-foundation.org, david@kernel.org, ljs@kernel.org, liam@infradead.org, vbabka@kernel.org, rppt@kernel.org, surenb@google.com, mhocko@suse.com, shuah@kernel.org Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Hongfu Li Subject: [PATCH v5 2/4] selftests/mm: unify pkey sighandler selftest assertions and tracing Date: Mon, 1 Jun 2026 14:19:51 +0800 Message-Id: <20260601061953.696844-3-lihongfu@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260601061953.696844-1-lihongfu@kylinos.cn> References: <20260601061953.696844-1-lihongfu@kylinos.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add per-test tracing to the pkey signal-handler selftest and use pkey_assert() for error handling. Each test enables tracing at start and disables it at end; on failure, pkey_assert() calls abort_hooks() to turn tracing off so ftrace is not left enabled. Signed-off-by: Hongfu Li --- .../selftests/mm/pkey_sighandler_tests.c | 63 +++++++++---------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/tools/testing/selftests/mm/pkey_sighandler_tests.c b/tools/tes= ting/selftests/mm/pkey_sighandler_tests.c index 302fef54049c..4438d8fb8ef8 100644 --- a/tools/testing/selftests/mm/pkey_sighandler_tests.c +++ b/tools/testing/selftests/mm/pkey_sighandler_tests.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -36,6 +35,10 @@ static pthread_mutex_t mutex =3D PTHREAD_MUTEX_INITIALIZ= ER; static pthread_cond_t cond =3D PTHREAD_COND_INITIALIZER; static siginfo_t siginfo =3D {0}; =20 +int iteration_nr =3D 1; +int test_nr; +int dprint_in_signal; + /* * We need to use inline assembly instead of glibc's syscall because glibc= 's * syscall will attempt to access the PLT in order to call a library funct= ion @@ -207,15 +210,14 @@ static void test_sigsegv_handler_with_pkey0_disabled(= void) struct sigaction sa; pthread_attr_t attr; pthread_t thr; + int ret; =20 sa.sa_flags =3D SA_SIGINFO; =20 sa.sa_sigaction =3D sigsegv_handler; sigemptyset(&sa.sa_mask); - if (sigaction(SIGSEGV, &sa, NULL) =3D=3D -1) { - perror("sigaction"); - exit(EXIT_FAILURE); - } + ret =3D sigaction(SIGSEGV, &sa, NULL); + pkey_assert(ret =3D=3D 0); =20 memset(&siginfo, 0, sizeof(siginfo)); =20 @@ -247,15 +249,14 @@ static void test_sigsegv_handler_cannot_access_stack(= void) struct sigaction sa; pthread_attr_t attr; pthread_t thr; + int ret; =20 sa.sa_flags =3D SA_SIGINFO; =20 sa.sa_sigaction =3D sigsegv_handler; sigemptyset(&sa.sa_mask); - if (sigaction(SIGSEGV, &sa, NULL) =3D=3D -1) { - perror("sigaction"); - exit(EXIT_FAILURE); - } + ret =3D sigaction(SIGSEGV, &sa, NULL); + pkey_assert(ret =3D=3D 0); =20 memset(&siginfo, 0, sizeof(siginfo)); =20 @@ -288,21 +289,20 @@ static void test_sigsegv_handler_with_different_pkey_= for_stack(void) int parent_pid =3D 0; int child_pid =3D 0; u64 pkey_reg; + long ret; =20 sa.sa_flags =3D SA_SIGINFO | SA_ONSTACK; =20 sa.sa_sigaction =3D sigsegv_handler; =20 sigemptyset(&sa.sa_mask); - if (sigaction(SIGSEGV, &sa, NULL) =3D=3D -1) { - perror("sigaction"); - exit(EXIT_FAILURE); - } + ret =3D sigaction(SIGSEGV, &sa, NULL); + pkey_assert(ret =3D=3D 0); =20 stack =3D mmap(0, STACK_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); =20 - assert(stack !=3D MAP_FAILED); + pkey_assert(stack !=3D MAP_FAILED); =20 /* Allow access to MPK 0 and MPK 1 */ pkey_reg =3D pkey_reg_restrictive_default(); @@ -323,7 +323,7 @@ static void test_sigsegv_handler_with_different_pkey_fo= r_stack(void) memset(&siginfo, 0, sizeof(siginfo)); =20 /* Use clone to avoid newer glibcs using rseq on new threads */ - long ret =3D clone_raw(CLONE_VM | CLONE_FS | CLONE_FILES | + ret =3D clone_raw(CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD | CLONE_SYSVSEM | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | CLONE_DETACHED, @@ -358,6 +358,7 @@ static void test_pkru_preserved_after_sigusr1(void) { struct sigaction sa; u64 pkey_reg; + int ret; =20 /* Allow access to MPK 0 and an arbitrary set of keys */ pkey_reg =3D pkey_reg_restrictive_default(); @@ -369,10 +370,8 @@ static void test_pkru_preserved_after_sigusr1(void) =20 sa.sa_sigaction =3D sigusr1_handler; sigemptyset(&sa.sa_mask); - if (sigaction(SIGUSR1, &sa, NULL) =3D=3D -1) { - perror("sigaction"); - exit(EXIT_FAILURE); - } + ret =3D sigaction(SIGUSR1, &sa, NULL); + pkey_assert(ret =3D=3D 0); =20 memset(&siginfo, 0, sizeof(siginfo)); =20 @@ -444,6 +443,7 @@ static void test_pkru_sigreturn(void) int parent_pid =3D 0; int child_pid =3D 0; u64 pkey_reg; + long ret; =20 sa.sa_handler =3D SIG_DFL; sa.sa_flags =3D 0; @@ -453,24 +453,20 @@ static void test_pkru_sigreturn(void) * For this testcase, we do not want to handle SIGSEGV. Reset handler * to default so that the application can crash if it receives SIGSEGV. */ - if (sigaction(SIGSEGV, &sa, NULL) =3D=3D -1) { - perror("sigaction"); - exit(EXIT_FAILURE); - } + ret =3D sigaction(SIGSEGV, &sa, NULL); + pkey_assert(ret =3D=3D 0); =20 sa.sa_flags =3D SA_SIGINFO | SA_ONSTACK; sa.sa_sigaction =3D sigusr2_handler; sigemptyset(&sa.sa_mask); =20 - if (sigaction(SIGUSR2, &sa, NULL) =3D=3D -1) { - perror("sigaction"); - exit(EXIT_FAILURE); - } + ret =3D sigaction(SIGUSR2, &sa, NULL); + pkey_assert(ret =3D=3D 0); =20 stack =3D mmap(0, STACK_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); =20 - assert(stack !=3D MAP_FAILED); + pkey_assert(stack !=3D MAP_FAILED); =20 /* * Allow access to MPK 0 and MPK 2. The child thread (to be created @@ -494,7 +490,7 @@ static void test_pkru_sigreturn(void) sigstack.ss_size =3D STACK_SIZE; =20 /* Use clone to avoid newer glibcs using rseq on new threads */ - long ret =3D clone_raw(CLONE_VM | CLONE_FS | CLONE_FILES | + ret =3D clone_raw(CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD | CLONE_SYSVSEM | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | CLONE_DETACHED, @@ -530,16 +526,17 @@ static void (*pkey_tests[])(void) =3D { =20 int main(int argc, char *argv[]) { - int i; - ksft_print_header(); ksft_set_plan(ARRAY_SIZE(pkey_tests)); =20 if (!is_pkeys_supported()) ksft_exit_skip("pkeys not supported\n"); =20 - for (i =3D 0; i < ARRAY_SIZE(pkey_tests); i++) - (*pkey_tests[i])(); + for (test_nr =3D 0; test_nr < ARRAY_SIZE(pkey_tests); test_nr++) { + tracing_on(); + (*pkey_tests[test_nr])(); + tracing_off(); + } =20 ksft_finished(); return 0; --=20 2.50.1 From nobody Mon Jun 8 06:39:40 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90F01349CFA; Mon, 1 Jun 2026 06:20:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780294833; cv=none; b=pV9YFv7RSJVAuwqx3ZSH1iCvbUyftRQ9amw5m0EON0qAmMsqDCEnNo6Luu3kSz5T40cKk7FM+deNX5d77VBe7fYMev0/3IcJXXWXQzePeEseA/AQnBX/KAiWsq3v1rDABPd6tJztYdsn5N8UVYpI7SMAqsMkFhe8N4czXalpUmw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780294833; c=relaxed/simple; bh=YGFDqpnamXYkojCIyVE18NcClYb4tz+JxQJYaRMR2kI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tck06KpsmahDoHCYipqhGVI5cD2SFQeFBh3KkH1HoJhS/dbwGR0FBBD5TruGGk2scDuMc/9MyMxWWnasV6ivyJyTxW/L21x1R6PgoFTOECgm3SrmlvYlT29zcWU51ydcm6tuDmcT75HExISMSbXvH01ink3YTdMwFynVGA98dmY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: f9ca4cd65d8111f1aa26b74ffac11d73-20260601 X-CTIC-Tags: HR_CC_COUNT, HR_CC_DOMAIN_COUNT, HR_CC_NAME, HR_CC_NO_NAME, HR_CTE_8B HR_CTT_MISS, HR_DATE_H, HR_DATE_WKD, HR_DATE_ZONE, HR_FROM_NAME HR_SJ_DIGIT_LEN, HR_SJ_LANG, HR_SJ_LEN, HR_SJ_LETTER, HR_SJ_NOR_SYM HR_SJ_PHRASE, HR_SJ_PHRASE_LEN, HR_SJ_WS, HR_TO_COUNT, HR_TO_DOMAIN_COUNT HR_TO_NO_NAME, IP_TRUSTED, SRC_TRUSTED, DN_TRUSTED, SA_TRUSTED SA_EXISTED, SN_TRUSTED, SN_EXISTED, SPF_NOPASS, DKIM_NOPASS DMARC_NOPASS, CIE_GOOD, CIE_GOOD_SPF, GTI_FG_BS, GTI_RG_INFO GTI_C_BU, AMN_GOOD, ABX_MISS_RDNS X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:6770480a-6d99-4640-8b4b-d49af257fb5e,IP:10, URL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:5 X-CID-INFO: VERSION:1.3.12,REQID:6770480a-6d99-4640-8b4b-d49af257fb5e,IP:10,UR L:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:5 X-CID-META: VersionHash:e7bac3a,CLOUDID:a843d2c3c1310ae75c79b190e4c9002c,BulkI D:260601142026HRCU1D1S,BulkQuantity:0,Recheck:0,SF:17|19|38|66|78|81|82|10 2|127|850|865|898,TC:nil,Content:0|15|50,EDM:-3,IP:-2,URL:0,File:nil,RT:ni l,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0, BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_FAS,TF_CID_SPAM_FSD X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: f9ca4cd65d8111f1aa26b74ffac11d73-20260601 X-User: lihongfu@kylinos.cn Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 1430660042; Mon, 01 Jun 2026 14:20:24 +0800 From: Hongfu Li To: akpm@linux-foundation.org, david@kernel.org, ljs@kernel.org, liam@infradead.org, vbabka@kernel.org, rppt@kernel.org, surenb@google.com, mhocko@suse.com, shuah@kernel.org Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Hongfu Li Subject: [PATCH v5 3/4] selftests/mm: use pkey_assert on clone_raw failure in pkey test Date: Mon, 1 Jun 2026 14:19:52 +0800 Message-Id: <20260601061953.696844-4-lihongfu@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260601061953.696844-1-lihongfu@kylinos.cn> References: <20260601061953.696844-1-lihongfu@kylinos.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use pkey_assert(0) instead of perror("clone") when clone_raw() fails. The old path only printed an error and continued; the test now exits via pkey_assert() on failure so it does not hang or proceed with an invalid child. Signed-off-by: Hongfu Li --- tools/testing/selftests/mm/pkey_sighandler_tests.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/mm/pkey_sighandler_tests.c b/tools/tes= ting/selftests/mm/pkey_sighandler_tests.c index 4438d8fb8ef8..9dfbe09cd87a 100644 --- a/tools/testing/selftests/mm/pkey_sighandler_tests.c +++ b/tools/testing/selftests/mm/pkey_sighandler_tests.c @@ -333,7 +333,7 @@ static void test_sigsegv_handler_with_different_pkey_fo= r_stack(void) =20 if (ret < 0) { errno =3D -ret; - perror("clone"); + pkey_assert(0); } else if (ret =3D=3D 0) { thread_segv_maperr_ptr(&sigstack); syscall_raw(SYS_exit, 0, 0, 0, 0, 0, 0); @@ -500,7 +500,7 @@ static void test_pkru_sigreturn(void) =20 if (ret < 0) { errno =3D -ret; - perror("clone"); + pkey_assert(0); } else if (ret =3D=3D 0) { thread_sigusr2_self(&sigstack); syscall_raw(SYS_exit, 0, 0, 0, 0, 0, 0); --=20 2.50.1 From nobody Mon Jun 8 06:39:40 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 17604346784; Mon, 1 Jun 2026 06:20:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780294836; cv=none; b=HFE8tcmvfs41kBoJG48ZbZyTg6J3ObbsIAzkzCTnYNorxrPjG6OqFckL2kRltjmRHptlZRuTZfdqsI8/pwQP2NO1v8B5epfPfA66ur4JJjaV9Ch9OuPCZlEBUsaHoq5EhfXJ9PcHyq+lzJRgAV91TxGiaq8spcm1lBvC8G7oOS8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780294836; c=relaxed/simple; bh=hdYAakkv8nWKF8c+fgzo6hI14Qrw4tYSJYoaUVLaxrc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=I47sUXxeVqVP4LVZEaGrXZwIeGtAnYgdt5qQMG10T1tQZEIU6jAEG2frAY9OXTj4VC2DZvwkNwjAsK1cGM1WCQ2booYynqdxmlOv0TIb76oFfaL029jCOn3NcegvhAkpz9kIPDJK0oSKqU2XVcXsUC9hh3q7iadWkpffMv82t4s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: fb8e67465d8111f1aa26b74ffac11d73-20260601 X-CTIC-Tags: HR_CC_COUNT, HR_CC_DOMAIN_COUNT, HR_CC_NAME, HR_CC_NO_NAME, HR_CTE_8B HR_CTT_MISS, HR_DATE_H, HR_DATE_WKD, HR_DATE_ZONE, HR_FROM_NAME HR_SJ_DIGIT_LEN, HR_SJ_LANG, HR_SJ_LEN, HR_SJ_LETTER, HR_SJ_NOR_SYM HR_SJ_PHRASE, HR_SJ_PHRASE_LEN, HR_SJ_WS, HR_TO_COUNT, HR_TO_DOMAIN_COUNT HR_TO_NO_NAME, IP_TRUSTED, SRC_TRUSTED, DN_TRUSTED, SA_TRUSTED SA_EXISTED, SN_TRUSTED, SN_EXISTED, SPF_NOPASS, DKIM_NOPASS DMARC_NOPASS, CIE_GOOD, CIE_GOOD_SPF, GTI_FG_BS, GTI_RG_INFO GTI_C_BU, AMN_GOOD, ABX_MISS_RDNS X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:6006e764-3ea0-43be-8729-bc0c0b92b327,IP:10, URL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:-15 X-CID-INFO: VERSION:1.3.12,REQID:6006e764-3ea0-43be-8729-bc0c0b92b327,IP:10,UR L:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-15 X-CID-META: VersionHash:e7bac3a,CLOUDID:adec6b23d3e10297c50ed285fd123819,BulkI D:2606011420295JGI1A52,BulkQuantity:0,Recheck:0,SF:17|19|38|66|78|81|82|10 2|127|850|865|898,TC:nil,Content:0|15|50,EDM:-3,IP:-2,URL:0,File:nil,RT:ni l,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0, BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_FAS,TF_CID_SPAM_FSD,TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: fb8e67465d8111f1aa26b74ffac11d73-20260601 X-User: lihongfu@kylinos.cn Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 187243058; Mon, 01 Jun 2026 14:20:27 +0800 From: Hongfu Li To: akpm@linux-foundation.org, david@kernel.org, ljs@kernel.org, liam@infradead.org, vbabka@kernel.org, rppt@kernel.org, surenb@google.com, mhocko@suse.com, shuah@kernel.org Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Hongfu Li Subject: [PATCH v5 4/4] selftests/mm: add missing mmap() return checks in pkey tests Date: Mon, 1 Jun 2026 14:19:53 +0800 Message-Id: <20260601061953.696844-5-lihongfu@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260601061953.696844-1-lihongfu@kylinos.cn> References: <20260601061953.696844-1-lihongfu@kylinos.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add missing checks against mmap() return value, replace (void *)-1 with MAP_FAILED for better readability and consistency. Signed-off-by: Hongfu Li --- tools/testing/selftests/mm/pkey-powerpc.h | 2 +- tools/testing/selftests/mm/pkey_sighandler_tests.c | 2 ++ tools/testing/selftests/mm/protection_keys.c | 12 +++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/mm/pkey-powerpc.h b/tools/testing/self= tests/mm/pkey-powerpc.h index 17bf2d1b0192..2ce85580b404 100644 --- a/tools/testing/selftests/mm/pkey-powerpc.h +++ b/tools/testing/selftests/mm/pkey-powerpc.h @@ -126,7 +126,7 @@ static inline void *malloc_pkey_with_mprotect_subpage(l= ong size, int prot, u16 p size, prot, pkey); pkey_assert(pkey < NR_PKEYS); ptr =3D mmap(NULL, size, prot, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); - pkey_assert(ptr !=3D (void *)-1); + pkey_assert(ptr !=3D MAP_FAILED); =20 ret =3D syscall(__NR_subpage_prot, ptr, size, NULL); if (ret) { diff --git a/tools/testing/selftests/mm/pkey_sighandler_tests.c b/tools/tes= ting/selftests/mm/pkey_sighandler_tests.c index 9dfbe09cd87a..f5c67c36815f 100644 --- a/tools/testing/selftests/mm/pkey_sighandler_tests.c +++ b/tools/testing/selftests/mm/pkey_sighandler_tests.c @@ -317,6 +317,7 @@ static void test_sigsegv_handler_with_different_pkey_fo= r_stack(void) /* Set up alternate signal stack that will use the default MPK */ sigstack.ss_sp =3D mmap(0, STACK_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + pkey_assert(sigstack.ss_sp !=3D MAP_FAILED); sigstack.ss_flags =3D 0; sigstack.ss_size =3D STACK_SIZE; =20 @@ -486,6 +487,7 @@ static void test_pkru_sigreturn(void) /* Set up alternate signal stack that will use the default MPK */ sigstack.ss_sp =3D mmap(0, STACK_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + pkey_assert(sigstack.ss_sp !=3D MAP_FAILED); sigstack.ss_flags =3D 0; sigstack.ss_size =3D STACK_SIZE; =20 diff --git a/tools/testing/selftests/mm/protection_keys.c b/tools/testing/s= elftests/mm/protection_keys.c index e504544e2197..96a4eb26f326 100644 --- a/tools/testing/selftests/mm/protection_keys.c +++ b/tools/testing/selftests/mm/protection_keys.c @@ -586,7 +586,7 @@ static void *malloc_pkey_with_mprotect(long size, int p= rot, u16 pkey) size, prot, pkey); pkey_assert(pkey < NR_PKEYS); ptr =3D mmap(NULL, size, prot, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); - pkey_assert(ptr !=3D (void *)-1); + pkey_assert(ptr !=3D MAP_FAILED); ret =3D mprotect_pkey((void *)ptr, PAGE_SIZE, prot, pkey); pkey_assert(!ret); record_pkey_malloc(ptr, size, prot); @@ -609,7 +609,7 @@ static void *malloc_pkey_anon_huge(long size, int prot,= u16 pkey) */ size =3D ALIGN_UP(size, HPAGE_SIZE * 2); ptr =3D mmap(NULL, size, PROT_NONE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); - pkey_assert(ptr !=3D (void *)-1); + pkey_assert(ptr !=3D MAP_FAILED); record_pkey_malloc(ptr, size, prot); mprotect_pkey(ptr, size, prot, pkey); =20 @@ -667,7 +667,7 @@ static void *malloc_pkey_hugetlb(long size, int prot, u= 16 pkey) size =3D ALIGN_UP(size, HPAGE_SIZE * 2); pkey_assert(pkey < NR_PKEYS); ptr =3D mmap(NULL, size, PROT_NONE, flags, -1, 0); - pkey_assert(ptr !=3D (void *)-1); + pkey_assert(ptr !=3D MAP_FAILED); mprotect_pkey(ptr, size, prot, pkey); =20 record_pkey_malloc(ptr, size, prot); @@ -696,7 +696,7 @@ static void *malloc_pkey(long size, int prot, u16 pkey) pkey_assert(malloc_type < nr_malloc_types); =20 ret =3D pkey_malloc[malloc_type](size, prot, pkey); - pkey_assert(ret !=3D (void *)-1); + pkey_assert(ret !=3D MAP_FAILED); =20 malloc_type++; if (malloc_type >=3D nr_malloc_types) @@ -1114,6 +1114,7 @@ static void arch_force_pkey_reg_init(void) * doing the XSAVE size enumeration dance. */ buf =3D mmap(NULL, 1*MB, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE,= -1, 0); + pkey_assert(buf !=3D MAP_FAILED); =20 /* These __builtins require compiling with -mxsave */ =20 @@ -1680,7 +1681,8 @@ int main(void) ksft_print_msg("running PKEY tests for unsupported CPU/OS\n"); =20 ptr =3D mmap(NULL, size, PROT_NONE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); - assert(ptr !=3D (void *)-1); + if (ptr =3D=3D MAP_FAILED) + ksft_exit_fail_perror("mmap"); test_mprotect_pkey_on_unsupported_cpu(ptr, 1); ksft_test_result_pass("pkey on unsupported CPU/OS\n"); ksft_finished(); --=20 2.50.1