- Linux-kselftest-mirror - lists.linaro.org

Re: [PATCH v2 16/17] drm/vc4: tests: Fail the current test if we access a register

by Javier Martinez Canillas

On 11/28/22 15:53, Maxime Ripard wrote: > Accessing a register when running under kunit is a bad idea since our > device is completely mocked. > > Fail the current test if we ever access any of our hardware registers. > > Signed-off-by: Maxime Ripard <maxime(a)cerno.tech> > --- [...] > -#define CRTC_WRITE(offset, val) writel(val, vc4_crtc->regs + (offset)) > -#define CRTC_READ(offset) readl(vc4_crtc->regs + (offset)) > +#define CRTC_WRITE(offset, val) \ > + do { \ > + kunit_fail_current_test("Accessing a register in a unit test!\n"); \ > + writel(val, vc4_crtc->regs + (offset)); \ > + } while (0) > + > +#define CRTC_READ(offset) \ > + ({ \ > + kunit_fail_current_test("Accessing a register in a unit test!\n"); \ > + readl(vc4_crtc->regs + (offset)); \ > + }) > Should this be made conditional on whether DRM_VC4_KUNIT_TEST is enabled ? That is, just define the simpler macros when is disabled? The kunit_fail_current_test() is just a no-op if CONFIG_KUNIT isn't enabled, but I think my question still stands. Reviewed-by: Javier Martinez Canillas <javierm(a)redhat.com> -- Best regards, Javier Martinez Canillas Core Platforms Red Hat

3 years

1
0
0 0

Re: [PATCH v2 09/17] drm/tests: helpers: Allow to pass a custom drm_driver

by Javier Martinez Canillas

On 11/28/22 15:53, Maxime Ripard wrote: > Some tests will need to provide their own drm_driver instead of relying > on the dumb one in the helpers, so let's create a helper that allows to > do so. > > Signed-off-by: Maxime Ripard <maxime(a)cerno.tech> > --- Reviewed-by: Javier Martinez Canillas <javierm(a)redhat.com> -- Best regards, Javier Martinez Canillas Core Platforms Red Hat

3 years

1
0
0 0

[PATCH] selftests/powerpc: Remove repeated word in comments

by Shaomin Deng

Remove the repeated word "not" in comments. Signed-off-by: Shaomin Deng <dengshaomin(a)cdjrlc.com> --- tools/testing/selftests/powerpc/include/pkeys.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/powerpc/include/pkeys.h b/tools/testing/selftests/powerpc/include/pkeys.h index 3312cb1b058d..51729d9a7111 100644 --- a/tools/testing/selftests/powerpc/include/pkeys.h +++ b/tools/testing/selftests/powerpc/include/pkeys.h @@ -24,7 +24,7 @@ #undef PKEY_DISABLE_EXECUTE #define PKEY_DISABLE_EXECUTE 0x4 -/* Older versions of libc do not not define this */ +/* Older versions of libc do not define this */ #ifndef SEGV_PKUERR #define SEGV_PKUERR 4 #endif -- 2.35.1

3 years

2
1
0 0

[PATCH] selftests/powerpc: Fix spelling mistake "mmaping" -> "mmapping"

by Colin Ian King

There is a spelling mistake in a perror message. Fix it. Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- tools/testing/selftests/powerpc/ptrace/core-pkey.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/powerpc/ptrace/core-pkey.c b/tools/testing/selftests/powerpc/ptrace/core-pkey.c index bbc05ffc5860..1a70a96f0bfe 100644 --- a/tools/testing/selftests/powerpc/ptrace/core-pkey.c +++ b/tools/testing/selftests/powerpc/ptrace/core-pkey.c @@ -329,7 +329,7 @@ static int parent(struct shared_info *info, pid_t pid) core = mmap(NULL, core_size, PROT_READ, MAP_PRIVATE, fd, 0); if (core == (void *) -1) { - perror("Error mmaping core file"); + perror("Error mmapping core file"); ret = TEST_FAIL; goto out; } -- 2.37.3

