February 2025 - Linux-kselftest-mirror

[PATCH 6.6 372/393] selftests/rseq: Fix handling of glibc without rseq support

by Greg Kroah-Hartman

6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> commit 336d02bc4c6bec5c3d933e5d470a94970f830957 upstream. When porting librseq commit: commit c7b45750fa85 ("Adapt to glibc __rseq_size feature detection") from librseq to the kernel selftests, the following line was missed at the end of rseq_init(): rseq_size = get_rseq_kernel_feature_size(); which effectively leaves rseq_size initialized to -1U when glibc does not have rseq support. glibc supports rseq from version 2.35 onwards. In a following librseq commit commit c67d198627c2 ("Only set 'rseq_size' on first thread registration") to mimic the libc behavior, a new approach is taken: don't set the feature size in 'rseq_size' until at least one thread has successfully registered. This allows using 'rseq_size' in fast-paths to test for both registration status and available features. The caveat is that on libc either all threads are registered or none are, while with bare librseq it is the responsability of the user to register all threads using rseq. This combines the changes from the following librseq git commits: commit c7b45750fa85 ("Adapt to glibc __rseq_size feature detection") commit c67d198627c2 ("Only set 'rseq_size' on first thread registration") Fixes: a0cc649353bb ("selftests/rseq: Fix mm_cid test failure") Reported-by: Raghavendra Rao Ananta <rananta(a)google.com> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Cc: Raghavendra Rao Ananta <rananta(a)google.com> Cc: Shuah Khan <skhan(a)linuxfoundation.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Boqun Feng <boqun.feng(a)gmail.com> Cc: "Paul E. McKenney" <paulmck(a)kernel.org> Cc: Carlos O'Donell <carlos(a)redhat.com> Cc: Florian Weimer <fweimer(a)redhat.com> Cc: Michael Jeanson <mjeanson(a)efficios.com> Cc: linux-kselftest(a)vger.kernel.org Cc: stable(a)vger.kernel.org Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- tools/testing/selftests/rseq/rseq.c | 32 ++++++++++++++++++++++------- tools/testing/selftests/rseq/rseq.h | 9 +++++++- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/rseq/rseq.c b/tools/testing/selftests/rseq/rseq.c index 5b9772cdf265..f6156790c3b4 100644 --- a/tools/testing/selftests/rseq/rseq.c +++ b/tools/testing/selftests/rseq/rseq.c @@ -61,7 +61,6 @@ unsigned int rseq_size = -1U; unsigned int rseq_flags; static int rseq_ownership; -static int rseq_reg_success; /* At least one rseq registration has succeded. */ /* Allocate a large area for the TLS. */ #define RSEQ_THREAD_AREA_ALLOC_SIZE 1024 @@ -152,14 +151,27 @@ int rseq_register_current_thread(void) } rc = sys_rseq(&__rseq_abi, get_rseq_min_alloc_size(), 0, RSEQ_SIG); if (rc) { - if (RSEQ_READ_ONCE(rseq_reg_success)) { + /* + * After at least one thread has registered successfully + * (rseq_size > 0), the registration of other threads should + * never fail. + */ + if (RSEQ_READ_ONCE(rseq_size) > 0) { /* Incoherent success/failure within process. */ abort(); } return -1; } assert(rseq_current_cpu_raw() >= 0); - RSEQ_WRITE_ONCE(rseq_reg_success, 1); + + /* + * The first thread to register sets the rseq_size to mimic the libc + * behavior. + */ + if (RSEQ_READ_ONCE(rseq_size) == 0) { + RSEQ_WRITE_ONCE(rseq_size, get_rseq_kernel_feature_size()); + } + return 0; } @@ -235,12 +247,18 @@ void rseq_init(void) return; } rseq_ownership = 1; - if (!rseq_available()) { - rseq_size = 0; - return; - } + + /* Calculate the offset of the rseq area from the thread pointer. */ rseq_offset = (void *)&__rseq_abi - rseq_thread_pointer(); + + /* rseq flags are deprecated, always set to 0. */ rseq_flags = 0; + + /* + * Set the size to 0 until at least one thread registers to mimic the + * libc behavior. + */ + rseq_size = 0; } static __attribute__((destructor)) diff --git a/tools/testing/selftests/rseq/rseq.h b/tools/testing/selftests/rseq/rseq.h index 4e217b620e0c..062d10925a10 100644 --- a/tools/testing/selftests/rseq/rseq.h +++ b/tools/testing/selftests/rseq/rseq.h @@ -60,7 +60,14 @@ extern ptrdiff_t rseq_offset; /* - * Size of the registered rseq area. 0 if the registration was + * The rseq ABI is composed of extensible feature fields. The extensions + * are done by appending additional fields at the end of the structure. + * The rseq_size defines the size of the active feature set which can be + * used by the application for the current rseq registration. Features + * starting at offset >= rseq_size are inactive and should not be used. + * + * The rseq_size is the intersection between the available allocation + * size for the rseq area and the feature size supported by the kernel. * unsuccessful. */ extern unsigned int rseq_size; -- 2.48.1

8 months, 3 weeks

1
0
0 0

[PATCH net-next v3 00/10] Some pktgen fixes/improvments

by Peter Seiderer

While taking a look at '[PATCH net] pktgen: Avoid out-of-range in get_imix_entries' ([1]) and '[PATCH net v2] pktgen: Avoid out-of-bounds access in get_imix_entries' ([2], [3]) and doing some tests and code review I detected that the /proc/net/pktgen/... parsing logic does not honour the user given buffer bounds (resulting in out-of-bounds access). This can be observed e.g. by the following simple test (sometimes the old/'longer' previous value is re-read from the buffer): $ echo add_device lo@0 > /proc/net/pktgen/kpktgend_0 $ echo "min_pkt_size 12345" > /proc/net/pktgen/lo\@0 && grep min_pkt_size /proc/net/pktgen/lo\@0 Params: count 1000 min_pkt_size: 12345 max_pkt_size: 0 Result: OK: min_pkt_size=12345 $ echo -n "min_pkt_size 123" > /proc/net/pktgen/lo\@0 && grep min_pkt_size /proc/net/pktgen/lo\@0 Params: count 1000 min_pkt_size: 12345 max_pkt_size: 0 Result: OK: min_pkt_size=12345 $ echo "min_pkt_size 123" > /proc/net/pktgen/lo\@0 && grep min_pkt_size /proc/net/pktgen/lo\@0 Params: count 1000 min_pkt_size: 123 max_pkt_size: 0 Result: OK: min_pkt_size=123 So fix the out-of-bounds access (and some minor findings) and add a simple proc_net_pktgen selftest... Regards, Peter Changes v2 -> v3: - new patch: 'net: pktgen: fix ctrl interface command parsing' - new patch: 'net: pktgen: fix mpls reset parsing' - tools/testing/selftests/net/proc_net_pktgen.c: - fix typo in change description ('v1 -> v1' and tyop) - rename some vars to better match usage add_loopback_0 -> thr_cmd_add_loopback_0 rm_loopback_0 -> thr_cmd_rm_loopback_0 wrong_ctrl_cmd -> wrong_thr_cmd legacy_ctrl_cmd -> legacy_thr_cmd ctrl_fd -> thr_fd - add ctrl interface tests Changes v1 -> v2: - new patch: 'net: pktgen: fix hex32_arg parsing for short reads' - new patch: 'net: pktgen: fix 'rate 0' error handling (return -EINVAL)' - new patch: 'net: pktgen: fix 'ratep 0' error handling (return -EINVAL)' - net/core/pktgen.c: additional fix get_imix_entries() and get_labels() - tools/testing/selftests/net/proc_net_pktgen.c: - fix tyop not vs. nod (suggested by Jakub Kicinski) - fix misaligned line (suggested by Jakub Kicinski) - enable fomerly commented out CONFIG_XFRM dependent test (command spi), as CONFIG_XFRM is enabled via tools/testing/selftests/net/config CONFIG_XFRM_INTERFACE/CONFIG_XFRM_USER (suggestex by Jakub Kicinski) - add CONFIG_NET_PKTGEN=m to tools/testing/selftests/net/config (suggested by Jakub Kicinski) - add modprobe pktgen to FIXTURE_SETUP() (suggested by Jakub Kicinski) - fix some checkpatch warnings (Missing a blank line after declarations) - shrink line length by re-naming some variables (command -> cmd, device -> dev) - add 'rate 0' testcase - add 'ratep 0' testcase [1] https://lore.kernel.org/netdev/20241006221221.3744995-1-artem.chernyshev@re… [2] https://lore.kernel.org/netdev/20250109083039.14004-1-pchelkin@ispras.ru/ [3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… Peter Seiderer (10): net: pktgen: replace ENOTSUPP with EOPNOTSUPP net: pktgen: enable 'param=value' parsing net: pktgen: fix hex32_arg parsing for short reads net: pktgen: fix 'rate 0' error handling (return -EINVAL) net: pktgen: fix 'ratep 0' error handling (return -EINVAL) net: pktgen: fix ctrl interface command parsing net: pktgen: fix access outside of user given buffer in pktgen_thread_write() net: pktgen: fix access outside of user given buffer in pktgen_if_write() net: pktgen: fix mpls reset parsing selftest: net: add proc_net_pktgen net/core/pktgen.c | 257 ++++--- tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/config | 1 + tools/testing/selftests/net/proc_net_pktgen.c | 650 ++++++++++++++++++ 4 files changed, 819 insertions(+), 90 deletions(-) create mode 100644 tools/testing/selftests/net/proc_net_pktgen.c -- 2.48.1

8 months, 3 weeks

3
23
0 0

[PATCH] selftests/mm: Fix thuge-gen test name uniqueness

by Mark Brown

The thuge-gen test_mmap() and test_shmget() tests are repeatedly run for a variety of sizes but always report the result of their test with the same name, meaning that automated sysetms running the tests are unable to distinguish between the various tests. Add the supplied sizes to the logged test names to distinguish between runs. Fixes: b38bd9b2c448 ("selftests/mm: thuge-gen: conform to TAP format output") Signed-off-by: Mark Brown <broonie(a)kernel.org> --- tools/testing/selftests/mm/thuge-gen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/mm/thuge-gen.c b/tools/testing/selftests/mm/thuge-gen.c index e4370b79b62ffb133056eb843cdd1eaeba6503df..cd5174d735be405220d99ae796a3768f53df6ea4 100644 --- a/tools/testing/selftests/mm/thuge-gen.c +++ b/tools/testing/selftests/mm/thuge-gen.c @@ -127,7 +127,7 @@ void test_mmap(unsigned long size, unsigned flags) show(size); ksft_test_result(size == getpagesize() || (before - after) == NUM_PAGES, - "%s mmap\n", __func__); + "%s mmap %lu\n", __func__, size); if (munmap(map, size * NUM_PAGES)) ksft_exit_fail_msg("%s: unmap %s\n", __func__, strerror(errno)); @@ -165,7 +165,7 @@ void test_shmget(unsigned long size, unsigned flags) show(size); ksft_test_result(size == getpagesize() || (before - after) == NUM_PAGES, - "%s: mmap\n", __func__); + "%s: mmap %lu\n", __func__, size); if (shmdt(map)) ksft_exit_fail_msg("%s: shmdt: %s\n", __func__, strerror(errno)); } --- base-commit: 2014c95afecee3e76ca4a56956a936e23283f05b change-id: 20250204-kselftest-mm-fix-dups-076a48577184 Best regards, -- Mark Brown <broonie(a)kernel.org>

8 months, 3 weeks

3
3
0 0

[PATCH] selftests: pidfd: Fix compiling warning of pidfs_setns

by I Hsin Cheng

