On Thu, Dec 26, 2019 at 2:20 PM Martin Lau <kafai@xxxxxx> wrote:
>
> On Thu, Dec 26, 2019 at 12:48:09PM -0800, Andrii Nakryiko wrote:
> > On Thu, Dec 26, 2019 at 12:25 PM Martin Lau <kafai@xxxxxx> wrote:
> > >
> > > On Thu, Dec 26, 2019 at 11:02:26AM -0800, Andrii Nakryiko wrote:
> > > > On Tue, Dec 24, 2019 at 8:50 AM Martin Lau <kafai@xxxxxx> wrote:
> > > > >
> > > > > On Mon, Dec 23, 2019 at 11:01:55PM -0800, Andrii Nakryiko wrote:
> > > > > > On Mon, Dec 23, 2019 at 5:31 PM Martin Lau <kafai@xxxxxx> wrote:
> > > > > > >
> > > > > > > On Mon, Dec 23, 2019 at 03:26:50PM -0800, Andrii Nakryiko wrote:
> > > > > > > > On Fri, Dec 20, 2019 at 10:26 PM Martin KaFai Lau <kafai@xxxxxx> wrote:
> > > > > > > > >
> > > > > > > > > This patch adds a bpf_dctcp example. It currently does not do
> > > > > > > > > no-ECN fallback but the same could be done through the cgrp2-bpf.
> > > > > > > > >
> > > > > > > > > Signed-off-by: Martin KaFai Lau <kafai@xxxxxx>
> > > > > > > > > ---
> > > > > > > > > tools/testing/selftests/bpf/bpf_tcp_helpers.h | 228 ++++++++++++++++++
> > > > > > > > > .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 218 +++++++++++++++++
> > > > > > > > > tools/testing/selftests/bpf/progs/bpf_dctcp.c | 210 ++++++++++++++++
> > > > > > > > > 3 files changed, 656 insertions(+)
> > > > > > > > > create mode 100644 tools/testing/selftests/bpf/bpf_tcp_helpers.h
> > > > > > > > > create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c
> > > > > > > > > create mode 100644 tools/testing/selftests/bpf/progs/bpf_dctcp.c
> > > > > > > > >
> > > > > > > > > diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
> > > > > > > > > new file mode 100644
> > > > > > > > > index 000000000000..7ba8c1b4157a
> > > > > > > > > --- /dev/null
> > > > > > > > > +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
> > > > > > > > > @@ -0,0 +1,228 @@
> > > > > > > > > +/* SPDX-License-Identifier: GPL-2.0 */
> > > > > > > > > +#ifndef __BPF_TCP_HELPERS_H
> > > > > > > > > +#define __BPF_TCP_HELPERS_H
> > > > > > > > > +
> > > > > > > > > +#include <stdbool.h>
> > > > > > > > > +#include <linux/types.h>
> > > > > > > > > +#include <bpf_helpers.h>
> > > > > > > > > +#include <bpf_core_read.h>
> > > > > > > > > +#include "bpf_trace_helpers.h"
> > > > > > > > > +
> > > > > > > > > +#define BPF_TCP_OPS_0(fname, ret_type, ...) BPF_TRACE_x(0, #fname"_sec", fname, ret_type, __VA_ARGS__)
> > > > > > > > > +#define BPF_TCP_OPS_1(fname, ret_type, ...) BPF_TRACE_x(1, #fname"_sec", fname, ret_type, __VA_ARGS__)
> > > > > > > > > +#define BPF_TCP_OPS_2(fname, ret_type, ...) BPF_TRACE_x(2, #fname"_sec", fname, ret_type, __VA_ARGS__)
> > > > > > > > > +#define BPF_TCP_OPS_3(fname, ret_type, ...) BPF_TRACE_x(3, #fname"_sec", fname, ret_type, __VA_ARGS__)
> > > > > > > > > +#define BPF_TCP_OPS_4(fname, ret_type, ...) BPF_TRACE_x(4, #fname"_sec", fname, ret_type, __VA_ARGS__)
> > > > > > > > > +#define BPF_TCP_OPS_5(fname, ret_type, ...) BPF_TRACE_x(5, #fname"_sec", fname, ret_type, __VA_ARGS__)
> > > > > > > >
> > > > > > > > Should we try to put those BPF programs into some section that would
> > > > > > > > indicate they are used with struct opts? libbpf doesn't use or enforce
> > > > > > > > that (even though it could to derive and enforce that they are
> > > > > > > > STRUCT_OPS programs). So something like
> > > > > > > > SEC("struct_ops/<ideally-operation-name-here>"). I think having this
> > > > > > > > convention is very useful for consistency and to do a quick ELF dump
> > > > > > > > and see what is where. WDYT?
> > > > > > > I did not use it here because I don't want any misperception that it is
> > > > > > > a required convention by libbpf.
> > > > > > >
> > > > > > > Sure, I can prefix it here and comment that it is just a
> > > > > > > convention but not a libbpf's requirement.
> > > > > >
> > > > > > Well, we can actually make it a requirement of sorts. Currently your
> > > > > > code expects that BPF program's type is UNSPEC and then it sets it to
> > > > > > STRUCT_OPS. Alternatively we can say that any BPF program in
> > > > > > SEC("struct_ops/<whatever>") will be automatically assigned
> > > > > > STRUCT_OPTS BPF program type (which is done generically in
> > > > > > bpf_object__open()), and then as .struct_ops section is parsed, all
> > > > > > those programs will be "assembled" by the code you added into a
> > > > > > struct_ops map.
> > > > > Setting BPF_PROG_TYPE_STRUCT_OPS can be done automatically at open
> > > > > phase (during collect_reloc time). I will make this change.
> > > > >
> > > >
> > > > Can you please extend exiting logic in __bpf_object__open() to do
> > > > this? See how libbpf_prog_type_by_name() is used for that.
> > > Does it have to call libbpf_prog_type_by_name() if everything
> > > has already been decided by the earlier
> > > bpf_object__collect_struct_ops_map_reloc()?
> >
> > We can certainly change the logic to omit guessing program type if
> > it's already set to something else than UNSPEC.
> >
> > But all I'm asking is that instead of using #fname"_sec" section name,
> > is to use "struct_ops/"#fname, because it's consistent with all other
> > program types. If you do that, then you don't have to do anything
> > extra (well, add single entry to section_defs, of course), it will
> > just work as is.
> Re: adding "struct_ops/" to section_defs,
> Sure. as long as SEC(".struct_ops") can use prog that
> libbpf_prog_type_by_name() concluded it is either -ESRCH or
> STRUCT_OPS.
>
> It is not the only change though. Other changes are still
> needed in collect_reloc (e.g. check prog type mismatch).
> They won't be much though.
sounds good, thanks!
