From patchwork Fri Jun 7 12:23:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dev Jain X-Patchwork-Id: 13689801 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8D7E5196C9E; Fri, 7 Jun 2024 12:24:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717763060; cv=none; b=KUObfDYr++BdJoV8l3sBh5eMa9Vo/G6JR9VvweLDcYNW1uBKwr9ojM02BGneARBPIypiyDw0O18kOQcL/rO0L2pE6p6phhhYTfpLv70JTZkFx7UBAVADk9XeYOQrb445QR0wCUwURV/5ABWlYZWwxpbS212HOgA8sPdmbJfra2A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717763060; c=relaxed/simple; bh=3pdZmKSI43FMtAQl2TMStYKg+YNTkPHMgLcGlH67v2s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rZnybnV8TqEWXzcxlwWONLNDgZYU90OGsNTx/H5WjrHEjCo3TKBUfjQvuIWzunSDJd/TmHY0hTn/0o7kgbWrJPZjC9qzsU6lOg3j31M4aOGCUD68UQIEc6IxFRWN9jvPV6bsB+Z068LOVVYGGr16qQ38nko4SiPSuza46PX+rYE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5BD87339; Fri, 7 Jun 2024 05:24:42 -0700 (PDT) Received: from e116581.blr.arm.com (e116581.arm.com [10.162.42.8]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id CCCE33F64C; Fri, 7 Jun 2024 05:24:12 -0700 (PDT) From: Dev Jain To: shuah@kernel.org, oleg@redhat.com, stsp2@yandex.ru Cc: mingo@kernel.org, tglx@linutronix.de, mark.rutland@arm.com, ryan.roberts@arm.com, broonie@kernel.org, suzuki.poulose@arm.com, Anshuman.Khandual@arm.com, DeepakKumar.Mishra@arm.com, AneeshKumar.KizhakeVeetil@arm.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Dev Jain Subject: [PATCH 1/2] selftests: Rename sigaltstack to generic signal Date: Fri, 7 Jun 2024 17:53:18 +0530 Message-Id: <20240607122319.768640-2-dev.jain@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240607122319.768640-1-dev.jain@arm.com> References: <20240607122319.768640-1-dev.jain@arm.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename sigaltstack to signal, and rename the existing test to sigaltstack.c. Signed-off-by: Dev Jain Reviewed-by: Mark Brown --- tools/testing/selftests/Makefile | 2 +- tools/testing/selftests/{sigaltstack => signal}/.gitignore | 2 +- tools/testing/selftests/{sigaltstack => signal}/Makefile | 2 +- .../selftests/{sigaltstack => signal}/current_stack_pointer.h | 0 .../selftests/{sigaltstack/sas.c => signal/sigaltstack.c} | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename tools/testing/selftests/{sigaltstack => signal}/.gitignore (76%) rename tools/testing/selftests/{sigaltstack => signal}/Makefile (72%) rename tools/testing/selftests/{sigaltstack => signal}/current_stack_pointer.h (100%) rename tools/testing/selftests/{sigaltstack/sas.c => signal/sigaltstack.c} (100%) diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 9039f3709aff..eee1031dc18f 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -85,7 +85,7 @@ TARGETS += rtc TARGETS += rust TARGETS += seccomp TARGETS += sgx -TARGETS += sigaltstack +TARGETS += signal TARGETS += size TARGETS += sparc64 TARGETS += splice diff --git a/tools/testing/selftests/sigaltstack/.gitignore b/tools/testing/selftests/signal/.gitignore similarity index 76% rename from tools/testing/selftests/sigaltstack/.gitignore rename to tools/testing/selftests/signal/.gitignore index 50a19a8888ce..98a7bbc4f325 100644 --- a/tools/testing/selftests/sigaltstack/.gitignore +++ b/tools/testing/selftests/signal/.gitignore @@ -1,2 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -sas +sigaltstack diff --git a/tools/testing/selftests/sigaltstack/Makefile b/tools/testing/selftests/signal/Makefile similarity index 72% rename from tools/testing/selftests/sigaltstack/Makefile rename to tools/testing/selftests/signal/Makefile index 3e96d5d47036..dd6be992fd81 100644 --- a/tools/testing/selftests/sigaltstack/Makefile +++ b/tools/testing/selftests/signal/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only CFLAGS = -Wall -TEST_GEN_PROGS = sas +TEST_GEN_PROGS = sigaltstack include ../lib.mk diff --git a/tools/testing/selftests/sigaltstack/current_stack_pointer.h b/tools/testing/selftests/signal/current_stack_pointer.h similarity index 100% rename from tools/testing/selftests/sigaltstack/current_stack_pointer.h rename to tools/testing/selftests/signal/current_stack_pointer.h diff --git a/tools/testing/selftests/sigaltstack/sas.c b/tools/testing/selftests/signal/sigaltstack.c similarity index 100% rename from tools/testing/selftests/sigaltstack/sas.c rename to tools/testing/selftests/signal/sigaltstack.c From patchwork Fri Jun 7 12:23:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dev Jain X-Patchwork-Id: 13689802 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D8E5F19308B; Fri, 7 Jun 2024 12:24:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717763066; cv=none; b=p/NHRX1hDGdAbC9EI/nVFji2k9ttEFywtHHHr4XWLtlc0R0WBrYViWzD1rFxWlohY4ei8egxKJG34qDMwJoao0YMYUzQnSFnSrdWl6OqYrtNlYjdyRh8/rmTJE6gPtNG8TTCb49r2dfo2a1pcJeXltLwhgKN3/WnbsC/3a/GvYY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717763066; c=relaxed/simple; bh=8mATx8ljEnNckwsyZDussvV/iVh+BnTFcanWppCv5+U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ddvNy43m4Z9sFu6LCSm8GOzOk5Ma0OQpe56FSQ41Z7+FsPGy47X33G0sXDFwCXEy5xqdW+KXiXP5Kdt+sXGqW3ErVzjGdAu/yLi9C/XxZDeLs31umc8RdUB21c8DKAcMcwLNzCc3IQxhk3G9BiPZtpjWiX9nlC1cFjCVTxmiKqM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C4877DA7; Fri, 7 Jun 2024 05:24:47 -0700 (PDT) Received: from e116581.blr.arm.com (e116581.arm.com [10.162.42.8]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8BC473F64C; Fri, 7 Jun 2024 05:24:18 -0700 (PDT) From: Dev Jain To: shuah@kernel.org, oleg@redhat.com, stsp2@yandex.ru Cc: mingo@kernel.org, tglx@linutronix.de, mark.rutland@arm.com, ryan.roberts@arm.com, broonie@kernel.org, suzuki.poulose@arm.com, Anshuman.Khandual@arm.com, DeepakKumar.Mishra@arm.com, AneeshKumar.KizhakeVeetil@arm.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Dev Jain Subject: [PATCH 2/2] selftests: Add a test mangling with uc_sigmask Date: Fri, 7 Jun 2024 17:53:19 +0530 Message-Id: <20240607122319.768640-3-dev.jain@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240607122319.768640-1-dev.jain@arm.com> References: <20240607122319.768640-1-dev.jain@arm.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This test asserts the relation between blocked signal, delivered signal, and ucontext. The ucontext is mangled with, by adding a signal mask to it; on return from the handler, the thread must block the corresponding signal. Signed-off-by: Dev Jain --- tools/testing/selftests/signal/.gitignore | 1 + tools/testing/selftests/signal/Makefile | 1 + .../selftests/signal/mangle_uc_sigmask.c | 141 ++++++++++++++++++ 3 files changed, 143 insertions(+) create mode 100644 tools/testing/selftests/signal/mangle_uc_sigmask.c diff --git a/tools/testing/selftests/signal/.gitignore b/tools/testing/selftests/signal/.gitignore index 98a7bbc4f325..ccba56247942 100644 --- a/tools/testing/selftests/signal/.gitignore +++ b/tools/testing/selftests/signal/.gitignore @@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only sigaltstack +mangle_uc_sigmask diff --git a/tools/testing/selftests/signal/Makefile b/tools/testing/selftests/signal/Makefile index dd6be992fd81..4ebf6ac2e303 100644 --- a/tools/testing/selftests/signal/Makefile +++ b/tools/testing/selftests/signal/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only CFLAGS = -Wall TEST_GEN_PROGS = sigaltstack +TEST_GEN_PROGS += mangle_uc_sigmask include ../lib.mk diff --git a/tools/testing/selftests/signal/mangle_uc_sigmask.c b/tools/testing/selftests/signal/mangle_uc_sigmask.c new file mode 100644 index 000000000000..0803aeb248a0 --- /dev/null +++ b/tools/testing/selftests/signal/mangle_uc_sigmask.c @@ -0,0 +1,141 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2024 ARM Ltd. + * + * Author: Dev Jain + * + * Test describing a clear distinction between signal states - delivered and + * blocked, and their relation with ucontext. + */ + +#include +#include +#include +#include +#include +#include + +#include "../kselftest.h" + +void handler_verify_ucontext(int signo, siginfo_t *info, void *uc) +{ + int ret; + + /* Kernel dumps ucontext with USR2 blocked */ + ret = sigismember(&(((ucontext_t *)uc)->uc_sigmask), SIGUSR2); + ksft_test_result(ret == 1, "USR2 in ucontext\n"); + + raise(SIGUSR2); +} + +void handler_segv(int signo, siginfo_t *info, void *uc) +{ + /* + * Three cases possible: + * 1. Program already terminated due to segmentation fault. + * 2. SEGV was blocked even after returning from handler_usr. + * 3. SEGV was delivered on returning from handler_usr. + * The last option must happen. + */ + ksft_test_result_pass("SEGV delivered\n"); +} + +static int cnt; + +void handler_usr(int signo, siginfo_t *info, void *uc) +{ + int ret; + + /* + * Break out of infinite recursion caused by raise(SIGUSR1) invoked + * from inside the handler + */ + ++cnt; + if (cnt > 1) + return; + + ksft_print_msg("In handler_usr\n"); + + /* SEGV blocked during handler execution, delivered on return */ + raise(SIGPIPE); + ksft_print_msg("SEGV bypassed successfully\n"); + + /* + * Signal responsible for handler invocation is blocked by default; + * delivered on return, leading to an infinite recursion + */ + raise(SIGUSR1); + ksft_test_result(cnt == 1, + "USR1 is blocked, cannot invoke handler again\n"); + + /* SIGPIPE has been blocked in sa_mask, but ucontext is invariant */ + ret = sigismember(&(((ucontext_t *)uc)->uc_sigmask), SIGPIPE); + ksft_test_result(ret == 0, "USR1 not in ucontext\n"); + + /* SIGUSR1 has been blocked, but ucontext is invariant */ + ret = sigismember(&(((ucontext_t *)uc)->uc_sigmask), SIGUSR1); + ksft_test_result(ret == 0, "SEGV not in ucontext\n"); + + /* + * Mangle ucontext; this will be copied back into ¤t->blocked + * on return from the handler. + */ + if (sigaddset(&((ucontext_t *)uc)->uc_sigmask, SIGUSR2)) + ksft_exit_fail_perror("Cannot add into uc_sigmask"); +} + +int main(int argc, char *argv[]) +{ + struct sigaction act, act2; + sigset_t *set, *oldset; + + ksft_print_header(); + ksft_set_plan(6); + + act.sa_flags = SA_SIGINFO; + act.sa_sigaction = &handler_usr; + + /* add SEGV to blocked mask */ + if (sigemptyset(&act.sa_mask) || sigaddset(&act.sa_mask, SIGPIPE) + || (sigismember(&act.sa_mask, SIGPIPE) != 1)) + ksft_exit_fail_msg("Cannot add SEGV to blocked mask\n"); + + if (sigaction(SIGUSR1, &act, NULL)) + ksft_exit_fail_perror("Cannot install handler"); + + act2.sa_flags = SA_SIGINFO; + act2.sa_sigaction = &handler_segv; + + if (sigaction(SIGPIPE, &act2, NULL)) + ksft_exit_fail_perror("Cannot install handler"); + + /* invoke handler */ + raise(SIGUSR1); + + /* Mangled ucontext implies USR2 is blocked for current thread */ + raise(SIGUSR2); + ksft_print_msg("USR2 bypassed successfully\n"); + + act.sa_sigaction = &handler_verify_ucontext; + if (sigaction(SIGUSR1, &act, NULL)) + ksft_exit_fail_perror("Cannot install handler"); + + raise(SIGUSR1); + + ksft_print_msg("USR2 still blocked on return from handler\n"); + + /* Confirm USR2 blockage by sigprocmask() too */ + set = malloc(sizeof(sigset_t *)); + oldset = malloc(sizeof(sigset_t *)); + + if (sigemptyset(set)) + ksft_exit_fail_perror("Cannot empty set"); + + if (sigprocmask(SIG_BLOCK, set, oldset)) + ksft_exit_fail_perror("sigprocmask()"); + + ksft_test_result(sigismember(oldset, SIGUSR2) == 1, + "USR2 present in ¤t->blocked\n"); + + ksft_finished(); +}