On Thu, 30 Jun 2022, Geliang Tang wrote:
> Rename optional_ops to optional_sched_ops, rename is_optional() to
> is_optional_sched(). We may add optional_pm_ops and is_optional_pm()
> in bpf.c in the future for BPF path managers.
>
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Fine to squash this, thanks Geliang.
- Mat
> ---
> net/mptcp/bpf.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c
> index e86dff4272d5..a450b0521ef6 100644
> --- a/net/mptcp/bpf.c
> +++ b/net/mptcp/bpf.c
> @@ -21,7 +21,7 @@ extern struct btf *btf_vmlinux;
> static const struct btf_type *mptcp_sched_type __read_mostly;
> static u32 mptcp_sched_id;
>
> -static u32 optional_ops[] = {
> +static u32 optional_sched_ops[] = {
> offsetof(struct mptcp_sched_ops, init),
> offsetof(struct mptcp_sched_ops, release),
> };
> @@ -92,12 +92,12 @@ static int bpf_mptcp_sched_check_member(const struct btf_type *t,
> return 0;
> }
>
> -static bool is_optional(u32 member_offset)
> +static bool is_optional_sched(u32 member_offset)
> {
> unsigned int i;
>
> - for (i = 0; i < ARRAY_SIZE(optional_ops); i++) {
> - if (member_offset == optional_ops[i])
> + for (i = 0; i < ARRAY_SIZE(optional_sched_ops); i++) {
> + if (member_offset == optional_sched_ops[i])
> return true;
> }
>
> @@ -132,7 +132,7 @@ static int bpf_mptcp_sched_init_member(const struct btf_type *t,
>
> /* Ensure bpf_prog is provided for compulsory func ptr */
> prog_fd = (int)(*(unsigned long *)(udata + moff));
> - if (!prog_fd && !is_optional(moff))
> + if (!prog_fd && !is_optional_sched(moff))
> return -EINVAL;
>
> return 0;
> --
> 2.35.3
>
>
>
--
Mat Martineau
Intel