Skip to content

selftests/bpf: fix ima_setup.sh missing issue #449

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
Closed
wants to merge 1 commit into from
Closed

selftests/bpf: fix ima_setup.sh missing issue #449

wants to merge 1 commit into from

Conversation

@kernel-patches-bot
Copy link

@kernel-patches-bot kernel-patches-bot commented May 13, 2022

Pull request for series with
subject: selftests/bpf: fix ima_setup.sh missing issue
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=641198

@kernel-patches-bot
Copy link
Author

kernel-patches-bot commented May 13, 2022

Master branch: a2aa95b
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=641198
version: 1

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: selftests/bpf: Fix build error with ima_setup.sh
Using index info to reconstruct a base tree...
M	tools/testing/selftests/bpf/Makefile
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/bpf/Makefile
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile
Patch failed at 0001 selftests/bpf: Fix build error with ima_setup.sh
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/Makefile
index 6bbc03161544,5944d3a8fff6..000000000000
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@@ -498,10 -490,9 +498,15 @@@ TRUNNER_EXTRA_SOURCES := test_progs.c c
  			 network_helpers.c testing_helpers.c		\
  			 btf_helpers.c flow_dissector_load.h		\
  			 cap_helpers.c
++<<<<<<< HEAD
 +TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read $(OUTPUT)/bpf_testmod.ko	\
 +		       $(OUTPUT)/liburandom_read.so			\
 +		       ima_setup.sh					\
++=======
+ TRUNNER_EXTRA_BUILD := $(OUTPUT)/urandom_read $(OUTPUT)/bpf_testmod.ko	\
++>>>>>>> selftests/bpf: Fix build error with ima_setup.sh
  		       $(wildcard progs/btf_dump_test_case_*.c)
+ TRUNNER_EXTRA_FILES := $(TRUNNER_EXTRA_BUILD) ima_setup.sh
  TRUNNER_BPF_BUILD_RULE := CLANG_BPF_BUILD_RULE
  TRUNNER_BPF_CFLAGS := $(BPF_CFLAGS) $(CLANG_CFLAGS) -DENABLE_ATOMICS_TESTS
  $(eval $(call DEFINE_TEST_RUNNER,test_progs))

@kernel-patches-bot
Copy link
Author

kernel-patches-bot commented May 13, 2022

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

@kernel-patches-bot kernel-patches-bot deleted the series/641198=>bpf-next branch May 15, 2022 21:51
kernel-patches-daemon-bpf-rc bot pushed a commit that referenced this pull request Sep 1, 2025
selftests/bpf: Add selftests for cpuidle_gov_ext
5842738 
Add test to verify cpuidle governor ext's load, attach, and kfuncs.

This patch also provides a simple demonstration of `cpuidle_gov_ext_ops` usage:
- In `ops.init()`, we set the "rating" value to 60 - significantly exceeding other governors' ratings - to activate `cpuidle_gov_ext`.
- For specific scenarios (e.g., screen-off music playback on mobile devices), we can enable "expect_deeper" to transition to deeper idle states.

This implementation serves as a foundation, not a final solution.
We can explore further exploration of cpuidle strategies optimized for various usage scenarios.

Test Results
-----------
:~/workplace/bpf/x86/submit/bpf_next/tools/testing/selftests/bpf$ make -j4

:$ sudo ./test_progs -t test_cpuidle_gov_ext
#449     test_cpuidle_gov_ext: OK
Summary: 1/0 PASSED, 0 SKIPPED, 0 FAILED

Additionally, the kernel log shows:
$sudo cat /dev/kmsg
6,911,10997439785,-; cpuidle: using governor ext
6,913,11010384887,-; cpuidle: using governor menu
After `cpuidle_gov_ext` exits, the system will restore the previous governor.

Signed-off-by: Lin Yikai <yikai.lin@vivo.com>
kernel-patches-daemon-bpf-rc bot pushed a commit that referenced this pull request Sep 2, 2025
selftests/bpf: Add selftests for cpuidle_gov_ext
adc0a44 
Add test to verify cpuidle governor ext's load, attach, and kfuncs.

This patch also provides a simple demonstration of `cpuidle_gov_ext_ops` usage:
- In `ops.init()`, we set the "rating" value to 60 - significantly exceeding other governors' ratings - to activate `cpuidle_gov_ext`.
- For specific scenarios (e.g., screen-off music playback on mobile devices), we can enable "expect_deeper" to transition to deeper idle states.

This implementation serves as a foundation, not a final solution.
We can explore further exploration of cpuidle strategies optimized for various usage scenarios.

Test Results
-----------
:~/workplace/bpf/x86/submit/bpf_next/tools/testing/selftests/bpf$ make -j4

:$ sudo ./test_progs -t test_cpuidle_gov_ext
#449     test_cpuidle_gov_ext: OK
Summary: 1/0 PASSED, 0 SKIPPED, 0 FAILED

Additionally, the kernel log shows:
$sudo cat /dev/kmsg
6,911,10997439785,-; cpuidle: using governor ext
6,913,11010384887,-; cpuidle: using governor menu
After `cpuidle_gov_ext` exits, the system will restore the previous governor.

Signed-off-by: Lin Yikai <yikai.lin@vivo.com>
kernel-patches-daemon-bpf-rc bot pushed a commit that referenced this pull request Sep 2, 2025
selftests/bpf: Add selftests for cpuidle_gov_ext
a4f2be0 
Add test to verify cpuidle governor ext's load, attach, and kfuncs.

This patch also provides a simple demonstration of `cpuidle_gov_ext_ops` usage:
- In `ops.init()`, we set the "rating" value to 60 - significantly exceeding other governors' ratings - to activate `cpuidle_gov_ext`.
- For specific scenarios (e.g., screen-off music playback on mobile devices), we can enable "expect_deeper" to transition to deeper idle states.

This implementation serves as a foundation, not a final solution.
We can explore further exploration of cpuidle strategies optimized for various usage scenarios.

Test Results
-----------
:~/workplace/bpf/x86/submit/bpf_next/tools/testing/selftests/bpf$ make -j4

:$ sudo ./test_progs -t test_cpuidle_gov_ext
#449     test_cpuidle_gov_ext: OK
Summary: 1/0 PASSED, 0 SKIPPED, 0 FAILED

Additionally, the kernel log shows:
$sudo cat /dev/kmsg
6,911,10997439785,-; cpuidle: using governor ext
6,913,11010384887,-; cpuidle: using governor menu
After `cpuidle_gov_ext` exits, the system will restore the previous governor.

Signed-off-by: Lin Yikai <yikai.lin@vivo.com>
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

bpf-next changes-requested V1

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@kernel-patches-bot