Merge ~cypressyew/+git/autotest-client-tests:phlin/riscv-skip-ftrace-multiple_kprobes into ~canonical-kernel-team/+git/autotest-client-tests:master

Proposed by Po-Hsu Lin
Status: Merged
Merge reported by: Po-Hsu Lin
Merged at revision: 636af5127f52d39af126953b6ef95b48f46e0b7e
Proposed branch: ~cypressyew/+git/autotest-client-tests:phlin/riscv-skip-ftrace-multiple_kprobes
Merge into: ~canonical-kernel-team/+git/autotest-client-tests:master
Diff against target: 13 lines (+2/-0)
1 file modified
ubuntu_kselftests_ftrace/ubuntu_kselftests_ftrace.py (+2/-0)
Reviewer Review Type Date Requested Status
Andrei Gherzan Approve
Review via email: mp+468054@code.launchpad.net

Commit message

BugLink: https://bugs.launchpad.net/bugs/2070034

The multiple_kprobes.tc test in test.d/kprobe will cause kernel panic
on N-RISCV instances. When this happens we will have to restart the
instance manually.

Fail this test directly to avoid interrupting the SRU process on the
target instance.

To post a comment you must log in.
Revision history for this message
Andrei Gherzan (agherzan) wrote :

Looks good.

review: Approve
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Applied and pushed. Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ubuntu_kselftests_ftrace/ubuntu_kselftests_ftrace.py b/ubuntu_kselftests_ftrace/ubuntu_kselftests_ftrace.py
2index a2181f7..5ac87fc 100644
3--- a/ubuntu_kselftests_ftrace/ubuntu_kselftests_ftrace.py
4+++ b/ubuntu_kselftests_ftrace/ubuntu_kselftests_ftrace.py
5@@ -99,6 +99,8 @@ class ubuntu_kselftests_ftrace(test.test):
6 cmd = "make -C linux/tools/testing/selftests TARGETS={}".format(test_name.replace('-build', ''))
7 utils.system_output(cmd, retain_output=True)
8 return
9+ if test_name == 'ftrace:test.d--kprobe--multiple_kprobes.tc' and self.arch == 'riscv64' and self.series == 'noble':
10+ raise error.TestFail('Test marked as failed as it cause panic for N-RISCV (LP: #2070034)')
11
12 category = test_name.split(':')[0]
13 sub_test = test_name.split(':')[1]

Subscribers

People subscribed via source and target branches