On Wed, Oct 2, 2019 at 3:01 PM Andrii Nakryiko <andriin@xxxxxx> 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@xxxxxx>
Acked-by: Song Liu <songliubraving@xxxxxx>
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?
