Add fallback to an old attaching method

Skip probing for loading
Skip kernel version check
2026-03-15 05:49:07 +08:00 · 2020-07-30 13:38:27 +03:00 · 2020-07-30 13:37:26 +03:00 · 2020-07-30 13:35:35 +03:00
34 changed files with 832 additions and 83718 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,23 +35,8 @@ stages:

 jobs:
    include:
-        - stage: Builds & Tests
-          name: Kernel LATEST + selftests
-          language: bash
-          env: KERNEL=LATEST
-          script:  $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
-
-        - name: Kernel 4.9.0 + selftests
-          language: bash
-          env: KERNEL=4.9.0
-          script:  $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
-
-        - name: Kernel 5.5.0 + selftests
-          language: bash
-          env: KERNEL=5.5.0
-          script:  $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
-
-        - name: Debian Build
+        - stage: Build & Test
+          name: Debian Build
          language: bash
          install:        $CI_ROOT/managers/debian.sh SETUP
          script:         $CI_ROOT/managers/debian.sh RUN || travis_terminate 1
@@ -106,6 +91,16 @@ jobs:
          language: bash
          script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1

+        - name: Kernel 5.5.0 + selftests
+          language: bash
+          env: KERNEL=5.5.0
+          script:  $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
+
+        - name: Kernel LATEST + selftests
+          language: bash
+          env: KERNEL=LATEST
+          script:  $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
+
        - stage: Coverity
          language: bash
          env:
@@ -126,5 +121,3 @@ jobs:
              - sudo apt-get install -y libelf-dev pkg-config
          script:
              - scripts/coverity.sh || travis_terminate 1
