From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 16CD9486656; Tue, 1 Sep 2026 17:09:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788282584; cv=none; b=EuplwMpdvE1B3Nvsh8uj743lZUx0Zc8LtBK12CBeZKstwXoCZzOQp7M6ooODUpqM1pZiaZSE+Xbe8gG//3Z8fkrIcmIJAbVNIxUUo1YKM+Ol/oa8K6zP6mCXuzfvufmSmd8W6lP4JGJxdAnYh34S7ABZOqBfHRWE8hfAVV68f6g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788282584; c=relaxed/simple; bh=RUm+OmsCqb1Gk0GBEixjr9Ge7JmaFMl9sztHiFSBLFk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fV+hZIbr4FosVtAk7TzIYmQZptfrFXS98Yj9NxPPlGuROzmptHhiyYp2PO2PqKNwANvUiEzEuPNge5IpooIKmc7CBJ8+sQUxm4F0FpZceFKZTnSNKCDjy6mdo1YUsdpIQ/SQ9CFuVuH+GsLY374b822oYOPStY1aPfuhwp8BP8I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=M8dNKu3/; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="M8dNKu3/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E494C1F000E9; Tue, 1 Sep 2026 17:09:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788282583; bh=jF5y9L+l3jNt20qPhgwwrkHDJKBrYSzsOIzrzqXhq2w=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=M8dNKu3/YOT7vpbR9f4HLYY4F751R7JlZIubqKgxCTrnrN86cMUnzO2FQK6+JhI9c GoZWLX92lk9Jaffs06LfbPBZGBEX+YqSuIqAPQXzScpbeMw0fOcwqPkeFryxkD6JYg va0V+i5cbDtFcjtsJLc1T9pLialrMv3fbbys8mckyms3C+wB6kSylg8JheNfF0iP0R JvfIq18FLBSO6IgFDvR3nOKZ4Qch8KSfXZsUIpaTBX7cavQMck/AxA5JndX7ZVM/ye DtQcUI3zG9qqRFLwByUMmKBuBPOtkWbncQ/MFN89frLFf8fOfVy48jBuBujuLNSwOl C3F26wvFrfbsQ== From: Mark Brown Date: Tue, 01 Sep 2026 18:06:42 +0100 Subject: [PATCH 02/11] kselftest/arm64: Factor shared signal handlers out of fp-stress loads Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260901-arm64-fp-stress-kvm-v1-2-31bce995b49b@kernel.org> References: <20260901-arm64-fp-stress-kvm-v1-0-31bce995b49b@kernel.org> In-Reply-To: <20260901-arm64-fp-stress-kvm-v1-0-31bce995b49b@kernel.org> To: Catalin Marinas , Will Deacon , Shuah Khan Cc: Marc Zyngier , Oliver Upton , Fuad Tabba , Mark Rutland , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kselftest@vger.kernel.org, Mark Brown X-Mailer: b4 0.17-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=8112; i=broonie@kernel.org; h=from:subject:message-id; bh=RUm+OmsCqb1Gk0GBEixjr9Ge7JmaFMl9sztHiFSBLFk=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBqlwbG/hXeR6h2D1b6d8tkkH+2fP8TFm0f8NWHs 7r+mE7iMAmJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCapcGxgAKCRAk1otyXVSH 0CKuB/9JKo1etOWICqzLxdOFGeZTIBxbPPlSLA7tedxD9XUR+ktF9V01dk7HVFxWcr6SwFhxNwt ZnE2URyXMyHr7fJ7iftTwlUoL88PY2vNTFCqrZDOev4P3kbT29WHhS151Ea4bzA5/Ug2Dce2FKZ 7dUjpK3FZaZvCKM/Y3bP7bk9gmGs3/QeLRhYvDo0pp8FsEHPuq2tsCQN7/4ZVCmP0xJT38vH/7a SAOoodPBT4X38ewzldXYhWfMGKdmFLpHQneiPAvr8z6jCADOoxE9jmMKdQjCkHeARYuWUT5IpyM y3OeT63WnlOzoP/YgguGZsVQw9Nq5y5BCays+wP2sSk3xEcA X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB The assembly programs run by fp-stress all have identical signal handlers for cleanly exiting the program and simply countil signal deliveries, consolidate them into a single copies in asm-utils-linux.S. No functional change. Signed-off-by: Mark Brown --- tools/testing/selftests/arm64/fp/Makefile | 14 +++---- tools/testing/selftests/arm64/fp/asm-utils-linux.S | 43 ++++++++++++++++++++++ tools/testing/selftests/arm64/fp/fpsimd-test.S | 28 -------------- tools/testing/selftests/arm64/fp/sve-test.S | 28 -------------- tools/testing/selftests/arm64/fp/za-test.S | 28 -------------- tools/testing/selftests/arm64/fp/zt-test.S | 28 -------------- 6 files changed, 50 insertions(+), 119 deletions(-) diff --git a/tools/testing/selftests/arm64/fp/Makefile b/tools/testing/selftests/arm64/fp/Makefile index 183e9d319b65..d92a755837ff 100644 --- a/tools/testing/selftests/arm64/fp/Makefile +++ b/tools/testing/selftests/arm64/fp/Makefile @@ -25,21 +25,21 @@ TEST_PROGS_EXTENDED := fpsimd-stress sve-stress ssve-stress za-stress EXTRA_CLEAN += $(OUTPUT)/asm-utils.o $(OUTPUT)/asm-utils-linux.o \ $(OUTPUT)/rdvl.o $(OUTPUT)/za-fork-asm.o -ASM_UTILS := $(OUTPUT)/asm-utils.o $(OUTPUT)/asm-utils-linux.o +ASM_UTILS_LINUX := $(OUTPUT)/asm-utils.o $(OUTPUT)/asm-utils-linux.o # Build with nolibc to avoid effects due to libc's clone() support -$(OUTPUT)/fp-pidbench: fp-pidbench.S $(ASM_UTILS) +$(OUTPUT)/fp-pidbench: fp-pidbench.S $(ASM_UTILS_LINUX) $(CC) -nostdlib $^ -o $@ $(OUTPUT)/fp-ptrace: fp-ptrace.c fp-ptrace-asm.S -$(OUTPUT)/fpsimd-test: fpsimd-test.S $(ASM_UTILS) +$(OUTPUT)/fpsimd-test: fpsimd-test.S $(ASM_UTILS_LINUX) $(CC) -nostdlib $^ -o $@ $(OUTPUT)/rdvl-sve: rdvl-sve.c $(OUTPUT)/rdvl.o $(OUTPUT)/rdvl-sme: rdvl-sme.c $(OUTPUT)/rdvl.o $(OUTPUT)/sve-ptrace: sve-ptrace.c $(OUTPUT)/sve-probe-vls: sve-probe-vls.c $(OUTPUT)/rdvl.o -$(OUTPUT)/sve-test: sve-test.S $(ASM_UTILS) +$(OUTPUT)/sve-test: sve-test.S $(ASM_UTILS_LINUX) $(CC) -nostdlib $^ -o $@ -$(OUTPUT)/ssve-test: sve-test.S $(ASM_UTILS) +$(OUTPUT)/ssve-test: sve-test.S $(ASM_UTILS_LINUX) $(CC) -DSSVE -nostdlib $^ -o $@ $(OUTPUT)/vec-syscfg: vec-syscfg.c $(OUTPUT)/rdvl.o $(OUTPUT)/vlset: vlset.c @@ -48,10 +48,10 @@ $(OUTPUT)/za-fork: za-fork.c $(OUTPUT)/za-fork-asm.o -include ../../../../include/nolibc/nolibc.h -I../..\ -static -ffreestanding -Wall $^ -o $@ $(OUTPUT)/za-ptrace: za-ptrace.c -$(OUTPUT)/za-test: za-test.S $(ASM_UTILS) +$(OUTPUT)/za-test: za-test.S $(ASM_UTILS_LINUX) $(CC) -nostdlib $^ -o $@ $(OUTPUT)/zt-ptrace: zt-ptrace.c -$(OUTPUT)/zt-test: zt-test.S $(ASM_UTILS) +$(OUTPUT)/zt-test: zt-test.S $(ASM_UTILS_LINUX) $(CC) -nostdlib $^ -o $@ include ../../lib.mk diff --git a/tools/testing/selftests/arm64/fp/asm-utils-linux.S b/tools/testing/selftests/arm64/fp/asm-utils-linux.S index e6c22b41dc5e..3effeb1fbf50 100644 --- a/tools/testing/selftests/arm64/fp/asm-utils-linux.S +++ b/tools/testing/selftests/arm64/fp/asm-utils-linux.S @@ -6,6 +6,7 @@ #include #include "assembler.h" +#include "asm-offsets.h" // Print a single character x0 to stdout // Clobbers x0-x2,x8 @@ -41,3 +42,45 @@ function puts ret endfunction .globl puts + +// Signal handler which reports a clean exit and terminates the program. +// The tests keep their iteration count in x22 and their signal count in +// x23, report those from the interrupted context. +// +// w0: signal number +// x2: ucontext +function terminate_handler + mov w21, w0 + mov x20, x2 + + puts "Terminated by signal " + mov w0, w21 + bl putdec + puts ", no error, iterations=" + ldr x0, [x20, #ucontext_regs + 8 * 22] + bl putdec + puts ", signals=" + ldr x0, [x20, #ucontext_regs + 8 * 23] + bl putdecn + + mov x0, #0 + mov x8, #__NR_exit + svc #0 +endfunction +.globl terminate_handler + +// Signal handler which only records that the program was interrupted. +// The tests keep their signal count in x23, update that in the +// interrupted context. +// +// w0: signal number +// x2: ucontext +function tickle_handler + // Increment the signal count (x23): + ldr x0, [x2, #ucontext_regs + 8 * 23] + add x0, x0, #1 + str x0, [x2, #ucontext_regs + 8 * 23] + + ret +endfunction +.globl tickle_handler diff --git a/tools/testing/selftests/arm64/fp/fpsimd-test.S b/tools/testing/selftests/arm64/fp/fpsimd-test.S index f89d67894c2e..9db7b5419397 100644 --- a/tools/testing/selftests/arm64/fp/fpsimd-test.S +++ b/tools/testing/selftests/arm64/fp/fpsimd-test.S @@ -149,34 +149,6 @@ function irritator_handler ret endfunction -function tickle_handler - // Increment the signal count (x23): - ldr x0, [x2, #ucontext_regs + 8 * 23] - add x0, x0, #1 - str x0, [x2, #ucontext_regs + 8 * 23] - - ret -endfunction - -function terminate_handler - mov w21, w0 - mov x20, x2 - - puts "Terminated by signal " - mov w0, w21 - bl putdec - puts ", no error, iterations=" - ldr x0, [x20, #ucontext_regs + 8 * 22] - bl putdec - puts ", signals=" - ldr x0, [x20, #ucontext_regs + 8 * 23] - bl putdecn - - mov x0, #0 - mov x8, #__NR_exit - svc #0 -endfunction - // w0: signal number // x1: sa_action // w2: sa_flags diff --git a/tools/testing/selftests/arm64/fp/sve-test.S b/tools/testing/selftests/arm64/fp/sve-test.S index 7ef7835389e7..2aadb5c3c0f3 100644 --- a/tools/testing/selftests/arm64/fp/sve-test.S +++ b/tools/testing/selftests/arm64/fp/sve-test.S @@ -317,34 +317,6 @@ function irritator_handler ret endfunction -function tickle_handler - // Increment the signal count (x23): - ldr x0, [x2, #ucontext_regs + 8 * 23] - add x0, x0, #1 - str x0, [x2, #ucontext_regs + 8 * 23] - - ret -endfunction - -function terminate_handler - mov w21, w0 - mov x20, x2 - - puts "Terminated by signal " - mov w0, w21 - bl putdec - puts ", no error, iterations=" - ldr x0, [x20, #ucontext_regs + 8 * 22] - bl putdec - puts ", signals=" - ldr x0, [x20, #ucontext_regs + 8 * 23] - bl putdecn - - mov x0, #0 - mov x8, #__NR_exit - svc #0 -endfunction - // w0: signal number // x1: sa_action // w2: sa_flags diff --git a/tools/testing/selftests/arm64/fp/za-test.S b/tools/testing/selftests/arm64/fp/za-test.S index 9c33e13e9dc4..84e63e510f23 100644 --- a/tools/testing/selftests/arm64/fp/za-test.S +++ b/tools/testing/selftests/arm64/fp/za-test.S @@ -162,34 +162,6 @@ function irritator_handler ret endfunction -function tickle_handler - // Increment the signal count (x23): - ldr x0, [x2, #ucontext_regs + 8 * 23] - add x0, x0, #1 - str x0, [x2, #ucontext_regs + 8 * 23] - - ret -endfunction - -function terminate_handler - mov w21, w0 - mov x20, x2 - - puts "Terminated by signal " - mov w0, w21 - bl putdec - puts ", no error, iterations=" - ldr x0, [x20, #ucontext_regs + 8 * 22] - bl putdec - puts ", signals=" - ldr x0, [x20, #ucontext_regs + 8 * 23] - bl putdecn - - mov x0, #0 - mov x8, #__NR_exit - svc #0 -endfunction - // w0: signal number // x1: sa_action // w2: sa_flags diff --git a/tools/testing/selftests/arm64/fp/zt-test.S b/tools/testing/selftests/arm64/fp/zt-test.S index a8df05771670..afcadb5aff23 100644 --- a/tools/testing/selftests/arm64/fp/zt-test.S +++ b/tools/testing/selftests/arm64/fp/zt-test.S @@ -131,34 +131,6 @@ function irritator_handler ret endfunction -function tickle_handler - // Increment the signal count (x23): - ldr x0, [x2, #ucontext_regs + 8 * 23] - add x0, x0, #1 - str x0, [x2, #ucontext_regs + 8 * 23] - - ret -endfunction - -function terminate_handler - mov w21, w0 - mov x20, x2 - - puts "Terminated by signal " - mov w0, w21 - bl putdec - puts ", no error, iterations=" - ldr x0, [x20, #ucontext_regs + 8 * 22] - bl putdec - puts ", signals=" - ldr x0, [x20, #ucontext_regs + 8 * 23] - bl putdecn - - mov x0, #0 - mov x8, #__NR_exit - svc #0 -endfunction - // w0: signal number // x1: sa_action // w2: sa_flags -- 2.47.3