Skip to contentSkip to conversation

sched-ext: Use correct annotation for strings in kfuncs

PATCH Applied Kumar Kartikeya Dwivedi 2 participants 3 messages Oct 21, 2024 – Oct 23, 2024

Subsystems (2)
lore
Share & tools
lore

Kumar Kartikeya Dwivedi

author maintainer
#0 lore raw

PATCH 1/1 sched-ext: Use correct annotation for strings in kfuncs

The sched-ext kfuncs with bstr suffix need to take a string, but that requires annotating the parameters with __str suffix, as right now the verifier will treat this parameter as a one-byte memory region.

Fixes f0e1a0643a59 ("sched_ext: Implement BPF extensible scheduler class")
Fixes 07814a9439a3 ("sched_ext: Print debug dump after an error exit")
Cc Tejun Heo <[email protected]>
---
 kernel/sched/ext.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/sched/ext.c +3 -3
index 3cd7c50a51c5..8b8e3c907340 100644
@@ -6708,7 +6708,7 @@ __bpf_kfunc_start_defs();
  * Indicate that the BPF scheduler wants to exit gracefully, and initiate ops
  * disabling.
  */
-__bpf_kfunc void scx_bpf_exit_bstr(s64 exit_code, char *fmt,
+__bpf_kfunc void scx_bpf_exit_bstr(s64 exit_code, char *fmt__str,
 				   unsigned long long *data, u32 data__sz)
 {
 	unsigned long flags;
@@ -6729,7 +6729,7 @@ __bpf_kfunc void scx_bpf_exit_bstr(s64 exit_code, char *fmt,
  * Indicate that the BPF scheduler encountered a fatal error and initiate ops
  * disabling.
  */
-__bpf_kfunc void scx_bpf_error_bstr(char *fmt, unsigned long long *data,
+__bpf_kfunc void scx_bpf_error_bstr(char *fmt__str, unsigned long long *data,
 				    u32 data__sz)
 {
 	unsigned long flags;
@@ -6753,7 +6753,7 @@ __bpf_kfunc void scx_bpf_error_bstr(char *fmt, unsigned long long *data,
  * The extra dump may be multiple lines. A single line may be split over
  * multiple calls. The last line is automatically terminated.
  */
-__bpf_kfunc void scx_bpf_dump_bstr(char *fmt, unsigned long long *data,
+__bpf_kfunc void scx_bpf_dump_bstr(char *fmt__str, unsigned long long *data,
 				   u32 data__sz)
 {
 	struct scx_dump_data *dd = &scx_dump_data;

--
2.43.5

Applied
#1 lore raw
Quoted 8 lines · Kumar Kartikeya Dwivedi

The sched-ext kfuncs with bstr suffix need to take a string, but that requires annotating the parameters with __str suffix, as right now the verifier will treat this parameter as a one-byte memory region.

Fixes f0e1a0643a59 ("sched_ext: Implement BPF extensible scheduler class")
Fixes 07814a9439a3 ("sched_ext: Print debug dump after an error exit")
Cc Tejun Heo <[email protected]>

Applied to sched_ext/for-6.12-fixes.

Thanks.

Signature · 1 line
tejun
#2 lore raw
In reply to Kumar Kartikeya Dwivedi
Quoted 8 lines · Kumar Kartikeya Dwivedi

The sched-ext kfuncs with bstr suffix need to take a string, but that requires annotating the parameters with __str suffix, as right now the verifier will treat this parameter as a one-byte memory region.

Fixes f0e1a0643a59 ("sched_ext: Implement BPF extensible scheduler class")
Fixes 07814a9439a3 ("sched_ext: Print debug dump after an error exit")
Cc Tejun Heo <[email protected]>

I popped this patch from sched_ext/for-6.12-fixes along with the follow-up fix. This breaks compatibility in a way which is difficult to work around. If we want to do this, I think we should do it by introducing new set of kfuncs and than phasing out the old ones. Also, it's unclear what the practical benefits of the change are anyway.

Thanks.

Signature · 1 line
tejun