Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

selftests/bpf: Fix kprobe_multi_test/attach_override test #5661

Closed
wants to merge 2 commits into from
Closed

selftests/bpf: Fix kprobe_multi_test/attach_override test #5661

wants to merge 2 commits into from

Conversation

kernel-patches-daemon-bpf[bot]
Copy link

Pull request for series with
subject: selftests/bpf: Fix kprobe_multi_test/attach_override test
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=783472

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 4a49024
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=783472
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 4eb94a7
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=783472
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 4eb94a7
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=783472
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: a8f1257
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=783472
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 214bfd2
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=783472
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 214bfd2
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=783472
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 214bfd2
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=783472
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 214bfd2
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=783472
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 214bfd2
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=783472
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 214bfd2
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=783472
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 214bfd2
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=783472
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 214bfd2
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=783758
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 214bfd2
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=783758
version: 1

@olsajiri
selftests/bpf: Fix kprobe_multi_test/attach_override test
3a1eae3 
We need to deny the attach_override test for arm64, denying the
whole kprobe_multi_test suite. Also making attach_override static.

Fixes: 7182e56 ("selftests/bpf: Add kprobe_multi override test")
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 8a19edd
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=783758
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=783758
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: selftests/bpf: Fix kprobe_multi_test/attach_override test
Using index info to reconstruct a base tree...
M	tools/testing/selftests/bpf/DENYLIST.aarch64
M	tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/bpf/DENYLIST.aarch64
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/DENYLIST.aarch64
Patch failed at 0001 selftests/bpf: Fix kprobe_multi_test/attach_override test
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc tools/testing/selftests/bpf/DENYLIST.aarch64
index 3babaf3eee5c,b733ce16c0f8..000000000000
--- a/tools/testing/selftests/bpf/DENYLIST.aarch64
+++ b/tools/testing/selftests/bpf/DENYLIST.aarch64
@@@ -1,7 -1,6 +1,10 @@@
  bpf_cookie/multi_kprobe_attach_api               # kprobe_multi_link_api_subtest:FAIL:fentry_raw_skel_load unexpected error: -3
  bpf_cookie/multi_kprobe_link_api                 # kprobe_multi_link_api_subtest:FAIL:fentry_raw_skel_load unexpected error: -3
  fexit_sleep                                      # The test never returns. The remaining tests cannot start.
++<<<<<<< HEAD
 +kprobe_multi_bench_attach                        # needs CONFIG_FPROBE
++=======
++>>>>>>> selftests/bpf: Fix kprobe_multi_test/attach_override test
  kprobe_multi_test                                # needs CONFIG_FPROBE
  module_attach                                    # prog 'kprobe_multi': failed to auto-attach: -95
  fentry_test/fentry_many_args                     # fentry_many_args:FAIL:fentry_many_args_attach unexpected error: -524

@kernel-patches-daemon-bpf
Copy link
Author

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=783758 irrelevant now. Closing PR.

@kernel-patches-daemon-bpf kernel-patches-daemon-bpf bot deleted the series/783472=>bpf branch September 13, 2023 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
accepted bpf V1
Projects
None yet
Milestone
No milestone
1 participant
@olsajiri