-    allow_failures:
-        - env: KERNEL=x.x.x
--- a/2
+++ b/2
@@ -1 +1 @@
-3fb1a96a91120877488071a167d26d76be4be977
+4e15507fea70c0c312d79610efa46b6853ccf8e0
--- a/2
+++ b/2
@@ -1 +1 @@
-06a4ec1d9dc652e17ee3ac2ceb6c7cf6c2b75cdd
+69119673bd50b176ded34032fadd41530fb5af21
--- a/README.md
+++ b/README.md
@@ -1,29 +1,20 @@
-This is a mirror of [bpf-next Linux source
-tree](https://kernel.googlesource.com/pub/scm/linux/kernel/git/bpf/bpf-next)'s
+
+This is a mirror of [bpf-next linux tree](https://kernel.googlesource.com/pub/scm/linux/kernel/git/bpf/bpf-next)'s
 `tools/lib/bpf` directory plus its supporting header files.

-All the gory details of syncing can be found in `scripts/sync-kernel.sh`
-script.
+The following files will by sync'ed with bpf-next repo:
+  - `src/` <-> `bpf-next/tools/lib/bpf/`
+  - `include/uapi/linux/bpf_common.h` <-> `bpf-next/tools/include/uapi/linux/bpf_common.h`
+  - `include/uapi/linux/bpf.h` <-> `bpf-next/tools/include/uapi/linux/bpf.h`
+  - `include/uapi/linux/btf.h` <-> `bpf-next/tools/include/uapi/linux/btf.h`
+  - `include/uapi/linux/if_link.h` <-> `bpf-next/tools/include/uapi/linux/if_link.h`
+  - `include/uapi/linux/if_xdp.h` <-> `bpf-next/tools/include/uapi/linux/if_xdp.h`
+  - `include/uapi/linux/netlink.h` <-> `bpf-next/tools/include/uapi/linux/netlink.h`
+  - `include/tools/libc_compat.h` <-> `bpf-next/tools/include/tools/libc_compat.h`

-Some header files in this repo (`include/linux/*.h`) are reduced versions of
-their counterpart files at
-[bpf-next](https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/)'s
-`tools/include/linux/*.h` to make compilation successful.
-
-BPF questions
-=============
-
-All general BPF questions, including kernel functionality, libbpf APIs and
-their application, should be sent to bpf@vger.kernel.org mailing list. You can
-subscribe to it [here](http://vger.kernel.org/vger-lists.html#bpf) and search
-its archive [here](https://lore.kernel.org/bpf/). Please search the archive
-before asking new questions. It very well might be that this was already
-addressed or answered before.
-
-bpf@vger.kernel.org is monitored by many more people and they will happily try
-to help you with whatever issue you have. This repository's PRs and issues
-should be opened only for dealing with issues pertaining to specific way this
-libbpf mirror repo is set up and organized.
+Other header files at this repo (`include/linux/*.h`) are reduced versions of
+their counterpart files at bpf-next's `tools/include/linux/*.h` to make compilation
+successful.

 Build
 [![Build Status](https://travis-ci.org/libbpf/libbpf.svg?branch=master)](https://travis-ci.org/libbpf/libbpf)
@@ -34,9 +25,8 @@ libelf is an internal dependency of libbpf and thus it is required to link
 against and must be installed on the system for applications to work.
 pkg-config is used by default to find libelf, and the program called can be
 overridden with `PKG_CONFIG`.
-
-If using `pkg-config` at build time is not desired, it can be disabled by
-setting `NO_PKG_CONFIG=1` when calling make.
+If using `pkg-config` at build time is not desired, it can be disabled by setting
+`NO_PKG_CONFIG=1` when calling make.

 To build both static libbpf.a and shared libbpf.so:
 ```bash
@@ -68,20 +58,17 @@ Distributions packaging libbpf from this mirror:
  - [Fedora](https://src.fedoraproject.org/rpms/libbpf)
  - [Gentoo](https://packages.gentoo.org/packages/dev-libs/libbpf)
  - [Debian](https://packages.debian.org/sid/libbpf-dev)
-  - [Arch](https://www.archlinux.org/packages/extra/x86_64/libbpf/)

 Benefits of packaging from the mirror over packaging from kernel sources:
  - Consistent versioning across distributions.
  - No ties to any specific kernel, transparent handling of older kernels.
-    Libbpf is designed to be kernel-agnostic and work across multitude of
-    kernel versions. It has built-in mechanisms to gracefully handle older
-    kernels, that are missing some of the features, by working around or
-    gracefully degrading functionality. Thus libbpf is not tied to a specific
-    kernel version and can/should be packaged and versioned independently.
-  - Continuous integration testing via
-    [TravisCI](https://travis-ci.org/libbpf/libbpf).
-  - Static code analysis via [LGTM](https://lgtm.com/projects/g/libbpf/libbpf)
-    and [Coverity](https://scan.coverity.com/projects/libbpf).
+    Libbpf is designed to be kernel-agnostic and work across multitude of kernel
+    versions. It has built-in mechanisms to gracefully handle older kernels,
+    that are missing some of the features, by working around or gracefully
+    degrading functionality. Thus libbpf is not tied to a specific kernel
+    version and can/should be packaged and versioned independently.
+  - Continuous integration testing via [TravisCI](https://travis-ci.org/libbpf/libbpf).
+  - Static code analysis via [LGTM](https://lgtm.com/projects/g/libbpf/libbpf) and [Coverity](https://scan.coverity.com/projects/libbpf).

 Package dependencies of libbpf, package names may vary across distros:
  - zlib
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -344,7 +344,6 @@ enum {
 	IFLA_BRPORT_ISOLATED,
 	IFLA_BRPORT_BACKUP_PORT,
 	IFLA_BRPORT_MRP_RING_OPEN,
-	IFLA_BRPORT_MRP_IN_OPEN,
 	__IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
--- a/include/uapi/linux/if_xdp.h
+++ b/include/uapi/linux/if_xdp.h
@@ -73,12 +73,9 @@ struct xdp_umem_reg {
 };

 struct xdp_statistics {
-	__u64 rx_dropped; /* Dropped for other reasons */
+	__u64 rx_dropped; /* Dropped for reasons other than invalid desc */
 	__u64 rx_invalid_descs; /* Dropped due to invalid descriptor */
 	__u64 tx_invalid_descs; /* Dropped due to invalid descriptor */
-	__u64 rx_ring_full; /* Dropped due to rx ring being full */
-	__u64 rx_fill_ring_empty_descs; /* Failed to retrieve item from fill ring */
-	__u64 tx_ring_empty_descs; /* Failed to retrieve item from tx ring */
 };

 struct xdp_options {
--- a/scripts/check-reallocarray.sh
+++ b/scripts/check-reallocarray.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-# Usage: check-reallocarray.sh cc_path [cc_args...]

 tfile=$(mktemp /tmp/test_reallocarray_XXXXXXXX.c)
 ofile=${tfile%.c}.o
@@ -14,6 +13,6 @@ int main(void)
 }
 EOL

-"$@" $tfile -o $ofile >/dev/null 2>&1
+gcc $tfile -o $ofile >/dev/null 2>&1
 if [ $? -ne 0 ]; then echo "FAIL"; fi
 /bin/rm -f $tfile $ofile
--- a/src/Makefile
+++ b/src/Makefile
@@ -10,7 +10,7 @@ TOPDIR = ..
 INCLUDES := -I. -I$(TOPDIR)/include -I$(TOPDIR)/include/uapi
 ALL_CFLAGS := $(INCLUDES)

-FEATURE_REALLOCARRAY := $(shell $(TOPDIR)/scripts/check-reallocarray.sh $(CC))
+FEATURE_REALLOCARRAY := $(shell $(TOPDIR)/scripts/check-reallocarray.sh)
 ifneq ($(FEATURE_REALLOCARRAY),)
 	ALL_CFLAGS += -DCOMPAT_NEED_REALLOCARRAY
 endif
--- a/src/bpf.c
+++ b/src/bpf.c
@@ -598,24 +598,10 @@ int bpf_link_create(int prog_fd, int target_fd,
 	attr.link_create.prog_fd = prog_fd;
 	attr.link_create.target_fd = target_fd;
 	attr.link_create.attach_type = attach_type;
-	attr.link_create.flags = OPTS_GET(opts, flags, 0);
-	attr.link_create.iter_info =
-		ptr_to_u64(OPTS_GET(opts, iter_info, (void *)0));
-	attr.link_create.iter_info_len = OPTS_GET(opts, iter_info_len, 0);

 	return sys_bpf(BPF_LINK_CREATE, &attr, sizeof(attr));
 }

-int bpf_link_detach(int link_fd)
-{
-	union bpf_attr attr;
-
-	memset(&attr, 0, sizeof(attr));
-	attr.link_detach.link_fd = link_fd;
-
-	return sys_bpf(BPF_LINK_DETACH, &attr, sizeof(attr));
-}
-
 int bpf_link_update(int link_fd, int new_prog_fd,
 		    const struct bpf_link_update_opts *opts)
 {
--- a/src/bpf.h
+++ b/src/bpf.h
@@ -168,21 +168,15 @@ LIBBPF_API int bpf_prog_detach(int attachable_fd, enum bpf_attach_type type);
 LIBBPF_API int bpf_prog_detach2(int prog_fd, int attachable_fd,
 				enum bpf_attach_type type);

-union bpf_iter_link_info; /* defined in up-to-date linux/bpf.h */
 struct bpf_link_create_opts {
 	size_t sz; /* size of this struct for forward/backward compatibility */
-	__u32 flags;
-	union bpf_iter_link_info *iter_info;
-	__u32 iter_info_len;
 };
-#define bpf_link_create_opts__last_field iter_info_len
+#define bpf_link_create_opts__last_field sz

 LIBBPF_API int bpf_link_create(int prog_fd, int target_fd,
 			       enum bpf_attach_type attach_type,
 			       const struct bpf_link_create_opts *opts);

-LIBBPF_API int bpf_link_detach(int link_fd);
-
 struct bpf_link_update_opts {
 	size_t sz; /* size of this struct for forward/backward compatibility */
 	__u32 flags;	   /* extra flags */
--- a/src/bpf_core_read.h
+++ b/src/bpf_core_read.h
@@ -217,7 +217,7 @@ enum bpf_field_info_kind {
 */
 #define BPF_CORE_READ_INTO(dst, src, a, ...)				    \
 	({								    \
-		___core_read(bpf_core_read, dst, (src), a, ##__VA_ARGS__)   \
+		___core_read(bpf_core_read, dst, src, a, ##__VA_ARGS__)	    \
 	})

 /*
@@ -227,7 +227,7 @@ enum bpf_field_info_kind {
 */
 #define BPF_CORE_READ_STR_INTO(dst, src, a, ...)			    \
 	({								    \
-		___core_read(bpf_core_read_str, dst, (src), a, ##__VA_ARGS__)\
+		___core_read(bpf_core_read_str, dst, src, a, ##__VA_ARGS__) \
 	})

 /*
@@ -254,8 +254,8 @@ enum bpf_field_info_kind {
 */
 #define BPF_CORE_READ(src, a, ...)					    \
 	({								    \
-		___type((src), a, ##__VA_ARGS__) __r;			    \
-		BPF_CORE_READ_INTO(&__r, (src), a, ##__VA_ARGS__);	    \
+		___type(src, a, ##__VA_ARGS__) __r;			    \
+		BPF_CORE_READ_INTO(&__r, src, a, ##__VA_ARGS__);	    \
 		__r;							    \
 	})

--- a/src/bpf_endian.h
+++ b/src/bpf_endian.h
@@ -2,35 +2,8 @@
 #ifndef __BPF_ENDIAN__
 #define __BPF_ENDIAN__

-/*
- * Isolate byte #n and put it into byte #m, for __u##b type.
- * E.g., moving byte #6 (nnnnnnnn) into byte #1 (mmmmmmmm) for __u64:
- * 1) xxxxxxxx nnnnnnnn xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx mmmmmmmm xxxxxxxx
- * 2) nnnnnnnn xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx mmmmmmmm xxxxxxxx 00000000
- * 3) 00000000 00000000 00000000 00000000 00000000 00000000 00000000 nnnnnnnn
- * 4) 00000000 00000000 00000000 00000000 00000000 00000000 nnnnnnnn 00000000
- */
-#define ___bpf_mvb(x, b, n, m) ((__u##b)(x) << (b-(n+1)*8) >> (b-8) << (m*8))
-
-#define ___bpf_swab16(x) ((__u16)(			\
-			  ___bpf_mvb(x, 16, 0, 1) |	\
-			  ___bpf_mvb(x, 16, 1, 0)))
-
-#define ___bpf_swab32(x) ((__u32)(			\
-			  ___bpf_mvb(x, 32, 0, 3) |	\
-			  ___bpf_mvb(x, 32, 1, 2) |	\
-			  ___bpf_mvb(x, 32, 2, 1) |	\
-			  ___bpf_mvb(x, 32, 3, 0)))
-
-#define ___bpf_swab64(x) ((__u64)(			\
-			  ___bpf_mvb(x, 64, 0, 7) |	\
-			  ___bpf_mvb(x, 64, 1, 6) |	\
-			  ___bpf_mvb(x, 64, 2, 5) |	\
-			  ___bpf_mvb(x, 64, 3, 4) |	\
-			  ___bpf_mvb(x, 64, 4, 3) |	\
-			  ___bpf_mvb(x, 64, 5, 2) |	\
-			  ___bpf_mvb(x, 64, 6, 1) |	\
-			  ___bpf_mvb(x, 64, 7, 0)))
+#include <linux/stddef.h>
+#include <linux/swab.h>

 /* LLVM's BPF target selects the endianness of the CPU
 * it compiles on, or the user specifies (bpfel/bpfeb),
@@ -50,16 +23,16 @@
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
 # define __bpf_ntohs(x)			__builtin_bswap16(x)
 # define __bpf_htons(x)			__builtin_bswap16(x)
-# define __bpf_constant_ntohs(x)	___bpf_swab16(x)
-# define __bpf_constant_htons(x)	___bpf_swab16(x)
+# define __bpf_constant_ntohs(x)	___constant_swab16(x)
+# define __bpf_constant_htons(x)	___constant_swab16(x)
 # define __bpf_ntohl(x)			__builtin_bswap32(x)
 # define __bpf_htonl(x)			__builtin_bswap32(x)
-# define __bpf_constant_ntohl(x)	___bpf_swab32(x)
-# define __bpf_constant_htonl(x)	___bpf_swab32(x)
+# define __bpf_constant_ntohl(x)	___constant_swab32(x)
+# define __bpf_constant_htonl(x)	___constant_swab32(x)
 # define __bpf_be64_to_cpu(x)		__builtin_bswap64(x)
 # define __bpf_cpu_to_be64(x)		__builtin_bswap64(x)
-# define __bpf_constant_be64_to_cpu(x)	___bpf_swab64(x)
-# define __bpf_constant_cpu_to_be64(x)	___bpf_swab64(x)
+# define __bpf_constant_be64_to_cpu(x)	___constant_swab64(x)
+# define __bpf_constant_cpu_to_be64(x)	___constant_swab64(x)
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 # define __bpf_ntohs(x)			(x)
 # define __bpf_htons(x)			(x)
--- a/src/bpf_helper_defs.h
+++ b/src/bpf_helper_defs.h
@@ -2,7 +2,6 @@

 /* Forward declarations of BPF structs */
 struct bpf_fib_lookup;
-struct bpf_sk_lookup;
 struct bpf_perf_event_data;
 struct bpf_perf_event_value;
 struct bpf_pidns_info;
@@ -20,12 +19,6 @@ struct sk_reuseport_md;
 struct sockaddr;
 struct tcphdr;
 struct seq_file;
-struct tcp6_sock;
-struct tcp_sock;
-struct tcp_timewait_sock;
-struct tcp_request_sock;
-struct udp6_sock;
-struct task_struct;
 struct __sk_buff;
 struct sk_msg_md;
 struct xdp_md;
@@ -61,7 +54,7 @@ static void *(*bpf_map_lookup_elem)(void *map, const void *key) = (void *) 1;
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_map_update_elem)(void *map, const void *key, const void *value, __u64 flags) = (void *) 2;
+static int (*bpf_map_update_elem)(void *map, const void *key, const void *value, __u64 flags) = (void *) 2;

 /*
 * bpf_map_delete_elem
@@ -71,7 +64,7 @@ static long (*bpf_map_update_elem)(void *map, const void *key, const void *value
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_map_delete_elem)(void *map, const void *key) = (void *) 3;
+static int (*bpf_map_delete_elem)(void *map, const void *key) = (void *) 3;

 /*
 * bpf_probe_read
@@ -85,7 +78,7 @@ static long (*bpf_map_delete_elem)(void *map, const void *key) = (void *) 3;
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_probe_read)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 4;
+static int (*bpf_probe_read)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 4;

 /*
 * bpf_ktime_get_ns
@@ -160,7 +153,7 @@ static __u64 (*bpf_ktime_get_ns)(void) = (void *) 5;
 * 	The number of bytes written to the buffer, or a negative error
 * 	in case of failure.
 */
-static long (*bpf_trace_printk)(const char *fmt, __u32 fmt_size, ...) = (void *) 6;
+static int (*bpf_trace_printk)(const char *fmt, __u32 fmt_size, ...) = (void *) 6;

 /*
 * bpf_get_prandom_u32
@@ -210,7 +203,7 @@ static __u32 (*bpf_get_smp_processor_id)(void) = (void *) 8;
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_store_bytes)(struct __sk_buff *skb, __u32 offset, const void *from, __u32 len, __u64 flags) = (void *) 9;
+static int (*bpf_skb_store_bytes)(struct __sk_buff *skb, __u32 offset, const void *from, __u32 len, __u64 flags) = (void *) 9;

 /*
 * bpf_l3_csum_replace
@@ -239,7 +232,7 @@ static long (*bpf_skb_store_bytes)(struct __sk_buff *skb, __u32 offset, const vo
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_l3_csum_replace)(struct __sk_buff *skb, __u32 offset, __u64 from, __u64 to, __u64 size) = (void *) 10;
+static int (*bpf_l3_csum_replace)(struct __sk_buff *skb, __u32 offset, __u64 from, __u64 to, __u64 size) = (void *) 10;

 /*
 * bpf_l4_csum_replace
@@ -275,7 +268,7 @@ static long (*bpf_l3_csum_replace)(struct __sk_buff *skb, __u32 offset, __u64 fr
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_l4_csum_replace)(struct __sk_buff *skb, __u32 offset, __u64 from, __u64 to, __u64 flags) = (void *) 11;
+static int (*bpf_l4_csum_replace)(struct __sk_buff *skb, __u32 offset, __u64 from, __u64 to, __u64 flags) = (void *) 11;

 /*
 * bpf_tail_call
@@ -310,7 +303,7 @@ static long (*bpf_l4_csum_replace)(struct __sk_buff *skb, __u32 offset, __u64 fr
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_tail_call)(void *ctx, void *prog_array_map, __u32 index) = (void *) 12;
+static int (*bpf_tail_call)(void *ctx, void *prog_array_map, __u32 index) = (void *) 12;

 /*
 * bpf_clone_redirect
@@ -338,7 +331,7 @@ static long (*bpf_tail_call)(void *ctx, void *prog_array_map, __u32 index) = (vo
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_clone_redirect)(struct __sk_buff *skb, __u32 ifindex, __u64 flags) = (void *) 13;
+static int (*bpf_clone_redirect)(struct __sk_buff *skb, __u32 ifindex, __u64 flags) = (void *) 13;

 /*
 * bpf_get_current_pid_tgid
@@ -375,7 +368,7 @@ static __u64 (*bpf_get_current_uid_gid)(void) = (void *) 15;
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_get_current_comm)(void *buf, __u32 size_of_buf) = (void *) 16;
+static int (*bpf_get_current_comm)(void *buf, __u32 size_of_buf) = (void *) 16;

 /*
 * bpf_get_cgroup_classid
@@ -425,7 +418,7 @@ static __u32 (*bpf_get_cgroup_classid)(struct __sk_buff *skb) = (void *) 17;
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_vlan_push)(struct __sk_buff *skb, __be16 vlan_proto, __u16 vlan_tci) = (void *) 18;
+static int (*bpf_skb_vlan_push)(struct __sk_buff *skb, __be16 vlan_proto, __u16 vlan_tci) = (void *) 18;

 /*
 * bpf_skb_vlan_pop
@@ -441,7 +434,7 @@ static long (*bpf_skb_vlan_push)(struct __sk_buff *skb, __be16 vlan_proto, __u16
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_vlan_pop)(struct __sk_buff *skb) = (void *) 19;
+static int (*bpf_skb_vlan_pop)(struct __sk_buff *skb) = (void *) 19;

 /*
 * bpf_skb_get_tunnel_key
@@ -496,7 +489,7 @@ static long (*bpf_skb_vlan_pop)(struct __sk_buff *skb) = (void *) 19;
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_get_tunnel_key)(struct __sk_buff *skb, struct bpf_tunnel_key *key, __u32 size, __u64 flags) = (void *) 20;
+static int (*bpf_skb_get_tunnel_key)(struct __sk_buff *skb, struct bpf_tunnel_key *key, __u32 size, __u64 flags) = (void *) 20;

 /*
 * bpf_skb_set_tunnel_key
@@ -537,7 +530,7 @@ static long (*bpf_skb_get_tunnel_key)(struct __sk_buff *skb, struct bpf_tunnel_k
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_set_tunnel_key)(struct __sk_buff *skb, struct bpf_tunnel_key *key, __u32 size, __u64 flags) = (void *) 21;
+static int (*bpf_skb_set_tunnel_key)(struct __sk_buff *skb, struct bpf_tunnel_key *key, __u32 size, __u64 flags) = (void *) 21;

 /*
 * bpf_perf_event_read
@@ -597,7 +590,7 @@ static __u64 (*bpf_perf_event_read)(void *map, __u64 flags) = (void *) 22;
 * 	are **TC_ACT_REDIRECT** on success or **TC_ACT_SHOT** on
 * 	error.
 */
-static long (*bpf_redirect)(__u32 ifindex, __u64 flags) = (void *) 23;
+static int (*bpf_redirect)(__u32 ifindex, __u64 flags) = (void *) 23;

 /*
 * bpf_get_route_realm
@@ -674,7 +667,7 @@ static __u32 (*bpf_get_route_realm)(struct __sk_buff *skb) = (void *) 24;
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_perf_event_output)(void *ctx, void *map, __u64 flags, void *data, __u64 size) = (void *) 25;
+static int (*bpf_perf_event_output)(void *ctx, void *map, __u64 flags, void *data, __u64 size) = (void *) 25;

 /*
 * bpf_skb_load_bytes
@@ -695,7 +688,7 @@ static long (*bpf_perf_event_output)(void *ctx, void *map, __u64 flags, void *da
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_load_bytes)(const void *skb, __u32 offset, void *to, __u32 len) = (void *) 26;
+static int (*bpf_skb_load_bytes)(const void *skb, __u32 offset, void *to, __u32 len) = (void *) 26;

 /*
 * bpf_get_stackid
@@ -741,7 +734,7 @@ static long (*bpf_skb_load_bytes)(const void *skb, __u32 offset, void *to, __u32
 * 	The positive or null stack id on success, or a negative error
 * 	in case of failure.
 */
-static long (*bpf_get_stackid)(void *ctx, void *map, __u64 flags) = (void *) 27;
+static int (*bpf_get_stackid)(void *ctx, void *map, __u64 flags) = (void *) 27;

 /*
 * bpf_csum_diff
@@ -794,7 +787,7 @@ static __s64 (*bpf_csum_diff)(__be32 *from, __u32 from_size, __be32 *to, __u32 t
 * Returns
 * 	The size of the option data retrieved.
 */
-static long (*bpf_skb_get_tunnel_opt)(struct __sk_buff *skb, void *opt, __u32 size) = (void *) 29;
+static int (*bpf_skb_get_tunnel_opt)(struct __sk_buff *skb, void *opt, __u32 size) = (void *) 29;

 /*
 * bpf_skb_set_tunnel_opt
@@ -808,7 +801,7 @@ static long (*bpf_skb_get_tunnel_opt)(struct __sk_buff *skb, void *opt, __u32 si
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_set_tunnel_opt)(struct __sk_buff *skb, void *opt, __u32 size) = (void *) 30;
+static int (*bpf_skb_set_tunnel_opt)(struct __sk_buff *skb, void *opt, __u32 size) = (void *) 30;

 /*
 * bpf_skb_change_proto
@@ -839,7 +832,7 @@ static long (*bpf_skb_set_tunnel_opt)(struct __sk_buff *skb, void *opt, __u32 si
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_change_proto)(struct __sk_buff *skb, __be16 proto, __u64 flags) = (void *) 31;
+static int (*bpf_skb_change_proto)(struct __sk_buff *skb, __be16 proto, __u64 flags) = (void *) 31;

 /*
 * bpf_skb_change_type
@@ -870,7 +863,7 @@ static long (*bpf_skb_change_proto)(struct __sk_buff *skb, __be16 proto, __u64 f
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_change_type)(struct __sk_buff *skb, __u32 type) = (void *) 32;
+static int (*bpf_skb_change_type)(struct __sk_buff *skb, __u32 type) = (void *) 32;

 /*
 * bpf_skb_under_cgroup
@@ -885,7 +878,7 @@ static long (*bpf_skb_change_type)(struct __sk_buff *skb, __u32 type) = (void *)
 * 	* 1, if the *skb* succeeded the cgroup2 descendant test.
 * 	* A negative error code, if an error occurred.
 */
-static long (*bpf_skb_under_cgroup)(struct __sk_buff *skb, void *map, __u32 index) = (void *) 33;
+static int (*bpf_skb_under_cgroup)(struct __sk_buff *skb, void *map, __u32 index) = (void *) 33;

 /*
 * bpf_get_hash_recalc
@@ -937,7 +930,7 @@ static __u64 (*bpf_get_current_task)(void) = (void *) 35;
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_probe_write_user)(void *dst, const void *src, __u32 len) = (void *) 36;
+static int (*bpf_probe_write_user)(void *dst, const void *src, __u32 len) = (void *) 36;

 /*
 * bpf_current_task_under_cgroup
@@ -953,7 +946,7 @@ static long (*bpf_probe_write_user)(void *dst, const void *src, __u32 len) = (vo
 * 	* 1, if the *skb* task does not belong to the cgroup2.
 * 	* A negative error code, if an error occurred.
 */
-static long (*bpf_current_task_under_cgroup)(void *map, __u32 index) = (void *) 37;
+static int (*bpf_current_task_under_cgroup)(void *map, __u32 index) = (void *) 37;

 /*
 * bpf_skb_change_tail
@@ -981,7 +974,7 @@ static long (*bpf_current_task_under_cgroup)(void *map, __u32 index) = (void *)
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_change_tail)(struct __sk_buff *skb, __u32 len, __u64 flags) = (void *) 38;
+static int (*bpf_skb_change_tail)(struct __sk_buff *skb, __u32 len, __u64 flags) = (void *) 38;

 /*
 * bpf_skb_pull_data
@@ -1021,7 +1014,7 @@ static long (*bpf_skb_change_tail)(struct __sk_buff *skb, __u32 len, __u64 flags
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_pull_data)(struct __sk_buff *skb, __u32 len) = (void *) 39;
+static int (*bpf_skb_pull_data)(struct __sk_buff *skb, __u32 len) = (void *) 39;

 /*
 * bpf_csum_update
@@ -1064,7 +1057,7 @@ static void (*bpf_set_hash_invalid)(struct __sk_buff *skb) = (void *) 41;
 * Returns
 * 	The id of current NUMA node.
 */
-static long (*bpf_get_numa_node_id)(void) = (void *) 42;
+static int (*bpf_get_numa_node_id)(void) = (void *) 42;

 /*
 * bpf_skb_change_head
@@ -1089,7 +1082,7 @@ static long (*bpf_get_numa_node_id)(void) = (void *) 42;
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_change_head)(struct __sk_buff *skb, __u32 len, __u64 flags) = (void *) 43;
+static int (*bpf_skb_change_head)(struct __sk_buff *skb, __u32 len, __u64 flags) = (void *) 43;

 /*
 * bpf_xdp_adjust_head
@@ -1108,7 +1101,7 @@ static long (*bpf_skb_change_head)(struct __sk_buff *skb, __u32 len, __u64 flags
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_xdp_adjust_head)(struct xdp_md *xdp_md, int delta) = (void *) 44;
+static int (*bpf_xdp_adjust_head)(struct xdp_md *xdp_md, int delta) = (void *) 44;

 /*
 * bpf_probe_read_str
@@ -1125,7 +1118,7 @@ static long (*bpf_xdp_adjust_head)(struct xdp_md *xdp_md, int delta) = (void *)
 * 	including the trailing NUL character. On error, a negative
 * 	value.
 */
-static long (*bpf_probe_read_str)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 45;
+static int (*bpf_probe_read_str)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 45;

 /*
 * bpf_get_socket_cookie
@@ -1166,7 +1159,7 @@ static __u32 (*bpf_get_socket_uid)(struct __sk_buff *skb) = (void *) 47;
 * Returns
 * 	0
 */
-static long (*bpf_set_hash)(struct __sk_buff *skb, __u32 hash) = (void *) 48;
+static __u32 (*bpf_set_hash)(struct __sk_buff *skb, __u32 hash) = (void *) 48;

 /*
 * bpf_setsockopt
@@ -1188,20 +1181,17 @@ static long (*bpf_set_hash)(struct __sk_buff *skb, __u32 hash) = (void *) 48;
 *
 * 	* **SOL_SOCKET**, which supports the following *optname*\ s:
 * 	  **SO_RCVBUF**, **SO_SNDBUF**, **SO_MAX_PACING_RATE**,
- * 	  **SO_PRIORITY**, **SO_RCVLOWAT**, **SO_MARK**,
- * 	  **SO_BINDTODEVICE**, **SO_KEEPALIVE**.
+ * 	  **SO_PRIORITY**, **SO_RCVLOWAT**, **SO_MARK**.
 * 	* **IPPROTO_TCP**, which supports the following *optname*\ s:
 * 	  **TCP_CONGESTION**, **TCP_BPF_IW**,
- * 	  **TCP_BPF_SNDCWND_CLAMP**, **TCP_SAVE_SYN**,
- * 	  **TCP_KEEPIDLE**, **TCP_KEEPINTVL**, **TCP_KEEPCNT**,
- * 	  **TCP_SYNCNT**, **TCP_USER_TIMEOUT**.
+ * 	  **TCP_BPF_SNDCWND_CLAMP**.
 * 	* **IPPROTO_IP**, which supports *optname* **IP_TOS**.
 * 	* **IPPROTO_IPV6**, which supports *optname* **IPV6_TCLASS**.
 *
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_setsockopt)(void *bpf_socket, int level, int optname, void *optval, int optlen) = (void *) 49;
+static int (*bpf_setsockopt)(void *bpf_socket, int level, int optname, void *optval, int optlen) = (void *) 49;

 /*
 * bpf_skb_adjust_room
@@ -1251,7 +1241,7 @@ static long (*bpf_setsockopt)(void *bpf_socket, int level, int optname, void *op
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_adjust_room)(struct __sk_buff *skb, __s32 len_diff, __u32 mode, __u64 flags) = (void *) 50;
+static int (*bpf_skb_adjust_room)(struct __sk_buff *skb, __s32 len_diff, __u32 mode, __u64 flags) = (void *) 50;

 /*
 * bpf_redirect_map
@@ -1276,7 +1266,7 @@ static long (*bpf_skb_adjust_room)(struct __sk_buff *skb, __s32 len_diff, __u32
 * 	**XDP_REDIRECT** on success, or the value of the two lower bits
 * 	of the *flags* argument on error.
 */
-static long (*bpf_redirect_map)(void *map, __u32 key, __u64 flags) = (void *) 51;
+static int (*bpf_redirect_map)(void *map, __u32 key, __u64 flags) = (void *) 51;

 /*
 * bpf_sk_redirect_map
@@ -1291,7 +1281,7 @@ static long (*bpf_redirect_map)(void *map, __u32 key, __u64 flags) = (void *) 51
 * Returns
 * 	**SK_PASS** on success, or **SK_DROP** on error.
 */
-static long (*bpf_sk_redirect_map)(struct __sk_buff *skb, void *map, __u32 key, __u64 flags) = (void *) 52;
+static int (*bpf_sk_redirect_map)(struct __sk_buff *skb, void *map, __u32 key, __u64 flags) = (void *) 52;

 /*
 * bpf_sock_map_update
@@ -1314,7 +1304,7 @@ static long (*bpf_sk_redirect_map)(struct __sk_buff *skb, void *map, __u32 key,
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_sock_map_update)(struct bpf_sock_ops *skops, void *map, void *key, __u64 flags) = (void *) 53;
+static int (*bpf_sock_map_update)(struct bpf_sock_ops *skops, void *map, void *key, __u64 flags) = (void *) 53;

 /*
 * bpf_xdp_adjust_meta
@@ -1347,7 +1337,7 @@ static long (*bpf_sock_map_update)(struct bpf_sock_ops *skops, void *map, void *
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_xdp_adjust_meta)(struct xdp_md *xdp_md, int delta) = (void *) 54;
+static int (*bpf_xdp_adjust_meta)(struct xdp_md *xdp_md, int delta) = (void *) 54;

 /*
 * bpf_perf_event_read_value
@@ -1401,7 +1391,7 @@ static long (*bpf_xdp_adjust_meta)(struct xdp_md *xdp_md, int delta) = (void *)
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_perf_event_read_value)(void *map, __u64 flags, struct bpf_perf_event_value *buf, __u32 buf_size) = (void *) 55;
+static int (*bpf_perf_event_read_value)(void *map, __u64 flags, struct bpf_perf_event_value *buf, __u32 buf_size) = (void *) 55;

 /*
 * bpf_perf_prog_read_value
@@ -1416,7 +1406,7 @@ static long (*bpf_perf_event_read_value)(void *map, __u64 flags, struct bpf_perf
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_perf_prog_read_value)(struct bpf_perf_event_data *ctx, struct bpf_perf_event_value *buf, __u32 buf_size) = (void *) 56;
+static int (*bpf_perf_prog_read_value)(struct bpf_perf_event_data *ctx, struct bpf_perf_event_value *buf, __u32 buf_size) = (void *) 56;

 /*
 * bpf_getsockopt
@@ -1445,7 +1435,7 @@ static long (*bpf_perf_prog_read_value)(struct bpf_perf_event_data *ctx, struct
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_getsockopt)(void *bpf_socket, int level, int optname, void *optval, int optlen) = (void *) 57;
+static int (*bpf_getsockopt)(void *bpf_socket, int level, int optname, void *optval, int optlen) = (void *) 57;

 /*
 * bpf_override_return
@@ -1474,7 +1464,7 @@ static long (*bpf_getsockopt)(void *bpf_socket, int level, int optname, void *op
 * Returns
 * 	0
 */
-static long (*bpf_override_return)(struct pt_regs *regs, __u64 rc) = (void *) 58;
+static int (*bpf_override_return)(struct pt_regs *regs, __u64 rc) = (void *) 58;

 /*
 * bpf_sock_ops_cb_flags_set
@@ -1522,7 +1512,7 @@ static long (*bpf_override_return)(struct pt_regs *regs, __u64 rc) = (void *) 58
 * 	be set is returned (which comes down to 0 if all bits were set
 * 	as required).
 */
-static long (*bpf_sock_ops_cb_flags_set)(struct bpf_sock_ops *bpf_sock, int argval) = (void *) 59;
+static int (*bpf_sock_ops_cb_flags_set)(struct bpf_sock_ops *bpf_sock, int argval) = (void *) 59;

 /*
 * bpf_msg_redirect_map
@@ -1540,7 +1530,7 @@ static long (*bpf_sock_ops_cb_flags_set)(struct bpf_sock_ops *bpf_sock, int argv
 * Returns
 * 	**SK_PASS** on success, or **SK_DROP** on error.
 */
-static long (*bpf_msg_redirect_map)(struct sk_msg_md *msg, void *map, __u32 key, __u64 flags) = (void *) 60;
+static int (*bpf_msg_redirect_map)(struct sk_msg_md *msg, void *map, __u32 key, __u64 flags) = (void *) 60;

 /*
 * bpf_msg_apply_bytes
@@ -1578,7 +1568,7 @@ static long (*bpf_msg_redirect_map)(struct sk_msg_md *msg, void *map, __u32 key,
 * Returns
 * 	0
 */
-static long (*bpf_msg_apply_bytes)(struct sk_msg_md *msg, __u32 bytes) = (void *) 61;
+static int (*bpf_msg_apply_bytes)(struct sk_msg_md *msg, __u32 bytes) = (void *) 61;

 /*
 * bpf_msg_cork_bytes
@@ -1600,7 +1590,7 @@ static long (*bpf_msg_apply_bytes)(struct sk_msg_md *msg, __u32 bytes) = (void *
 * Returns
 * 	0
 */
-static long (*bpf_msg_cork_bytes)(struct sk_msg_md *msg, __u32 bytes) = (void *) 62;
+static int (*bpf_msg_cork_bytes)(struct sk_msg_md *msg, __u32 bytes) = (void *) 62;

 /*
 * bpf_msg_pull_data
@@ -1635,7 +1625,7 @@ static long (*bpf_msg_cork_bytes)(struct sk_msg_md *msg, __u32 bytes) = (void *)
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_msg_pull_data)(struct sk_msg_md *msg, __u32 start, __u32 end, __u64 flags) = (void *) 63;
+static int (*bpf_msg_pull_data)(struct sk_msg_md *msg, __u32 start, __u32 end, __u64 flags) = (void *) 63;

 /*
 * bpf_bind
@@ -1657,7 +1647,7 @@ static long (*bpf_msg_pull_data)(struct sk_msg_md *msg, __u32 start, __u32 end,
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_bind)(struct bpf_sock_addr *ctx, struct sockaddr *addr, int addr_len) = (void *) 64;
+static int (*bpf_bind)(struct bpf_sock_addr *ctx, struct sockaddr *addr, int addr_len) = (void *) 64;

 /*
 * bpf_xdp_adjust_tail
@@ -1675,7 +1665,7 @@ static long (*bpf_bind)(struct bpf_sock_addr *ctx, struct sockaddr *addr, int ad
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_xdp_adjust_tail)(struct xdp_md *xdp_md, int delta) = (void *) 65;
+static int (*bpf_xdp_adjust_tail)(struct xdp_md *xdp_md, int delta) = (void *) 65;

 /*
 * bpf_skb_get_xfrm_state
@@ -1695,7 +1685,7 @@ static long (*bpf_xdp_adjust_tail)(struct xdp_md *xdp_md, int delta) = (void *)
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_get_xfrm_state)(struct __sk_buff *skb, __u32 index, struct bpf_xfrm_state *xfrm_state, __u32 size, __u64 flags) = (void *) 66;
+static int (*bpf_skb_get_xfrm_state)(struct __sk_buff *skb, __u32 index, struct bpf_xfrm_state *xfrm_state, __u32 size, __u64 flags) = (void *) 66;

 /*
 * bpf_get_stack
@@ -1732,7 +1722,7 @@ static long (*bpf_skb_get_xfrm_state)(struct __sk_buff *skb, __u32 index, struct
 * 	A non-negative value equal to or less than *size* on success,
 * 	or a negative error in case of failure.
 */
-static long (*bpf_get_stack)(void *ctx, void *buf, __u32 size, __u64 flags) = (void *) 67;
+static int (*bpf_get_stack)(void *ctx, void *buf, __u32 size, __u64 flags) = (void *) 67;

 /*
 * bpf_skb_load_bytes_relative
@@ -1758,7 +1748,7 @@ static long (*bpf_get_stack)(void *ctx, void *buf, __u32 size, __u64 flags) = (v
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_load_bytes_relative)(const void *skb, __u32 offset, void *to, __u32 len, __u32 start_header) = (void *) 68;
+static int (*bpf_skb_load_bytes_relative)(const void *skb, __u32 offset, void *to, __u32 len, __u32 start_header) = (void *) 68;

 /*
 * bpf_fib_lookup
@@ -1793,7 +1783,7 @@ static long (*bpf_skb_load_bytes_relative)(const void *skb, __u32 offset, void *
 * 	* > 0 one of **BPF_FIB_LKUP_RET_** codes explaining why the
 * 	  packet is not forwarded or needs assist from full stack
 */
-static long (*bpf_fib_lookup)(void *ctx, struct bpf_fib_lookup *params, int plen, __u32 flags) = (void *) 69;
+static int (*bpf_fib_lookup)(void *ctx, struct bpf_fib_lookup *params, int plen, __u32 flags) = (void *) 69;

 /*
 * bpf_sock_hash_update
@@ -1816,7 +1806,7 @@ static long (*bpf_fib_lookup)(void *ctx, struct bpf_fib_lookup *params, int plen
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_sock_hash_update)(struct bpf_sock_ops *skops, void *map, void *key, __u64 flags) = (void *) 70;
+static int (*bpf_sock_hash_update)(struct bpf_sock_ops *skops, void *map, void *key, __u64 flags) = (void *) 70;

 /*
 * bpf_msg_redirect_hash
@@ -1834,7 +1824,7 @@ static long (*bpf_sock_hash_update)(struct bpf_sock_ops *skops, void *map, void
 * Returns
 * 	**SK_PASS** on success, or **SK_DROP** on error.
 */
-static long (*bpf_msg_redirect_hash)(struct sk_msg_md *msg, void *map, void *key, __u64 flags) = (void *) 71;
+static int (*bpf_msg_redirect_hash)(struct sk_msg_md *msg, void *map, void *key, __u64 flags) = (void *) 71;

 /*
 * bpf_sk_redirect_hash
@@ -1852,7 +1842,7 @@ static long (*bpf_msg_redirect_hash)(struct sk_msg_md *msg, void *map, void *key
 * Returns
 * 	**SK_PASS** on success, or **SK_DROP** on error.
 */
-static long (*bpf_sk_redirect_hash)(struct __sk_buff *skb, void *map, void *key, __u64 flags) = (void *) 72;
+static int (*bpf_sk_redirect_hash)(struct __sk_buff *skb, void *map, void *key, __u64 flags) = (void *) 72;

 /*
 * bpf_lwt_push_encap
@@ -1893,7 +1883,7 @@ static long (*bpf_sk_redirect_hash)(struct __sk_buff *skb, void *map, void *key,
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_lwt_push_encap)(struct __sk_buff *skb, __u32 type, void *hdr, __u32 len) = (void *) 73;
+static int (*bpf_lwt_push_encap)(struct __sk_buff *skb, __u32 type, void *hdr, __u32 len) = (void *) 73;

 /*
 * bpf_lwt_seg6_store_bytes
@@ -1912,7 +1902,7 @@ static long (*bpf_lwt_push_encap)(struct __sk_buff *skb, __u32 type, void *hdr,
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_lwt_seg6_store_bytes)(struct __sk_buff *skb, __u32 offset, const void *from, __u32 len) = (void *) 74;
+static int (*bpf_lwt_seg6_store_bytes)(struct __sk_buff *skb, __u32 offset, const void *from, __u32 len) = (void *) 74;

 /*
 * bpf_lwt_seg6_adjust_srh
@@ -1932,7 +1922,7 @@ static long (*bpf_lwt_seg6_store_bytes)(struct __sk_buff *skb, __u32 offset, con
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_lwt_seg6_adjust_srh)(struct __sk_buff *skb, __u32 offset, __s32 delta) = (void *) 75;
+static int (*bpf_lwt_seg6_adjust_srh)(struct __sk_buff *skb, __u32 offset, __s32 delta) = (void *) 75;

 /*
 * bpf_lwt_seg6_action
@@ -1965,7 +1955,7 @@ static long (*bpf_lwt_seg6_adjust_srh)(struct __sk_buff *skb, __u32 offset, __s3
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_lwt_seg6_action)(struct __sk_buff *skb, __u32 action, void *param, __u32 param_len) = (void *) 76;
+static int (*bpf_lwt_seg6_action)(struct __sk_buff *skb, __u32 action, void *param, __u32 param_len) = (void *) 76;

 /*
 * bpf_rc_repeat
@@ -1988,7 +1978,7 @@ static long (*bpf_lwt_seg6_action)(struct __sk_buff *skb, __u32 action, void *pa
 * Returns
 * 	0
 */
-static long (*bpf_rc_repeat)(void *ctx) = (void *) 77;
+static int (*bpf_rc_repeat)(void *ctx) = (void *) 77;

 /*
 * bpf_rc_keydown
@@ -2018,7 +2008,7 @@ static long (*bpf_rc_repeat)(void *ctx) = (void *) 77;
 * Returns
 * 	0
 */
-static long (*bpf_rc_keydown)(void *ctx, __u32 protocol, __u64 scancode, __u32 toggle) = (void *) 78;
+static int (*bpf_rc_keydown)(void *ctx, __u32 protocol, __u64 scancode, __u32 toggle) = (void *) 78;

 /*
 * bpf_skb_cgroup_id
@@ -2083,7 +2073,7 @@ static void *(*bpf_get_local_storage)(void *map, __u64 flags) = (void *) 81;
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_sk_select_reuseport)(struct sk_reuseport_md *reuse, void *map, void *key, __u64 flags) = (void *) 82;
+static int (*bpf_sk_select_reuseport)(struct sk_reuseport_md *reuse, void *map, void *key, __u64 flags) = (void *) 82;

 /*
 * bpf_skb_ancestor_cgroup_id
@@ -2126,7 +2116,7 @@ static __u64 (*bpf_skb_ancestor_cgroup_id)(struct __sk_buff *skb, int ancestor_l
 * 		Look for an IPv6 socket.
 *
 * 	If the *netns* is a negative signed 32-bit integer, then the
- * 	socket lookup table in the netns associated with the *ctx*
+ * 	socket lookup table in the netns associated with the *ctx* will
 * 	will be used. For the TC hooks, this is the netns of the device
 * 	in the skb. For socket hooks, this is the netns of the socket.
 * 	If *netns* is any other signed 32-bit value greater than or
@@ -2167,7 +2157,7 @@ static struct bpf_sock *(*bpf_sk_lookup_tcp)(void *ctx, struct bpf_sock_tuple *t
 * 		Look for an IPv6 socket.
 *
 * 	If the *netns* is a negative signed 32-bit integer, then the
- * 	socket lookup table in the netns associated with the *ctx*
+ * 	socket lookup table in the netns associated with the *ctx* will
 * 	will be used. For the TC hooks, this is the netns of the device
 * 	in the skb. For socket hooks, this is the netns of the socket.
 * 	If *netns* is any other signed 32-bit value greater than or
@@ -2199,7 +2189,7 @@ static struct bpf_sock *(*bpf_sk_lookup_udp)(void *ctx, struct bpf_sock_tuple *t
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_sk_release)(struct bpf_sock *sock) = (void *) 86;
+static int (*bpf_sk_release)(struct bpf_sock *sock) = (void *) 86;

 /*
 * bpf_map_push_elem
@@ -2213,7 +2203,7 @@ static long (*bpf_sk_release)(struct bpf_sock *sock) = (void *) 86;
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_map_push_elem)(void *map, const void *value, __u64 flags) = (void *) 87;
+static int (*bpf_map_push_elem)(void *map, const void *value, __u64 flags) = (void *) 87;

 /*
 * bpf_map_pop_elem
@@ -2223,7 +2213,7 @@ static long (*bpf_map_push_elem)(void *map, const void *value, __u64 flags) = (v
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_map_pop_elem)(void *map, void *value) = (void *) 88;
+static int (*bpf_map_pop_elem)(void *map, void *value) = (void *) 88;

 /*
 * bpf_map_peek_elem
@@ -2233,7 +2223,7 @@ static long (*bpf_map_pop_elem)(void *map, void *value) = (void *) 88;
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_map_peek_elem)(void *map, void *value) = (void *) 89;
+static int (*bpf_map_peek_elem)(void *map, void *value) = (void *) 89;

 /*
 * bpf_msg_push_data
@@ -2253,7 +2243,7 @@ static long (*bpf_map_peek_elem)(void *map, void *value) = (void *) 89;
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_msg_push_data)(struct sk_msg_md *msg, __u32 start, __u32 len, __u64 flags) = (void *) 90;
+static int (*bpf_msg_push_data)(struct sk_msg_md *msg, __u32 start, __u32 len, __u64 flags) = (void *) 90;

 /*
 * bpf_msg_pop_data
@@ -2269,7 +2259,7 @@ static long (*bpf_msg_push_data)(struct sk_msg_md *msg, __u32 start, __u32 len,
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_msg_pop_data)(struct sk_msg_md *msg, __u32 start, __u32 len, __u64 flags) = (void *) 91;
+static int (*bpf_msg_pop_data)(struct sk_msg_md *msg, __u32 start, __u32 len, __u64 flags) = (void *) 91;

 /*
 * bpf_rc_pointer_rel
@@ -2287,7 +2277,7 @@ static long (*bpf_msg_pop_data)(struct sk_msg_md *msg, __u32 start, __u32 len, _
 * Returns
 * 	0
 */
-static long (*bpf_rc_pointer_rel)(void *ctx, __s32 rel_x, __s32 rel_y) = (void *) 92;
+static int (*bpf_rc_pointer_rel)(void *ctx, __s32 rel_x, __s32 rel_y) = (void *) 92;

 /*
 * bpf_spin_lock
@@ -2339,7 +2329,7 @@ static long (*bpf_rc_pointer_rel)(void *ctx, __s32 rel_x, __s32 rel_y) = (void *
 * Returns
 * 	0
 */
-static long (*bpf_spin_lock)(struct bpf_spin_lock *lock) = (void *) 93;
+static int (*bpf_spin_lock)(struct bpf_spin_lock *lock) = (void *) 93;

 /*
 * bpf_spin_unlock
@@ -2350,7 +2340,7 @@ static long (*bpf_spin_lock)(struct bpf_spin_lock *lock) = (void *) 93;
 * Returns
 * 	0
 */
-static long (*bpf_spin_unlock)(struct bpf_spin_lock *lock) = (void *) 94;
+static int (*bpf_spin_unlock)(struct bpf_spin_lock *lock) = (void *) 94;

 /*
 * bpf_sk_fullsock
@@ -2388,7 +2378,7 @@ static struct bpf_tcp_sock *(*bpf_tcp_sock)(struct bpf_sock *sk) = (void *) 96;
 * 	1 if the **CE** flag is set (either by the current helper call
 * 	or because it was already present), 0 if it is not set.
 */
-static long (*bpf_skb_ecn_set_ce)(struct __sk_buff *skb) = (void *) 97;
+static int (*bpf_skb_ecn_set_ce)(struct __sk_buff *skb) = (void *) 97;

 /*
 * bpf_get_listener_sock
@@ -2442,7 +2432,7 @@ static struct bpf_sock *(*bpf_skc_lookup_tcp)(void *ctx, struct bpf_sock_tuple *
 * 	0 if *iph* and *th* are a valid SYN cookie ACK, or a negative
 * 	error otherwise.
 */
-static long (*bpf_tcp_check_syncookie)(struct bpf_sock *sk, void *iph, __u32 iph_len, struct tcphdr *th, __u32 th_len) = (void *) 100;
+static int (*bpf_tcp_check_syncookie)(struct bpf_sock *sk, void *iph, __u32 iph_len, struct tcphdr *th, __u32 th_len) = (void *) 100;

 /*
 * bpf_sysctl_get_name
@@ -2462,7 +2452,7 @@ static long (*bpf_tcp_check_syncookie)(struct bpf_sock *sk, void *iph, __u32 iph
 * 	**-E2BIG** if the buffer wasn't big enough (*buf* will contain
 * 	truncated name in this case).
 */
-static long (*bpf_sysctl_get_name)(struct bpf_sysctl *ctx, char *buf, unsigned long buf_len, __u64 flags) = (void *) 101;
+static int (*bpf_sysctl_get_name)(struct bpf_sysctl *ctx, char *buf, unsigned long buf_len, __u64 flags) = (void *) 101;

 /*
 * bpf_sysctl_get_current_value
@@ -2485,7 +2475,7 @@ static long (*bpf_sysctl_get_name)(struct bpf_sysctl *ctx, char *buf, unsigned l
 * 	**-EINVAL** if current value was unavailable, e.g. because
 * 	sysctl is uninitialized and read returns -EIO for it.
 */
-static long (*bpf_sysctl_get_current_value)(struct bpf_sysctl *ctx, char *buf, unsigned long buf_len) = (void *) 102;
+static int (*bpf_sysctl_get_current_value)(struct bpf_sysctl *ctx, char *buf, unsigned long buf_len) = (void *) 102;

 /*
 * bpf_sysctl_get_new_value
@@ -2506,7 +2496,7 @@ static long (*bpf_sysctl_get_current_value)(struct bpf_sysctl *ctx, char *buf, u
 *
 * 	**-EINVAL** if sysctl is being read.
 */
-static long (*bpf_sysctl_get_new_value)(struct bpf_sysctl *ctx, char *buf, unsigned long buf_len) = (void *) 103;
+static int (*bpf_sysctl_get_new_value)(struct bpf_sysctl *ctx, char *buf, unsigned long buf_len) = (void *) 103;

 /*
 * bpf_sysctl_set_new_value
@@ -2527,7 +2517,7 @@ static long (*bpf_sysctl_get_new_value)(struct bpf_sysctl *ctx, char *buf, unsig
 *
 * 	**-EINVAL** if sysctl is being read.
 */
-static long (*bpf_sysctl_set_new_value)(struct bpf_sysctl *ctx, const char *buf, unsigned long buf_len) = (void *) 104;
+static int (*bpf_sysctl_set_new_value)(struct bpf_sysctl *ctx, const char *buf, unsigned long buf_len) = (void *) 104;

 /*
 * bpf_strtol
@@ -2555,7 +2545,7 @@ static long (*bpf_sysctl_set_new_value)(struct bpf_sysctl *ctx, const char *buf,
 *
 * 	**-ERANGE** if resulting value was out of range.
 */
-static long (*bpf_strtol)(const char *buf, unsigned long buf_len, __u64 flags, long *res) = (void *) 105;
+static int (*bpf_strtol)(const char *buf, unsigned long buf_len, __u64 flags, long *res) = (void *) 105;

 /*
 * bpf_strtoul
@@ -2582,7 +2572,7 @@ static long (*bpf_strtol)(const char *buf, unsigned long buf_len, __u64 flags, l
 *
 * 	**-ERANGE** if resulting value was out of range.
 */
-static long (*bpf_strtoul)(const char *buf, unsigned long buf_len, __u64 flags, unsigned long *res) = (void *) 106;
+static int (*bpf_strtoul)(const char *buf, unsigned long buf_len, __u64 flags, unsigned long *res) = (void *) 106;

 /*
 * bpf_sk_storage_get
@@ -2626,7 +2616,7 @@ static void *(*bpf_sk_storage_get)(void *map, struct bpf_sock *sk, void *value,
 *
 * 	**-ENOENT** if the bpf-local-storage cannot be found.
 */
-static long (*bpf_sk_storage_delete)(void *map, struct bpf_sock *sk) = (void *) 108;
+static int (*bpf_sk_storage_delete)(void *map, struct bpf_sock *sk) = (void *) 108;

 /*
 * bpf_send_signal
@@ -2645,7 +2635,7 @@ static long (*bpf_sk_storage_delete)(void *map, struct bpf_sock *sk) = (void *)
 *
 * 	**-EAGAIN** if bpf program can try again.
 */
-static long (*bpf_send_signal)(__u32 sig) = (void *) 109;
+static int (*bpf_send_signal)(__u32 sig) = (void *) 109;

 /*
 * bpf_tcp_gen_syncookie
@@ -2703,7 +2693,7 @@ static __s64 (*bpf_tcp_gen_syncookie)(struct bpf_sock *sk, void *iph, __u32 iph_
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_skb_output)(void *ctx, void *map, __u64 flags, void *data, __u64 size) = (void *) 111;
+static int (*bpf_skb_output)(void *ctx, void *map, __u64 flags, void *data, __u64 size) = (void *) 111;

 /*
 * bpf_probe_read_user
@@ -2714,7 +2704,7 @@ static long (*bpf_skb_output)(void *ctx, void *map, __u64 flags, void *data, __u
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_probe_read_user)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 112;
+static int (*bpf_probe_read_user)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 112;

 /*
 * bpf_probe_read_kernel
@@ -2725,7 +2715,7 @@ static long (*bpf_probe_read_user)(void *dst, __u32 size, const void *unsafe_ptr
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_probe_read_kernel)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 113;
+static int (*bpf_probe_read_kernel)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 113;

 /*
 * bpf_probe_read_user_str
@@ -2773,7 +2763,7 @@ static long (*bpf_probe_read_kernel)(void *dst, __u32 size, const void *unsafe_p
 * 	including the trailing NUL character. On error, a negative
 * 	value.
 */
-static long (*bpf_probe_read_user_str)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 114;
+static int (*bpf_probe_read_user_str)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 114;

 /*
 * bpf_probe_read_kernel_str
@@ -2785,7 +2775,7 @@ static long (*bpf_probe_read_user_str)(void *dst, __u32 size, const void *unsafe
 * 	On success, the strictly positive length of the string, including
 * 	the trailing NUL character. On error, a negative value.
 */
-static long (*bpf_probe_read_kernel_str)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 115;
+static int (*bpf_probe_read_kernel_str)(void *dst, __u32 size, const void *unsafe_ptr) = (void *) 115;

 /*
 * bpf_tcp_send_ack
@@ -2796,7 +2786,7 @@ static long (*bpf_probe_read_kernel_str)(void *dst, __u32 size, const void *unsa
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_tcp_send_ack)(void *tp, __u32 rcv_nxt) = (void *) 116;
+static int (*bpf_tcp_send_ack)(void *tp, __u32 rcv_nxt) = (void *) 116;

 /*
 * bpf_send_signal_thread
@@ -2814,7 +2804,7 @@ static long (*bpf_tcp_send_ack)(void *tp, __u32 rcv_nxt) = (void *) 116;
 *
 * 	**-EAGAIN** if bpf program can try again.
 */
-static long (*bpf_send_signal_thread)(__u32 sig) = (void *) 117;
+static int (*bpf_send_signal_thread)(__u32 sig) = (void *) 117;

 /*
 * bpf_jiffies64
@@ -2847,7 +2837,7 @@ static __u64 (*bpf_jiffies64)(void) = (void *) 118;
 *
 * 	**-ENOENT** if architecture does not support branch records.
 */
-static long (*bpf_read_branch_records)(struct bpf_perf_event_data *ctx, void *buf, __u32 size, __u64 flags) = (void *) 119;
+static int (*bpf_read_branch_records)(struct bpf_perf_event_data *ctx, void *buf, __u32 size, __u64 flags) = (void *) 119;

 /*
 * bpf_get_ns_current_pid_tgid
@@ -2863,7 +2853,7 @@ static long (*bpf_read_branch_records)(struct bpf_perf_event_data *ctx, void *bu
 *
 * 	**-ENOENT** if pidns does not exists for the current task.
 */
-static long (*bpf_get_ns_current_pid_tgid)(__u64 dev, __u64 ino, struct bpf_pidns_info *nsdata, __u32 size) = (void *) 120;
+static int (*bpf_get_ns_current_pid_tgid)(__u64 dev, __u64 ino, struct bpf_pidns_info *nsdata, __u32 size) = (void *) 120;

 /*
 * bpf_xdp_output
@@ -2891,7 +2881,7 @@ static long (*bpf_get_ns_current_pid_tgid)(__u64 dev, __u64 ino, struct bpf_pidn
 * Returns
 * 	0 on success, or a negative error in case of failure.
 */
-static long (*bpf_xdp_output)(void *ctx, void *map, __u64 flags, void *data, __u64 size) = (void *) 121;
+static int (*bpf_xdp_output)(void *ctx, void *map, __u64 flags, void *data, __u64 size) = (void *) 121;

 /*
 * bpf_get_netns_cookie
@@ -2935,10 +2925,6 @@ static __u64 (*bpf_get_current_ancestor_cgroup_id)(int ancestor_level) = (void *
 /*
 * bpf_sk_assign
 *
- * 	Helper is overloaded depending on BPF program type. This
- * 	description applies to **BPF_PROG_TYPE_SCHED_CLS** and
- * 	**BPF_PROG_TYPE_SCHED_ACT** programs.
- *
 * 	Assign the *sk* to the *skb*. When combined with appropriate
 * 	routing configuration to receive the packet towards the socket,
 * 	will cause *skb* to be delivered to the specified socket.
@@ -2965,7 +2951,7 @@ static __u64 (*bpf_get_current_ancestor_cgroup_id)(int ancestor_level) = (void *
 * 	**-ESOCKTNOSUPPORT** if the socket type is not supported
 * 	(reuseport).
 */
-static long (*bpf_sk_assign)(void *ctx, struct bpf_sock *sk, __u64 flags) = (void *) 124;
+static int (*bpf_sk_assign)(struct __sk_buff *skb, struct bpf_sock *sk, __u64 flags) = (void *) 124;

 /*
 * bpf_ktime_get_boot_ns
@@ -3010,7 +2996,7 @@ static __u64 (*bpf_ktime_get_boot_ns)(void) = (void *) 125;
 *
 * 	**-EOVERFLOW** if an overflow happened: The same object will be tried again.
 */
-static long (*bpf_seq_printf)(struct seq_file *m, const char *fmt, __u32 fmt_size, const void *data, __u32 data_len) = (void *) 126;
+static int (*bpf_seq_printf)(struct seq_file *m, const char *fmt, __u32 fmt_size, const void *data, __u32 data_len) = (void *) 126;

 /*
 * bpf_seq_write
@@ -3024,7 +3010,7 @@ static long (*bpf_seq_printf)(struct seq_file *m, const char *fmt, __u32 fmt_siz
 *
 * 	**-EOVERFLOW** if an overflow happened: The same object will be tried again.
 */
-static long (*bpf_seq_write)(struct seq_file *m, const void *data, __u32 len) = (void *) 127;
+static int (*bpf_seq_write)(struct seq_file *m, const void *data, __u32 len) = (void *) 127;

 /*
 * bpf_sk_cgroup_id
@@ -3070,15 +3056,16 @@ static __u64 (*bpf_sk_ancestor_cgroup_id)(struct bpf_sock *sk, int ancestor_leve
 * bpf_ringbuf_output
 *
 * 	Copy *size* bytes from *data* into a ring buffer *ringbuf*.
- * 	If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
- * 	of new data availability is sent.
- * 	If **BPF_RB_FORCE_WAKEUP** is specified in *flags*, notification
- * 	of new data availability is sent unconditionally.
+ * 	If BPF_RB_NO_WAKEUP is specified in *flags*, no notification of
+ * 	new data availability is sent.
+ * 	IF BPF_RB_FORCE_WAKEUP is specified in *flags*, notification of
+ * 	new data availability is sent unconditionally.
 *
 * Returns
- * 	0 on success, or a negative error in case of failure.
+ * 	0, on success;
+ * 	< 0, on error.
 */
-static long (*bpf_ringbuf_output)(void *ringbuf, void *data, __u64 size, __u64 flags) = (void *) 130;
+static int (*bpf_ringbuf_output)(void *ringbuf, void *data, __u64 size, __u64 flags) = (void *) 130;

 /*
 * bpf_ringbuf_reserve
@@ -3095,10 +3082,10 @@ static void *(*bpf_ringbuf_reserve)(void *ringbuf, __u64 size, __u64 flags) = (v
 * bpf_ringbuf_submit
 *
 * 	Submit reserved ring buffer sample, pointed to by *data*.
- * 	If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
- * 	of new data availability is sent.
- * 	If **BPF_RB_FORCE_WAKEUP** is specified in *flags*, notification
- * 	of new data availability is sent unconditionally.
+ * 	If BPF_RB_NO_WAKEUP is specified in *flags*, no notification of
+ * 	new data availability is sent.
+ * 	IF BPF_RB_FORCE_WAKEUP is specified in *flags*, notification of
+ * 	new data availability is sent unconditionally.
 *
 * Returns
 * 	Nothing. Always succeeds.
@@ -3109,10 +3096,10 @@ static void (*bpf_ringbuf_submit)(void *data, __u64 flags) = (void *) 132;
 * bpf_ringbuf_discard
 *
 * 	Discard reserved ring buffer sample, pointed to by *data*.
- * 	If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
- * 	of new data availability is sent.
- * 	If **BPF_RB_FORCE_WAKEUP** is specified in *flags*, notification
- * 	of new data availability is sent unconditionally.
+ * 	If BPF_RB_NO_WAKEUP is specified in *flags*, no notification of
+ * 	new data availability is sent.
+ * 	IF BPF_RB_FORCE_WAKEUP is specified in *flags*, notification of
+ * 	new data availability is sent unconditionally.
 *
 * Returns
 * 	Nothing. Always succeeds.
@@ -3124,19 +3111,17 @@ static void (*bpf_ringbuf_discard)(void *data, __u64 flags) = (void *) 133;
 *
 * 	Query various characteristics of provided ring buffer. What
 * 	exactly is queries is determined by *flags*:
- *
- * 	* **BPF_RB_AVAIL_DATA**: Amount of data not yet consumed.
- * 	* **BPF_RB_RING_SIZE**: The size of ring buffer.
- * 	* **BPF_RB_CONS_POS**: Consumer position (can wrap around).
- * 	* **BPF_RB_PROD_POS**: Producer(s) position (can wrap around).
- *
- * 	Data returned is just a momentary snapshot of actual values
+ * 	  - BPF_RB_AVAIL_DATA - amount of data not yet consumed;
+ * 	  - BPF_RB_RING_SIZE - the size of ring buffer;
+ * 	  - BPF_RB_CONS_POS - consumer position (can wrap around);
+ * 	  - BPF_RB_PROD_POS - producer(s) position (can wrap around);
+ * 	Data returned is just a momentary snapshots of actual values
 * 	and could be inaccurate, so this facility should be used to
 * 	power heuristics and for reporting, not to make 100% correct
 * 	calculation.
 *
 * Returns
- * 	Requested value, or 0, if *flags* are not recognized.
+ * 	Requested value, or 0, if flags are not recognized.
 */
 static __u64 (*bpf_ringbuf_query)(void *ringbuf, __u64 flags) = (void *) 134;

@@ -3174,92 +3159,6 @@ static __u64 (*bpf_ringbuf_query)(void *ringbuf, __u64 flags) = (void *) 134;
 * 	is returned or the error code -EACCES in case the skb is not
 * 	subject to CHECKSUM_UNNECESSARY.
 */
-static long (*bpf_csum_level)(struct __sk_buff *skb, __u64 level) = (void *) 135;
-
-/*
- * bpf_skc_to_tcp6_sock
- *
- * 	Dynamically cast a *sk* pointer to a *tcp6_sock* pointer.
- *
- * Returns
- * 	*sk* if casting is valid, or NULL otherwise.
- */
-static struct tcp6_sock *(*bpf_skc_to_tcp6_sock)(void *sk) = (void *) 136;
-
-/*
- * bpf_skc_to_tcp_sock
- *
- * 	Dynamically cast a *sk* pointer to a *tcp_sock* pointer.
- *
- * Returns
- * 	*sk* if casting is valid, or NULL otherwise.
- */
-static struct tcp_sock *(*bpf_skc_to_tcp_sock)(void *sk) = (void *) 137;
-
-/*
- * bpf_skc_to_tcp_timewait_sock
- *
- * 	Dynamically cast a *sk* pointer to a *tcp_timewait_sock* pointer.
- *
- * Returns
- * 	*sk* if casting is valid, or NULL otherwise.
- */
-static struct tcp_timewait_sock *(*bpf_skc_to_tcp_timewait_sock)(void *sk) = (void *) 138;
-
-/*
- * bpf_skc_to_tcp_request_sock
- *
- * 	Dynamically cast a *sk* pointer to a *tcp_request_sock* pointer.
- *
- * Returns
- * 	*sk* if casting is valid, or NULL otherwise.
- */
-static struct tcp_request_sock *(*bpf_skc_to_tcp_request_sock)(void *sk) = (void *) 139;
-
-/*
- * bpf_skc_to_udp6_sock
- *
- * 	Dynamically cast a *sk* pointer to a *udp6_sock* pointer.
- *
- * Returns
- * 	*sk* if casting is valid, or NULL otherwise.
- */
-static struct udp6_sock *(*bpf_skc_to_udp6_sock)(void *sk) = (void *) 140;
-
-/*
- * bpf_get_task_stack
- *
- * 	Return a user or a kernel stack in bpf program provided buffer.
- * 	To achieve this, the helper needs *task*, which is a valid
- * 	pointer to struct task_struct. To store the stacktrace, the
- * 	bpf program provides *buf* with	a nonnegative *size*.
- *
- * 	The last argument, *flags*, holds the number of stack frames to
- * 	skip (from 0 to 255), masked with
- * 	**BPF_F_SKIP_FIELD_MASK**. The next bits can be used to set
- * 	the following flags:
- *
- * 	**BPF_F_USER_STACK**
- * 		Collect a user space stack instead of a kernel stack.
- * 	**BPF_F_USER_BUILD_ID**
- * 		Collect buildid+offset instead of ips for user stack,
- * 		only valid if **BPF_F_USER_STACK** is also specified.
- *
- * 	**bpf_get_task_stack**\ () can collect up to
- * 	**PERF_MAX_STACK_DEPTH** both kernel and user frames, subject
- * 	to sufficient large buffer size. Note that
- * 	this limit can be controlled with the **sysctl** program, and
- * 	that it should be manually increased in order to profile long
- * 	user stacks (such as stacks for Java programs). To do so, use:
- *
- * 	::
- *
- * 		# sysctl kernel.perf_event_max_stack=<new value>
- *
- * Returns
- * 	A non-negative value equal to or less than *size* on success,
- * 	or a negative error in case of failure.
- */
-static long (*bpf_get_task_stack)(struct task_struct *task, void *buf, __u32 size, __u64 flags) = (void *) 141;
+static int (*bpf_csum_level)(struct __sk_buff *skb, __u64 level) = (void *) 135;


--- a/src/bpf_helpers.h
+++ b/src/bpf_helpers.h
@@ -40,7 +40,7 @@
 * Helper macro to manipulate data structures
 */
 #ifndef offsetof
-#define offsetof(TYPE, MEMBER)	((unsigned long)&((TYPE *)0)->MEMBER)
+#define offsetof(TYPE, MEMBER)  ((size_t)&((TYPE *)0)->MEMBER)
 #endif
 #ifndef container_of
 #define container_of(ptr, type, member)				\
@@ -75,6 +75,5 @@ enum libbpf_tristate {
 };

 #define __kconfig __attribute__((section(".kconfig")))
-#define __ksym __attribute__((section(".ksyms")))

 #endif
--- a/src/bpf_tracing.h
+++ b/src/bpf_tracing.h
@@ -215,7 +215,7 @@ struct pt_regs;
 #define PT_REGS_PARM5(x) ((x)->regs[8])
 #define PT_REGS_RET(x) ((x)->regs[31])
 #define PT_REGS_FP(x) ((x)->regs[30]) /* Works only with CONFIG_FRAME_POINTER */
-#define PT_REGS_RC(x) ((x)->regs[2])
+#define PT_REGS_RC(x) ((x)->regs[1])
 #define PT_REGS_SP(x) ((x)->regs[29])
 #define PT_REGS_IP(x) ((x)->cp0_epc)

@@ -226,7 +226,7 @@ struct pt_regs;
 #define PT_REGS_PARM5_CORE(x) BPF_CORE_READ((x), regs[8])
 #define PT_REGS_RET_CORE(x) BPF_CORE_READ((x), regs[31])
 #define PT_REGS_FP_CORE(x) BPF_CORE_READ((x), regs[30])
-#define PT_REGS_RC_CORE(x) BPF_CORE_READ((x), regs[2])
+#define PT_REGS_RC_CORE(x) BPF_CORE_READ((x), regs[1])
 #define PT_REGS_SP_CORE(x) BPF_CORE_READ((x), regs[29])
 #define PT_REGS_IP_CORE(x) BPF_CORE_READ((x), cp0_epc)

--- a/src/btf.c
+++ b/src/btf.c
@@ -41,7 +41,6 @@ struct btf {
 	__u32 types_size;
 	__u32 data_size;
 	int fd;
-	int ptr_sz;
 };

 static inline __u64 ptr_to_u64(const void *ptr)
@@ -222,70 +221,6 @@ const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 type_id)
 	return btf->types[type_id];
 }

-static int determine_ptr_size(const struct btf *btf)
-{
-	const struct btf_type *t;
-	const char *name;
-	int i;
-
-	for (i = 1; i <= btf->nr_types; i++) {
-		t = btf__type_by_id(btf, i);
-		if (!btf_is_int(t))
-			continue;
-
-		name = btf__name_by_offset(btf, t->name_off);
-		if (!name)
-			continue;
-
-		if (strcmp(name, "long int") == 0 ||
-		    strcmp(name, "long unsigned int") == 0) {
-			if (t->size != 4 && t->size != 8)
-				continue;
-			return t->size;
-		}
-	}
-
-	return -1;
-}
-
-static size_t btf_ptr_sz(const struct btf *btf)
-{
-	if (!btf->ptr_sz)
-		((struct btf *)btf)->ptr_sz = determine_ptr_size(btf);
-	return btf->ptr_sz < 0 ? sizeof(void *) : btf->ptr_sz;
-}
-
-/* Return pointer size this BTF instance assumes. The size is heuristically
- * determined by looking for 'long' or 'unsigned long' integer type and
- * recording its size in bytes. If BTF type information doesn't have any such
- * type, this function returns 0. In the latter case, native architecture's
- * pointer size is assumed, so will be either 4 or 8, depending on
- * architecture that libbpf was compiled for. It's possible to override
- * guessed value by using btf__set_pointer_size() API.
- */
-size_t btf__pointer_size(const struct btf *btf)
-{
-	if (!btf->ptr_sz)
-		((struct btf *)btf)->ptr_sz = determine_ptr_size(btf);
-
-	if (btf->ptr_sz < 0)
-		/* not enough BTF type info to guess */
-		return 0;
-
-	return btf->ptr_sz;
-}
-
-/* Override or set pointer size in bytes. Only values of 4 and 8 are
- * supported.
- */
-int btf__set_pointer_size(struct btf *btf, size_t ptr_sz)
-{
-	if (ptr_sz != 4 && ptr_sz != 8)
-		return -EINVAL;
-	btf->ptr_sz = ptr_sz;
-	return 0;
-}
-
 static bool btf_type_is_void(const struct btf_type *t)
 {
 	return t == &btf_void || btf_is_fwd(t);
@@ -318,7 +253,7 @@ __s64 btf__resolve_size(const struct btf *btf, __u32 type_id)
 			size = t->size;
 			goto done;
 		case BTF_KIND_PTR:
-			size = btf_ptr_sz(btf);
+			size = sizeof(void *);
 			goto done;
 		case BTF_KIND_TYPEDEF:
 		case BTF_KIND_VOLATILE:
@@ -358,9 +293,9 @@ int btf__align_of(const struct btf *btf, __u32 id)
 	switch (kind) {
 	case BTF_KIND_INT:
 	case BTF_KIND_ENUM:
-		return min(btf_ptr_sz(btf), (size_t)t->size);
+		return min(sizeof(void *), (size_t)t->size);
 	case BTF_KIND_PTR:
-		return btf_ptr_sz(btf);
+		return sizeof(void *);
 	case BTF_KIND_TYPEDEF:
 	case BTF_KIND_VOLATILE:
 	case BTF_KIND_CONST:
@@ -451,10 +386,10 @@ __s32 btf__find_by_name_kind(const struct btf *btf, const char *type_name,

 void btf__free(struct btf *btf)
 {
-	if (IS_ERR_OR_NULL(btf))
+	if (!btf)
 		return;

-	if (btf->fd >= 0)
+	if (btf->fd != -1)
 		close(btf->fd);

 	free(btf->data);
@@ -462,7 +397,7 @@ void btf__free(struct btf *btf)
 	free(btf);
 }

-struct btf *btf__new(const void *data, __u32 size)
+struct btf *btf__new(__u8 *data, __u32 size)
 {
 	struct btf *btf;
 	int err;
@@ -598,18 +533,6 @@ struct btf *btf__parse_elf(const char *path, struct btf_ext **btf_ext)
 	if (IS_ERR(btf))
 		goto done;

-	switch (gelf_getclass(elf)) {
-	case ELFCLASS32:
-		btf__set_pointer_size(btf, 4);
-		break;
-	case ELFCLASS64:
-		btf__set_pointer_size(btf, 8);
-		break;
-	default:
-		pr_warn("failed to get ELF class (bitness) for %s\n", path);
-		break;
-	}
-
 	if (btf_ext && btf_ext_data) {
 		*btf_ext = btf_ext__new(btf_ext_data->d_buf,
 					btf_ext_data->d_size);
@@ -639,83 +562,6 @@ done:
 	return btf;
 }

-struct btf *btf__parse_raw(const char *path)
-{
-	struct btf *btf = NULL;
-	void *data = NULL;
-	FILE *f = NULL;
-	__u16 magic;
-	int err = 0;
-	long sz;
-
-	f = fopen(path, "rb");
-	if (!f) {
-		err = -errno;
-		goto err_out;
-	}
-
-	/* check BTF magic */
-	if (fread(&magic, 1, sizeof(magic), f) < sizeof(magic)) {
-		err = -EIO;
-		goto err_out;
-	}
-	if (magic != BTF_MAGIC) {
-		/* definitely not a raw BTF */
-		err = -EPROTO;
-		goto err_out;
-	}
-
-	/* get file size */
-	if (fseek(f, 0, SEEK_END)) {
-		err = -errno;
-		goto err_out;
-	}
-	sz = ftell(f);
-	if (sz < 0) {
-		err = -errno;
-		goto err_out;
-	}
-	/* rewind to the start */
-	if (fseek(f, 0, SEEK_SET)) {
-		err = -errno;
-		goto err_out;
-	}
-
-	/* pre-alloc memory and read all of BTF data */
-	data = malloc(sz);
-	if (!data) {
-		err = -ENOMEM;
-		goto err_out;
-	}
-	if (fread(data, 1, sz, f) < sz) {
-		err = -EIO;
-		goto err_out;
-	}
-
-	/* finally parse BTF data */
-	btf = btf__new(data, sz);
-
-err_out:
-	free(data);
-	if (f)
-		fclose(f);
-	return err ? ERR_PTR(err) : btf;
-}
-
-struct btf *btf__parse(const char *path, struct btf_ext **btf_ext)
-{
-	struct btf *btf;
-
-	if (btf_ext)
-		*btf_ext = NULL;
-
-	btf = btf__parse_raw(path);
-	if (!IS_ERR(btf) || PTR_ERR(btf) != -EPROTO)
-		return btf;
-
-	return btf__parse_elf(path, btf_ext);
-}
-
 static int compare_vsi_off(const void *_a, const void *_b)
 {
 	const struct btf_var_secinfo *a = _a;
@@ -854,11 +700,6 @@ int btf__fd(const struct btf *btf)
 	return btf->fd;
 }

-void btf__set_fd(struct btf *btf, int fd)
-{
-	btf->fd = fd;
-}
-
 const void *btf__get_raw_data(const struct btf *btf, __u32 *size)
 {
 	*size = btf->data_size;
@@ -1179,7 +1020,7 @@ static int btf_ext_parse_hdr(__u8 *data, __u32 data_size)

 void btf_ext__free(struct btf_ext *btf_ext)
 {
-	if (IS_ERR_OR_NULL(btf_ext))
+	if (!btf_ext)
 		return;
 	free(btf_ext->data);
 	free(btf_ext);
@@ -3105,6 +2946,41 @@ static int btf_dedup_remap_types(struct btf_dedup *d)
 	return 0;
 }

+static struct btf *btf_load_raw(const char *path)
+{
+	struct btf *btf;
+	size_t read_cnt;
+	struct stat st;
+	void *data;
+	FILE *f;
+
+	if (stat(path, &st))
+		return ERR_PTR(-errno);
+
+	data = malloc(st.st_size);
+	if (!data)
+		return ERR_PTR(-ENOMEM);
+
+	f = fopen(path, "rb");
+	if (!f) {
+		btf = ERR_PTR(-errno);
+		goto cleanup;
+	}
+
+	read_cnt = fread(data, 1, st.st_size, f);
+	fclose(f);
+	if (read_cnt < st.st_size) {
+		btf = ERR_PTR(-EBADF);
+		goto cleanup;
+	}
+
+	btf = btf__new(data, read_cnt);
+
+cleanup:
+	free(data);
+	return btf;
+}
+
 /*
 * Probe few well-known locations for vmlinux kernel image and try to load BTF
 * data out of it to use for target BTF.
@@ -3140,7 +3016,7 @@ struct btf *libbpf_find_kernel_btf(void)
 			continue;

 		if (locations[i].raw_btf)
-			btf = btf__parse_raw(path);
+			btf = btf_load_raw(path);
 		else
 			btf = btf__parse_elf(path, NULL);

--- a/src/btf.h
+++ b/src/btf.h
@@ -63,10 +63,9 @@ struct btf_ext_header {
 };

 LIBBPF_API void btf__free(struct btf *btf);
-LIBBPF_API struct btf *btf__new(const void *data, __u32 size);
-LIBBPF_API struct btf *btf__parse(const char *path, struct btf_ext **btf_ext);
-LIBBPF_API struct btf *btf__parse_elf(const char *path, struct btf_ext **btf_ext);
-LIBBPF_API struct btf *btf__parse_raw(const char *path);
+LIBBPF_API struct btf *btf__new(__u8 *data, __u32 size);
+LIBBPF_API struct btf *btf__parse_elf(const char *path,
+				      struct btf_ext **btf_ext);
 LIBBPF_API int btf__finalize_data(struct bpf_object *obj, struct btf *btf);
 LIBBPF_API int btf__load(struct btf *btf);
 LIBBPF_API __s32 btf__find_by_name(const struct btf *btf,
@@ -76,13 +75,10 @@ LIBBPF_API __s32 btf__find_by_name_kind(const struct btf *btf,
 LIBBPF_API __u32 btf__get_nr_types(const struct btf *btf);
 LIBBPF_API const struct btf_type *btf__type_by_id(const struct btf *btf,
 						  __u32 id);
-LIBBPF_API size_t btf__pointer_size(const struct btf *btf);
-LIBBPF_API int btf__set_pointer_size(struct btf *btf, size_t ptr_sz);
 LIBBPF_API __s64 btf__resolve_size(const struct btf *btf, __u32 type_id);
 LIBBPF_API int btf__resolve_type(const struct btf *btf, __u32 type_id);
 LIBBPF_API int btf__align_of(const struct btf *btf, __u32 id);
 LIBBPF_API int btf__fd(const struct btf *btf);
-LIBBPF_API void btf__set_fd(struct btf *btf, int fd);
 LIBBPF_API const void *btf__get_raw_data(const struct btf *btf, __u32 *size);
 LIBBPF_API const char *btf__name_by_offset(const struct btf *btf, __u32 offset);
 LIBBPF_API int btf__get_from_id(__u32 id, struct btf **btf);
@@ -147,10 +143,8 @@ struct btf_dump_emit_type_decl_opts {
 	 * necessary indentation already
 	 */
 	int indent_level;
-	/* strip all the const/volatile/restrict mods */
-	bool strip_mods;
 };
-#define btf_dump_emit_type_decl_opts__last_field strip_mods
+#define btf_dump_emit_type_decl_opts__last_field indent_level

 LIBBPF_API int
 btf_dump__emit_type_decl(struct btf_dump *d, __u32 id,
@@ -174,11 +168,6 @@ static inline bool btf_kflag(const struct btf_type *t)
 	return BTF_INFO_KFLAG(t->info);
 }

-static inline bool btf_is_void(const struct btf_type *t)
-{
-	return btf_kind(t) == BTF_KIND_UNKN;
-}
-
 static inline bool btf_is_int(const struct btf_type *t)
 {
 	return btf_kind(t) == BTF_KIND_INT;
--- a/src/btf_dump.c
+++ b/src/btf_dump.c
@@ -13,7 +13,6 @@
 #include <errno.h>
 #include <linux/err.h>
 #include <linux/btf.h>
-#include <linux/kernel.h>
 #include "btf.h"
 #include "hashmap.h"
 #include "libbpf.h"
@@ -61,8 +60,6 @@ struct btf_dump {
 	const struct btf_ext *btf_ext;
 	btf_dump_printf_fn_t printf_fn;
 	struct btf_dump_opts opts;
-	int ptr_sz;
-	bool strip_mods;

 	/* per-type auxiliary state */
 	struct btf_dump_type_aux_state *type_states;
@@ -140,7 +137,6 @@ struct btf_dump *btf_dump__new(const struct btf *btf,
 	d->btf_ext = btf_ext;
 	d->printf_fn = printf_fn;
 	d->opts.ctx = opts ? opts->ctx : NULL;
-	d->ptr_sz = btf__pointer_size(btf) ? : sizeof(void *);

 	d->type_names = hashmap__new(str_hash_fn, str_equal_fn, NULL);
 	if (IS_ERR(d->type_names)) {
@@ -186,7 +182,7 @@ void btf_dump__free(struct btf_dump *d)
 {
 	int i, cnt;

-	if (IS_ERR_OR_NULL(d))
+	if (!d)
 		return;

 	free(d->type_states);
@@ -552,9 +548,6 @@ static int btf_dump_order_type(struct btf_dump *d, __u32 id, bool through_ptr)
 	}
 }

-static void btf_dump_emit_missing_aliases(struct btf_dump *d, __u32 id,
-					  const struct btf_type *t);
-
 static void btf_dump_emit_struct_fwd(struct btf_dump *d, __u32 id,
 				     const struct btf_type *t);
 static void btf_dump_emit_struct_def(struct btf_dump *d, __u32 id,
@@ -677,9 +670,6 @@ static void btf_dump_emit_type(struct btf_dump *d, __u32 id, __u32 cont_id)

 	switch (kind) {
 	case BTF_KIND_INT:
-		/* Emit type alias definitions if necessary */
-		btf_dump_emit_missing_aliases(d, id, t);
-
 		tstate->emit_state = EMITTED;
 		break;
 	case BTF_KIND_ENUM:
@@ -806,7 +796,7 @@ static void btf_dump_emit_bit_padding(const struct btf_dump *d,
 				      int align, int lvl)
 {
 	int off_diff = m_off - cur_off;
-	int ptr_bits = d->ptr_sz * 8;
+	int ptr_bits = sizeof(void *) * 8;

 	if (off_diff <= 0)
 		/* no gap */
@@ -879,7 +869,7 @@ static void btf_dump_emit_struct_def(struct btf_dump *d,
 			btf_dump_printf(d, ": %d", m_sz);
 			off = m_off + m_sz;
 		} else {
-			m_sz = max((__s64)0, btf__resolve_size(d->btf, m->type));
+			m_sz = max(0, btf__resolve_size(d->btf, m->type));
 			off = m_off + m_sz * 8;
 		}
 		btf_dump_printf(d, ";");
@@ -899,32 +889,6 @@ static void btf_dump_emit_struct_def(struct btf_dump *d,
 		btf_dump_printf(d, " __attribute__((packed))");
 }

-static const char *missing_base_types[][2] = {
-	/*
-	 * GCC emits typedefs to its internal __PolyX_t types when compiling Arm
-	 * SIMD intrinsics. Alias them to standard base types.
-	 */
-	{ "__Poly8_t",		"unsigned char" },
-	{ "__Poly16_t",		"unsigned short" },
-	{ "__Poly64_t",		"unsigned long long" },
-	{ "__Poly128_t",	"unsigned __int128" },
-};
-
-static void btf_dump_emit_missing_aliases(struct btf_dump *d, __u32 id,
-					  const struct btf_type *t)
-{
-	const char *name = btf_dump_type_name(d, id);
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(missing_base_types); i++) {
-		if (strcmp(name, missing_base_types[i][0]) == 0) {
-			btf_dump_printf(d, "typedef %s %s;\n\n",
-					missing_base_types[i][1], name);
-			break;
-		}
-	}
-}
-
 static void btf_dump_emit_enum_fwd(struct btf_dump *d, __u32 id,
 				   const struct btf_type *t)
 {
@@ -1068,9 +1032,7 @@ int btf_dump__emit_type_decl(struct btf_dump *d, __u32 id,

 	fname = OPTS_GET(opts, field_name, "");
 	lvl = OPTS_GET(opts, indent_level, 0);
-	d->strip_mods = OPTS_GET(opts, strip_mods, false);
 	btf_dump_emit_type_decl(d, id, fname, lvl);
-	d->strip_mods = false;
 	return 0;
 }

@@ -1083,10 +1045,6 @@ static void btf_dump_emit_type_decl(struct btf_dump *d, __u32 id,

 	stack_start = d->decl_stack_cnt;
 	for (;;) {
-		t = btf__type_by_id(d->btf, id);
-		if (d->strip_mods && btf_is_mod(t))
-			goto skip_mod;
-
 		err = btf_dump_push_decl_stack_id(d, id);
 		if (err < 0) {
 			/*
@@ -1098,11 +1056,12 @@ static void btf_dump_emit_type_decl(struct btf_dump *d, __u32 id,
 			d->decl_stack_cnt = stack_start;
 			return;
 		}
-skip_mod:
+
 		/* VOID */
 		if (id == 0)
 			break;

+		t = btf__type_by_id(d->btf, id);
 		switch (btf_kind(t)) {
 		case BTF_KIND_PTR:
 		case BTF_KIND_VOLATILE:
--- a/src/hashmap.h
+++ b/src/hashmap.h
@@ -11,18 +11,14 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <limits.h>
+#ifndef __WORDSIZE
+#define __WORDSIZE (__SIZEOF_LONG__ * 8)
+#endif

 static inline size_t hash_bits(size_t h, int bits)
 {
 	/* shuffle bits and return requested number of upper bits */
-#if (__SIZEOF_SIZE_T__ == __SIZEOF_LONG_LONG__)
-	/* LP64 case */
-	return (h * 11400714819323198485llu) >> (__SIZEOF_LONG_LONG__ * 8 - bits);
-#elif (__SIZEOF_SIZE_T__ <= __SIZEOF_LONG__)
-	return (h * 2654435769lu) >> (__SIZEOF_LONG__ * 8 - bits);
-#else
-#	error "Unsupported size_t size"
-#endif
+	return (h * 11400714819323198485llu) >> (__WORDSIZE - bits);
 }

 typedef size_t (*hashmap_hash_fn)(const void *key, void *ctx);
--- a/src/libbpf.c
+++ b/src/libbpf.c
--- a/src/libbpf.h
+++ b/src/libbpf.h
@@ -200,8 +200,6 @@ LIBBPF_API void bpf_program__set_ifindex(struct bpf_program *prog,
 LIBBPF_API const char *bpf_program__name(const struct bpf_program *prog);
 LIBBPF_API const char *bpf_program__title(const struct bpf_program *prog,
 					  bool needs_copy);
-LIBBPF_API bool bpf_program__autoload(const struct bpf_program *prog);
-LIBBPF_API int bpf_program__set_autoload(struct bpf_program *prog, bool autoload);

 /* returns program size in bytes */
 LIBBPF_API size_t bpf_program__size(const struct bpf_program *prog);
@@ -229,7 +227,6 @@ LIBBPF_API int bpf_link__unpin(struct bpf_link *link);
 LIBBPF_API int bpf_link__update_program(struct bpf_link *link,
 					struct bpf_program *prog);
 LIBBPF_API void bpf_link__disconnect(struct bpf_link *link);
-LIBBPF_API int bpf_link__detach(struct bpf_link *link);
 LIBBPF_API int bpf_link__destroy(struct bpf_link *link);

 LIBBPF_API struct bpf_link *
@@ -258,8 +255,6 @@ LIBBPF_API struct bpf_link *
 bpf_program__attach_cgroup(struct bpf_program *prog, int cgroup_fd);
 LIBBPF_API struct bpf_link *
 bpf_program__attach_netns(struct bpf_program *prog, int netns_fd);
-LIBBPF_API struct bpf_link *
-bpf_program__attach_xdp(struct bpf_program *prog, int ifindex);

 struct bpf_map;

@@ -267,10 +262,8 @@ LIBBPF_API struct bpf_link *bpf_map__attach_struct_ops(struct bpf_map *map);

 struct bpf_iter_attach_opts {
 	size_t sz; /* size of this struct for forward/backward compatibility */
-	union bpf_iter_link_info *link_info;
-	__u32 link_info_len;
 };
-#define bpf_iter_attach_opts__last_field link_info_len
+#define bpf_iter_attach_opts__last_field sz

 LIBBPF_API struct bpf_link *
 bpf_program__attach_iter(struct bpf_program *prog,
@@ -355,7 +348,6 @@ LIBBPF_API int bpf_program__set_perf_event(struct bpf_program *prog);
 LIBBPF_API int bpf_program__set_tracing(struct bpf_program *prog);
 LIBBPF_API int bpf_program__set_struct_ops(struct bpf_program *prog);
 LIBBPF_API int bpf_program__set_extension(struct bpf_program *prog);
-LIBBPF_API int bpf_program__set_sk_lookup(struct bpf_program *prog);

 LIBBPF_API enum bpf_prog_type bpf_program__get_type(struct bpf_program *prog);
 LIBBPF_API void bpf_program__set_type(struct bpf_program *prog,
@@ -383,7 +375,6 @@ LIBBPF_API bool bpf_program__is_perf_event(const struct bpf_program *prog);
 LIBBPF_API bool bpf_program__is_tracing(const struct bpf_program *prog);
 LIBBPF_API bool bpf_program__is_struct_ops(const struct bpf_program *prog);
 LIBBPF_API bool bpf_program__is_extension(const struct bpf_program *prog);
-LIBBPF_API bool bpf_program__is_sk_lookup(const struct bpf_program *prog);

 /*
 * No need for __attribute__((packed)), all members of 'bpf_map_def'
@@ -427,38 +418,11 @@ bpf_map__next(const struct bpf_map *map, const struct bpf_object *obj);
 LIBBPF_API struct bpf_map *
 bpf_map__prev(const struct bpf_map *map, const struct bpf_object *obj);

-/* get/set map FD */
 LIBBPF_API int bpf_map__fd(const struct bpf_map *map);
-LIBBPF_API int bpf_map__reuse_fd(struct bpf_map *map, int fd);
-/* get map definition */
 LIBBPF_API const struct bpf_map_def *bpf_map__def(const struct bpf_map *map);
-/* get map name */
 LIBBPF_API const char *bpf_map__name(const struct bpf_map *map);
-/* get/set map type */
-LIBBPF_API enum bpf_map_type bpf_map__type(const struct bpf_map *map);
-LIBBPF_API int bpf_map__set_type(struct bpf_map *map, enum bpf_map_type type);
-/* get/set map size (max_entries) */
-LIBBPF_API __u32 bpf_map__max_entries(const struct bpf_map *map);
-LIBBPF_API int bpf_map__set_max_entries(struct bpf_map *map, __u32 max_entries);
-LIBBPF_API int bpf_map__resize(struct bpf_map *map, __u32 max_entries);
-/* get/set map flags */
-LIBBPF_API __u32 bpf_map__map_flags(const struct bpf_map *map);
-LIBBPF_API int bpf_map__set_map_flags(struct bpf_map *map, __u32 flags);
-/* get/set map NUMA node */
-LIBBPF_API __u32 bpf_map__numa_node(const struct bpf_map *map);
-LIBBPF_API int bpf_map__set_numa_node(struct bpf_map *map, __u32 numa_node);
-/* get/set map key size */
-LIBBPF_API __u32 bpf_map__key_size(const struct bpf_map *map);
-LIBBPF_API int bpf_map__set_key_size(struct bpf_map *map, __u32 size);
-/* get/set map value size */
-LIBBPF_API __u32 bpf_map__value_size(const struct bpf_map *map);
-LIBBPF_API int bpf_map__set_value_size(struct bpf_map *map, __u32 size);
-/* get map key/value BTF type IDs */
 LIBBPF_API __u32 bpf_map__btf_key_type_id(const struct bpf_map *map);
 LIBBPF_API __u32 bpf_map__btf_value_type_id(const struct bpf_map *map);
-/* get/set map if_index */
-LIBBPF_API __u32 bpf_map__ifindex(const struct bpf_map *map);
-LIBBPF_API int bpf_map__set_ifindex(struct bpf_map *map, __u32 ifindex);

 typedef void (*bpf_map_clear_priv_t)(struct bpf_map *, void *);
 LIBBPF_API int bpf_map__set_priv(struct bpf_map *map, void *priv,
@@ -466,8 +430,11 @@ LIBBPF_API int bpf_map__set_priv(struct bpf_map *map, void *priv,
 LIBBPF_API void *bpf_map__priv(const struct bpf_map *map);
 LIBBPF_API int bpf_map__set_initial_value(struct bpf_map *map,
 					  const void *data, size_t size);
+LIBBPF_API int bpf_map__reuse_fd(struct bpf_map *map, int fd);
+LIBBPF_API int bpf_map__resize(struct bpf_map *map, __u32 max_entries);
 LIBBPF_API bool bpf_map__is_offload_neutral(const struct bpf_map *map);
 LIBBPF_API bool bpf_map__is_internal(const struct bpf_map *map);
+LIBBPF_API void bpf_map__set_ifindex(struct bpf_map *map, __u32 ifindex);
 LIBBPF_API int bpf_map__set_pin_path(struct bpf_map *map, const char *path);
 LIBBPF_API const char *bpf_map__get_pin_path(const struct bpf_map *map);
 LIBBPF_API bool bpf_map__is_pinned(const struct bpf_map *map);
--- a/src/libbpf.map
+++ b/src/libbpf.map
@@ -270,32 +270,3 @@ LIBBPF_0.0.9 {
 		ring_buffer__new;
 		ring_buffer__poll;
 } LIBBPF_0.0.8;
-
-LIBBPF_0.1.0 {
-	global:
-		bpf_link__detach;
-		bpf_link_detach;
-		bpf_map__ifindex;
-		bpf_map__key_size;
-		bpf_map__map_flags;
-		bpf_map__max_entries;
-		bpf_map__numa_node;
-		bpf_map__set_key_size;
-		bpf_map__set_map_flags;
-		bpf_map__set_max_entries;
-		bpf_map__set_numa_node;
-		bpf_map__set_type;
-		bpf_map__set_value_size;
-		bpf_map__type;
-		bpf_map__value_size;
-		bpf_program__attach_xdp;
-		bpf_program__autoload;
-		bpf_program__is_sk_lookup;
-		bpf_program__set_autoload;
-		bpf_program__set_sk_lookup;
-		btf__parse;
-		btf__parse_raw;
-		btf__pointer_size;
-		btf__set_fd;
-		btf__set_pointer_size;
-} LIBBPF_0.0.9;
--- a/src/libbpf_probes.c
+++ b/src/libbpf_probes.c
@@ -78,9 +78,6 @@ probe_load(enum bpf_prog_type prog_type, const struct bpf_insn *insns,
 	case BPF_PROG_TYPE_CGROUP_SOCK_ADDR:
 		xattr.expected_attach_type = BPF_CGROUP_INET4_CONNECT;
 		break;
-	case BPF_PROG_TYPE_SK_LOOKUP:
-		xattr.expected_attach_type = BPF_SK_LOOKUP;
-		break;
 	case BPF_PROG_TYPE_KPROBE:
 		xattr.kern_version = get_kernel_version();
 		break;
--- a/travis-ci/vmtest/build_selftests.sh
+++ b/travis-ci/vmtest/build_selftests.sh
@@ -2,7 +2,7 @@

 set -euxo pipefail

-LLVM_VER=12
+LLVM_VER=11
 LIBBPF_PATH="${REPO_ROOT}"
 REPO_PATH="travis-ci/vmtest/bpf-next"

@@ -11,20 +11,13 @@ if [ -f "${PREPARE_SELFTESTS_SCRIPT}" ]; then
 	(cd "${REPO_ROOT}/${REPO_PATH}/tools/testing/selftests/bpf" && ${PREPARE_SELFTESTS_SCRIPT})
 fi

-if [[ "${KERNEL}" = 'LATEST' ]]; then
-	VMLINUX_H=
-else
-	VMLINUX_H=${VMTEST_ROOT}/vmlinux.h
-fi
-
 make \
 	CLANG=clang-${LLVM_VER} \
 	LLC=llc-${LLVM_VER} \
 	LLVM_STRIP=llvm-strip-${LLVM_VER} \
 	VMLINUX_BTF="${VMLINUX_BTF}" \
-	VMLINUX_H=${VMLINUX_H} \
 	-C "${REPO_ROOT}/${REPO_PATH}/tools/testing/selftests/bpf" \
-	-j $((2*$(nproc)))
+	-j $((4*$(nproc)))
 mkdir ${LIBBPF_PATH}/selftests
 cp -R "${REPO_ROOT}/${REPO_PATH}/tools/testing/selftests/bpf" \
 	${LIBBPF_PATH}/selftests
--- a/travis-ci/vmtest/checkout_latest_kernel.sh
+++ b/travis-ci/vmtest/checkout_latest_kernel.sh
@@ -8,31 +8,17 @@ REPO_PATH=$1

 BPF_NEXT_ORIGIN=https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
 LINUX_SHA=$(cat ${LIBBPF_PATH}/CHECKPOINT-COMMIT)
-SNAPSHOT_URL=https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/snapshot/bpf-next-${LINUX_SHA}.tar.gz

 echo REPO_PATH = ${REPO_PATH}
 echo LINUX_SHA = ${LINUX_SHA}

 if [ ! -d "${REPO_PATH}" ]; then
-	mkdir -p $(dirname "${REPO_PATH}")
-	cd $(dirname "${REPO_PATH}")
-	# attempt to fetch desired bpf-next repo snapshot
-	if wget ${SNAPSHOT_URL} ; then
-		tar xf bpf-next-${LINUX_SHA}.tar.gz
-		mv bpf-next-${LINUX_SHA} $(basename ${REPO_PATH})
-	else
-		# but fallback to git fetch approach if that fails
-		mkdir -p $(basename ${REPO_PATH})
-		cd $(basename ${REPO_PATH})
-		git init
-		git remote add bpf-next ${BPF_NEXT_ORIGIN}
-		# try shallow clone first
-		git fetch --depth 32 bpf-next
-		# check if desired SHA exists
-		if ! git cat-file -e ${LINUX_SHA}^{commit} ; then
-			# if not, fetch all of bpf-next; slow and painful
-			git fetch bpf-next
-		fi
-		git reset --hard ${LINUX_SHA}
-	fi
+	mkdir -p ${REPO_PATH}
+	cd ${REPO_PATH}
+	git init
+	git remote add bpf-next ${BPF_NEXT_ORIGIN}
+	for depth in 32 64 128; do
+		git fetch --depth ${depth} bpf-next
+		git reset --hard ${LINUX_SHA} && break
+	done
 fi
--- a/travis-ci/vmtest/configs/INDEX
+++ b/travis-ci/vmtest/configs/INDEX
@@ -1,8 +1,6 @@
 INDEX	https://libbpf-vmtest.s3-us-west-1.amazonaws.com/x86_64/INDEX
 libbpf-vmtest-rootfs-2020.03.11.tar.zst	https://libbpf-vmtest.s3-us-west-1.amazonaws.com/x86_64/libbpf-vmtest-rootfs-2020.03.11.tar.zst
-vmlinux-4.9.0.zst	https://libbpf-vmtest.s3-us-west-1.amazonaws.com/x86_64/vmlinux-4.9.0.zst
 vmlinux-5.5.0-rc6.zst	https://libbpf-vmtest.s3-us-west-1.amazonaws.com/x86_64/vmlinux-5.5.0-rc6.zst
 vmlinux-5.5.0.zst	https://libbpf-vmtest.s3-us-west-1.amazonaws.com/x86_64/vmlinux-5.5.0.zst
 vmlinuz-5.5.0-rc6	https://libbpf-vmtest.s3-us-west-1.amazonaws.com/x86_64/vmlinuz-5.5.0-rc6
 vmlinuz-5.5.0	https://libbpf-vmtest.s3-us-west-1.amazonaws.com/x86_64/vmlinuz-5.5.0
-vmlinuz-4.9.0	https://libbpf-vmtest.s3-us-west-1.amazonaws.com/x86_64/vmlinuz-4.9.0
--- a/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0
+++ b/travis-ci/vmtest/configs/blacklist/BLACKLIST-5.5.0
@@ -9,9 +9,7 @@ bpf_verif_scale
 #bpf_verif_scale/strobemeta.o
 #bpf_verif_scale/strobemeta_nounroll1.o
 #bpf_verif_scale/strobemeta_nounroll2.o
-btf_map_in_map		# inner map leak fixed in 5.8

-cg_storage_multi	# v5.9+ functionality
 cgroup_attach_multi	# BPF_F_REPLACE_PROG missing
 cgroup_link		# LINK_CREATE is missing
 cgroup_skb_sk_lookup	# bpf_sk_lookup_tcp() helper is missing
@@ -24,10 +22,8 @@ fexit_test		# bpf_prog_test_tracing missing
 flow_dissector		# bpf_link-based flow dissector is in 5.8+
 flow_dissector_reattach
 get_stack_raw_tp	# exercising BPF verifier bug causing infinite loop
-ksyms			# __start_BTF has different name
 link_pinning		# bpf_link is missing
 load_bytes_relative	# new functionality in 5.8
-map_ptr			# test uses BPF_MAP_TYPE_RINGBUF, added in 5.8
 mmap			# 5.5 kernel is too permissive with re-mmaping
 modify_return		# fmod_ret support is missing
 ns_current_pid_tgid	# bpf_get_ns_current_pid_tgid() helper is missing
@@ -41,23 +37,15 @@ reference_tracking
 select_reuseport	# UDP support is missing
 sk_assign		# bpf_sk_assign helper missing
 skb_helpers		# helpers added in 5.8+
-sockmap_basic		# uses new socket fields, 5.8+
 sockmap_listen		# no listen socket supportin SOCKMAP
-sockopt_sk
-sk_lookup		# v5.9+
 skb_ctx			# ctx_{size, }_{in, out} in BPF_PROG_TEST_RUN is missing
 test_global_funcs	# kernel doesn't support BTF linkage=global on FUNCs
 test_lsm		# no BPF_LSM support
 test_overhead		# no fmod_ret support
-udp_limit		# no cgroup/sock_release BPF program type (5.9+)
-varlen			# verifier bug fixed in later kernels
 vmlinux			# hrtimer_nanosleep() signature changed incompatibly
 xdp_adjust_tail		# new XDP functionality added in 5.8
 xdp_attach		# IFLA_XDP_EXPECTED_FD support is missing
 xdp_bpf2bpf		# freplace is missing
-xdp_cpumap_attach	# v5.9+
-xdp_devmap_attach	# new feature in 5.8
-xdp_link		# v5.9+


 # TEMPORARILY DISABLED
--- a/travis-ci/vmtest/configs/blacklist/BLACKLIST-latest
+++ b/travis-ci/vmtest/configs/blacklist/BLACKLIST-latest
@@ -2,6 +2,4 @@
 send_signal		# flaky
 test_lsm		# semi-working
 sk_assign		# needs better setup in Travis CI
-sk_lookup
 core_reloc		# temporary test breakage
-bpf_verif_scale		# clang regression
--- a/travis-ci/vmtest/configs/whitelist/WHITELIST-4.9.0
+++ b/travis-ci/vmtest/configs/whitelist/WHITELIST-4.9.0
@@ -1,7 +0,0 @@
-btf_dump
-core_retro
-cpu_mask
-hashmap
-perf_buffer
-section_names
-
--- a/travis-ci/vmtest/prepare_selftests-5.5.0.sh
+++ b/travis-ci/vmtest/prepare_selftests-5.5.0.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+# these tests expect vmlinux.h to have latest defiition of bpf_devmap_val xdp_md->egress_ifindex
+rm progs/test_xdp_with_devmap_helpers.c
+rm progs/test_xdp_devmap_helpers.c
+rm prog_tests/xdp_devmap_attach.c
+
+# no BPF_F_NO_PREALLOC in BTF and no sk_msg_md->sk field
+rm progs/test_skmsg_load_helpers.c
+rm prog_tests/sockmap_basic.c
--- a/travis-ci/vmtest/run_selftests.sh
+++ b/travis-ci/vmtest/run_selftests.sh
@@ -3,17 +3,13 @@
 set -euxo pipefail

 test_progs() {
-	if [[ "${KERNEL}" != '4.9.0' ]]; then
-		echo TEST_PROGS
-		./test_progs ${BLACKLIST:+-b$BLACKLIST} ${WHITELIST:+-t$WHITELIST}
-	fi
-
-	echo TEST_PROGS-NO_ALU32
-	./test_progs-no_alu32 ${BLACKLIST:+-b$BLACKLIST} ${WHITELIST:+-t$WHITELIST}
+	echo TEST_PROGS
+	./test_progs ${BLACKLIST:+-b$BLACKLIST} ${WHITELIST:+-t$WHITELIST}
 }

 test_maps() {
 	echo TEST_MAPS
+	# Allow failing on older kernels.
 	./test_maps
 }

--- a/travis-ci/vmtest/run_vmtest.sh
+++ b/travis-ci/vmtest/run_vmtest.sh
@@ -12,8 +12,8 @@ ${VMTEST_ROOT}/build_pahole.sh travis-ci/vmtest/pahole
 # Install required packages
 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
 echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main" | sudo tee -a /etc/apt/sources.list
-sudo apt-get update
-sudo apt-get -y install clang-12 lld-12 llvm-12
+sudo apt-get -qq update
+sudo apt-get -qq -y install clang lld llvm

 # Build selftests (and latest kernel, if necessary)
 KERNEL="${KERNEL}" ${VMTEST_ROOT}/prepare_selftests.sh travis-ci/vmtest/bpf-next
--- a/travis-ci/vmtest/vmlinux.h
+++ b/travis-ci/vmtest/vmlinux.h
Author	SHA1	Message	Date
Vladimir Kobal	673424c561	Add fallback to an old attaching method	2020-07-30 13:38:27 +03:00
Vladimir Kobal	d2feaff998	Skip probing for loading	2020-07-30 13:37:26 +03:00
Vladimir Kobal	0d4b75d30e	Skip kernel version check	2020-07-30 13:35:35 +03:00