In the compilation of pidfs_setns_test.c , a warning as the following will pop out. pidfd_setns_test.c: In function ‘current_nsset_setup’: pidfd_setns_test.c:173:54: warning: implicit declaration of function \ ‘ioctl’ [-Wimplicit-function-declaration] 173 | self->child_pidfd_derived_nsfds[i] = \ ioctl(self->pidfd, info->pidfd_ioctl, 0); It's caused by wrong import of header file <linux/ioctl.h>, fix it to <sys/ioctl.h>. Signed-off-by: I Hsin Cheng <richard120310(a)gmail.com> --- tools/testing/selftests/pidfd/pidfd_setns_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/pidfd/pidfd_setns_test.c b/tools/testing/selftests/pidfd/pidfd_setns_test.c index 7c2a43491..3ed42f1eb 100644 --- a/tools/testing/selftests/pidfd/pidfd_setns_test.c +++ b/tools/testing/selftests/pidfd/pidfd_setns_test.c @@ -16,7 +16,7 @@ #include <unistd.h> #include <sys/socket.h> #include <sys/stat.h> -#include <linux/ioctl.h> +#include <sys/ioctl.h> #include "pidfd.h" #include "../clone3/clone3_selftests.h" -- 2.43.0

8 months, 3 weeks

2
1
0 0

[PATCH net 0/2] bonding: fix incorrect mac address setting

by Hangbin Liu

The mac address on backup slave should be convert from Solicited-Node Multicast address, not from bonding unicast target address. Hangbin Liu (2): bonding: fix incorrect MAC address setting to receive NA messages selftests: bonding: fix incorrect mac address drivers/net/bonding/bond_options.c | 4 +++- tools/testing/selftests/drivers/net/bonding/bond_options.sh | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) -- 2.39.5 (Apple Git-154)

8 months, 3 weeks

1
3
0 0

[PATCH 0/2] tools/nolibc: support for 32-bit s390

by Thomas Weißschuh

