On Wed, Mar 10, 2021 at 12:09 AM Björn Töpel <bjorn.topel@xxxxxxxxx> wrote:
>
> From: Björn Töpel <bjorn.topel@xxxxxxxxx>
>
> The only user of libbpf_util.h is xsk.h. Move the barriers to xsk.h,
> and remove libbpf_util.h. The barriers are used as an implementation
> detail, and should not be considered part of the stable API.
>
> Signed-off-by: Björn Töpel <bjorn.topel@xxxxxxxxx>
> ---
> tools/lib/bpf/Makefile | 1 -
> tools/lib/bpf/libbpf_util.h | 82 -------------------------------------
> tools/lib/bpf/xsk.h | 68 +++++++++++++++++++++++++++++-
> 3 files changed, 67 insertions(+), 84 deletions(-)
> delete mode 100644 tools/lib/bpf/libbpf_util.h
>
[...]
> diff --git a/tools/lib/bpf/xsk.h b/tools/lib/bpf/xsk.h
> index a9fdea87b5cd..1d846a419d21 100644
> --- a/tools/lib/bpf/xsk.h
> +++ b/tools/lib/bpf/xsk.h
> @@ -4,6 +4,7 @@
> * AF_XDP user-space access library.
> *
> * Copyright(c) 2018 - 2019 Intel Corporation.
Couldn't unsee ^this mismatch. Added space there.
Also, removing libbpf_util.h caused incremental build failure for the
kernel due to cached dependency files. make clean solved the issue. So
just FYI for everyone.
Applied to bpf-next, thanks.
> + * Copyright (c) 2019 Facebook
> *
> * Author(s): Magnus Karlsson <magnus.karlsson@xxxxxxxxx>
> */
> @@ -13,15 +14,80 @@
>
> #include <stdio.h>
> #include <stdint.h>
> +#include <stdbool.h>
> #include <linux/if_xdp.h>
>
> #include "libbpf.h"
> -#include "libbpf_util.h"
>
> #ifdef __cplusplus
> extern "C" {
> #endif
>
[...]
