From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.50 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793045616; b=H/CnFS+BwZy3vqk5sY8EvolrMwbLdzpcz6XbrgGp/FQwFS4EROZEf950uoMBDO0L4i6s AhXu1TPdfskN+28FS+6OUJqF4J3pocLdXQRtkIavjHnU0VspTqylEAHXYhxZAFqJQzO8S kAlGr8wnRUeWWorJKXRFs0LRpztJ6DoyW6mWGZIKK4dp+HwD3aomgCqDox1fLi1yPvr9M aQWkT3jcoq39kvtSMo+geyoqGlRi6Vwzq9E9ALABmCRx/jJWzShEHA8SlZjNoZMkjIslk tkfn8u/JH736oIPSMNIAcstUoXRa7A2EdCUl0vo/cVBORfBnKf8tRad3Px5b7In/W+Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793045616; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=29PYuZcMuk+6BqVhsEf3/8y855sPSJj2J3ONQETVxCk=; b=vhbcDA303NfXoOzoiekwzCtafB0i94PwTPm++ygAX45FN0SMv6pPKZKHYw/rQIE1wscY p6LOy2pYpqfsZVtcgWYj4TdNZuME3xoFbGlMZE96VhUqlMgqWTzA36BKglBwGxmjaP2Cw Di0s+miLhbbFo9pk7d8okjMcm4CPRWa7WV2sea6OlH5nTshX93P9xKcWQELrPYEynYFzU CepSRF4lopEMiifSLTez+CHdqPO4vK+pHqyjhQahtaIBk/DVFLNQ3r4DiGxB0rp5Vf1aW HgqcOddFiLmeoAtntKr9AUXTGdif2Tw2q1hmgyvLnqIJLClKRWdUT/KQX3k1MiCJhoA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=lgqiTZBv; arc=none smtp.remote-ip=74.125.82.50 Received: from mail-dl1-f50.google.com (mail-dl1-f50.google.com [74.125.82.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 77D31606A31E for ; Mon, 26 Oct 2026 20:13:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 77D31606A31E Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=lgqiTZBv Received: by mail-dl1-f50.google.com with SMTP id a92af1059eb24-15ea896ddc8so5921059c88.0 for ; Mon, 26 Oct 2026 13:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1793045616; x=1793650416; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=29PYuZcMuk+6BqVhsEf3/8y855sPSJj2J3ONQETVxCk=; b=lgqiTZBvuwBsm/QD6Q04dpuwb3hT5D0KF0Iidza14BSZtsryM3FuxPGAxoRcl1+aHU Wum0veb4k29fmNZUzA6I5nsDRMm8/ROiICgggJyWWxqY8841k3ihr20RjfaXuPNcjyK3 +pvcvDJcn6hdr93DZn6xuLytaLaJ1JpcjEIdCHOgVqhv3tOKwmxl0d2zhxgX7aXhP/9s 9DP8cQO6iot5Sfrln4aAaFfi/qTJFVGtDlokuQxrSr/TzgMEOo+yqiGUlU5c4xWdpSr+ ZdSX/HFPTLJD+C0FjK6rfj+Gib3kmVSlDvHdlQ/zrLNSeHC4L9bCWAfn5ltoKwImxREK 7O9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793045616; x=1793650416; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=29PYuZcMuk+6BqVhsEf3/8y855sPSJj2J3ONQETVxCk=; b=w1Jle4C2qLky6Ig4vW+6niKZHGHCAF84HDCGzguukZQNXWbD8Zbn4M5szy16vser7t lNWOj/Qg+c7Oxj5ai3VdzmToN8nriw3dOousK9ma7JLZwT6nko+JQWXUuLkc+2m97O6b uCKKEhMRbVsQlkyrJNov9i/x/wKTBrn8XI9WTEhcMoaINguLv6SoGcXh0Joez2X3pA4E f+K86+DkpLbJDp89fi503ZTzWSiuXNvtBBlTd4X8wpJ9xob6RnUaq0mA+TaU9Xm7z+ij XuvxIOehqNX9f1SgNaS1AlCC3CMaIrl30K7/iIjxsaKaJ4s74i2NdiVywN5AeDW2ExL/ rXYA== X-Forwarded-Encrypted: i=1; AKwUvBy0ERWMfAPP68uSdqng7MNdobL1GguLIEH+8pbWlhGlo9FOjw+ekG7dp+jURB6Ab46AjFevUF+Zro04nC8=@vger.kernel.org X-Gm-Message-State: AFq9FYLjfV3OBUW/7HzZB02CJrfvQ3JepQdm+C/7WbMe9pxbr1Tc9ha9 bhJCXFR6rOUKJs2uQk9b1gi6DjxOCIcaDecB/ciH6DoSBkubojtelF99 X-Gm-Gg: AYBFou3UQurp+0opd+8wutylM2AYNRjSCsnPJIh/0g/u8GUQE0o2qsg/+/y5qMUsYj3 X+BkBs9Pe7adQ1n4Hor9AI0qf73sWJpzbojd16i3BIdpncvOi/frK5mQbUMXNiEYSF5WYrPHWaw Ed8mX25qaYwKjbvO20U2aAlVc8j8Ab4JZGYc79cBM7A25mA4wTJvij3S5IwmOR0lzeR7VXH5Ncp BFBsGMpUsUc+w6S4Ca/e+9pFpipLpkJ1I6gAtOatNqdZ8pqIg7p13r98Hj1aENr4BvCL43tAkvn ssofp29JP61gikJWHyzzRRY7Jn1NQ/LoHXGg6lV1VjnL9OxTKDwyB874pZLIXJHc0aFW+rCrjUm 1US7MWlfK1HjEQ3AfWiHfs9Nk9Vwa96oUPuFY3pzHwamf3OFBE+BaBqq7XOmsKeUkzygR+79yqw Xfm0VvJH3X88W9pDXR3SPUIJ6y+IkN3Nbq8GXU57OcAzEIVpa1TOitGK0TYI2LuCQa3CphwF3ZB rjlRYSH8T9Xc/gtg4Ob0NlEadIJ3d7xD5hcoObGNhcdQ4UVa6fXdOHv/Y9GZjWJMsVb4yAbWah5 /AJ2DOr7aKPD8YZU2Zi42DE+w41lh+ESPXbm X-Received: by 2002:a05:7023:885:b0:136:b50c:c0e9 with SMTP id a92af1059eb24-19934a96fffmr13762865c88.21.1793045615364; Mon, 26 Oct 2026 13:13:35 -0700 (PDT) Received: from valdaarhun.localdomain ([2401:4900:1c44:61b8:f26f:bd5b:b550:7a07]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-198a020df20sm31730486c88.6.2026.10.26.13.13.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2026 13:13:34 -0700 (PDT) From: Sahil Siddiq To: jonas@southpole.se, stefan.kristiansson@saunalahti.fi, shorne@gmail.com, naveen@kernel.org, davem@davemloft.net, mhiramat@kernel.org Cc: pjw@kernel.org, wangruikang@iscas.ac.cn, namcao@linutronix.de, kees@kernel.org, linux-openrisc@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Sahil Siddiq Subject: [PATCH v3 3/4] openrisc: Add unit tests for KProbes on branch instructions Date: Tue, 27 Oct 2026 01:42:39 +0530 Message-ID: <20261026201240.107462-4-sahilcdq0@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930202744.50489-1-sahilcdq0@gmail.com> References: <20260930202744.50489-1-sahilcdq0@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Tests already exist lib/tests to verify the generic functionality of KProbes. Add unit tests to verify that KProbes work on instructions that require simulation in the OpenRISC ISA, and that the corresponding delay slots are handled correctly. Signed-off-by: Sahil Siddiq --- Changes v2 -> v3: - arch/openrisc/kernel/tests/test_kprobes_asm.S: - (test_kprobes_*): Set value in r11 register to 0 prior to running tests - (test_kprobes_adrp): Place function at page-aligned address Use PAGE_SIZE macro instead of magic number Move value in r13 to r11 before exiting Changes v1 -> v2: New commit arch/openrisc/Kconfig.debug | 30 +++- arch/openrisc/kernel/Makefile | 1 + arch/openrisc/kernel/tests/Makefile | 3 + arch/openrisc/kernel/tests/test_kprobes.c | 59 +++++++ arch/openrisc/kernel/tests/test_kprobes.h | 24 +++ arch/openrisc/kernel/tests/test_kprobes_asm.S | 157 ++++++++++++++++++ 6 files changed, 273 insertions(+), 1 deletion(-) create mode 100644 arch/openrisc/kernel/tests/Makefile create mode 100644 arch/openrisc/kernel/tests/test_kprobes.c create mode 100644 arch/openrisc/kernel/tests/test_kprobes.h create mode 100644 arch/openrisc/kernel/tests/test_kprobes_asm.S diff --git a/arch/openrisc/Kconfig.debug b/arch/openrisc/Kconfig.debug index 295942fe3fd5..54110f3a111f 100644 --- a/arch/openrisc/Kconfig.debug +++ b/arch/openrisc/Kconfig.debug @@ -1,2 +1,30 @@ # SPDX-License-Identifier: GPL-2.0-only -# dummy file, do not delete +menu "openrisc Testing" + +menuconfig RUNTIME_KERNEL_TESTING_MENU + bool "openrisc kernel runtime testing" + default y + help + Enable openrisc kernel runtime testing. With this option, one can + build and run tests to verify the correctness of relevant components + in the kernel at runtime. + +if RUNTIME_KERNEL_TESTING_MENU + +config OR_KPROBES_KUNIT + tristate "KUnit test for kprobes on openrisc" + depends on KUNIT + depends on KPROBES + default KUNIT_ALL_TESTS + help + Enable testing of KProbes in OpenRISC for instructions that + require simulation. When further changes related to probes or + tracing are added to OpenRISC's port, these tests can help + verify that instruction simulation and processing of delay slots + continue to work as expected. + + If unsure, say N + +endif # RUNTIME_KERNEL_TESTING_MENU + +endmenu # "openrisc Testing" diff --git a/arch/openrisc/kernel/Makefile b/arch/openrisc/kernel/Makefile index 2ac824867963..0c1cade09e0c 100644 --- a/arch/openrisc/kernel/Makefile +++ b/arch/openrisc/kernel/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_OF) += prom.o obj-$(CONFIG_KPROBES) += kprobes.o +obj-$(CONFIG_OR_KPROBES_KUNIT) += tests/ obj-y += patching.o clean: diff --git a/arch/openrisc/kernel/tests/Makefile b/arch/openrisc/kernel/tests/Makefile new file mode 100644 index 000000000000..9e9693fd3550 --- /dev/null +++ b/arch/openrisc/kernel/tests/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_OR_KPROBES_KUNIT) += openrisc_test_kprobes.o + +openrisc_test_kprobes-objs := test_kprobes.o test_kprobes_asm.o diff --git a/arch/openrisc/kernel/tests/test_kprobes.c b/arch/openrisc/kernel/tests/test_kprobes.c new file mode 100644 index 000000000000..a41bdec662e1 --- /dev/null +++ b/arch/openrisc/kernel/tests/test_kprobes.c @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * KProbe unit tests for OpenRISC + * + * Unit tests borrowed liberally from similar work of RISC-V. All + * original copyrights apply as per the original source declaration. + */ + +// #include +#include +#include +#include "test_kprobes.h" + +static void test_kprobe_openrisc(struct kunit *test) +{ + unsigned int num_kprobe = 0; + unsigned long (*func)(void); + struct kprobe *kp; + int i; + + while (test_kprobes_addresses[num_kprobe]) + num_kprobe++; + + kp = kcalloc(num_kprobe, sizeof(struct kprobe), GFP_KERNEL); + KUNIT_EXPECT_TRUE(test, kp); + if (!kp) + return; + + for (i = 0; i < num_kprobe; ++i) { + kp[i].addr = test_kprobes_addresses[i]; + KUNIT_EXPECT_EQ(test, 0, register_kprobe(&kp[i])); + } + + for (i = 0;; ++i) { + func = test_kprobes_functions[i]; + if (!func) + break; + KUNIT_EXPECT_EQ_MSG(test, KPROBE_TEST_MAGIC, func(), "function %d broken", i); + } + + for (i = 0; i < num_kprobe; ++i) + unregister_kprobe(&kp[i]); + kfree(kp); +} + +static struct kunit_case kprobes_testcases[] = { + KUNIT_CASE(test_kprobe_openrisc), + {} +}; + +static struct kunit_suite kprobes_test_suite = { + .name = "kprobes_openrisc", + .test_cases = kprobes_testcases, +}; + +kunit_test_suites(&kprobes_test_suite); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("KUnit test for OpenRISC KProbes"); diff --git a/arch/openrisc/kernel/tests/test_kprobes.h b/arch/openrisc/kernel/tests/test_kprobes.h new file mode 100644 index 000000000000..26c26920d430 --- /dev/null +++ b/arch/openrisc/kernel/tests/test_kprobes.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Unit tests borrowed liberally from similar work of RISC-V. All + * original copyrights apply as per the original source declaration. + */ + +#ifndef TEST_KPROBES_H +#define TEST_KPROBES_H + +#define KPROBE_TEST_MAGIC 0xDEADC0DE +#define KPROBE_TEST_MAGIC_LOWER 0x0000C0DE +#define KPROBE_TEST_MAGIC_UPPER 0x0000DEAD + +#ifndef __ASSEMBLER__ + +/* array of addresses to install kprobes */ +extern void *test_kprobes_addresses[]; + +/* array of functions that return KPROBE_TEST_MAGIC */ +extern unsigned long (*test_kprobes_functions[])(void); + +#endif /* __ASSEMBLER__ */ + +#endif /* TEST_KPROBES_H */ diff --git a/arch/openrisc/kernel/tests/test_kprobes_asm.S b/arch/openrisc/kernel/tests/test_kprobes_asm.S new file mode 100644 index 000000000000..bc87a5fb00d5 --- /dev/null +++ b/arch/openrisc/kernel/tests/test_kprobes_asm.S @@ -0,0 +1,157 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * KProbes unit tests for OpenRISC + * + * Unit tests borrowed liberally from similar work of RISC-V. All + * original copyrights apply as per the original source declaration. + */ + +#include +#include +#include + +#include "test_kprobes.h" + +SYM_FUNC_START(test_kprobes_j) +test_kprobes_j_addr1: + l.addi r11,r0,0 + l.j 2f + l.nop +1: l.ori r13,r13,KPROBE_TEST_MAGIC_LOWER + l.addi r11,r13,0 + l.jr r9 + l.nop +2: l.movhi r13,KPROBE_TEST_MAGIC_UPPER +test_kprobes_j_addr2: + l.j 1b + l.nop +SYM_FUNC_END(test_kprobes_j) + +SYM_FUNC_START(test_kprobes_jal) + l.addi r11,r0,0 + l.addi r15,r9,0 +test_kprobes_jal_addr1: + l.jal 2f + l.nop +1: l.movhi r13,KPROBE_TEST_MAGIC_UPPER + l.jr r9 + l.nop +test_kprobes_jal_addr2: +2: l.jal 1b + l.nop + l.ori r13,r13,KPROBE_TEST_MAGIC_LOWER + l.addi r11,r13,0 + l.addi r9,r15,0 + l.jr r9 + l.nop +SYM_FUNC_END(test_kprobes_jal) + +SYM_FUNC_START(test_kprobes_jr) + l.addi r11,r0,0 + l.movhi r15,hi(2f) + l.ori r15,r15,lo(2f) +test_kprobes_jr_addr1: + l.jr r15 + l.nop +1: l.ori r13,r13,KPROBE_TEST_MAGIC_LOWER + l.addi r11,r13,0 + l.jr r9 + l.nop +2: l.movhi r13,KPROBE_TEST_MAGIC_UPPER + l.movhi r15,hi(1b) + l.ori r15,r15,lo(1b) +test_kprobes_jr_addr2: + l.jr r15 + l.nop +SYM_FUNC_END(test_kprobes_jr) + +SYM_FUNC_START(test_kprobes_jalr) + l.addi r11,r0,0 + l.addi r15,r9,0 + l.movhi r17,hi(2f) + l.ori r17,r17,lo(2f) +test_kprobes_jalr_addr1: + l.jalr r17 + l.nop +1: l.movhi r13,KPROBE_TEST_MAGIC_UPPER + l.jr r9 + l.nop +2: l.movhi r17,hi(1b) + l.ori r17,r17,lo(1b) +test_kprobes_jalr_addr2: + l.jalr r17 + l.nop + l.ori r13,r13,KPROBE_TEST_MAGIC_LOWER + l.addi r11,r13,0 + l.addi r9,r15,0 + l.jr r9 + l.nop +SYM_FUNC_END(test_kprobes_jalr) + +SYM_FUNC_START(test_kprobes_branch) + l.addi r11,r0,0 + l.addi r15,r0,1 + l.addi r17,r0,0 + l.sfgts r15,r17 +test_kprobes_branch_addr1: + l.bf 2f + l.nop +1: l.ori r13,r13,KPROBE_TEST_MAGIC_LOWER + l.addi r11,r13,0 + l.jr r9 + l.nop +2: l.movhi r13,KPROBE_TEST_MAGIC_UPPER + l.sfeq r15,r17 +test_kprobes_branch_addr2: + l.bnf 1b + l.nop +SYM_FUNC_END(test_kprobes_branch) + + .align PAGE_SIZE +SYM_FUNC_START(test_kprobes_adrp) + l.addi r11,r0,0 + l.addi r13,r0,0 + l.addi r15,r9,0 + l.addi r17,r0,-PAGE_SIZE + l.jal 1f + l.nop +1: l.and r19,r9,r17 +test_kprobes_adrp_addr: + l.adrp r21,0 + l.sfeq r21,r19 + l.bnf 2f + l.nop + l.movhi r13,KPROBE_TEST_MAGIC_UPPER + l.ori r13,r13,KPROBE_TEST_MAGIC_LOWER + l.addi r11,r13,0 +2: l.addi r9,r15,0 + l.jr r9 + l.nop +SYM_FUNC_END(test_kprobes_adrp) + + .section .rodata +SYM_DATA_START(test_kprobes_addresses) + .word test_kprobes_j_addr1 + .word test_kprobes_j_addr2 + .word test_kprobes_jal_addr1 + .word test_kprobes_jal_addr2 + .word test_kprobes_jr_addr1 + .word test_kprobes_jr_addr2 + .word test_kprobes_jalr_addr1 + .word test_kprobes_jalr_addr2 + .word test_kprobes_branch_addr1 + .word test_kprobes_branch_addr2 + .word test_kprobes_adrp_addr + .word 0 +SYM_DATA_END(test_kprobes_addresses) + + .section .rodata +SYM_DATA_START(test_kprobes_functions) + .word test_kprobes_j + .word test_kprobes_jal + .word test_kprobes_jr + .word test_kprobes_jalr + .word test_kprobes_branch + .word test_kprobes_adrp + .word 0 +SYM_DATA_END(test_kprobes_functions) -- 2.55.0