Message ID | 20240801232317.545577-1-kuba@kernel.org (mailing list archive) |
---|---|
State | Accepted |
Commit | 46619175f1b7e4f7fc5dc98547f5eca27193f8dc |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next,v3] selftests: net: ksft: print more of the stack for checks | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Thu, 1 Aug 2024 16:23:17 -0700 you wrote: > Print more stack frames and the failing line when check fails. > This helps when tests use helpers to do the checks. > > Before: > > # At ./ksft/drivers/net/hw/rss_ctx.py line 92: > # Check failed 1037698 >= 396893.0 traffic on other queues:[344612, 462380, 233020, 449174, 342298] > not ok 8 rss_ctx.test_rss_context_queue_reconfigure > > [...] Here is the summary with links: - [net-next,v3] selftests: net: ksft: print more of the stack for checks https://git.kernel.org/netdev/net-next/c/46619175f1b7 You are awesome, thank you!
Jakub Kicinski <kuba@kernel.org> writes: > Print more stack frames and the failing line when check fails. > This helps when tests use helpers to do the checks. > > Before: > > # At ./ksft/drivers/net/hw/rss_ctx.py line 92: > # Check failed 1037698 >= 396893.0 traffic on other queues:[344612, 462380, 233020, 449174, 342298] > not ok 8 rss_ctx.test_rss_context_queue_reconfigure > > After: > > # Check| At ./ksft/drivers/net/hw/rss_ctx.py, line 387, in test_rss_context_queue_reconfigure: > # Check| test_rss_queue_reconfigure(cfg, main_ctx=False) > # Check| At ./ksft/drivers/net/hw/rss_ctx.py, line 230, in test_rss_queue_reconfigure: > # Check| _send_traffic_check(cfg, port, ctx_ref, { 'target': (0, 3), > # Check| At ./ksft/drivers/net/hw/rss_ctx.py, line 92, in _send_traffic_check: > # Check| ksft_lt(sum(cnts[i] for i in params['noise']), directed / 2, > # Check failed 1045235 >= 405823.5 traffic on other queues (context 1)':[460068, 351995, 565970, 351579, 127270] > not ok 8 rss_ctx.test_rss_context_queue_reconfigure > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: Petr Machata <petrm@nvidia.com>
diff --git a/tools/testing/selftests/net/lib/py/ksft.py b/tools/testing/selftests/net/lib/py/ksft.py index f26c20df9db4..ed20508e1d71 100644 --- a/tools/testing/selftests/net/lib/py/ksft.py +++ b/tools/testing/selftests/net/lib/py/ksft.py @@ -32,8 +32,18 @@ KSFT_RESULT_ALL = True global KSFT_RESULT KSFT_RESULT = False - frame = inspect.stack()[2] - ksft_pr("At " + frame.filename + " line " + str(frame.lineno) + ":") + stack = inspect.stack() + started = False + for frame in reversed(stack[2:]): + # Start printing from the test case function + if not started: + if frame.function == 'ksft_run': + started = True + continue + + ksft_pr("Check| At " + frame.filename + ", line " + str(frame.lineno) + + ", in " + frame.function + ":") + ksft_pr("Check| " + frame.code_context[0].strip()) ksft_pr(*args)
Print more stack frames and the failing line when check fails. This helps when tests use helpers to do the checks. Before: # At ./ksft/drivers/net/hw/rss_ctx.py line 92: # Check failed 1037698 >= 396893.0 traffic on other queues:[344612, 462380, 233020, 449174, 342298] not ok 8 rss_ctx.test_rss_context_queue_reconfigure After: # Check| At ./ksft/drivers/net/hw/rss_ctx.py, line 387, in test_rss_context_queue_reconfigure: # Check| test_rss_queue_reconfigure(cfg, main_ctx=False) # Check| At ./ksft/drivers/net/hw/rss_ctx.py, line 230, in test_rss_queue_reconfigure: # Check| _send_traffic_check(cfg, port, ctx_ref, { 'target': (0, 3), # Check| At ./ksft/drivers/net/hw/rss_ctx.py, line 92, in _send_traffic_check: # Check| ksft_lt(sum(cnts[i] for i in params['noise']), directed / 2, # Check failed 1045235 >= 405823.5 traffic on other queues (context 1)':[460068, 351995, 565970, 351579, 127270] not ok 8 rss_ctx.test_rss_context_queue_reconfigure Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- v3: - don't bitwise bools (Petr) - add a comment while at it v2: https://lore.kernel.org/20240731013344.4102038-1-kuba@kernel.org - use Stan's iteration suggestion v1: https://lore.kernel.org/20240729204536.3637577-1-kuba@kernel.org CC: shuah@kernel.org CC: petrm@nvidia.com --- tools/testing/selftests/net/lib/py/ksft.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)