From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Song Liu <liu.song.a23@gmail.com>
Cc: Andrii Nakryiko <andriin@fb.com>, bpf <bpf@vger.kernel.org>,
Networking <netdev@vger.kernel.org>,
Alexei Starovoitov <ast@fb.com>,
Daniel Borkmann <daniel@iogearbox.net>,
Kernel Team <kernel-team@fb.com>
Subject: Re: [PATCH v2 bpf-next 2/7] selftests/bpf: samples/bpf: split off legacy stuff from bpf_helpers.h
Date: Thu, 3 Oct 2019 14:22:20 -0700 [thread overview]
Message-ID: <CAEf4BzY2dG0QrBQF8g2w=yvSeVJ7LtWrLOckrWsCAnBvtZgMiQ@mail.gmail.com> (raw)
In-Reply-To: <CAPhsuW4pS_P0n+UCB40uSVKp6W0N4Xas4UT9oofLxSZjhmyeGw@mail.gmail.com>
On Thu, Oct 3, 2019 at 1:09 PM Song Liu <liu.song.a23@gmail.com> wrote:
>
> On Wed, Oct 2, 2019 at 3:01 PM Andrii Nakryiko <andriin@fb.com> wrote:
> >
> > Split off few legacy things from bpf_helpers.h into separate
> > bpf_legacy.h file:
> > - load_{byte|half|word};
> > - remove extra inner_idx and numa_node fields from bpf_map_def and
> > introduce bpf_map_def_legacy for use in samples;
> > - move BPF_ANNOTATE_KV_PAIR into bpf_legacy.h.
> >
> > Adjust samples and selftests accordingly by either including
> > bpf_legacy.h and using bpf_map_def_legacy, or switching to BTF-defined
> > maps altogether.
> >
> > Signed-off-by: Andrii Nakryiko <andriin@fb.com>
>
> Acked-by: Song Liu <songliubraving@fb.com>
>
> with a nit below
>
> > ---
> > samples/bpf/hbm_kern.h | 28 +++++++------
> > samples/bpf/map_perf_test_kern.c | 23 +++++------
> > samples/bpf/parse_ldabs.c | 1 +
> > samples/bpf/sockex1_kern.c | 1 +
> > samples/bpf/sockex2_kern.c | 1 +
> > samples/bpf/sockex3_kern.c | 1 +
> > samples/bpf/tcbpf1_kern.c | 1 +
> > samples/bpf/test_map_in_map_kern.c | 15 +++----
> > tools/testing/selftests/bpf/bpf_helpers.h | 24 +-----------
> > tools/testing/selftests/bpf/bpf_legacy.h | 39 +++++++++++++++++++
> > .../testing/selftests/bpf/progs/sockopt_sk.c | 13 +++----
> > tools/testing/selftests/bpf/progs/tcp_rtt.c | 13 +++----
> > .../selftests/bpf/progs/test_btf_haskv.c | 1 +
> > .../selftests/bpf/progs/test_btf_newkv.c | 1 +
> > 14 files changed, 92 insertions(+), 70 deletions(-)
> > create mode 100644 tools/testing/selftests/bpf/bpf_legacy.h
> >
> > diff --git a/samples/bpf/hbm_kern.h b/samples/bpf/hbm_kern.h
> > index aa207a2eebbd..91880a0e9c2f 100644
> > --- a/samples/bpf/hbm_kern.h
> > +++ b/samples/bpf/hbm_kern.h
> > @@ -24,6 +24,7 @@
> > #include <net/inet_ecn.h>
> > #include "bpf_endian.h"
> > #include "bpf_helpers.h"
> > +#include "bpf_legacy.h"
>
> nit: I guess we don't need bpf_legacy.h here?
You are right, I converted maps to BTF-defined ones, dropping bpf_legacy.h.
next prev parent reply other threads:[~2019-10-03 21:22 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-02 21:50 [PATCH v2 bpf-next 0/7] Move bpf_helpers and add BPF_CORE_READ macros Andrii Nakryiko
2019-10-02 21:50 ` [PATCH v2 bpf-next 1/7] selftests/bpf: undo GCC-specific bpf_helpers.h changes Andrii Nakryiko
2019-10-02 21:50 ` [PATCH v2 bpf-next 2/7] selftests/bpf: samples/bpf: split off legacy stuff from bpf_helpers.h Andrii Nakryiko
2019-10-03 7:35 ` Toke Høiland-Jørgensen
2019-10-03 16:20 ` Andrii Nakryiko
2019-10-03 16:27 ` Toke Høiland-Jørgensen
2019-10-03 17:31 ` John Fastabend
2019-10-03 20:08 ` Song Liu
2019-10-03 21:22 ` Andrii Nakryiko [this message]
2019-10-02 21:50 ` [PATCH v2 bpf-next 3/7] selftests/bpf: adjust CO-RE reloc tests for new bpf_core_read() macro Andrii Nakryiko
2019-10-03 20:16 ` Song Liu
2019-10-03 20:28 ` Andrii Nakryiko
2019-10-03 20:41 ` Song Liu
2019-10-03 21:10 ` Andrii Nakryiko
2019-10-02 21:50 ` [PATCH v2 bpf-next 4/7] selftests/bpf: split off tracing-only helpers into bpf_tracing.h Andrii Nakryiko
2019-10-03 7:35 ` Toke Høiland-Jørgensen
2019-10-03 16:22 ` Andrii Nakryiko
2019-10-03 17:21 ` Toke Høiland-Jørgensen
2019-10-03 17:33 ` John Fastabend
2019-10-03 20:18 ` Song Liu
2019-10-02 21:50 ` [PATCH v2 bpf-next 5/7] libbpf: move bpf_{helpers,endian,tracing}.h into libbpf Andrii Nakryiko
2019-10-03 20:22 ` Song Liu
2019-10-02 21:50 ` [PATCH v2 bpf-next 6/7] libbpf: add BPF_CORE_READ/BPF_CORE_READ_INTO helpers Andrii Nakryiko
2019-10-03 20:35 ` Song Liu
2019-10-03 21:25 ` Andrii Nakryiko
2019-10-02 21:50 ` [PATCH v2 bpf-next 7/7] selftests/bpf: add BPF_CORE_READ and BPF_CORE_READ_STR_INTO macro tests Andrii Nakryiko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAEf4BzY2dG0QrBQF8g2w=yvSeVJ7LtWrLOckrWsCAnBvtZgMiQ@mail.gmail.com' \
--to=andrii.nakryiko@gmail.com \
--cc=andriin@fb.com \
--cc=ast@fb.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=liu.song.a23@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).