3 years

2
1
0 0

Re: [PATCH v2 08/17] drm/tests: helpers: Allow for a custom device struct to be allocated

by Javier Martinez Canillas

On 11/28/22 15:53, Maxime Ripard wrote: > The current helper to allocate a DRM device doesn't allow for any > subclassing by drivers, which is going to be troublesome as we work on > getting some kunit testing on atomic modesetting code. > > Let's use a similar pattern to the other allocation helpers by providing > the structure size and offset as arguments. > > Signed-off-by: Maxime Ripard <maxime(a)cerno.tech> > --- [...] > -EXPORT_SYMBOL(drm_kunit_helper_alloc_drm_device); > +EXPORT_SYMBOL(__drm_kunit_helper_alloc_drm_device); > I'm not sure if I would add a __ prefix to exported symbols, but I see that this is a convention in the DRM subsystem so I'm OK with it. Another thing that came to mind is if we want to use EXPORT_SYMBOL_GPL() instead for the DRM KUnit helpers. But that's not related to this series. Reviewed-by: Javier Martinez Canillas <javierm(a)redhat.com> -- Best regards, Javier Martinez Canillas Core Platforms Red Hat

3 years

1
0
0 0

[PATCH net-next 0/8] mptcp: MSG_FASTOPEN and TFO listener side support

by Matthieu Baerts

Before this series, only the initiator of a connection was able to combine both TCP FastOpen and MPTCP when using TCP_FASTOPEN_CONNECT socket option. These new patches here add (in theory) the full support of TFO with MPTCP, which means: - MSG_FASTOPEN sendmsg flag support (patch 1/8) - TFO support for the listener side (patches 2-5/8) - TCP_FASTOPEN socket option (patch 6/8) - TCP_FASTOPEN_KEY socket option (patch 7/8) To support TFO for the server side, a few preparation patches are needed (patches 2 to 5/8). Some of them were inspired by a previous work from Benjamin Hesmans. Note that TFO support with MPTCP has been validated with selftests (patch 8/8) but also with Packetdrill tests running with a modified but still very WIP version supporting MPTCP. Both the modified tool and the tests are available online: https://github.com/multipath-tcp/packetdrill/ Dmytro Shytyi (5): mptcp: add MSG_FASTOPEN sendmsg flag support mptcp: implement delayed seq generation for passive fastopen mptcp: add subflow_v(4,6)_send_synack() mptcp: add TCP_FASTOPEN sock option selftests: mptcp: mptfo Initiator/Listener Matthieu Baerts (1): mptcp: add support for TCP_FASTOPEN_KEY sockopt Paolo Abeni (2): mptcp: track accurately the incoming MPC suboption type mptcp: consolidate initial ack seq generation net/mptcp/Makefile | 2 +- net/mptcp/fastopen.c | 73 ++++++++ net/mptcp/options.c | 25 ++- net/mptcp/protocol.c | 39 +--- net/mptcp/protocol.h | 28 ++- net/mptcp/sockopt.c | 9 +- net/mptcp/subflow.c | 105 ++++++++--- .../selftests/net/mptcp/mptcp_connect.c | 171 +++++++++++++----- .../selftests/net/mptcp/mptcp_connect.sh | 21 +++ 9 files changed, 358 insertions(+), 115 deletions(-) create mode 100644 net/mptcp/fastopen.c Cc: Benjamin Hesmans <benjamin.hesmans(a)tessares.net> base-commit: a6e3d86ece0b42a571a11055ace5c3148cb7ce76 -- 2.37.2

3 years

2
2
0 0

[PATCH -next] selftests/landlock: Fix selftest ptrace_test run fail

by limin

