Update bindings for libbpf v1.0.0

xsk APIs are deprecated in libbpf and removed in this release [0].
This means removing all of the custom binding functions that we defined
in previous commits.

And the macro `BTF_KIND_ENUM64` was added causing definition collisions
in the generation [1].

[0] libbpf/libbpf@8ee1202
[1] libbpf/libbpf@a945df2

bindings.c

@@ -3,79 +3,3 @@
 //
 // Wrap the inline functions in libbpf with C functions so Rust bindings can be generated
 //
-
-inline __u64 *_xsk_ring_prod__fill_addr(struct xsk_ring_prod *fill, __u32 idx)
-{
-    return xsk_ring_prod__fill_addr(fill, idx);
-}
-
-inline const __u64 *_xsk_ring_cons__comp_addr(const struct xsk_ring_cons *comp, __u32 idx)
-{
-    return xsk_ring_cons__comp_addr(comp, idx);
-}
-
-inline size_t _xsk_ring_cons__peek(struct xsk_ring_cons *cons,
-                                   size_t nb, __u32 *idx)
-{
-    return xsk_ring_cons__peek(cons, nb, idx);
-}
-
-inline void _xsk_ring_cons__release(struct xsk_ring_cons *cons, size_t nb)
-{
-    xsk_ring_cons__release(cons, nb);
-}
-
-inline size_t _xsk_ring_prod__reserve(struct xsk_ring_prod *prod, size_t nb, __u32 *idx)
-{
-    return xsk_ring_prod__reserve(prod, nb, idx);
-}
-
-inline void _xsk_ring_prod__submit(struct xsk_ring_prod *prod, size_t nb)
-{
-    xsk_ring_prod__submit(prod, nb);
-}
-
-inline const struct xdp_desc *_xsk_ring_cons__rx_desc(const struct xsk_ring_cons *rx, __u32 idx)
-{
-    return xsk_ring_cons__rx_desc(rx, idx);
-}
-
-inline extern struct xdp_desc *_xsk_ring_prod__tx_desc(struct xsk_ring_prod *tx, __u32 idx)
-{
-    return xsk_ring_prod__tx_desc(tx, idx);
-}
-
-inline void *_xsk_umem__get_data(void *umem_area, __u64 addr)
-{
-    return xsk_umem__get_data(umem_area, addr);
-}
-
-inline int _xsk_ring_prod__needs_wakeup(const struct xsk_ring_prod *r)
-{
-    return xsk_ring_prod__needs_wakeup(r);
-}
-
-inline int _xsk_prod_nb_free(struct xsk_ring_prod *r, __u32 nb)
-{
-    return xsk_prod_nb_free(r, nb);
-}
-
-inline int _xsk_cons_nb_avail(struct xsk_ring_cons *r, __u32 nb)
-{
-    return xsk_cons_nb_avail(r, nb);
-}
-
-inline __u64 _xsk_umem__extract_addr(__u64 addr)
-{
-    return xsk_umem__extract_addr(addr);
-}
-
-inline __u64 _xsk_umem__extract_offset(__u64 addr)
-{
-    return xsk_umem__extract_offset(addr);
-}
-
-inline __u64 _xsk_umem__add_offset_to_addr(__u64 addr)
-{
-    return xsk_umem__add_offset_to_addr(addr);
-}

bindings.h

@@ -4,42 +4,10 @@
 #include <bpf/bpf.h>
 #include <bpf/btf.h>
 #include <bpf/libbpf.h>
-#include <bpf/xsk.h>
 #else
 #include "libbpf/include/uapi/linux/if_link.h"
 #include "libbpf/include/uapi/linux/perf_event.h"
 #include "libbpf/src/bpf.h"
 #include "libbpf/src/btf.h"
 #include "libbpf/src/libbpf.h"
-#include "libbpf/src/xsk.h"
 #endif /* __LIBBPF_SYS_NOVENDOR */
-
-extern __u64 *_xsk_ring_prod__fill_addr(struct xsk_ring_prod *fill, __u32 idx);
-
-extern const __u64 *_xsk_ring_cons__comp_addr(const struct xsk_ring_cons *comp, __u32 idx);
-
-extern size_t _xsk_ring_cons__peek(struct xsk_ring_cons *cons, size_t nb, __u32 *idx);
-
-extern void _xsk_ring_cons__release(struct xsk_ring_cons *cons, size_t nb);
-
-extern size_t _xsk_ring_prod__reserve(struct xsk_ring_prod *prod, size_t nb, __u32 *idx);
-
-extern void _xsk_ring_prod__submit(struct xsk_ring_prod *prod, size_t nb);
-
-extern const struct xdp_desc *_xsk_ring_cons__rx_desc(const struct xsk_ring_cons *rx, __u32 idx);
-
-extern struct xdp_desc *_xsk_ring_prod__tx_desc(struct xsk_ring_prod *tx, __u32 idx);
-
-extern void *_xsk_umem__get_data(void *umem_area, __u64 addr);
-
-extern int _xsk_ring_prod__needs_wakeup(const struct xsk_ring_prod *r);
-
-extern int _xsk_prod_nb_free(struct xsk_ring_prod *r, __u32 nb);
-
-extern int _xsk_cons_nb_avail(struct xsk_ring_cons *r, __u32 nb);
-
-extern __u64 _xsk_umem__extract_addr(__u64 addr);
-
-extern __u64 _xsk_umem__extract_offset(__u64 addr);
-
-extern __u64 _xsk_umem__add_offset_to_addr(__u64 addr);

build.rs

@@ -34,6 +34,7 @@ fn generate_bindings(src_dir: path::PathBuf) {
             "BTF_KIND_FLOAT",
             "BTF_KIND_DECL_TAG",
             "BTF_KIND_TYPE_TAG",
+            "BTF_KIND_ENUM64",
         ]
         .into_iter()
         .collect(),
@@ -50,19 +51,15 @@ fn generate_bindings(src_dir: path::PathBuf) {
         .allowlist_function("bpf_.+")
         .allowlist_function("btf_.+")
         .allowlist_function("libbpf_.+")
-        .allowlist_function("xsk_.+")
-        .allowlist_function("_xsk_.+")
         .allowlist_function("perf_.+")
         .allowlist_function("ring_buffer_.+")
         .allowlist_function("vdprintf")
         .allowlist_type("bpf_.+")
         .allowlist_type("btf_.+")
         .allowlist_type("xdp_.+")
-        .allowlist_type("xsk_.+")
         .allowlist_type("perf_.+")
         .allowlist_var("BPF_.+")
         .allowlist_var("BTF_.+")
-        .allowlist_var("XSK_.+")
         .allowlist_var("XDP_.+")
         .allowlist_var("PERF_.+")
         .parse_callbacks(Box::new(ignored_macros))