Support for 32-bit s390 is very easy to implement and useful for testing. For example I used to test some generic compat_ptr() logic, which is only testable on 32-bit s390. The series depends on my other series "selftests/nolibc: test kernel configuration cleanups". (It's not a hard dependency, only a minor diff conflict) Signed-off-by: Thomas Weißschuh <linux(a)weissschuh.net> --- Thomas Weißschuh (2): selftests/nolibc: rename s390 to s390x tools/nolibc: add support for 32-bit s390 tools/include/nolibc/arch-s390.h | 5 +++++ tools/include/nolibc/arch.h | 2 +- tools/testing/selftests/nolibc/Makefile | 10 ++++++++-- tools/testing/selftests/nolibc/run-tests.sh | 8 +++++++- 4 files changed, 21 insertions(+), 4 deletions(-) --- base-commit: 0597614d84c8593ba906418bf3c0c0de1e02e82a change-id: 20250122-nolibc-s390-e57141682c88 Best regards, -- Thomas Weißschuh <linux(a)weissschuh.net>

8 months, 3 weeks

3
4
0 0

[PATCH net-next] netconsole: selftest: Add test for fragmented messages

by Breno Leitao

Add a new selftest to verify netconsole's handling of messages that exceed the packet size limit and require fragmentation. The test sends messages with varying sizes and userdata, validating that: 1. Large messages are correctly fragmented and reassembled 2. Userdata fields are properly preserved across fragments 3. Messages work correctly with and without kernel release version appending The test creates a networking environment using netdevsim, sends messages through /dev/kmsg, and verifies the received fragments maintain message integrity. Signed-off-by: Breno Leitao <leitao(a)debian.org> Reviewed-by: Simon Horman <horms(a)kernel.org> --- Changes compared to RFC - Removed the long-line comment (Simon) - Added Simon's reviwed-by tag. - Link to v1: https://lore.kernel.org/r/20250131-netcons_frag_msgs-v1-1-0de83bf2a7e6@debi… --- tools/testing/selftests/drivers/net/Makefile | 1 + .../selftests/drivers/net/lib/sh/lib_netcons.sh | 7 ++ .../drivers/net/netcons_fragmented_msg.sh | 122 +++++++++++++++++++++ 3 files changed, 130 insertions(+) diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/selftests/drivers/net/Makefile index 137470bdee0c7fd2517bd1baafc12d575de4b4ac..c7f1c443f2af091aa13f67dd1df9ae05d7a43f40 100644 --- a/tools/testing/selftests/drivers/net/Makefile +++ b/tools/testing/selftests/drivers/net/Makefile @@ -7,6 +7,7 @@ TEST_INCLUDES := $(wildcard lib/py/*.py) \ TEST_PROGS := \ netcons_basic.sh \ + netcons_fragmented_msg.sh \ netcons_overflow.sh \ ping.py \ queues.py \ diff --git a/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh b/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh index 3acaba41ac7b21aa2fd8457ed640a5ac8a41bc12..0c262b123fdd3082c40b2bd899ec626d223226ed 100644 --- a/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh +++ b/tools/testing/selftests/drivers/net/lib/sh/lib_netcons.sh @@ -110,6 +110,13 @@ function create_dynamic_target() { echo 1 > "${NETCONS_PATH}"/enabled } +# Do not append the release to the header of the message +function disable_release_append() { + echo 0 > "${NETCONS_PATH}"/enabled + echo 0 > "${NETCONS_PATH}"/release + echo 1 > "${NETCONS_PATH}"/enabled +} + function cleanup() { local NSIM_DEV_SYS_DEL="/sys/bus/netdevsim/del_device" diff --git a/tools/testing/selftests/drivers/net/netcons_fragmented_msg.sh b/tools/testing/selftests/drivers/net/netcons_fragmented_msg.sh new file mode 100755 index 0000000000000000000000000000000000000000..4a71e01a230c75c14147a9937920fe0b68a0926a --- /dev/null +++ b/tools/testing/selftests/drivers/net/netcons_fragmented_msg.sh @@ -0,0 +1,122 @@ +#!/usr/bin/env bash +# SPDX-License-Identifier: GPL-2.0 + +# Test netconsole's message fragmentation functionality. +# +# When a message exceeds the maximum packet size, netconsole splits it into +# multiple fragments for transmission. This test verifies: +# - Correct fragmentation of large messages +# - Proper reassembly of fragments at the receiver +# - Preservation of userdata across fragments +# - Behavior with and without kernel release version appending +# +# Author: Breno Leitao <leitao(a)debian.org> + +set -euo pipefail + +SCRIPTDIR=$(dirname "$(readlink -e "${BASH_SOURCE[0]}")") + +source "${SCRIPTDIR}"/lib/sh/lib_netcons.sh + +modprobe netdevsim 2> /dev/null || true +modprobe netconsole 2> /dev/null || true + +# The content of kmsg will be save to the following file +OUTPUT_FILE="/tmp/${TARGET}" + +# set userdata to a long value. In this case, it is "1-2-3-4...50-" +USERDATA_VALUE=$(printf -- '%.2s-' {1..60}) + +# Convert the header string in a regexp, so, we can remove +# the second header as well. +# A header looks like "13,468,514729715,-,ncfrag=0/1135;". If +# release is appended, you might find something like:L +# "6.13.0-04048-g4f561a87745a,13,468,514729715,-,ncfrag=0/1135;" +function header_to_regex() { + # header is everything before ; + local HEADER="${1}" + REGEX=$(echo "${HEADER}" | cut -d'=' -f1) + echo "${REGEX}=[0-9]*\/[0-9]*;" +} + +# We have two headers in the message. Remove both to get the full message, +# and extract the full message. +function extract_msg() { + local MSGFILE="${1}" + # Extract the header, which is the very first thing that arrives in the + # first list. + HEADER=$(sed -n '1p' "${MSGFILE}" | cut -d';' -f1) + HEADER_REGEX=$(header_to_regex "${HEADER}") + + # Remove the two headers from the received message + # This will return the message without any header, similarly to what + # was sent. + sed "s/""${HEADER_REGEX}""//g" "${MSGFILE}" +} + +# Validate the message, which has two messages glued together. +# unwrap them to make sure all the characters were transmitted. +# File will look like the following: +# 13,468,514729715,-,ncfrag=0/1135;<message> +# key=<part of key>-13,468,514729715,-,ncfrag=967/1135;<rest of the key> +function validate_fragmented_result() { + # Discard the netconsole headers, and assemble the full message + RCVMSG=$(extract_msg "${1}") + + # check for the main message + if ! echo "${RCVMSG}" | grep -q "${MSG}"; then + echo "Message body doesn't match." >&2 + echo "msg received=" "${RCVMSG}" >&2 + exit "${ksft_fail}" + fi + + # check userdata + if ! echo "${RCVMSG}" | grep -q "${USERDATA_VALUE}"; then + echo "message userdata doesn't match" >&2 + echo "msg received=" "${RCVMSG}" >&2 + exit "${ksft_fail}" + fi + # test passed. hooray +} + +# Check for basic system dependency and exit if not found +check_for_dependencies +# Set current loglevel to KERN_INFO(6), and default to KERN_NOTICE(5) +echo "6 5" > /proc/sys/kernel/printk +# Remove the namespace, interfaces and netconsole target on exit +trap cleanup EXIT +# Create one namespace and two interfaces +set_network +# Create a dynamic target for netconsole +create_dynamic_target +# Set userdata "key" with the "value" value +set_user_data + + +# TEST 1: Send message and userdata. They will fragment +# ======= +MSG=$(printf -- 'MSG%.3s=' {1..150}) + +# Listen for netconsole port inside the namespace and destination interface +listen_port_and_save_to "${OUTPUT_FILE}" & +# Wait for socat to start and listen to the port. +wait_local_port_listen "${NAMESPACE}" "${PORT}" udp +# Send the message +echo "${MSG}: ${TARGET}" > /dev/kmsg +# Wait until socat saves the file to disk +busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}" +# Check if the message was not corrupted +validate_fragmented_result "${OUTPUT_FILE}" + +# TEST 2: Test with smaller message, and without release appended +# ======= +MSG=$(printf -- 'FOOBAR%.3s=' {1..100}) +# Let's disable release and test again. +disable_release_append + +listen_port_and_save_to "${OUTPUT_FILE}" & +wait_local_port_listen "${NAMESPACE}" "${PORT}" udp +echo "${MSG}: ${TARGET}" > /dev/kmsg +busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}" +validate_fragmented_result "${OUTPUT_FILE}" +exit "${ksft_pass}" --- base-commit: 0ad9617c78acbc71373fb341a6f75d4012b01d69 change-id: 20250129-netcons_frag_msgs-91506d136f50 Best regards, -- Breno Leitao <leitao(a)debian.org>

8 months, 3 weeks

2
1
0 0

[PATCH] selftests/cgroup: use bash in test_cpuset_v1_hp.sh

by Bharadwaj Raju

The script uses non-POSIX features like `[[` for conditionals and hence does not work when run with a POSIX /bin/sh. Change the shebang to /bin/bash instead, like the other tests in cgroup. Signed-off-by: Bharadwaj Raju <bharadwaj.raju777(a)gmail.com> --- tools/testing/selftests/cgroup/test_cpuset_v1_hp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/cgroup/test_cpuset_v1_hp.sh b/tools/testing/selftests/cgroup/test_cpuset_v1_hp.sh index 3f45512fb512..7406c24be1ac 100755 --- a/tools/testing/selftests/cgroup/test_cpuset_v1_hp.sh +++ b/tools/testing/selftests/cgroup/test_cpuset_v1_hp.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # SPDX-License-Identifier: GPL-2.0 # # Test the special cpuset v1 hotplug case where a cpuset become empty of -- 2.43.0

8 months, 3 weeks

2
1
0 0

[PATCH v3 0/2] EDITME: cover title for scanf-kunit-convert

by Tamir Duberstein

This is one of just 3 remaining "Test Module" kselftests (the others being bitmap and printf), the rest having been converted to KUnit. In addition to the enclosed patch, please consider this an RFC on the removal of the "Test Module" kselftest machinery. I tested this using: $ tools/testing/kunit/kunit.py run --arch arm64 --make_options LLVM=1 scanf Signed-off-by: Tamir Duberstein <tamird(a)gmail.com> --- Changes in v3: - Reduce diff noise in lib/Makefile. (Petr Mladek) - Split `scanf_test` into a few test cases. New output: : =================== scanf (10 subtests) ==================== : [PASSED] numbers_simple : ====================== numbers_list ======================= : [PASSED] delim=" " : [PASSED] delim=":" : [PASSED] delim="," : [PASSED] delim="-" : [PASSED] delim="/" : ================== [PASSED] numbers_list =================== : ============ numbers_list_field_width_typemax ============= : [PASSED] delim=" " : [PASSED] delim=":" : [PASSED] delim="," : [PASSED] delim="-" : [PASSED] delim="/" : ======== [PASSED] numbers_list_field_width_typemax ========= : =========== numbers_list_field_width_val_width ============ : [PASSED] delim=" " : [PASSED] delim=":" : [PASSED] delim="," : [PASSED] delim="-" : [PASSED] delim="/" : ======= [PASSED] numbers_list_field_width_val_width ======== : [PASSED] numbers_slice : [PASSED] numbers_prefix_overflow : [PASSED] test_simple_strtoull : [PASSED] test_simple_strtoll : [PASSED] test_simple_strtoul : [PASSED] test_simple_strtol : ====================== [PASSED] scanf ====================== : ============================================================ : Testing complete. Ran 22 tests: passed: 22 : Elapsed time: 5.517s total, 0.001s configuring, 5.440s building, 0.067s running - Link to v2: https://lore.kernel.org/r/20250203-scanf-kunit-convert-v2-1-277a618d804e@gm… Changes in v2: - Rename lib/{test_scanf.c => scanf_kunit.c}. (Andy Shevchenko) - Link to v1: https://lore.kernel.org/r/20250131-scanf-kunit-convert-v1-1-0976524f0eba@gm… --- Tamir Duberstein (2): scanf: convert self-test to KUnit scanf: break kunit into test cases MAINTAINERS | 2 +- arch/m68k/configs/amiga_defconfig | 1 - arch/m68k/configs/apollo_defconfig | 1 - arch/m68k/configs/atari_defconfig | 1 - arch/m68k/configs/bvme6000_defconfig | 1 - arch/m68k/configs/hp300_defconfig | 1 - arch/m68k/configs/mac_defconfig | 1 - arch/m68k/configs/multi_defconfig | 1 - arch/m68k/configs/mvme147_defconfig | 1 - arch/m68k/configs/mvme16x_defconfig | 1 - arch/m68k/configs/q40_defconfig | 1 - arch/m68k/configs/sun3_defconfig | 1 - arch/m68k/configs/sun3x_defconfig | 1 - arch/powerpc/configs/ppc64_defconfig | 1 - lib/Kconfig.debug | 20 +- lib/Makefile | 2 +- lib/scanf_kunit.c | 800 ++++++++++++++++++++++++++++++++++ lib/test_scanf.c | 814 ----------------------------------- tools/testing/selftests/lib/Makefile | 2 +- tools/testing/selftests/lib/config | 1 - tools/testing/selftests/lib/scanf.sh | 4 - 21 files changed, 820 insertions(+), 838 deletions(-) --- base-commit: a86bf2283d2c9769205407e2b54777c03d012939 change-id: 20250131-scanf-kunit-convert-f70dc33bb34c Best regards, -- Tamir Duberstein <tamird(a)gmail.com>

8 months, 3 weeks

1
3
0 0

[PATCH v2] scanf: convert self-test to KUnit

by Tamir Duberstein

Convert the scanf() self-test to a KUnit test. In the interest of keeping the patch reasonably-sized this doesn't refactor the tests into proper parameterized tests - it's all one big test case. Signed-off-by: Tamir Duberstein <tamird(a)gmail.com> Acked-by: Geert Uytterhoeven <geert(a)linux-m68k.org> # m68k --- This is one of just 3 remaining "Test Module" kselftests (the others being bitmap and printf), the rest having been converted to KUnit. In addition to the enclosed patch, please consider this an RFC on the removal of the "Test Module" kselftest machinery. I tested this using: $ tools/testing/kunit/kunit.py run --arch arm64 --make_options LLVM=1 scanf --- Changes in v2: - Rename lib/{test_scanf.c => scanf_kunit.c}. (Andy Shevchenko) - Link to v1: https://lore.kernel.org/r/20250131-scanf-kunit-convert-v1-1-0976524f0eba@gm… --- MAINTAINERS | 2 +- arch/m68k/configs/amiga_defconfig | 1 - arch/m68k/configs/apollo_defconfig | 1 - arch/m68k/configs/atari_defconfig | 1 - arch/m68k/configs/bvme6000_defconfig | 1 - arch/m68k/configs/hp300_defconfig | 1 - arch/m68k/configs/mac_defconfig | 1 - arch/m68k/configs/multi_defconfig | 1 - arch/m68k/configs/mvme147_defconfig | 1 - arch/m68k/configs/mvme16x_defconfig | 1 - arch/m68k/configs/q40_defconfig | 1 - arch/m68k/configs/sun3_defconfig | 1 - arch/m68k/configs/sun3x_defconfig | 1 - arch/powerpc/configs/ppc64_defconfig | 1 - lib/Kconfig.debug | 20 +- lib/Makefile | 4 +- lib/{test_scanf.c => scanf_kunit.c} | 704 +++++++++++++++++------------------ tools/testing/selftests/lib/Makefile | 2 +- tools/testing/selftests/lib/config | 1 - tools/testing/selftests/lib/scanf.sh | 4 - 20 files changed, 360 insertions(+), 390 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ab7463b2f165..7c6eb5dc0470 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -25358,8 +25358,8 @@ R: Sergey Senozhatsky <senozhatsky(a)chromium.org> S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git F: Documentation/core-api/printk-formats.rst +F: lib/scanf_kunit.c F: lib/test_printf.c -F: lib/test_scanf.c F: lib/vsprintf.c VT1211 HARDWARE MONITOR DRIVER diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index dbf2ea561c85..e85a4b3a9847 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig @@ -623,7 +623,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m CONFIG_TEST_KSTRTOX=m CONFIG_TEST_PRINTF=m -CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m CONFIG_TEST_UUID=m CONFIG_TEST_XARRAY=m diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index b0fd199cc0a4..232b885cc26e 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig @@ -580,7 +580,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m CONFIG_TEST_KSTRTOX=m CONFIG_TEST_PRINTF=m -CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m CONFIG_TEST_UUID=m CONFIG_TEST_XARRAY=m diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index bb5b2d3b6c10..228af5b4cd42 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig @@ -600,7 +600,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m CONFIG_TEST_KSTRTOX=m CONFIG_TEST_PRINTF=m -CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m CONFIG_TEST_UUID=m CONFIG_TEST_XARRAY=m diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index 8315a13bab73..cbc59aed3d97 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig @@ -572,7 +572,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m CONFIG_TEST_KSTRTOX=m CONFIG_TEST_PRINTF=m -CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m CONFIG_TEST_UUID=m CONFIG_TEST_XARRAY=m diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 350370657e5f..8d3787b8fe6d 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig @@ -582,7 +582,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m CONFIG_TEST_KSTRTOX=m CONFIG_TEST_PRINTF=m -CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m CONFIG_TEST_UUID=m CONFIG_TEST_XARRAY=m diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index f942b4755702..a68893d83361 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig @@ -599,7 +599,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m CONFIG_TEST_KSTRTOX=m CONFIG_TEST_PRINTF=m -CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m CONFIG_TEST_UUID=m CONFIG_TEST_XARRAY=m diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index b1eaad02efab..9a17526cefd2 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig @@ -686,7 +686,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m CONFIG_TEST_KSTRTOX=m CONFIG_TEST_PRINTF=m -CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m CONFIG_TEST_UUID=m CONFIG_TEST_XARRAY=m diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index 6309a4442bb3..5cf2e2860044 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig @@ -572,7 +572,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m CONFIG_TEST_KSTRTOX=m CONFIG_TEST_PRINTF=m -CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m CONFIG_TEST_UUID=m CONFIG_TEST_XARRAY=m diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index 3feb0731f814..eb395749bc75 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig @@ -573,7 +573,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m CONFIG_TEST_KSTRTOX=m CONFIG_TEST_PRINTF=m -CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m CONFIG_TEST_UUID=m CONFIG_TEST_XARRAY=m diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index ea04b1b0da7d..8891f12c2a18 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig @@ -589,7 +589,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m CONFIG_TEST_KSTRTOX=m CONFIG_TEST_PRINTF=m -CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m CONFIG_TEST_UUID=m CONFIG_TEST_XARRAY=m diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index f52d9af92153..a49ff5330e5b 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig @@ -569,7 +569,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m CONFIG_TEST_KSTRTOX=m CONFIG_TEST_PRINTF=m -CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m CONFIG_TEST_UUID=m CONFIG_TEST_XARRAY=m diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index f348447824da..3022ff492136 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig @@ -570,7 +570,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m CONFIG_TEST_KSTRTOX=m CONFIG_TEST_PRINTF=m -CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m CONFIG_TEST_UUID=m CONFIG_TEST_XARRAY=m diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 465eb96c755e..819387cbbe69 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig @@ -445,7 +445,6 @@ CONFIG_STRING_SELFTEST=m CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_KSTRTOX=m CONFIG_TEST_PRINTF=m -CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m CONFIG_TEST_UUID=m CONFIG_TEST_XARRAY=m diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 1af972a92d06..716c4ef857bb 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -2427,6 +2427,23 @@ config ASYNC_RAID6_TEST config TEST_HEXDUMP tristate "Test functions located in the hexdump module at runtime" +config SCANF_KUNIT_TEST + tristate "KUnit test scanf() family of functions at runtime" if !KUNIT_ALL_TESTS + depends on KUNIT + default KUNIT_ALL_TESTS + help + Enable this option to test the scanf functions at boot. + + KUnit tests run during boot and output the results to the debug log + in TAP format (http://testanything.org/). Only useful for kernel devs + running the KUnit test harness, and not intended for inclusion into a + production build. + + For more information on KUnit and unit tests in general please refer + to the KUnit documentation in Documentation/dev-tools/kunit/. + + If unsure, say N. + config STRING_KUNIT_TEST tristate "KUnit test string functions at runtime" if !KUNIT_ALL_TESTS depends on KUNIT @@ -2443,9 +2460,6 @@ config TEST_KSTRTOX config TEST_PRINTF tristate "Test printf() family of functions at runtime" -config TEST_SCANF - tristate "Test scanf() family of functions at runtime" - config TEST_BITMAP tristate "Test bitmap_*() family of functions at runtime" help diff --git a/lib/Makefile b/lib/Makefile index d5cfc7afbbb8..a53cf6dd1505 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -85,7 +85,6 @@ obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_keys.o obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_key_base.o obj-$(CONFIG_TEST_DYNAMIC_DEBUG) += test_dynamic_debug.o obj-$(CONFIG_TEST_PRINTF) += test_printf.o -obj-$(CONFIG_TEST_SCANF) += test_scanf.o obj-$(CONFIG_TEST_BITMAP) += test_bitmap.o ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_KASAN),yy) @@ -373,8 +372,9 @@ CFLAGS_bitfield_kunit.o := $(DISABLE_STRUCTLEAK_PLUGIN) obj-$(CONFIG_BITFIELD_KUNIT) += bitfield_kunit.o obj-$(CONFIG_CHECKSUM_KUNIT) += checksum_kunit.o obj-$(CONFIG_UTIL_MACROS_KUNIT) += util_macros_kunit.o -obj-$(CONFIG_LIST_KUNIT_TEST) += list-test.o obj-$(CONFIG_HASHTABLE_KUNIT_TEST) += hashtable_test.o +obj-$(CONFIG_LIST_KUNIT_TEST) += list-test.o +obj-$(CONFIG_SCANF_KUNIT_TEST) += scanf_kunit.o obj-$(CONFIG_LINEAR_RANGES_TEST) += test_linear_ranges.o obj-$(CONFIG_BITS_TEST) += test_bits.o obj-$(CONFIG_CMDLINE_KUNIT_TEST) += cmdline_kunit.o diff --git a/lib/test_scanf.c b/lib/scanf_kunit.c similarity index 30% rename from lib/test_scanf.c rename to lib/scanf_kunit.c index 44f8508c9d88..70364ce20ec3 100644 --- a/lib/test_scanf.c +++ b/lib/scanf_kunit.c @@ -5,8 +5,8 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <kunit/test.h> #include <linux/bitops.h> -#include <linux/init.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/overflow.h> @@ -15,148 +15,123 @@ #include <linux/slab.h> #include <linux/string.h> -#include "../tools/testing/selftests/kselftest_module.h" - #define BUF_SIZE 1024 -KSTM_MODULE_GLOBALS(); -static char *test_buffer __initdata; -static char *fmt_buffer __initdata; -static struct rnd_state rnd_state __initdata; +static char *test_buffer; +static char *fmt_buffer; +static struct rnd_state rnd_state; -typedef int (*check_fn)(const void *check_data, const char *string, +typedef void (*check_fn)(struct kunit *test, const void *check_data, const char *string, const char *fmt, int n_args, va_list ap); -static void __scanf(4, 6) __init -_test(check_fn fn, const void *check_data, const char *string, const char *fmt, +static void __scanf(5, 7) +_test(struct kunit *test, check_fn fn, const void *check_data, const char *string, const char *fmt, int n_args, ...) { va_list ap, ap_copy; - int ret; - - total_tests++; va_start(ap, n_args); va_copy(ap_copy, ap); - ret = vsscanf(string, fmt, ap_copy); + KUNIT_EXPECT_EQ_MSG(test, vsscanf(string, fmt, ap_copy), n_args, + "vsscanf(\"%s\", \"%s\", ...)", string, fmt); va_end(ap_copy); - if (ret != n_args) { - pr_warn("vsscanf(\"%s\", \"%s\", ...) returned %d expected %d\n", - string, fmt, ret, n_args); - goto fail; - } - - ret = (*fn)(check_data, string, fmt, n_args, ap); - if (ret) - goto fail; - - va_end(ap); - - return; - -fail: - failed_tests++; + (*fn)(test, check_data, string, fmt, n_args, ap); va_end(ap); } -#define _check_numbers_template(arg_fmt, expect, str, fmt, n_args, ap) \ +#define _check_numbers_template(test, arg_fmt, expect, str, fmt, n_args, ap) \ do { \ pr_debug("\"%s\", \"%s\" ->\n", str, fmt); \ for (; n_args > 0; n_args--, expect++) { \ typeof(*expect) got = *va_arg(ap, typeof(expect)); \ pr_debug("\t" arg_fmt "\n", got); \ - if (got != *expect) { \ - pr_warn("vsscanf(\"%s\", \"%s\", ...) expected " arg_fmt " got " arg_fmt "\n", \ - str, fmt, *expect, got); \ - return 1; \ - } \ + KUNIT_EXPECT_EQ_MSG(test, got, *expect, "vsscanf(\"%s\", \"%s\", ...)", str, fmt); \ } \ - return 0; \ } while (0) -static int __init check_ull(const void *check_data, const char *string, +static void check_ull(struct kunit *test, const void *check_data, const char *string, const char *fmt, int n_args, va_list ap) { const unsigned long long *pval = check_data; - _check_numbers_template("%llu", pval, string, fmt, n_args, ap); + _check_numbers_template(test, "%llu", pval, string, fmt, n_args, ap); } -static int __init check_ll(const void *check_data, const char *string, +static void check_ll(struct kunit *test, const void *check_data, const char *string, const char *fmt, int n_args, va_list ap) { const long long *pval = check_data; - _check_numbers_template("%lld", pval, string, fmt, n_args, ap); + _check_numbers_template(test, "%lld", pval, string, fmt, n_args, ap); } -static int __init check_ulong(const void *check_data, const char *string, +static void check_ulong(struct kunit *test, const void *check_data, const char *string, const char *fmt, int n_args, va_list ap) { const unsigned long *pval = check_data; - _check_numbers_template("%lu", pval, string, fmt, n_args, ap); + _check_numbers_template(test, "%lu", pval, string, fmt, n_args, ap); } -static int __init check_long(const void *check_data, const char *string, +static void check_long(struct kunit *test, const void *check_data, const char *string, const char *fmt, int n_args, va_list ap) { const long *pval = check_data; - _check_numbers_template("%ld", pval, string, fmt, n_args, ap); + _check_numbers_template(test, "%ld", pval, string, fmt, n_args, ap); } -static int __init check_uint(const void *check_data, const char *string, +static void check_uint(struct kunit *test, const void *check_data, const char *string, const char *fmt, int n_args, va_list ap) { const unsigned int *pval = check_data; - _check_numbers_template("%u", pval, string, fmt, n_args, ap); + _check_numbers_template(test, "%u", pval, string, fmt, n_args, ap); } -static int __init check_int(const void *check_data, const char *string, +static void check_int(struct kunit *test, const void *check_data, const char *string, const char *fmt, int n_args, va_list ap) { const int *pval = check_data; - _check_numbers_template("%d", pval, string, fmt, n_args, ap); + _check_numbers_template(test, "%d", pval, string, fmt, n_args, ap); } -static int __init check_ushort(const void *check_data, const char *string, +static void check_ushort(struct kunit *test, const void *check_data, const char *string, const char *fmt, int n_args, va_list ap) { const unsigned short *pval = check_data; - _check_numbers_template("%hu", pval, string, fmt, n_args, ap); + _check_numbers_template(test, "%hu", pval, string, fmt, n_args, ap); } -static int __init check_short(const void *check_data, const char *string, +static void check_short(struct kunit *test, const void *check_data, const char *string, const char *fmt, int n_args, va_list ap) { const short *pval = check_data; - _check_numbers_template("%hd", pval, string, fmt, n_args, ap); + _check_numbers_template(test, "%hd", pval, string, fmt, n_args, ap); } -static int __init check_uchar(const void *check_data, const char *string, +static void check_uchar(struct kunit *test, const void *check_data, const char *string, const char *fmt, int n_args, va_list ap) { const unsigned char *pval = check_data; - _check_numbers_template("%hhu", pval, string, fmt, n_args, ap); + _check_numbers_template(test, "%hhu", pval, string, fmt, n_args, ap); } -static int __init check_char(const void *check_data, const char *string, +static void check_char(struct kunit *test, const void *check_data, const char *string, const char *fmt, int n_args, va_list ap) { const signed char *pval = check_data; - _check_numbers_template("%hhd", pval, string, fmt, n_args, ap); + _check_numbers_template(test, "%hhd", pval, string, fmt, n_args, ap); } /* Selection of interesting numbers to test, copied from test-kstrtox.c */ -static const unsigned long long numbers[] __initconst = { +static const unsigned long long numbers[] = { 0x0ULL, 0x1ULL, 0x7fULL, @@ -190,76 +165,76 @@ static const unsigned long long numbers[] __initconst = { : ((unsigned long long)(val) <= type_max(T))) -#define test_one_number(T, gen_fmt, scan_fmt, val, fn) \ -do { \ - const T expect_val = (T)(val); \ - T result = ~expect_val; /* should be overwritten */ \ - \ - snprintf(test_buffer, BUF_SIZE, gen_fmt, expect_val); \ - _test(fn, &expect_val, test_buffer, "%" scan_fmt, 1, &result); \ +#define test_one_number(test, T, gen_fmt, scan_fmt, val, fn) \ +do { \ + const T expect_val = (T)(val); \ + T result = ~expect_val; /* should be overwritten */ \ + \ + snprintf(test_buffer, BUF_SIZE, gen_fmt, expect_val); \ + _test(test, fn, &expect_val, test_buffer, "%" scan_fmt, 1, &result); \ } while (0) -#define simple_numbers_loop(T, gen_fmt, scan_fmt, fn) \ +#define simple_numbers_loop(test, T, gen_fmt, scan_fmt, fn) \ do { \ int i; \ \ for (i = 0; i < ARRAY_SIZE(numbers); i++) { \ if (value_representable_in_type(T, numbers[i])) \ - test_one_number(T, gen_fmt, scan_fmt, \ + test_one_number(test, T, gen_fmt, scan_fmt, \ numbers[i], fn); \ \ if (value_representable_in_type(T, -numbers[i])) \ - test_one_number(T, gen_fmt, scan_fmt, \ + test_one_number(test, T, gen_fmt, scan_fmt, \ -numbers[i], fn); \ } \ } while (0) -static void __init numbers_simple(void) -{ - simple_numbers_loop(unsigned long long, "%llu", "llu", check_ull); - simple_numbers_loop(long long, "%lld", "lld", check_ll); - simple_numbers_loop(long long, "%lld", "lli", check_ll); - simple_numbers_loop(unsigned long long, "%llx", "llx", check_ull); - simple_numbers_loop(long long, "%llx", "llx", check_ll); - simple_numbers_loop(long long, "0x%llx", "lli", check_ll); - simple_numbers_loop(unsigned long long, "0x%llx", "llx", check_ull); - simple_numbers_loop(long long, "0x%llx", "llx", check_ll); - - simple_numbers_loop(unsigned long, "%lu", "lu", check_ulong); - simple_numbers_loop(long, "%ld", "ld", check_long); - simple_numbers_loop(long, "%ld", "li", check_long); - simple_numbers_loop(unsigned long, "%lx", "lx", check_ulong); - simple_numbers_loop(long, "%lx", "lx", check_long); - simple_numbers_loop(long, "0x%lx", "li", check_long); - simple_numbers_loop(unsigned long, "0x%lx", "lx", check_ulong); - simple_numbers_loop(long, "0x%lx", "lx", check_long); - - simple_numbers_loop(unsigned int, "%u", "u", check_uint); - simple_numbers_loop(int, "%d", "d", check_int); - simple_numbers_loop(int, "%d", "i", check_int); - simple_numbers_loop(unsigned int, "%x", "x", check_uint); - simple_numbers_loop(int, "%x", "x", check_int); - simple_numbers_loop(int, "0x%x", "i", check_int); - simple_numbers_loop(unsigned int, "0x%x", "x", check_uint); - simple_numbers_loop(int, "0x%x", "x", check_int); - - simple_numbers_loop(unsigned short, "%hu", "hu", check_ushort); - simple_numbers_loop(short, "%hd", "hd", check_short); - simple_numbers_loop(short, "%hd", "hi", check_short); - simple_numbers_loop(unsigned short, "%hx", "hx", check_ushort); - simple_numbers_loop(short, "%hx", "hx", check_short); - simple_numbers_loop(short, "0x%hx", "hi", check_short); - simple_numbers_loop(unsigned short, "0x%hx", "hx", check_ushort); - simple_numbers_loop(short, "0x%hx", "hx", check_short); - - simple_numbers_loop(unsigned char, "%hhu", "hhu", check_uchar); - simple_numbers_loop(signed char, "%hhd", "hhd", check_char); - simple_numbers_loop(signed char, "%hhd", "hhi", check_char); - simple_numbers_loop(unsigned char, "%hhx", "hhx", check_uchar); - simple_numbers_loop(signed char, "%hhx", "hhx", check_char); - simple_numbers_loop(signed char, "0x%hhx", "hhi", check_char); - simple_numbers_loop(unsigned char, "0x%hhx", "hhx", check_uchar); - simple_numbers_loop(signed char, "0x%hhx", "hhx", check_char); +static void numbers_simple(struct kunit *test) +{ + simple_numbers_loop(test, unsigned long long, "%llu", "llu", check_ull); + simple_numbers_loop(test, long long, "%lld", "lld", check_ll); + simple_numbers_loop(test, long long, "%lld", "lli", check_ll); + simple_numbers_loop(test, unsigned long long, "%llx", "llx", check_ull); + simple_numbers_loop(test, long long, "%llx", "llx", check_ll); + simple_numbers_loop(test, long long, "0x%llx", "lli", check_ll); + simple_numbers_loop(test, unsigned long long, "0x%llx", "llx", check_ull); + simple_numbers_loop(test, long long, "0x%llx", "llx", check_ll); + + simple_numbers_loop(test, unsigned long, "%lu", "lu", check_ulong); + simple_numbers_loop(test, long, "%ld", "ld", check_long); + simple_numbers_loop(test, long, "%ld", "li", check_long); + simple_numbers_loop(test, unsigned long, "%lx", "lx", check_ulong); + simple_numbers_loop(test, long, "%lx", "lx", check_long); + simple_numbers_loop(test, long, "0x%lx", "li", check_long); + simple_numbers_loop(test, unsigned long, "0x%lx", "lx", check_ulong); + simple_numbers_loop(test, long, "0x%lx", "lx", check_long); + + simple_numbers_loop(test, unsigned int, "%u", "u", check_uint); + simple_numbers_loop(test, int, "%d", "d", check_int); + simple_numbers_loop(test, int, "%d", "i", check_int); + simple_numbers_loop(test, unsigned int, "%x", "x", check_uint); + simple_numbers_loop(test, int, "%x", "x", check_int); + simple_numbers_loop(test, int, "0x%x", "i", check_int); + simple_numbers_loop(test, unsigned int, "0x%x", "x", check_uint); + simple_numbers_loop(test, int, "0x%x", "x", check_int); + + simple_numbers_loop(test, unsigned short, "%hu", "hu", check_ushort); + simple_numbers_loop(test, short, "%hd", "hd", check_short); + simple_numbers_loop(test, short, "%hd", "hi", check_short); + simple_numbers_loop(test, unsigned short, "%hx", "hx", check_ushort); + simple_numbers_loop(test, short, "%hx", "hx", check_short); + simple_numbers_loop(test, short, "0x%hx", "hi", check_short); + simple_numbers_loop(test, unsigned short, "0x%hx", "hx", check_ushort); + simple_numbers_loop(test, short, "0x%hx", "hx", check_short); + + simple_numbers_loop(test, unsigned char, "%hhu", "hhu", check_uchar); + simple_numbers_loop(test, signed char, "%hhd", "hhd", check_char); + simple_numbers_loop(test, signed char, "%hhd", "hhi", check_char); + simple_numbers_loop(test, unsigned char, "%hhx", "hhx", check_uchar); + simple_numbers_loop(test, signed char, "%hhx", "hhx", check_char); + simple_numbers_loop(test, signed char, "0x%hhx", "hhi", check_char); + simple_numbers_loop(test, unsigned char, "0x%hhx", "hhx", check_uchar); + simple_numbers_loop(test, signed char, "0x%hhx", "hhx", check_char); } /* @@ -267,14 +242,14 @@ static void __init numbers_simple(void) * the raw prandom*() functions (Not mathematically rigorous!!). * Variabilty of length and value is more important than perfect randomness. */ -static u32 __init next_test_random(u32 max_bits) +static u32 next_test_random(u32 max_bits) { u32 n_bits = hweight32(prandom_u32_state(&rnd_state)) % (max_bits + 1); return prandom_u32_state(&rnd_state) & GENMASK(n_bits, 0); } -static unsigned long long __init next_test_random_ull(void) +static unsigned long long next_test_random_ull(void) { u32 rand1 = prandom_u32_state(&rnd_state); u32 n_bits = (hweight32(rand1) * 3) % 64; @@ -311,7 +286,7 @@ do { \ * updating buf_pos and returning the number of characters appended. * On error buf_pos is not changed and return value is 0. */ -static int __init __printf(4, 5) +static int __printf(4, 5) append_fmt(char *buf, int *buf_pos, int buf_len, const char *val_fmt, ...) { va_list ap; @@ -333,7 +308,7 @@ append_fmt(char *buf, int *buf_pos, int buf_len, const char *val_fmt, ...) * Convenience function to append the field delimiter string * to both the value string and format string buffers. */ -static void __init append_delim(char *str_buf, int *str_buf_pos, int str_buf_len, +static void append_delim(char *str_buf, int *str_buf_pos, int str_buf_len, char *fmt_buf, int *fmt_buf_pos, int fmt_buf_len, const char *delim_str) { @@ -341,15 +316,15 @@ static void __init append_delim(char *str_buf, int *str_buf_pos, int str_buf_len append_fmt(fmt_buf, fmt_buf_pos, fmt_buf_len, delim_str); } -#define test_array_8(fn, check_data, string, fmt, arr) \ +#define test_array_8(test, fn, check_data, string, fmt, arr) \ do { \ BUILD_BUG_ON(ARRAY_SIZE(arr) != 8); \ - _test(fn, check_data, string, fmt, 8, \ + _test(test, fn, check_data, string, fmt, 8, \ &(arr)[0], &(arr)[1], &(arr)[2], &(arr)[3], \ &(arr)[4], &(arr)[5], &(arr)[6], &(arr)[7]); \ } while (0) -#define numbers_list_8(T, gen_fmt, field_sep, scan_fmt, fn) \ +#define numbers_list_8(test, T, gen_fmt, field_sep, scan_fmt, fn) \ do { \ int i, pos = 0, fmt_pos = 0; \ T expect[8], result[8]; \ @@ -366,18 +341,18 @@ do { \ append_fmt(fmt_buffer, &fmt_pos, BUF_SIZE, "%%%s", scan_fmt); \ } \ \ - test_array_8(fn, expect, test_buffer, fmt_buffer, result); \ + test_array_8(test, fn, expect, test_buffer, fmt_buffer, result); \ } while (0) -#define numbers_list_fix_width(T, gen_fmt, field_sep, width, scan_fmt, fn) \ +#define numbers_list_fix_width(test, T, gen_fmt, field_sep, width, scan_fmt, fn)\ do { \ char full_fmt[16]; \ \ snprintf(full_fmt, sizeof(full_fmt), "%u%s", width, scan_fmt); \ - numbers_list_8(T, gen_fmt, field_sep, full_fmt, fn); \ + numbers_list_8(test, T, gen_fmt, field_sep, full_fmt, fn); \ } while (0) -#define numbers_list_val_width(T, gen_fmt, field_sep, scan_fmt, fn) \ +#define numbers_list_val_width(test, T, gen_fmt, field_sep, scan_fmt, fn) \ do { \ int i, val_len, pos = 0, fmt_pos = 0; \ T expect[8], result[8]; \ @@ -395,201 +370,201 @@ do { \ "%%%u%s", val_len, scan_fmt); \ } \ \ - test_array_8(fn, expect, test_buffer, fmt_buffer, result); \ + test_array_8(test, fn, expect, test_buffer, fmt_buffer, result); \ } while (0) -static void __init numbers_list_ll(const char *delim) +static void numbers_list_ll(struct kunit *test, const char *delim) { - numbers_list_8(unsigned long long, "%llu", delim, "llu", check_ull); - numbers_list_8(long long, "%lld", delim, "lld", check_ll); - numbers_list_8(long long, "%lld", delim, "lli", check_ll); - numbers_list_8(unsigned long long, "%llx", delim, "llx", check_ull); - numbers_list_8(unsigned long long, "0x%llx", delim, "llx", check_ull); - numbers_list_8(long long, "0x%llx", delim, "lli", check_ll); + numbers_list_8(test, unsigned long long, "%llu", delim, "llu", check_ull); + numbers_list_8(test, long long, "%lld", delim, "lld", check_ll); + numbers_list_8(test, long long, "%lld", delim, "lli", check_ll); + numbers_list_8(test, unsigned long long, "%llx", delim, "llx", check_ull); + numbers_list_8(test, unsigned long long, "0x%llx", delim, "llx", check_ull); + numbers_list_8(test, long long, "0x%llx", delim, "lli", check_ll); } -static void __init numbers_list_l(const char *delim) +static void numbers_list_l(struct kunit *test, const char *delim) { - numbers_list_8(unsigned long, "%lu", delim, "lu", check_ulong); - numbers_list_8(long, "%ld", delim, "ld", check_long); - numbers_list_8(long, "%ld", delim, "li", check_long); - numbers_list_8(unsigned long, "%lx", delim, "lx", check_ulong); - numbers_list_8(unsigned long, "0x%lx", delim, "lx", check_ulong); - numbers_list_8(long, "0x%lx", delim, "li", check_long); + numbers_list_8(test, unsigned long, "%lu", delim, "lu", check_ulong); + numbers_list_8(test, long, "%ld", delim, "ld", check_long); + numbers_list_8(test, long, "%ld", delim, "li", check_long); + numbers_list_8(test, unsigned long, "%lx", delim, "lx", check_ulong); + numbers_list_8(test, unsigned long, "0x%lx", delim, "lx", check_ulong); + numbers_list_8(test, long, "0x%lx", delim, "li", check_long); } -static void __init numbers_list_d(const char *delim) +static void numbers_list_d(struct kunit *test, const char *delim) { - numbers_list_8(unsigned int, "%u", delim, "u", check_uint); - numbers_list_8(int, "%d", delim, "d", check_int); - numbers_list_8(int, "%d", delim, "i", check_int); - numbers_list_8(unsigned int, "%x", delim, "x", check_uint); - numbers_list_8(unsigned int, "0x%x", delim, "x", check_uint); - numbers_list_8(int, "0x%x", delim, "i", check_int); + numbers_list_8(test, unsigned int, "%u", delim, "u", check_uint); + numbers_list_8(test, int, "%d", delim, "d", check_int); + numbers_list_8(test, int, "%d", delim, "i", check_int); + numbers_list_8(test, unsigned int, "%x", delim, "x", check_uint); + numbers_list_8(test, unsigned int, "0x%x", delim, "x", check_uint); + numbers_list_8(test, int, "0x%x", delim, "i", check_int); } -static void __init numbers_list_h(const char *delim) +static void numbers_list_h(struct kunit *test, const char *delim) { - numbers_list_8(unsigned short, "%hu", delim, "hu", check_ushort); - numbers_list_8(short, "%hd", delim, "hd", check_short); - numbers_list_8(short, "%hd", delim, "hi", check_short); - numbers_list_8(unsigned short, "%hx", delim, "hx", check_ushort); - numbers_list_8(unsigned short, "0x%hx", delim, "hx", check_ushort); - numbers_list_8(short, "0x%hx", delim, "hi", check_short); + numbers_list_8(test, unsigned short, "%hu", delim, "hu", check_ushort); + numbers_list_8(test, short, "%hd", delim, "hd", check_short); + numbers_list_8(test, short, "%hd", delim, "hi", check_short); + numbers_list_8(test, unsigned short, "%hx", delim, "hx", check_ushort); + numbers_list_8(test, unsigned short, "0x%hx", delim, "hx", check_ushort); + numbers_list_8(test, short, "0x%hx", delim, "hi", check_short); } -static void __init numbers_list_hh(const char *delim) +static void numbers_list_hh(struct kunit *test, const char *delim) { - numbers_list_8(unsigned char, "%hhu", delim, "hhu", check_uchar); - numbers_list_8(signed char, "%hhd", delim, "hhd", check_char); - numbers_list_8(signed char, "%hhd", delim, "hhi", check_char); - numbers_list_8(unsigned char, "%hhx", delim, "hhx", check_uchar); - numbers_list_8(unsigned char, "0x%hhx", delim, "hhx", check_uchar); - numbers_list_8(signed char, "0x%hhx", delim, "hhi", check_char); + numbers_list_8(test, unsigned char, "%hhu", delim, "hhu", check_uchar); + numbers_list_8(test, signed char, "%hhd", delim, "hhd", check_char); + numbers_list_8(test, signed char, "%hhd", delim, "hhi", check_char); + numbers_list_8(test, unsigned char, "%hhx", delim, "hhx", check_uchar); + numbers_list_8(test, unsigned char, "0x%hhx", delim, "hhx", check_uchar); + numbers_list_8(test, signed char, "0x%hhx", delim, "hhi", check_char); } -static void __init numbers_list(const char *delim) +static void numbers_list(struct kunit *test, const char *delim) { - numbers_list_ll(delim); - numbers_list_l(delim); - numbers_list_d(delim); - numbers_list_h(delim); - numbers_list_hh(delim); + numbers_list_ll(test, delim); + numbers_list_l(test, delim); + numbers_list_d(test, delim); + numbers_list_h(test, delim); + numbers_list_hh(test, delim); } -static void __init numbers_list_field_width_ll(const char *delim) +static void numbers_list_field_width_ll(struct kunit *test, const char *delim) { - numbers_list_fix_width(unsigned long long, "%llu", delim, 20, "llu", check_ull); - numbers_list_fix_width(long long, "%lld", delim, 20, "lld", check_ll); - numbers_list_fix_width(long long, "%lld", delim, 20, "lli", check_ll); - numbers_list_fix_width(unsigned long long, "%llx", delim, 16, "llx", check_ull); - numbers_list_fix_width(unsigned long long, "0x%llx", delim, 18, "llx", check_ull); - numbers_list_fix_width(long long, "0x%llx", delim, 18, "lli", check_ll); + numbers_list_fix_width(test, unsigned long long, "%llu", delim, 20, "llu", check_ull); + numbers_list_fix_width(test, long long, "%lld", delim, 20, "lld", check_ll); + numbers_list_fix_width(test, long long, "%lld", delim, 20, "lli", check_ll); + numbers_list_fix_width(test, unsigned long long, "%llx", delim, 16, "llx", check_ull); + numbers_list_fix_width(test, unsigned long long, "0x%llx", delim, 18, "llx", check_ull); + numbers_list_fix_width(test, long long, "0x%llx", delim, 18, "lli", check_ll); } -static void __init numbers_list_field_width_l(const char *delim) +static void numbers_list_field_width_l(struct kunit *test, const char *delim) { #if BITS_PER_LONG == 64 - numbers_list_fix_width(unsigned long, "%lu", delim, 20, "lu", check_ulong); - numbers_list_fix_width(long, "%ld", delim, 20, "ld", check_long); - numbers_list_fix_width(long, "%ld", delim, 20, "li", check_long); - numbers_list_fix_width(unsigned long, "%lx", delim, 16, "lx", check_ulong); - numbers_list_fix_width(unsigned long, "0x%lx", delim, 18, "lx", check_ulong); - numbers_list_fix_width(long, "0x%lx", delim, 18, "li", check_long); + numbers_list_fix_width(test, unsigned long, "%lu", delim, 20, "lu", check_ulong); + numbers_list_fix_width(test, long, "%ld", delim, 20, "ld", check_long); + numbers_list_fix_width(test, long, "%ld", delim, 20, "li", check_long); + numbers_list_fix_width(test, unsigned long, "%lx", delim, 16, "lx", check_ulong); + numbers_list_fix_width(test, unsigned long, "0x%lx", delim, 18, "lx", check_ulong); + numbers_list_fix_width(test, long, "0x%lx", delim, 18, "li", check_long); #else - numbers_list_fix_width(unsigned long, "%lu", delim, 10, "lu", check_ulong); - numbers_list_fix_width(long, "%ld", delim, 11, "ld", check_long); - numbers_list_fix_width(long, "%ld", delim, 11, "li", check_long); - numbers_list_fix_width(unsigned long, "%lx", delim, 8, "lx", check_ulong); - numbers_list_fix_width(unsigned long, "0x%lx", delim, 10, "lx", check_ulong); - numbers_list_fix_width(long, "0x%lx", delim, 10, "li", check_long); + numbers_list_fix_width(test, unsigned long, "%lu", delim, 10, "lu", check_ulong); + numbers_list_fix_width(test, long, "%ld", delim, 11, "ld", check_long); + numbers_list_fix_width(test, long, "%ld", delim, 11, "li", check_long); + numbers_list_fix_width(test, unsigned long, "%lx", delim, 8, "lx", check_ulong); + numbers_list_fix_width(test, unsigned long, "0x%lx", delim, 10, "lx", check_ulong); + numbers_list_fix_width(test, long, "0x%lx", delim, 10, "li", check_long); #endif } -static void __init numbers_list_field_width_d(const char *delim) +static void numbers_list_field_width_d(struct kunit *test, const char *delim) { - numbers_list_fix_width(unsigned int, "%u", delim, 10, "u", check_uint); - numbers_list_fix_width(int, "%d", delim, 11, "d", check_int); - numbers_list_fix_width(int, "%d", delim, 11, "i", check_int); - numbers_list_fix_width(unsigned int, "%x", delim, 8, "x", check_uint); - numbers_list_fix_width(unsigned int, "0x%x", delim, 10, "x", check_uint); - numbers_list_fix_width(int, "0x%x", delim, 10, "i", check_int); + numbers_list_fix_width(test, unsigned int, "%u", delim, 10, "u", check_uint); + numbers_list_fix_width(test, int, "%d", delim, 11, "d", check_int); + numbers_list_fix_width(test, int, "%d", delim, 11, "i", check_int); + numbers_list_fix_width(test, unsigned int, "%x", delim, 8, "x", check_uint); + numbers_list_fix_width(test, unsigned int, "0x%x", delim, 10, "x", check_uint); + numbers_list_fix_width(test, int, "0x%x", delim, 10, "i", check_int); } -static void __init numbers_list_field_width_h(const char *delim) +static void numbers_list_field_width_h(struct kunit *test, const char *delim) { - numbers_list_fix_width(unsigned short, "%hu", delim, 5, "hu", check_ushort); - numbers_list_fix_width(short, "%hd", delim, 6, "hd", check_short); - numbers_list_fix_width(short, "%hd", delim, 6, "hi", check_short); - numbers_list_fix_width(unsigned short, "%hx", delim, 4, "hx", check_ushort); - numbers_list_fix_width(unsigned short, "0x%hx", delim, 6, "hx", check_ushort); - numbers_list_fix_width(short, "0x%hx", delim, 6, "hi", check_short); + numbers_list_fix_width(test, unsigned short, "%hu", delim, 5, "hu", check_ushort); + numbers_list_fix_width(test, short, "%hd", delim, 6, "hd", check_short); + numbers_list_fix_width(test, short, "%hd", delim, 6, "hi", check_short); + numbers_list_fix_width(test, unsigned short, "%hx", delim, 4, "hx", check_ushort); + numbers_list_fix_width(test, unsigned short, "0x%hx", delim, 6, "hx", check_ushort); + numbers_list_fix_width(test, short, "0x%hx", delim, 6, "hi", check_short); } -static void __init numbers_list_field_width_hh(const char *delim) +static void numbers_list_field_width_hh(struct kunit *test, const char *delim) { - numbers_list_fix_width(unsigned char, "%hhu", delim, 3, "hhu", check_uchar); - numbers_list_fix_width(signed char, "%hhd", delim, 4, "hhd", check_char); - numbers_list_fix_width(signed char, "%hhd", delim, 4, "hhi", check_char); - numbers_list_fix_width(unsigned char, "%hhx", delim, 2, "hhx", check_uchar); - numbers_list_fix_width(unsigned char, "0x%hhx", delim, 4, "hhx", check_uchar); - numbers_list_fix_width(signed char, "0x%hhx", delim, 4, "hhi", check_char); + numbers_list_fix_width(test, unsigned char, "%hhu", delim, 3, "hhu", check_uchar); + numbers_list_fix_width(test, signed char, "%hhd", delim, 4, "hhd", check_char); + numbers_list_fix_width(test, signed char, "%hhd", delim, 4, "hhi", check_char); + numbers_list_fix_width(test, unsigned char, "%hhx", delim, 2, "hhx", check_uchar); + numbers_list_fix_width(test, unsigned char, "0x%hhx", delim, 4, "hhx", check_uchar); + numbers_list_fix_width(test, signed char, "0x%hhx", delim, 4, "hhi", check_char); } /* * List of numbers separated by delim. Each field width specifier is the * maximum possible digits for the given type and base. */ -static void __init numbers_list_field_width_typemax(const char *delim) +static void numbers_list_field_width_typemax(struct kunit *test, const char *delim) { - numbers_list_field_width_ll(delim); - numbers_list_field_width_l(delim); - numbers_list_field_width_d(delim); - numbers_list_field_width_h(delim); - numbers_list_field_width_hh(delim); + numbers_list_field_width_ll(test, delim); + numbers_list_field_width_l(test, delim); + numbers_list_field_width_d(test, delim); + numbers_list_field_width_h(test, delim); + numbers_list_field_width_hh(test, delim); } -static void __init numbers_list_field_width_val_ll(const char *delim) +static void numbers_list_field_width_val_ll(struct kunit *test, const char *delim) { - numbers_list_val_width(unsigned long long, "%llu", delim, "llu", check_ull); - numbers_list_val_width(long long, "%lld", delim, "lld", check_ll); - numbers_list_val_width(long long, "%lld", delim, "lli", check_ll); - numbers_list_val_width(unsigned long long, "%llx", delim, "llx", check_ull); - numbers_list_val_width(unsigned long long, "0x%llx", delim, "llx", check_ull); - numbers_list_val_width(long long, "0x%llx", delim, "lli", check_ll); + numbers_list_val_width(test, unsigned long long, "%llu", delim, "llu", check_ull); + numbers_list_val_width(test, long long, "%lld", delim, "lld", check_ll); + numbers_list_val_width(test, long long, "%lld", delim, "lli", check_ll); + numbers_list_val_width(test, unsigned long long, "%llx", delim, "llx", check_ull); + numbers_list_val_width(test, unsigned long long, "0x%llx", delim, "llx", check_ull); + numbers_list_val_width(test, long long, "0x%llx", delim, "lli", check_ll); } -static void __init numbers_list_field_width_val_l(const char *delim) +static void numbers_list_field_width_val_l(struct kunit *test, const char *delim) { - numbers_list_val_width(unsigned long, "%lu", delim, "lu", check_ulong); - numbers_list_val_width(long, "%ld", delim, "ld", check_long); - numbers_list_val_width(long, "%ld", delim, "li", check_long); - numbers_list_val_width(unsigned long, "%lx", delim, "lx", check_ulong); - numbers_list_val_width(unsigned long, "0x%lx", delim, "lx", check_ulong); - numbers_list_val_width(long, "0x%lx", delim, "li", check_long); + numbers_list_val_width(test, unsigned long, "%lu", delim, "lu", check_ulong); + numbers_list_val_width(test, long, "%ld", delim, "ld", check_long); + numbers_list_val_width(test, long, "%ld", delim, "li", check_long); + numbers_list_val_width(test, unsigned long, "%lx", delim, "lx", check_ulong); + numbers_list_val_width(test, unsigned long, "0x%lx", delim, "lx", check_ulong); + numbers_list_val_width(test, long, "0x%lx", delim, "li", check_long); } -static void __init numbers_list_field_width_val_d(const char *delim) +static void numbers_list_field_width_val_d(struct kunit *test, const char *delim) { - numbers_list_val_width(unsigned int, "%u", delim, "u", check_uint); - numbers_list_val_width(int, "%d", delim, "d", check_int); - numbers_list_val_width(int, "%d", delim, "i", check_int); - numbers_list_val_width(unsigned int, "%x", delim, "x", check_uint); - numbers_list_val_width(unsigned int, "0x%x", delim, "x", check_uint); - numbers_list_val_width(int, "0x%x", delim, "i", check_int); + numbers_list_val_width(test, unsigned int, "%u", delim, "u", check_uint); + numbers_list_val_width(test, int, "%d", delim, "d", check_int); + numbers_list_val_width(test, int, "%d", delim, "i", check_int); + numbers_list_val_width(test, unsigned int, "%x", delim, "x", check_uint); + numbers_list_val_width(test, unsigned int, "0x%x", delim, "x", check_uint); + numbers_list_val_width(test, int, "0x%x", delim, "i", check_int); } -static void __init numbers_list_field_width_val_h(const char *delim) +static void numbers_list_field_width_val_h(struct kunit *test, const char *delim) { - numbers_list_val_width(unsigned short, "%hu", delim, "hu", check_ushort); - numbers_list_val_width(short, "%hd", delim, "hd", check_short); - numbers_list_val_width(short, "%hd", delim, "hi", check_short); - numbers_list_val_width(unsigned short, "%hx", delim, "hx", check_ushort); - numbers_list_val_width(unsigned short, "0x%hx", delim, "hx", check_ushort); - numbers_list_val_width(short, "0x%hx", delim, "hi", check_short); + numbers_list_val_width(test, unsigned short, "%hu", delim, "hu", check_ushort); + numbers_list_val_width(test, short, "%hd", delim, "hd", check_short); + numbers_list_val_width(test, short, "%hd", delim, "hi", check_short); + numbers_list_val_width(test, unsigned short, "%hx", delim, "hx", check_ushort); + numbers_list_val_width(test, unsigned short, "0x%hx", delim, "hx", check_ushort); + numbers_list_val_width(test, short, "0x%hx", delim, "hi", check_short); } -static void __init numbers_list_field_width_val_hh(const char *delim) +static void numbers_list_field_width_val_hh(struct kunit *test, const char *delim) { - numbers_list_val_width(unsigned char, "%hhu", delim, "hhu", check_uchar); - numbers_list_val_width(signed char, "%hhd", delim, "hhd", check_char); - numbers_list_val_width(signed char, "%hhd", delim, "hhi", check_char); - numbers_list_val_width(unsigned char, "%hhx", delim, "hhx", check_uchar); - numbers_list_val_width(unsigned char, "0x%hhx", delim, "hhx", check_uchar); - numbers_list_val_width(signed char, "0x%hhx", delim, "hhi", check_char); + numbers_list_val_width(test, unsigned char, "%hhu", delim, "hhu", check_uchar); + numbers_list_val_width(test, signed char, "%hhd", delim, "hhd", check_char); + numbers_list_val_width(test, signed char, "%hhd", delim, "hhi", check_char); + numbers_list_val_width(test, unsigned char, "%hhx", delim, "hhx", check_uchar); + numbers_list_val_width(test, unsigned char, "0x%hhx", delim, "hhx", check_uchar); + numbers_list_val_width(test, signed char, "0x%hhx", delim, "hhi", check_char); } /* * List of numbers separated by delim. Each field width specifier is the * exact length of the corresponding value digits in the string being scanned. */ -static void __init numbers_list_field_width_val_width(const char *delim) +static void numbers_list_field_width_val_width(struct kunit *test, const char *delim) { - numbers_list_field_width_val_ll(delim); - numbers_list_field_width_val_l(delim); - numbers_list_field_width_val_d(delim); - numbers_list_field_width_val_h(delim); - numbers_list_field_width_val_hh(delim); + numbers_list_field_width_val_ll(test, delim); + numbers_list_field_width_val_l(test, delim); + numbers_list_field_width_val_d(test, delim); + numbers_list_field_width_val_h(test, delim); + numbers_list_field_width_val_hh(test, delim); } /* @@ -598,67 +573,67 @@ static void __init numbers_list_field_width_val_width(const char *delim) * of digits. For example the hex values c0,3,bf01,303 would have a * string representation of "c03bf01303" and extracted with "%2x%1x%4x%3x". */ -static void __init numbers_slice(void) +static void numbers_slice(struct kunit *test) { - numbers_list_field_width_val_width(""); + numbers_list_field_width_val_width(test, ""); } -#define test_number_prefix(T, str, scan_fmt, expect0, expect1, n_args, fn) \ +#define test_number_prefix(test, T, str, scan_fmt, expect0, expect1, n_args, fn)\ do { \ const T expect[2] = { expect0, expect1 }; \ T result[2] = { (T)~expect[0], (T)~expect[1] }; \ \ - _test(fn, &expect, str, scan_fmt, n_args, &result[0], &result[1]); \ + _test(test, fn, &expect, str, scan_fmt, n_args, &result[0], &result[1]);\ } while (0) /* * Number prefix is >= field width. * Expected behaviour is derived from testing userland sscanf. */ -static void __init numbers_prefix_overflow(void) +static void numbers_prefix_overflow(struct kunit *test) { /* * Negative decimal with a field of width 1, should quit scanning * and return 0. */ - test_number_prefix(long long, "-1 1", "%1lld %lld", 0, 0, 0, check_ll); - test_number_prefix(long, "-1 1", "%1ld %ld", 0, 0, 0, check_long); - test_number_prefix(int, "-1 1", "%1d %d", 0, 0, 0, check_int); - test_number_prefix(short, "-1 1", "%1hd %hd", 0, 0, 0, check_short); - test_number_prefix(signed char, "-1 1", "%1hhd %hhd", 0, 0, 0, check_char); - - test_number_prefix(long long, "-1 1", "%1lli %lli", 0, 0, 0, check_ll); - test_number_prefix(long, "-1 1", "%1li %li", 0, 0, 0, check_long); - test_number_prefix(int, "-1 1", "%1i %i", 0, 0, 0, check_int); - test_number_prefix(short, "-1 1", "%1hi %hi", 0, 0, 0, check_short); - test_number_prefix(signed char, "-1 1", "%1hhi %hhi", 0, 0, 0, check_char); + test_number_prefix(test, long long, "-1 1", "%1lld %lld", 0, 0, 0, check_ll); + test_number_prefix(test, long, "-1 1", "%1ld %ld", 0, 0, 0, check_long); + test_number_prefix(test, int, "-1 1", "%1d %d", 0, 0, 0, check_int); + test_number_prefix(test, short, "-1 1", "%1hd %hd", 0, 0, 0, check_short); + test_number_prefix(test, signed char, "-1 1", "%1hhd %hhd", 0, 0, 0, check_char); + + test_number_prefix(test, long long, "-1 1", "%1lli %lli", 0, 0, 0, check_ll); + test_number_prefix(test, long, "-1 1", "%1li %li", 0, 0, 0, check_long); + test_number_prefix(test, int, "-1 1", "%1i %i", 0, 0, 0, check_int); + test_number_prefix(test, short, "-1 1", "%1hi %hi", 0, 0, 0, check_short); + test_number_prefix(test, signed char, "-1 1", "%1hhi %hhi", 0, 0, 0, check_char); /* * 0x prefix in a field of width 1: 0 is a valid digit so should * convert. Next field scan starts at the 'x' which isn't a digit so * scan quits with one field converted. */ - test_number_prefix(unsigned long long, "0xA7", "%1llx%llx", 0, 0, 1, check_ull); - test_number_prefix(unsigned long, "0xA7", "%1lx%lx", 0, 0, 1, check_ulong); - test_number_prefix(unsigned int, "0xA7", "%1x%x", 0, 0, 1, check_uint); - test_number_prefix(unsigned short, "0xA7", "%1hx%hx", 0, 0, 1, check_ushort); - test_number_prefix(unsigned char, "0xA7", "%1hhx%hhx", 0, 0, 1, check_uchar); - test_number_prefix(long long, "0xA7", "%1lli%llx", 0, 0, 1, check_ll); - test_number_prefix(long, "0xA7", "%1li%lx", 0, 0, 1, check_long); - test_number_prefix(int, "0xA7", "%1i%x", 0, 0, 1, check_int); - test_number_prefix(short, "0xA7", "%1hi%hx", 0, 0, 1, check_short); - test_number_prefix(char, "0xA7", "%1hhi%hhx", 0, 0, 1, check_char); + test_number_prefix(test, unsigned long long, "0xA7", "%1llx%llx", 0, 0, 1, check_ull); + test_number_prefix(test, unsigned long, "0xA7", "%1lx%lx", 0, 0, 1, check_ulong); + test_number_prefix(test, unsigned int, "0xA7", "%1x%x", 0, 0, 1, check_uint); + test_number_prefix(test, unsigned short, "0xA7", "%1hx%hx", 0, 0, 1, check_ushort); + test_number_prefix(test, unsigned char, "0xA7", "%1hhx%hhx", 0, 0, 1, check_uchar); + test_number_prefix(test, long long, "0xA7", "%1lli%llx", 0, 0, 1, check_ll); + test_number_prefix(test, long, "0xA7", "%1li%lx", 0, 0, 1, check_long); + test_number_prefix(test, int, "0xA7", "%1i%x", 0, 0, 1, check_int); + test_number_prefix(test, short, "0xA7", "%1hi%hx", 0, 0, 1, check_short); + test_number_prefix(test, char, "0xA7", "%1hhi%hhx", 0, 0, 1, check_char); /* * 0x prefix in a field of width 2 using %x conversion: first field * converts to 0. Next field scan starts at the character after "0x". * Both fields will convert. */ - test_number_prefix(unsigned long long, "0xA7", "%2llx%llx", 0, 0xa7, 2, check_ull); - test_number_prefix(unsigned long, "0xA7", "%2lx%lx", 0, 0xa7, 2, check_ulong); - test_number_prefix(unsigned int, "0xA7", "%2x%x", 0, 0xa7, 2, check_uint); - test_number_prefix(unsigned short, "0xA7", "%2hx%hx", 0, 0xa7, 2, check_ushort); - test_number_prefix(unsigned char, "0xA7", "%2hhx%hhx", 0, 0xa7, 2, check_uchar); + test_number_prefix(test, unsigned long long, "0xA7", "%2llx%llx", 0, 0xa7, 2, check_ull); + test_number_prefix(test, unsigned long, "0xA7", "%2lx%lx", 0, 0xa7, 2, check_ulong); + test_number_prefix(test, unsigned int, "0xA7", "%2x%x", 0, 0xa7, 2, check_uint); + test_number_prefix(test, unsigned short, "0xA7", "%2hx%hx", 0, 0xa7, 2, check_ushort); + test_number_prefix(test, unsigned char, "0xA7", "%2hhx%hhx", 0, 0xa7, 2, check_uchar); /* * 0x prefix in a field of width 2 using %i conversion: first field @@ -666,124 +641,112 @@ static void __init numbers_prefix_overflow(void) * which will convert if can be interpreted as decimal but will fail * if it contains any hex digits (since no 0x prefix). */ - test_number_prefix(long long, "0x67", "%2lli%lli", 0, 67, 2, check_ll); - test_number_prefix(long, "0x67", "%2li%li", 0, 67, 2, check_long); - test_number_prefix(int, "0x67", "%2i%i", 0, 67, 2, check_int); - test_number_prefix(short, "0x67", "%2hi%hi", 0, 67, 2, check_short); - test_number_prefix(char, "0x67", "%2hhi%hhi", 0, 67, 2, check_char); - - test_number_prefix(long long, "0xA7", "%2lli%lli", 0, 0, 1, check_ll); - test_number_prefix(long, "0xA7", "%2li%li", 0, 0, 1, check_long); - test_number_prefix(int, "0xA7", "%2i%i", 0, 0, 1, check_int); - test_number_prefix(short, "0xA7", "%2hi%hi", 0, 0, 1, check_short); - test_number_prefix(char, "0xA7", "%2hhi%hhi", 0, 0, 1, check_char); -} - -#define _test_simple_strtoxx(T, fn, gen_fmt, expect, base) \ -do { \ - T got; \ - char *endp; \ - int len; \ - bool fail = false; \ - \ - total_tests++; \ - len = snprintf(test_buffer, BUF_SIZE, gen_fmt, expect); \ - got = (fn)(test_buffer, &endp, base); \ - pr_debug(#fn "(\"%s\", %d) -> " gen_fmt "\n", test_buffer, base, got); \ - if (got != (expect)) { \ - fail = true; \ - pr_warn(#fn "(\"%s\", %d): got " gen_fmt " expected " gen_fmt "\n", \ - test_buffer, base, got, expect); \ - } else if (endp != test_buffer + len) { \ - fail = true; \ - pr_warn(#fn "(\"%s\", %d) startp=0x%px got endp=0x%px expected 0x%px\n", \ - test_buffer, base, test_buffer, \ - test_buffer + len, endp); \ - } \ - \ - if (fail) \ - failed_tests++; \ + test_number_prefix(test, long long, "0x67", "%2lli%lli", 0, 67, 2, check_ll); + test_number_prefix(test, long, "0x67", "%2li%li", 0, 67, 2, check_long); + test_number_prefix(test, int, "0x67", "%2i%i", 0, 67, 2, check_int); + test_number_prefix(test, short, "0x67", "%2hi%hi", 0, 67, 2, check_short); + test_number_prefix(test, char, "0x67", "%2hhi%hhi", 0, 67, 2, check_char); + + test_number_prefix(test, long long, "0xA7", "%2lli%lli", 0, 0, 1, check_ll); + test_number_prefix(test, long, "0xA7", "%2li%li", 0, 0, 1, check_long); + test_number_prefix(test, int, "0xA7", "%2i%i", 0, 0, 1, check_int); + test_number_prefix(test, short, "0xA7", "%2hi%hi", 0, 0, 1, check_short); + test_number_prefix(test, char, "0xA7", "%2hhi%hhi", 0, 0, 1, check_char); +} + +#define _test_simple_strtoxx(test, T, fn, gen_fmt, expect, base) \ +do { \ + T got; \ + char *endp; \ + int len; \ + \ + len = snprintf(test_buffer, BUF_SIZE, gen_fmt, expect); \ + got = (fn)(test_buffer, &endp, base); \ + pr_debug(#fn "(\"%s\", %d) -> " gen_fmt "\n", test_buffer, base, got); \ + KUNIT_EXPECT_EQ_MSG(test, got, expect, #fn "(\"%s\", %d)", test_buffer, base); \ + KUNIT_EXPECT_PTR_EQ_MSG(test, endp, test_buffer + len, \ + #fn "(\"%s\", %d)", test_buffer, base); \ } while (0) -#define test_simple_strtoxx(T, fn, gen_fmt, base) \ +#define test_simple_strtoxx(test, T, fn, gen_fmt, base) \ do { \ int i; \ \ for (i = 0; i < ARRAY_SIZE(numbers); i++) { \ - _test_simple_strtoxx(T, fn, gen_fmt, (T)numbers[i], base); \ + _test_simple_strtoxx(test, T, fn, gen_fmt, (T)numbers[i], base);\ \ if (is_signed_type(T)) \ - _test_simple_strtoxx(T, fn, gen_fmt, \ + _test_simple_strtoxx(test, T, fn, gen_fmt, \ -(T)numbers[i], base); \ } \ } while (0) -static void __init test_simple_strtoull(void) +static void test_simple_strtoull(struct kunit *test) { - test_simple_strtoxx(unsigned long long, simple_strtoull, "%llu", 10); - test_simple_strtoxx(unsigned long long, simple_strtoull, "%llu", 0); - test_simple_strtoxx(unsigned long long, simple_strtoull, "%llx", 16); - test_simple_strtoxx(unsigned long long, simple_strtoull, "0x%llx", 16); - test_simple_strtoxx(unsigned long long, simple_strtoull, "0x%llx", 0); + test_simple_strtoxx(test, unsigned long long, simple_strtoull, "%llu", 10); + test_simple_strtoxx(test, unsigned long long, simple_strtoull, "%llu", 0); + test_simple_strtoxx(test, unsigned long long, simple_strtoull, "%llx", 16); + test_simple_strtoxx(test, unsigned long long, simple_strtoull, "0x%llx", 16); + test_simple_strtoxx(test, unsigned long long, simple_strtoull, "0x%llx", 0); } -static void __init test_simple_strtoll(void) +static void test_simple_strtoll(struct kunit *test) { - test_simple_strtoxx(long long, simple_strtoll, "%lld", 10); - test_simple_strtoxx(long long, simple_strtoll, "%lld", 0); - test_simple_strtoxx(long long, simple_strtoll, "%llx", 16); - test_simple_strtoxx(long long, simple_strtoll, "0x%llx", 16); - test_simple_strtoxx(long long, simple_strtoll, "0x%llx", 0); + test_simple_strtoxx(test, long long, simple_strtoll, "%lld", 10); + test_simple_strtoxx(test, long long, simple_strtoll, "%lld", 0); + test_simple_strtoxx(test, long long, simple_strtoll, "%llx", 16); + test_simple_strtoxx(test, long long, simple_strtoll, "0x%llx", 16); + test_simple_strtoxx(test, long long, simple_strtoll, "0x%llx", 0); } -static void __init test_simple_strtoul(void) +static void test_simple_strtoul(struct kunit *test) { - test_simple_strtoxx(unsigned long, simple_strtoul, "%lu", 10); - test_simple_strtoxx(unsigned long, simple_strtoul, "%lu", 0); - test_simple_strtoxx(unsigned long, simple_strtoul, "%lx", 16); - test_simple_strtoxx(unsigned long, simple_strtoul, "0x%lx", 16); - test_simple_strtoxx(unsigned long, simple_strtoul, "0x%lx", 0); + test_simple_strtoxx(test, unsigned long, simple_strtoul, "%lu", 10); + test_simple_strtoxx(test, unsigned long, simple_strtoul, "%lu", 0); + test_simple_strtoxx(test, unsigned long, simple_strtoul, "%lx", 16); + test_simple_strtoxx(test, unsigned long, simple_strtoul, "0x%lx", 16); + test_simple_strtoxx(test, unsigned long, simple_strtoul, "0x%lx", 0); } -static void __init test_simple_strtol(void) +static void test_simple_strtol(struct kunit *test) { - test_simple_strtoxx(long, simple_strtol, "%ld", 10); - test_simple_strtoxx(long, simple_strtol, "%ld", 0); - test_simple_strtoxx(long, simple_strtol, "%lx", 16); - test_simple_strtoxx(long, simple_strtol, "0x%lx", 16); - test_simple_strtoxx(long, simple_strtol, "0x%lx", 0); + test_simple_strtoxx(test, long, simple_strtol, "%ld", 10); + test_simple_strtoxx(test, long, simple_strtol, "%ld", 0); + test_simple_strtoxx(test, long, simple_strtol, "%lx", 16); + test_simple_strtoxx(test, long, simple_strtol, "0x%lx", 16); + test_simple_strtoxx(test, long, simple_strtol, "0x%lx", 0); } /* Selection of common delimiters/separators between numbers in a string. */ -static const char * const number_delimiters[] __initconst = { +static const char * const number_delimiters[] = { " ", ":", ",", "-", "/", }; -static void __init test_numbers(void) +static void test_numbers(struct kunit *test) { int i; /* String containing only one number. */ - numbers_simple(); + numbers_simple(test); /* String with multiple numbers separated by delimiter. */ for (i = 0; i < ARRAY_SIZE(number_delimiters); i++) { - numbers_list(number_delimiters[i]); + numbers_list(test, number_delimiters[i]); /* Field width may be longer than actual field digits. */ - numbers_list_field_width_typemax(number_delimiters[i]); + numbers_list_field_width_typemax(test, number_delimiters[i]); /* Each field width exactly length of actual field digits. */ - numbers_list_field_width_val_width(number_delimiters[i]); + numbers_list_field_width_val_width(test, number_delimiters[i]); } /* Slice continuous sequence of digits using field widths. */ - numbers_slice(); + numbers_slice(test); - numbers_prefix_overflow(); + numbers_prefix_overflow(test); } -static void __init selftest(void) +static void scanf_test(struct kunit *test) { test_buffer = kmalloc(BUF_SIZE, GFP_KERNEL); if (!test_buffer) @@ -797,18 +760,29 @@ static void __init selftest(void) prandom_seed_state(&rnd_state, 3141592653589793238ULL); - test_numbers(); + test_numbers(test); - test_simple_strtoull(); - test_simple_strtoll(); - test_simple_strtoul(); - test_simple_strtol(); + test_simple_strtoull(test); + test_simple_strtoll(test); + test_simple_strtoul(test); + test_simple_strtol(test); kfree(fmt_buffer); kfree(test_buffer); } -KSTM_MODULE_LOADERS(test_scanf); +static struct kunit_case scanf_test_cases[] = { + KUNIT_CASE(scanf_test), + {} +}; + +static struct kunit_suite scanf_test_suite = { + .name = "scanf", + .test_cases = scanf_test_cases, +}; + +kunit_test_suite(scanf_test_suite); + MODULE_AUTHOR("Richard Fitzgerald <rf(a)opensource.cirrus.com>"); MODULE_DESCRIPTION("Test cases for sscanf facility"); MODULE_LICENSE("GPL v2"); diff --git a/tools/testing/selftests/lib/Makefile b/tools/testing/selftests/lib/Makefile index c52fe3ad8e98..4afda556151f 100644 --- a/tools/testing/selftests/lib/Makefile +++ b/tools/testing/selftests/lib/Makefile @@ -4,5 +4,5 @@ # No binaries, but make sure arg-less "make" doesn't trigger "run_tests" all: -TEST_PROGS := printf.sh bitmap.sh prime_numbers.sh scanf.sh +TEST_PROGS := printf.sh bitmap.sh prime_numbers.sh include ../lib.mk diff --git a/tools/testing/selftests/lib/config b/tools/testing/selftests/lib/config index dc15aba8d0a3..80b55a504868 100644 --- a/tools/testing/selftests/lib/config +++ b/tools/testing/selftests/lib/config @@ -1,5 +1,4 @@ CONFIG_TEST_PRINTF=m -CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m CONFIG_PRIME_NUMBERS=m CONFIG_TEST_BITOPS=m diff --git a/tools/testing/selftests/lib/scanf.sh b/tools/testing/selftests/lib/scanf.sh deleted file mode 100755 index b59b8ba561c3..000000000000 --- a/tools/testing/selftests/lib/scanf.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 -# Tests the scanf infrastructure using test_scanf kernel module. -$(dirname $0)/../kselftest/module.sh "scanf" test_scanf --- base-commit: 18fe18c99c8d90d77c7ed6b42f48fa5b4e5c99c3 change-id: 20250131-scanf-kunit-convert-f70dc33bb34c Best regards, -- Tamir Duberstein <tamird(a)gmail.com>

8 months, 3 weeks

2
5
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror February 2025