Tests PTRACE_ATTACH and PTRACE_MODE_READ on the parent, trace parent return -1 when child== 0 How to reproduce warning: $ make -C tools/testing/selftests TARGETS=landlock run_tests Signed-off-by: limin <limin100(a)huawei.com> --- tools/testing/selftests/landlock/ptrace_test.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/landlock/ptrace_test.c b/tools/testing/selftests/landlock/ptrace_test.c index c28ef98ff3ac..88c4dc63eea0 100644 --- a/tools/testing/selftests/landlock/ptrace_test.c +++ b/tools/testing/selftests/landlock/ptrace_test.c @@ -267,12 +267,11 @@ TEST_F(hierarchy, trace) /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the parent. */ err_proc_read = test_ptrace_read(parent); ret = ptrace(PTRACE_ATTACH, parent, NULL, 0); + EXPECT_EQ(-1, ret); + EXPECT_EQ(EPERM, errno); if (variant->domain_child) { - EXPECT_EQ(-1, ret); - EXPECT_EQ(EPERM, errno); EXPECT_EQ(EACCES, err_proc_read); } else { - EXPECT_EQ(0, ret); EXPECT_EQ(0, err_proc_read); } if (ret == 0) { -- 2.33.0

3 years

2
5
0 0

[PATCH v2 0/6] selftests: Use "grep -E" instead of "egrep"

by Tiezhu Yang

v2: split into separate 6 patches suggested by Shuah Tiezhu Yang (6): selftests: rcutorture: Use "grep -E" instead of "egrep" selftests: ftrace: Use "grep -E" instead of "egrep" selftests: powerpc: Use "grep -E" instead of "egrep" selftests: gpio: Use "grep -E" instead of "egrep" selftests: net: Use "grep -E" instead of "egrep" selftests: kselftest_deps: Use "grep -E" instead of "egrep" .../selftests/ftrace/test.d/preemptirq/irqsoff_tracer.tc | 8 ++++---- tools/testing/selftests/gpio/gpio-sim.sh | 2 +- tools/testing/selftests/kselftest_deps.sh | 2 +- tools/testing/selftests/net/toeplitz.sh | 2 +- tools/testing/selftests/powerpc/scripts/hmi.sh | 2 +- tools/testing/selftests/rcutorture/bin/console-badness.sh | 2 +- tools/testing/selftests/rcutorture/bin/kvm-build.sh | 4 ++-- tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh | 4 ++-- tools/testing/selftests/rcutorture/bin/kvm.sh | 4 ++-- tools/testing/selftests/rcutorture/bin/parse-console.sh | 10 +++++----- 10 files changed, 20 insertions(+), 20 deletions(-) -- 2.1.0

3 years

3
13
0 0

[PATCH] kunit: tool: don't include KTAP headers and the like in the test log

by Daniel Latypov

We print the "test log" on failure. This is meant to be all the kernel output that happened during the test. But we also include the special KTAP lines in it, which are often redundant. E.g. we include the "not ok" line in the log, right before we print that the test case failed... [13:51:48] Expected 2 + 1 == 2, but [13:51:48] 2 + 1 == 3 (0x3) [13:51:48] not ok 1 example_simple_test [13:51:48] [FAILED] example_simple_test More full example after this patch: [13:51:48] =================== example (4 subtests) =================== [13:51:48] # example_simple_test: initializing [13:51:48] # example_simple_test: EXPECTATION FAILED at lib/kunit/kunit-example-test.c:29 [13:51:48] Expected 2 + 1 == 2, but [13:51:48] 2 + 1 == 3 (0x3) [13:51:48] [FAILED] example_simple_test Signed-off-by: Daniel Latypov <dlatypov(a)google.com> --- tools/testing/kunit/kunit_parser.py | 8 ++++---- tools/testing/kunit/kunit_tool_test.py | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py index 4cc2f8b7ecd0..99b8f058db40 100644 --- a/tools/testing/kunit/kunit_parser.py +++ b/tools/testing/kunit/kunit_parser.py @@ -295,7 +295,7 @@ def parse_ktap_header(lines: LineStream, test: Test) -> bool: check_version(version_num, TAP_VERSIONS, 'TAP', test) else: return False - test.log.append(lines.pop()) + lines.pop() return True TEST_HEADER = re.compile(r'^# Subtest: (.*)$') @@ -318,8 +318,8 @@ def parse_test_header(lines: LineStream, test: Test) -> bool: match = TEST_HEADER.match(lines.peek()) if not match: return False - test.log.append(lines.pop()) test.name = match.group(1) + lines.pop() return True TEST_PLAN = re.compile(r'1\.\.([0-9]+)') @@ -345,9 +345,9 @@ def parse_test_plan(lines: LineStream, test: Test) -> bool: if not match: test.expected_count = None return False - test.log.append(lines.pop()) expected_count = int(match.group(1)) test.expected_count = expected_count + lines.pop() return True TEST_RESULT = re.compile(r'^(ok|not ok) ([0-9]+) (- )?([^#]*)( # .*)?$') @@ -409,7 +409,7 @@ def parse_test_result(lines: LineStream, test: Test, # Check if line matches test result line format if not match: return False - test.log.append(lines.pop()) + lines.pop() # Set name of test object if skip_match: diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/kunit_tool_test.py index d7f669cbf2a8..1ef921ac4331 100755 --- a/tools/testing/kunit/kunit_tool_test.py +++ b/tools/testing/kunit/kunit_tool_test.py @@ -84,6 +84,10 @@ class KUnitParserTest(unittest.TestCase): self.print_mock = mock.patch('kunit_printer.Printer.print').start() self.addCleanup(mock.patch.stopall) + def noPrintCallContains(self, substr: str): + for call in self.print_mock.mock_calls: + self.assertNotIn(substr, call.args[0]) + def assertContains(self, needle: str, haystack: kunit_parser.LineStream): # Clone the iterator so we can print the contents on failure. copy, backup = itertools.tee(haystack) @@ -327,6 +331,19 @@ class KUnitParserTest(unittest.TestCase): result = kunit_parser.parse_run_tests(file.readlines()) self.print_mock.assert_any_call(StrContains('suite (1 subtest)')) + def test_show_test_output_on_failure(self): + output = """ + KTAP version 1 + 1..1 + Test output. + not ok 1 test1 + """ + result = kunit_parser.parse_run_tests(output.splitlines()) + self.assertEqual(kunit_parser.TestStatus.FAILURE, result.status) + + self.print_mock.assert_any_call(StrContains('Test output.')) + self.noPrintCallContains('not ok 1 test1') + def line_stream_from_strs(strs: Iterable[str]) -> kunit_parser.LineStream: return kunit_parser.LineStream(enumerate(strs, start=1)) base-commit: 11300092f6f4dc4103ac4bd950d62f94effc736a -- 2.38.1.584.g0f3c55d4c2-goog

3 years

3
3
0 0

[PATCH 3/3] selftests: Make a warning if getcpu is missing on 32bit.

by Sebastian Andrzej Siewior

The vsyscall for getcpu has been wired up on 32bit so it can be warned now if missing. Cc: Shuah Khan <shuah(a)kernel.org> Cc: linux-kselftest(a)vger.kernel.org Signed-off-by: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> --- tools/testing/selftests/x86/test_vsyscall.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/x86/test_vsyscall.c b/tools/testing/selftests/x86/test_vsyscall.c index 5b45e6986aeab..47cab972807c4 100644 --- a/tools/testing/selftests/x86/test_vsyscall.c +++ b/tools/testing/selftests/x86/test_vsyscall.c @@ -92,11 +92,8 @@ static void init_vdso(void) printf("[WARN]\tfailed to find time in vDSO\n"); vdso_getcpu = (getcpu_t)dlsym(vdso, "__vdso_getcpu"); - if (!vdso_getcpu) { - /* getcpu() was never wired up in the 32-bit vDSO. */ - printf("[%s]\tfailed to find getcpu in vDSO\n", - sizeof(long) == 8 ? "WARN" : "NOTE"); - } + if (!vdso_getcpu) + printf("[WARN]\tfailed to find getcpu in vDSO\n"); } static int init_vsys(void) -- 2.38.1

3 years

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror