Re: [PATCH 01/11] sched_ext: Rename scx_kfunc_set_sleepable to unlocked and relocate

David Vernet
2024-08-30T17:45:53Z

[-- Attachment #1: Type: text/plain, Size: 4227 bytes --]

On Fri, Aug 30, 2024 at 01:03:45AM -1000, Tejun Heo wrote:
> Sleepables don't need to be in its own kfunc set as each is tagged with
> KF_SLEEPABLE. Rename to scx_kfunc_set_unlocked indicating that rq lock is
> not held and relocate right above the any set. This will be used to add
> kfuncs that are allowed to be called from SYSCALL but not TRACING.
>
> No functional changes intended.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>

Acked-by: David Vernet <void@manifault.com>

> ---
> kernel/sched/ext.c | 66 +++++++++++++++++++++++-----------------------
> 1 file changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
> index 140a4612d379..5423554a11af 100644
> --- a/kernel/sched/ext.c
> +++ b/kernel/sched/ext.c
> @@ -5395,35 +5395,6 @@ void __init init_sched_ext_class(void)
>
> __bpf_kfunc_start_defs();
>
> -/**
> - * scx_bpf_create_dsq - Create a custom DSQ
> - * @dsq_id: DSQ to create
> - * @node: NUMA node to allocate from
> - *
> - * Create a custom DSQ identified by @dsq_id. Can be called from any sleepable
> - * scx callback, and any BPF_PROG_TYPE_SYSCALL prog.
> - */
> -__bpf_kfunc s32 scx_bpf_create_dsq(u64 dsq_id, s32 node)
> -{
> - if (unlikely(node >= (int)nr_node_ids ||
> - (node < 0 && node != NUMA_NO_NODE)))
> - return -EINVAL;
> - return PTR_ERR_OR_ZERO(create_dsq(dsq_id, node));
> -}
> -
> -__bpf_kfunc_end_defs();
> -
> -BTF_KFUNCS_START(scx_kfunc_ids_sleepable)
> -BTF_ID_FLAGS(func, scx_bpf_create_dsq, KF_SLEEPABLE)
> -BTF_KFUNCS_END(scx_kfunc_ids_sleepable)
> -
> -static const struct btf_kfunc_id_set scx_kfunc_set_sleepable = {
> - .owner = THIS_MODULE,
> - .set = &scx_kfunc_ids_sleepable,
> -};
> -
> -__bpf_kfunc_start_defs();
> -
> /**
> * scx_bpf_select_cpu_dfl - The default implementation of ops.select_cpu()
> * @p: task_struct to select a CPU for
> @@ -5766,6 +5737,35 @@ static const struct btf_kfunc_id_set scx_kfunc_set_cpu_release = {
>
> __bpf_kfunc_start_defs();
>
> +/**
> + * scx_bpf_create_dsq - Create a custom DSQ
> + * @dsq_id: DSQ to create
> + * @node: NUMA node to allocate from
> + *
> + * Create a custom DSQ identified by @dsq_id. Can be called from any sleepable
> + * scx callback, and any BPF_PROG_TYPE_SYSCALL prog.
> + */
> +__bpf_kfunc s32 scx_bpf_create_dsq(u64 dsq_id, s32 node)
> +{
> + if (unlikely(node >= (int)nr_node_ids ||
> + (node < 0 && node != NUMA_NO_NODE)))
> + return -EINVAL;
> + return PTR_ERR_OR_ZERO(create_dsq(dsq_id, node));
> +}
> +
> +__bpf_kfunc_end_defs();
> +
> +BTF_KFUNCS_START(scx_kfunc_ids_unlocked)
> +BTF_ID_FLAGS(func, scx_bpf_create_dsq, KF_SLEEPABLE)
> +BTF_KFUNCS_END(scx_kfunc_ids_unlocked)
> +
> +static const struct btf_kfunc_id_set scx_kfunc_set_unlocked = {
> + .owner = THIS_MODULE,
> + .set = &scx_kfunc_ids_unlocked,
> +};
> +
> +__bpf_kfunc_start_defs();
> +
> /**
> * scx_bpf_kick_cpu - Trigger reschedule on a CPU
> * @cpu: cpu to kick
> @@ -6462,10 +6462,6 @@ static int __init scx_init(void)
> * check using scx_kf_allowed().
> */
> if ((ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS,
> - &scx_kfunc_set_sleepable)) ||
> - (ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_SYSCALL,
> - &scx_kfunc_set_sleepable)) ||
> - (ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS,
> &scx_kfunc_set_select_cpu)) ||
> (ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS,
> &scx_kfunc_set_enqueue_dispatch)) ||
> @@ -6473,6 +6469,10 @@ static int __init scx_init(void)
> &scx_kfunc_set_dispatch)) ||
> (ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS,
> &scx_kfunc_set_cpu_release)) ||
> + (ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS,
> + &scx_kfunc_set_unlocked)) ||
> + (ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_SYSCALL,
> + &scx_kfunc_set_unlocked)) ||
> (ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS,
> &scx_kfunc_set_any)) ||
> (ret = register_btf_kfunc_id_set(BPF_PROG_TYPE_TRACING,
> --
> 2.46.0
>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]