From nobody Mon Jun 8 19:57: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 C4AFD3264E4; Wed, 27 May 2026 01:38:27 +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=1779845910; cv=none; b=qZ501HohaiVt+2ssi/NmgccUb56FnSa6tzweA2/ZyOidvocCngxGjbQ1U6bxk1aVkdZ5+b1KlyGRU/GSNULS7/MHdWF+Xrf3n46uWhG1NLGtZRS8OaKPh99cmjaPqgqePIe18jqEgVuY+97wD2r9phHdVPsH8zzHdetZpWJ2/Kc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779845910; c=relaxed/simple; bh=rbAQO6bgRaGqHrDYgOWDl8vVcTPq520iZEKA/cS14Tk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WWUby+aBLdxckXwIy6RnxxzcC3DqqJzCfoz/l4KvfER/logfUHjgqWRrF2CQPNEM8uIltFJVat/ErQPXijDNVTw95L57n3TXeRCfVUVUUaSZS+4f5YcdYTqqKrw2JW8UrG1RMrLgIbwpQhNx2XW7Kp/n+rvaLCSYNiMgFiHXk2g= 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: ba101b52596c11f1aa26b74ffac11d73-20260527 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_BAD, 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:7eab5d1b-dabe-4777-9882-8e3c355a1b33,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:7eab5d1b-dabe-4777-9882-8e3c355a1b33,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:f9df7567538b62d5f88850ddb78c839f,BulkI D:2605270912542TAN7YC1,BulkQuantity:1,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:40,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,B RR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_FSD,TF_CID_SPAM_SNR,TF_CID_SPAM_FAS X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: ba101b52596c11f1aa26b74ffac11d73-20260527 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 1097359920; Wed, 27 May 2026 09:38:13 +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 v3 1/2] selftests/mm: refactor pkey test helpers and unify assertions Date: Wed, 27 May 2026 09:38:24 +0800 Message-Id: <20260527013825.1134225-2-lihongfu@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260527013825.1134225-1-lihongfu@kylinos.cn> References: <20260527013825.1134225-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 shared tracing and assertion helpers to a common file, then convert the sighandler test to use pkey_assert() for consistent diagnostic output, and add per-test tracing around test execution. Signed-off-by: Hongfu Li --- tools/testing/selftests/mm/pkey-helpers.h | 5 +- .../selftests/mm/pkey_sighandler_tests.c | 108 +++++++++--------- tools/testing/selftests/mm/pkey_util.c | 81 +++++++++++++ tools/testing/selftests/mm/protection_keys.c | 82 ------------- 4 files changed, 137 insertions(+), 139 deletions(-) diff --git a/tools/testing/selftests/mm/pkey-helpers.h b/tools/testing/self= tests/mm/pkey-helpers.h index 7c29f075e40b..de9052386343 100644 --- a/tools/testing/selftests/mm/pkey-helpers.h +++ b/tools/testing/selftests/mm/pkey-helpers.h @@ -68,7 +68,10 @@ 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 cat_into_file(char *str, char *file); +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_sighandler_tests.c b/tools/tes= ting/selftests/mm/pkey_sighandler_tests.c index 302fef54049c..231dfb079075 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; + int 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,18 +323,18 @@ static void test_sigsegv_handler_with_different_pkey_= for_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 | - CLONE_SIGHAND | CLONE_THREAD | CLONE_SYSVSEM | - CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | - CLONE_DETACHED, - stack + STACK_SIZE, - &parent_pid, - &child_pid); - - if (ret < 0) { - errno =3D -ret; - perror("clone"); - } else if (ret =3D=3D 0) { + child_pid =3D clone_raw(CLONE_VM | CLONE_FS | CLONE_FILES | + CLONE_SIGHAND | CLONE_THREAD | CLONE_SYSVSEM | + CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | + CLONE_DETACHED, + stack + STACK_SIZE, + &parent_pid, + &child_pid); + + if (child_pid < 0) { + errno =3D -child_pid; + pkey_assert(0); + } else if (child_pid =3D=3D 0) { thread_segv_maperr_ptr(&sigstack); syscall_raw(SYS_exit, 0, 0, 0, 0, 0, 0); } @@ -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; + int 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,23 +490,22 @@ 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 | - CLONE_SIGHAND | CLONE_THREAD | CLONE_SYSVSEM | - CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | - CLONE_DETACHED, - stack + STACK_SIZE, - &parent_pid, - &child_pid); - - if (ret < 0) { - errno =3D -ret; - perror("clone"); - } else if (ret =3D=3D 0) { + child_pid =3D clone_raw(CLONE_VM | CLONE_FS | CLONE_FILES | + CLONE_SIGHAND | CLONE_THREAD | CLONE_SYSVSEM | + CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | + CLONE_DETACHED, + stack + STACK_SIZE, + &parent_pid, + &child_pid); + + if (child_pid < 0) { + errno =3D -child_pid; + pkey_assert(0); + } else if (child_pid =3D=3D 0) { thread_sigusr2_self(&sigstack); syscall_raw(SYS_exit, 0, 0, 0, 0, 0, 0); } =20 - child_pid =3D ret; /* Check that thread exited */ do { sched_yield(); @@ -530,16 +525,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; diff --git a/tools/testing/selftests/mm/pkey_util.c b/tools/testing/selftes= ts/mm/pkey_util.c index 255b332f7a08..a080d1dcc82d 100644 --- a/tools/testing/selftests/mm/pkey_util.c +++ b/tools/testing/selftests/mm/pkey_util.c @@ -2,9 +2,90 @@ #define __SANE_USERSPACE_TYPES__ #include #include +#include +#include +#include =20 #include "pkey-helpers.h" =20 +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); + 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); +} + +#if CONTROL_TRACING > 0 +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) +{ + 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 2085982dba69..3c0cbf8f3eaa 100644 --- a/tools/testing/selftests/mm/protection_keys.c +++ b/tools/testing/selftests/mm/protection_keys.c @@ -61,88 +61,6 @@ noinline int read_ptr(int *ptr) return *ptr; } =20 -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); -} - -#if CONTROL_TRACING > 0 -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) -{ - 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 19:57: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 48D273254B2; Wed, 27 May 2026 01:38: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=1779845909; cv=none; b=R1at2Iyre2AAQL6s5Op8yfe2Te3HDs8IwCDiGRf2gGcD6zjI8I2vNwxBAGzriAWgOr1GKXZFHsUI7WiUr5nkKi6Z0zHlXFAQ28yCl5d4azDlrT7UEVr6jNfBjfWW9YFrzShMYzOSBc0uOGgNDFGPeUWTW7pasnKwhRdkHWJuIlo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779845909; c=relaxed/simple; bh=DvT71AjTFdq3s4Pq6muFSx3IFYaCt/ocKEm/TwlN6FI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=P3GiqEyXmt0aps3OrhhVWHx6kJN4nsIDQVGl/k43dB/0qEDFutIKIq/H805yapN/nkL9//MOM5iDItT2ZWzLO0A3IiuLEhWZKQqQbfEN1NMdGt9kbm2HTOpeOu4BbjvfMs6b1Nq80tkFDgVb2ecMxgVAbsZ03y4wwUKVDgkoE6A= 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: bde7164a596c11f1aa26b74ffac11d73-20260527 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_BAD, 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:2c5901fa-b67d-4165-8bf7-7b893bceb6bf,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:2c5901fa-b67d-4165-8bf7-7b893bceb6bf,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:6818a2f5f96fa0529c7c5c47841df6a6,BulkI D:260527091300VQJFK9I1,BulkQuantity:1,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:40,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,B RR: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: bde7164a596c11f1aa26b74ffac11d73-20260527 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 1442202244; Wed, 27 May 2026 09:38: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 v3 2/2] selftests/mm: add missing mmap() return checks in pkey tests Date: Wed, 27 May 2026 09:38:25 +0800 Message-Id: <20260527013825.1134225-3-lihongfu@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260527013825.1134225-1-lihongfu@kylinos.cn> References: <20260527013825.1134225-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 +- .../testing/selftests/mm/pkey_sighandler_tests.c | 2 ++ tools/testing/selftests/mm/protection_keys.c | 16 ++++++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/mm/pkey-powerpc.h b/tools/testing/self= tests/mm/pkey-powerpc.h index 17bf2d1b0192..f482b1abcf55 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 (void *)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 231dfb079075..475aa3e3208a 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 3c0cbf8f3eaa..ae474e65f3aa 100644 --- a/tools/testing/selftests/mm/protection_keys.c +++ b/tools/testing/selftests/mm/protection_keys.c @@ -585,7 +585,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); @@ -608,7 +608,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 @@ -688,7 +688,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); @@ -717,7 +717,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) @@ -1135,6 +1135,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 @@ -1693,7 +1694,10 @@ int main(void) printf("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) { + perror("mmap"); + return EXIT_FAILURE; + } test_mprotect_pkey_on_unsupported_cpu(ptr, 1); exit(0); } @@ -1706,5 +1710,5 @@ int main(void) run_tests_once(); =20 printf("done (all tests OK)\n"); - return 0; + return EXIT_SUCCESS; } --=20 2.50.1