v0.5.1_netdata_patch: Apply patch

2026-03-14 13:29:06 +08:00 · 2021-11-11 19:28:58 +00:00
131 changed files with 93432 additions and 119284 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +0,0 @@
-assets/** export-ignore
--- a/.github/actions/build-selftests/action.yml
+++ b/.github/actions/build-selftests/action.yml
@@ -1,31 +0,0 @@
-name: 'build-selftests'
-description: 'Build BPF selftests'
-inputs:
-  repo-path:
-    description: 'where is the source code'
-    required: true
-  kernel:
-    description: 'kernel version or LATEST'
-    required: true
-    default: 'LATEST'
-  vmlinux:
-    description: 'where is vmlinux file'
-    required: true
-    default: '${{ github.workspace }}/vmlinux'
-
-runs:
-  using: "composite"
-  steps:
-    - shell: bash
-      run: |
-        source $GITHUB_ACTION_PATH/../../../ci/vmtest/helpers.sh
-        foldable start "Setup Env"
-        sudo apt-get install -y qemu-kvm zstd binutils-dev elfutils libcap-dev libelf-dev libdw-dev python3-docutils
-        foldable end
-    - shell: bash
-      run: |
-        export KERNEL=${{ inputs.kernel }}
-        export REPO_ROOT="${{ github.workspace }}"
-        export REPO_PATH="${{ inputs.repo-path }}"
-        export VMLINUX_BTF="${{ inputs.vmlinux }}"
-        ${{ github.action_path }}/build_selftests.sh
--- a/.github/actions/build-selftests/build_selftests.sh
+++ b/.github/actions/build-selftests/build_selftests.sh
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-THISDIR="$(cd $(dirname $0) && pwd)"
-
-source ${THISDIR}/helpers.sh
-
-foldable start prepare_selftests "Building selftests"
-
-LIBBPF_PATH="${REPO_ROOT}"
-
-llvm_default_version() {
-	echo "16"
-}
-
-llvm_latest_version() {
-	echo "17"
-}
-
-LLVM_VERSION=$(llvm_default_version)
-if [[ "${LLVM_VERSION}" == $(llvm_latest_version) ]]; then
-	REPO_DISTRO_SUFFIX=""
-else
-	REPO_DISTRO_SUFFIX="-${LLVM_VERSION}"
-fi
-
-echo "deb https://apt.llvm.org/focal/ llvm-toolchain-focal${REPO_DISTRO_SUFFIX} main" \
-	| sudo tee /etc/apt/sources.list.d/llvm.list
-
-PREPARE_SELFTESTS_SCRIPT=${THISDIR}/prepare_selftests-${KERNEL}.sh
-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=${THISDIR}/vmlinux.h
-fi
-
-cd ${REPO_ROOT}/${REPO_PATH}
-make headers
-make \
-	CLANG=clang-${LLVM_VERSION} \
-	LLC=llc-${LLVM_VERSION} \
-	LLVM_STRIP=llvm-strip-${LLVM_VERSION} \
-	VMLINUX_BTF="${VMLINUX_BTF}" \
-	VMLINUX_H=${VMLINUX_H} \
-	-C "${REPO_ROOT}/${REPO_PATH}/tools/testing/selftests/bpf" \
-	-j $((4*$(nproc))) > /dev/null
-cd -
-mkdir ${LIBBPF_PATH}/selftests
-cp -R "${REPO_ROOT}/${REPO_PATH}/tools/testing/selftests/bpf" \
-	${LIBBPF_PATH}/selftests
-cd ${LIBBPF_PATH}
-rm selftests/bpf/.gitignore
-git add selftests
-
-foldable end prepare_selftests
--- a/.github/actions/build-selftests/helpers.sh
+++ b/.github/actions/build-selftests/helpers.sh
@@ -1,38 +0,0 @@
-# shellcheck shell=bash
-
-# $1 - start or end
-# $2 - fold identifier, no spaces
-# $3 - fold section description
-foldable() {
-  local YELLOW='\033[1;33m'
-  local NOCOLOR='\033[0m'
-  if [ $1 = "start" ]; then
-    line="::group::$2"
-    if [ ! -z "${3:-}" ]; then
-      line="$line - ${YELLOW}$3${NOCOLOR}"
-    fi
-  else
-    line="::endgroup::"
-  fi
-  echo -e "$line"
-}
-
-__print() {
-  local TITLE=""
-  if [[ -n $2 ]]; then
-      TITLE=" title=$2"
-  fi
-  echo "::$1${TITLE}::$3"
-}
-
-# $1 - title
-# $2 - message
-print_error() {
-  __print error $1 $2
-}
-
-# $1 - title
-# $2 - message
-print_notice() {
-  __print notice $1 $2
-}
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -6,17 +6,17 @@ runs:
    - id: variables
      run: |
        export REPO_ROOT=$GITHUB_WORKSPACE
-        export CI_ROOT=$REPO_ROOT/ci
+        export CI_ROOT=$REPO_ROOT/travis-ci
        # this is somewhat ugly, but that is the easiest way to share this code with
        # arch specific docker
        echo 'echo ::group::Env setup' > /tmp/ci_setup
        echo export DEBIAN_FRONTEND=noninteractive >> /tmp/ci_setup
        echo sudo apt-get update >> /tmp/ci_setup
-        echo sudo apt-get install -y aptitude qemu-kvm zstd binutils-dev elfutils libcap-dev libelf-dev libdw-dev libguestfs-tools >> /tmp/ci_setup
+        echo sudo apt-get install -y aptitude qemu-kvm zstd binutils-dev elfutils libcap-dev libelf-dev libdw-dev >> /tmp/ci_setup
        echo export PROJECT_NAME='libbpf' >> /tmp/ci_setup
        echo export AUTHOR_EMAIL="$(git log -1 --pretty=\"%aE\")" >> /tmp/ci_setup
        echo export REPO_ROOT=$GITHUB_WORKSPACE >> /tmp/ci_setup
-        echo export CI_ROOT=$REPO_ROOT/ci >> /tmp/ci_setup
+        echo export CI_ROOT=$REPO_ROOT/travis-ci >> /tmp/ci_setup
        echo export VMTEST_ROOT=$CI_ROOT/vmtest >> /tmp/ci_setup
        echo 'echo ::endgroup::' >> /tmp/ci_setup
      shell: bash
--- a/.github/actions/vmtest/action.yml
+++ b/.github/actions/vmtest/action.yml
@@ -5,114 +5,31 @@ inputs:
    description: 'kernel version or LATEST'
    required: true
    default: 'LATEST'
-  arch:
-    description: 'what arch to test'
+  kernel-rev:
+    description: 'CHECKPOINT or rev/tag/branch'
    required: true
-    default: 'x86_64'
+    default: 'CHECKPOINT'
+  kernel-origin:
+    description: 'kernel repo'
+    required: true
+    default: 'https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git'
  pahole:
-    description: 'pahole rev or master'
+    description: 'pahole rev/tag/branch'
    required: true
    default: 'master'
+  pahole-origin:
+    description: 'pahole repo'
+    required: true
+    default: 'https://git.kernel.org/pub/scm/devel/pahole/pahole.git'
 runs:
  using: "composite"
  steps:
-    # Allow CI user to access /dev/kvm (via qemu) w/o group change/relogin
-    # by changing permissions set by udev.
-    - name: Set /dev/kvm permissions
+    - run: |
+        source /tmp/ci_setup
+        export KERNEL=${{ inputs.kernel }}
+        export KERNEL_BRANCH=${{ inputs.kernel-rev }}
+        export KERNEL_ORIGIN=${{ inputs.kernel-origin }}
+        export PAHOLE_BRANCH=${{ inputs.pahole }}
+        export PAHOLE_ORIGIN=${{ inputs.pahole-origin }}
+        $CI_ROOT/vmtest/run_vmtest.sh
      shell: bash
-      run: |
-        if [ -e /dev/kvm ]; then
-          echo "/dev/kvm exists"
-          if [ $(id -u) != 0 ]; then
-            echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' \
-              | sudo tee /etc/udev/rules.d/99-kvm4all.rules > /dev/null
-            sudo udevadm control --reload-rules
-            sudo udevadm trigger --name-match=kvm
-          fi
-        else
-          echo "/dev/kvm does not exist"
-        fi
-    # setup environment
-    - name: Setup environment
-      uses: libbpf/ci/setup-build-env@main
-      with:
-        pahole: ${{ inputs.pahole }}
-        arch: ${{ inputs.arch }}
-    # 1. download CHECKPOINT kernel source
-    - name: Get checkpoint commit
-      shell: bash
-      run: |
-        cat CHECKPOINT-COMMIT
-        echo "CHECKPOINT=$(cat CHECKPOINT-COMMIT)" >> $GITHUB_ENV
-    - name: Get kernel source at checkpoint
-      uses: libbpf/ci/get-linux-source@main
-      with:
-        repo: 'https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git'
-        rev: ${{ env.CHECKPOINT }}
-        dest: '${{ github.workspace }}/.kernel'
-    - name: Patch kernel source
-      uses: libbpf/ci/patch-kernel@main
-      with:
-        patches-root: '${{ github.workspace }}/ci/diffs'
-        repo-root: '.kernel'
-    - name: Prepare to build BPF selftests
-      shell: bash
-      run: |
-        source $GITHUB_ACTION_PATH/../../../ci/vmtest/helpers.sh
-        foldable start "Prepare building selftest"
-        cd .kernel
-        cat tools/testing/selftests/bpf/config \
-            tools/testing/selftests/bpf/config.${{ inputs.arch }} > .config
-        # this file might or mihgt not exist depending on kernel version
-        cat tools/testing/selftests/bpf/config.vm >> .config || :
-        make olddefconfig && make prepare
-        cd -
-        foldable end
-    # 2. if kernel == LATEST, build kernel image from tree
-    - name: Build kernel image
-      if: ${{ inputs.kernel == 'LATEST' }}
-      shell: bash
-      run: |
-        source $GITHUB_ACTION_PATH/../../../ci/vmtest/helpers.sh
-        foldable start "Build Kernel Image"
-        cd .kernel
-        make -j $((4*$(nproc))) all > /dev/null
-        cp vmlinux ${{ github.workspace }}
-        cd -
-        foldable end
-    # else, just download prebuilt kernel image
-    - name: Download prebuilt kernel
-      if: ${{ inputs.kernel != 'LATEST' }}
-      uses: libbpf/ci/download-vmlinux@main
-      with:
-        kernel: ${{ inputs.kernel }}
-        arch: ${{ inputs.arch }}
-    # 3. build selftests
-    - name: Build BPF selftests
-      uses: ./.github/actions/build-selftests
-      with:
-        repo-path: '.kernel'
-        kernel: ${{ inputs.kernel }}
-    # 4. prepare rootfs
-    - name: prepare rootfs
-      uses: libbpf/ci/prepare-rootfs@main
-      env:
-        KBUILD_OUTPUT: '.kernel'
-      with:
-        project-name: 'libbpf'
-        arch: ${{ inputs.arch }}
-        kernel: ${{ inputs.kernel }}
-        kernel-root: '.kernel'
-        kbuild-output: ${{ env.KBUILD_OUTPUT }}
-        image-output: '/tmp/root.img'
-    # 5. run selftest in QEMU
-    - name: Run selftests
-      env:
-        KERNEL: ${{ inputs.kernel }}
-        REPO_ROOT: ${{ github.workspace }}
-      uses: libbpf/ci/run-qemu@main
-      with:
-        arch: ${{ inputs.arch }}
-        img: '/tmp/root.img'
-        vmlinuz: 'vmlinuz'
-        kernel-root: '.kernel'
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,91 +0,0 @@
-name: libbpf-build
-
-on:
-  pull_request:
-  push:
-  schedule:
-    - cron:  '0 18 * * *'
-
-concurrency:
-  group: ci-build-${{ github.head_ref }}
-  cancel-in-progress: true
-
-jobs:
-
-  debian:
-    runs-on: ubuntu-latest
-    name: Debian Build (${{ matrix.name }})
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: default
-            target: RUN
-          - name: ASan+UBSan
-            target: RUN_ASAN
-          - name: clang ASan+UBSan
-            target: RUN_CLANG_ASAN
-          - name: gcc-10 ASan+UBSan
-            target: RUN_GCC10_ASAN
-          - name: clang
-            target: RUN_CLANG
-          - name: clang-14
-            target: RUN_CLANG14
-          - name: clang-15
-            target: RUN_CLANG15
-          - name: clang-16
-            target: RUN_CLANG16
-          - name: gcc-10
-            target: RUN_GCC10
-          - name: gcc-11
-            target: RUN_GCC11
-          - name: gcc-12
-            target: RUN_GCC12
-    steps:
-      - uses: actions/checkout@v4
-        name: Checkout
-      - uses: ./.github/actions/setup
-        name: Setup
-      - uses: ./.github/actions/debian
-        name: Build
-        with:
-          target: ${{ matrix.target }}
-
-  ubuntu:
-    runs-on: ubuntu-latest
-    name: Ubuntu Build (${{ matrix.arch }})
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - arch: aarch64
-          - arch: ppc64le
-          - arch: s390x
-          - arch: x86
-    steps:
-      - uses: actions/checkout@v4
-        name: Checkout
-      - uses: ./.github/actions/setup
-        name: Pre-Setup
-      - run: source /tmp/ci_setup && sudo -E $CI_ROOT/managers/ubuntu.sh
-        if: matrix.arch == 'x86'
-        name: Setup
-      - uses: uraimo/run-on-arch-action@v2.7.1
-        name: Build in docker
-        if: matrix.arch != 'x86'
-        with:
-          distro:
-            ubuntu22.04
-          arch:
-            ${{ matrix.arch }}
-          setup:
-            cp /tmp/ci_setup $GITHUB_WORKSPACE
-          dockerRunArgs: |
-            --volume "${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE}"
-          shell: /bin/bash
-          install: |
-            export DEBIAN_FRONTEND=noninteractive
-            export TZ="America/Los_Angeles"
-            apt-get update -y
-            apt-get install -y tzdata build-essential sudo
-          run: source ${GITHUB_WORKSPACE}/ci_setup && $CI_ROOT/managers/ubuntu.sh
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -1,52 +0,0 @@
---
-# vi: ts=2 sw=2 et:
-
-name: "CodeQL"
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-permissions:
-  contents: read
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    concurrency:
-      group: ${{ github.workflow }}-${{ matrix.language }}-${{ github.ref }}
-      cancel-in-progress: true
-    permissions:
-      actions: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ['cpp', 'python']
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: ${{ matrix.language }}
-          queries: +security-extended,security-and-quality
-
-      - name: Setup
-        uses: ./.github/actions/setup
-
-      - name: Build
-        run: |
-          source /tmp/ci_setup
-          make -C ./src
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -11,17 +11,16 @@ jobs:
    if: github.repository == 'libbpf/libbpf'
    name: Coverity
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
      - uses: ./.github/actions/setup
      - name: Run coverity
        run: |
-          source "${GITHUB_WORKSPACE}"/ci/vmtest/helpers.sh
-          foldable start "Setup CI env"
+          echo ::group::Setup CI env
          source /tmp/ci_setup
          export COVERITY_SCAN_NOTIFICATION_EMAIL="${AUTHOR_EMAIL}"
          export COVERITY_SCAN_BRANCH_PATTERN=${GITHUB_REF##refs/*/}
          export TRAVIS_BRANCH=${COVERITY_SCAN_BRANCH_PATTERN}
-          foldable end
+          echo ::endgroup::
          scripts/coverity.sh
        env:
          COVERITY_SCAN_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,19 +0,0 @@
-name: "lint"
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-
-jobs:
-  shellcheck:
-    name: ShellCheck
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Run ShellCheck
-        uses: ludeeus/action-shellcheck@master
-        env:
-          SHELLCHECK_OPTS: --severity=error
--- a/.github/workflows/ondemand.yml
+++ b/.github/workflows/ondemand.yml
@@ -25,7 +25,7 @@ jobs:
    runs-on: ubuntu-latest
    name: vmtest with customized pahole/Kernel
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
      - uses: ./.github/actions/setup
      - uses: ./.github/actions/vmtest
        with:
--- a/.github/workflows/pahole.yml
+++ b/.github/workflows/pahole.yml
@@ -1,18 +1,18 @@
 name: pahole-staging

 on:
-  workflow_dispatch:
  schedule:
    - cron:  '0 18 * * *'

+
 jobs:
  vmtest:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    name: Kernel LATEST + staging pahole
    env:
      STAGING: tmp.master
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
      - uses: ./.github/actions/setup
      - uses: ./.github/actions/vmtest
        with:
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,26 +12,17 @@ concurrency:

 jobs:
  vmtest:
-    runs-on: ${{ matrix.runs_on }}
-    name: Kernel ${{ matrix.kernel }} on ${{ matrix.runs_on }} + selftests
+    runs-on: ubuntu-latest
+    name: Kernel ${{ matrix.kernel }} + selftests
    strategy:
      fail-fast: false
      matrix:
        include:
          - kernel: 'LATEST'
-            runs_on: ubuntu-20.04
-            arch: 'x86_64'
          - kernel: '5.5.0'
-            runs_on: ubuntu-20.04
-            arch: 'x86_64'
          - kernel: '4.9.0'
-            runs_on: ubuntu-20.04
-            arch: 'x86_64'
-          - kernel: 'LATEST'
-            runs_on: s390x
-            arch: 's390x'
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
        name: Checkout
      - uses: ./.github/actions/setup
        name: Setup
@@ -39,4 +30,71 @@ jobs:
        name: vmtest
        with:
          kernel: ${{ matrix.kernel }}
-          arch: ${{ matrix.arch }}
+
+  debian:
+    runs-on: ubuntu-latest
+    name: Debian Build (${{ matrix.name }})
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: default
+            target: RUN
+          - name: ASan+UBSan
+            target: RUN_ASAN
+          - name: clang
+            target: RUN_CLANG
+          - name: clang ASan+UBSan
+            target: RUN_CLANG_ASAN
+          - name: gcc-10
+            target: RUN_GCC10
+          - name: gcc-10 ASan+UBSan
+            target: RUN_GCC10_ASAN
+    steps:
+      - uses: actions/checkout@v2
+        name: Checkout
+      - uses: ./.github/actions/setup
+        name: Setup
+      - uses: ./.github/actions/debian
+        name: Build
+        with:
+          target: ${{ matrix.target }}
+
+  ubuntu:
+    runs-on: ubuntu-latest
+    name: Ubuntu Focal Build (${{ matrix.arch }})
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: aarch64
+          - arch: ppc64le
+          - arch: s390x
+          - arch: x86
+    steps:
+      - uses: actions/checkout@v2
+        name: Checkout
+      - uses: ./.github/actions/setup
+        name: Pre-Setup
+      - run: source /tmp/ci_setup && sudo -E $CI_ROOT/managers/ubuntu.sh
+        if: matrix.arch == 'x86'
+        name: Setup
+      - uses: uraimo/run-on-arch-action@v2.0.5
+        name: Build in docker
+        if: matrix.arch != 'x86'
+        with:
+          distro:
+            ubuntu20.04
+          arch:
+            ${{ matrix.arch }}
+          setup:
+            cp /tmp/ci_setup $GITHUB_WORKSPACE
+          dockerRunArgs: |
+              --volume "${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE}"
+          shell: /bin/bash
+          install: |
+              export DEBIAN_FRONTEND=noninteractive
+              export TZ="America/Los_Angeles"
+              apt-get update -y
+              apt-get install -y tzdata build-essential sudo
+          run: source ${GITHUB_WORKSPACE}/ci_setup && $CI_ROOT/managers/ubuntu.sh
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -0,0 +1,14 @@
+# vi: set ts=2 sw=2:
+extraction:
+  cpp:
+    prepare:
+      packages:
+        - libelf-dev
+        - pkg-config
+    after_prepare:
+      # As the buildsystem detection by LGTM is performed _only_ during the
+      # 'configure' phase, we need to trick LGTM we use a supported build
+      # system (configure, meson, cmake, etc.). This way LGTM correctly detects
+      # that our sources are in the src/ subfolder.
+      - touch src/configure
+      - chmod +x src/configure
--- a/.mailmap
+++ b/.mailmap
@@ -1,21 +0,0 @@
-Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
-Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>
-Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>
-Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com>
-Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
-Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>
-Dan Carpenter <error27@gmail.com> <dan.carpenter@oracle.com>
-Geliang Tang <geliang@kernel.org> <geliang.tang@suse.com>
-Herbert Xu <herbert@gondor.apana.org.au>
-Jakub Kicinski <kuba@kernel.org> <jakub.kicinski@netronome.com>
-Kees Cook <kees@kernel.org> <keescook@chromium.org>
-Leo Yan <leo.yan@linux.dev> <leo.yan@linaro.org>
-Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>
-Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@mellanox.com>
-Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>
-Puranjay Mohan <puranjay@kernel.org> <puranjay12@gmail.com>
-Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>
-Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>
-Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>
-Vadim Fedorenko <vadim.fedorenko@linux.dev> <vadfed@meta.com>
-Vadim Fedorenko <vadim.fedorenko@linux.dev> <vfedorenko@novek.ru>
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -5,22 +5,13 @@
 # Required
 version: 2

-build:
-  os: "ubuntu-22.04"
-  tools:
-    python: "3.11"
-
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
  builder: html
  configuration: docs/conf.py

-formats:
-  - htmlzip
-  - pdf
-  - epub
-
 # Optionally set the version of Python and requirements required to build your docs
 python:
+   version: 3.7
   install:
-   - requirements: docs/sphinx/requirements.txt
+   - requirements: docs/sphinx/requirements.txt
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,130 @@
+sudo: required
+language: bash
+dist: focal
+services:
+    - docker
+
+env:
+    global:
+        - PROJECT_NAME='libbpf'
+        - AUTHOR_EMAIL="$(git log -1 --pretty=\"%aE\")"
+        - REPO_ROOT="$TRAVIS_BUILD_DIR"
+        - CI_ROOT="$REPO_ROOT/travis-ci"
+        - VMTEST_ROOT="$CI_ROOT/vmtest"
+
+addons:
+    apt:
+        packages:
+            - qemu-kvm
+            - zstd
+            - binutils-dev
+            - elfutils
+            - libcap-dev
+            - libelf-dev
+            - libdw-dev
+
+stages:
+    # Run Coverity periodically instead of for each PR for following reasons:
+    # 1) Coverity jobs are heavily rate-limited
+    # 2) Due to security restrictions of encrypted environment variables
+    #    in Travis CI, pull requests made from forks can't access encrypted
+    #    env variables, making Coverity unusable
+    #    See: https://docs.travis-ci.com/user/pull-requests#pull-requests-and-security-restrictions
+    - name: Coverity
+      if: type = cron
+
+jobs:
+    include:
+        - stage: Builds & Tests
+          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
+
+        - name: Kernel 4.9.0 + selftests
+          language: bash
+          env: KERNEL=4.9.0
+          script:  $CI_ROOT/vmtest/run_vmtest.sh || travis_terminate 1
+
+        - name: Debian Build
+          language: bash
+          install:        $CI_ROOT/managers/debian.sh SETUP
+          script:         $CI_ROOT/managers/debian.sh RUN || travis_terminate 1
+          after_script:   $CI_ROOT/managers/debian.sh CLEANUP
+
+        - name: Debian Build (ASan+UBSan)
+          language: bash
+          install:        $CI_ROOT/managers/debian.sh SETUP
+          script:         $CI_ROOT/managers/debian.sh RUN_ASAN || travis_terminate 1
+          after_script:   $CI_ROOT/managers/debian.sh CLEANUP
+
+        - name: Debian Build (clang)
+          language: bash
+          install:        $CI_ROOT/managers/debian.sh SETUP
+          script:         $CI_ROOT/managers/debian.sh RUN_CLANG || travis_terminate 1
+          after_script:   $CI_ROOT/managers/debian.sh CLEANUP
+
+        - name: Debian Build (clang ASan+UBSan)
+          language: bash
+          install:        $CI_ROOT/managers/debian.sh SETUP
+          script:         $CI_ROOT/managers/debian.sh RUN_CLANG_ASAN || travis_terminate 1
+          after_script:   $CI_ROOT/managers/debian.sh CLEANUP
+
+        - name: Debian Build (gcc-10)
+          language: bash
+          install:        $CI_ROOT/managers/debian.sh SETUP
+          script:         $CI_ROOT/managers/debian.sh RUN_GCC10 || travis_terminate 1
+          after_script:   $CI_ROOT/managers/debian.sh CLEANUP
+
+        - name: Debian Build (gcc-10 ASan+UBSan)
+          language: bash
+          install:        $CI_ROOT/managers/debian.sh SETUP
+          script:         $CI_ROOT/managers/debian.sh RUN_GCC10_ASAN || travis_terminate 1
+          after_script:   $CI_ROOT/managers/debian.sh CLEANUP
+
+        - name: Ubuntu Focal Build
+          language: bash
+          script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1
+
+        - name: Ubuntu Focal Build (arm)
+          arch: arm64
+          language: bash
+          script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1
+
+        - name: Ubuntu Focal Build (s390x)
+          arch: s390x
+          language: bash
+          script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1
+
+        - name: Ubuntu Focal Build (ppc64le)
+          arch: ppc64le
+          language: bash
+          script: sudo $CI_ROOT/managers/ubuntu.sh || travis_terminate 1
+
+        - stage: Coverity
+          language: bash
+          env:
+              # Coverity configuration
+              # COVERITY_SCAN_TOKEN=xxx
+              # Encrypted using `travis encrypt --repo libbpf/libbpf COVERITY_SCAN_TOKEN=xxx`
+              - secure: "I9OsMRHbb82IUivDp+I+w/jEQFOJgBDAqYqf1ollqCM1QhocxMcS9bwIAgfPhdXi2hohV7sRrVMZstahY67FAvJLGxNopi4tAPDIAaIFxgO0yDxMhaTMx5xDfMwlIm2FOP/9gB9BQsd6M7CmoQZgXYwBIv7xd1ooxoQrh2rOK1YrRl7UQu3+c3zPTjDfIYZzR3bFttMqZ9/c4U0v8Ry5IFXrel3hCshndHA1TtttJrUSrILlZcmVc1ch7JIy6zCbCU/2lGv0B/7rWXfF8MT7O9jPtFOhJ1DEcd2zhw2n4j9YT3a8OhtnM61LA6ask632mwCOsxpFLTun7AzuR1Cb5mdPHsxhxnCHcXXARa2mJjem0QG1NhwxwJE8sbRDapojexxCvweYlEN40ofwMDSnj/qNt95XIcrk0tiIhGFx0gVNWvAdmZwx+N4mwGPMTAN0AEOFjpgI+ZdB89m+tL/CbEgE1flc8QxUxJhcp5OhH6yR0z9qYOp0nXIbHsIaCiRvt/7LqFRQfheifztWVz4mdQlCdKS9gcOQ09oKicPevKO1L0Ue3cb7Ug7jOpMs+cdh3XokJtUeYEr1NijMHT9+CTAhhO5RToWXIZRon719z3fwoUBNDREATwVFMlVxqSO/pbYgaKminigYbl785S89YYaZ6E5UvaKRHM6KHKMDszs="
+              - COVERITY_SCAN_PROJECT_NAME="libbpf"
+              - COVERITY_SCAN_NOTIFICATION_EMAIL="${AUTHOR_EMAIL}"
+              - COVERITY_SCAN_BRANCH_PATTERN="$TRAVIS_BRANCH"
+              # Note: `make -C src/` as a BUILD_COMMAND will not work here
+              - COVERITY_SCAN_BUILD_COMMAND_PREPEND="cd src/"
+              - COVERITY_SCAN_BUILD_COMMAND="make"
+          install:
+              - sudo echo 'deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse' >>/etc/apt/sources.list
+              - sudo apt-get update
+              - sudo apt-get -y build-dep libelf-dev
+              - 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 @@
-e1533b6319ab9c3a97dad314dd88b3783bc41b69
+47b3708c6088a60e7dc3b809dbb0d4c46590b32f
--- a/2
+++ b/2
@@ -1 +1 @@
-ec5b8c76ab1c6d163762d60cfbedcd27e7527144
+b8b5cb55f5d3f03cc1479a3768d68173a10359ad
--- a/LICENSE.BSD-2-Clause
+++ b/LICENSE.BSD-2-Clause
@@ -7,7 +7,7 @@ Usage-Guide:
    SPDX-License-Identifier: BSD-2-Clause
 License-Text:

-Copyright (c) 2015 The Libbpf Authors. All rights reserved.
+Copyright (c) <year> <owner> . All rights reserved.

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
--- a/README.md
+++ b/README.md
@@ -1,33 +1,17 @@
-<picture>
-  <source media="(prefers-color-scheme: dark)" srcset="assets/libbpf-logo-sideways-darkbg.png" width="40%">
-  <img src="assets/libbpf-logo-sideways.png" width="40%">
-</picture>
+This is a mirror of [bpf-next Linux source
+tree](https://kernel.googlesource.com/pub/scm/linux/kernel/git/bpf/bpf-next)'s
+`tools/lib/bpf` directory plus its supporting header files.

-libbpf
-[![Github Actions Builds & Tests](https://github.com/libbpf/libbpf/actions/workflows/test.yml/badge.svg)](https://github.com/libbpf/libbpf/actions/workflows/test.yml)
-[![Coverity](https://img.shields.io/coverity/scan/18195.svg)](https://scan.coverity.com/projects/libbpf)
-[![CodeQL](https://github.com/libbpf/libbpf/workflows/CodeQL/badge.svg?branch=master)](https://github.com/libbpf/libbpf/actions?query=workflow%3ACodeQL+branch%3Amaster)
-[![OSS-Fuzz Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/libbpf.svg)](https://oss-fuzz-build-logs.storage.googleapis.com/index.html#libbpf)
-[![Read the Docs](https://readthedocs.org/projects/libbpf/badge/?version=latest)](https://libbpf.readthedocs.io/en/latest/)
-======
+All the gory details of syncing can be found in `scripts/sync-kernel.sh`
+script.

-**This is the official home of the libbpf library.**
+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.

-*Please use this Github repository for building and packaging libbpf
-and when using it in your projects through Git submodule.*
-
-Libbpf *authoritative source code* is developed as part of [bpf-next Linux source
-tree](https://kernel.googlesource.com/pub/scm/linux/kernel/git/bpf/bpf-next) under
-`tools/lib/bpf` subdirectory and is periodically synced to Github. As such, all the
-libbpf changes should be sent to [BPF mailing list](http://vger.kernel.org/vger-lists.html#bpf),
-please don't open PRs here unless you are changing Github-specific parts of libbpf
-(e.g., Github-specific Makefile).
-
-Libbpf and general BPF usage questions
-======================================
-
-Libbpf documentation can be found [here](https://libbpf.readthedocs.io/en/latest/api.html).
-It's an ongoing effort and has ways to go, but please take a look and consider contributing as well.
+BPF/libbpf usage and questions
+==============================

 Please check out [libbpf-bootstrap](https://github.com/libbpf/libbpf-bootstrap)
 and [the companion blog post](https://nakryiko.com/posts/libbpf-bootstrap/) for
@@ -52,8 +36,12 @@ 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.

-Building libbpf
-===============
+Build
+[![Github Actions Builds & Tests](https://github.com/libbpf/libbpf/actions/workflows/test.yml/badge.svg)](https://github.com/libbpf/libbpf/actions/workflows/test.yml)
+[![Total alerts](https://img.shields.io/lgtm/alerts/g/libbpf/libbpf.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/libbpf/libbpf/alerts/)
+[![Coverity](https://img.shields.io/coverity/scan/18195.svg)](https://scan.coverity.com/projects/libbpf)
+[![OSS-Fuzz Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/libbpf.svg)](https://oss-fuzz-build-logs.storage.googleapis.com/index.html#libbpf)
+=====
 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
@@ -85,6 +73,34 @@ $ cd src
 $ PKG_CONFIG_PATH=/build/root/lib64/pkgconfig DESTDIR=/build/root make install
 ```

+Distributions
+=============
+
+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/source/sid/libbpf)
+  - [Arch](https://www.archlinux.org/packages/extra/x86_64/libbpf/)
+  - [Ubuntu](https://packages.ubuntu.com/source/groovy/libbpf)
+  - [Alpine](https://pkgs.alpinelinux.org/packages?name=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).
+
+Package dependencies of libbpf, package names may vary across distros:
+  - zlib
+  - libelf
+
 BPF CO-RE (Compile Once – Run Everywhere)
 =========================================

@@ -138,48 +154,6 @@ use it:
  converting some more to both contribute to the BPF community and gain some
  more experience with it.

-Distributions
-=============
-
-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/source/sid/libbpf)
-  - [Arch](https://archlinux.org/packages/core/x86_64/libbpf/)
-  - [Ubuntu](https://packages.ubuntu.com/source/jammy/libbpf)
-  - [Alpine](https://pkgs.alpinelinux.org/packages?name=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
-    [GitHub Actions](https://github.com/libbpf/libbpf/actions).
-  - 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
-  - libelf
-
-[![libbpf distro packaging status](https://repology.org/badge/vertical-allrepos/libbpf.svg)](https://repology.org/project/libbpf/versions)
-
-
-bpf-next to Github sync
-=======================
-
-All the gory details of syncing can be found in `scripts/sync-kernel.sh`
-script. See [SYNC.md](SYNC.md) for instruction.
-
-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.
-
 License
 =======

--- a/SYNC.md
+++ b/SYNC.md
@@ -1,281 +0,0 @@
-<picture>
-  <source media="(prefers-color-scheme: dark)" srcset="assets/libbpf-logo-sideways-darkbg.png" width="40%">
-  <img src="assets/libbpf-logo-sideways.png" width="40%">
-</picture>
-
-Libbpf sync
-===========
-
-Libbpf *authoritative source code* is developed as part of [bpf-next Linux source
-tree](https://kernel.googlesource.com/pub/scm/linux/kernel/git/bpf/bpf-next) under
-`tools/lib/bpf` subdirectory and is periodically synced to Github.
-
-Most of the mundane mechanical things like bpf and bpf-next tree merge, Git
-history transformation, cherry-picking relevant commits, re-generating
-auto-generated headers, etc. are taken care by
-[sync-kernel.sh script](https://github.com/libbpf/libbpf/blob/master/scripts/sync-kernel.sh).
-But occasionally human needs to do few extra things to make everything work
-nicely.
-
-This document goes over the process of syncing libbpf sources from Linux repo
-to this Github repository. Feel free to contribute fixes and additions if you
-run into new problems not outlined here.
-
-Setup expectations
------------------
-
-Sync script has particular expectation of upstream Linux repo setup. It
-expects that current HEAD of that repo points to bpf-next's master branch and
-that there is a separate local branch pointing to bpf tree's master branch.
-This is important, as the script will automatically merge their histories for
-the purpose of libbpf sync.
-
-Below, we assume that Linux repo is located at `~/linux`, it's current head is
-at latest `bpf-next/master`, and libbpf's Github repo is located at
-`~/libbpf`, checked out to latest commit on `master` branch. It doesn't matter
-from where to run `sync-kernel.sh` script, but we'll be running it from inside
-`~/libbpf`.
-
-```
-$ cd ~/linux && git remote -v | grep -E '^(bpf|bpf-next)'
-bpf     https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git (fetch)
-bpf     ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
-(push)
-bpf-next
-https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git (fetch)
-bpf-next
-ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git (push)
-$ git branch -vv | grep -E '^? (master|bpf-master)'
-* bpf-master                               2d311f480b52 [bpf/master] riscv, bpf: Fix patch_text implicit declaration
-  master                                   c8ee37bde402 [bpf-next/master] libbpf: Fix bpf_xdp_query() in old kernels
-$ git checkout bpf-master && git pull && git checkout master && git pull
-...
-$ git log --oneline -n1
-c8ee37bde402 (HEAD -> master, bpf-next/master) libbpf: Fix bpf_xdp_query() in old kernels
-$ cd ~/libbpf && git checkout master && git pull
-Your branch is up to date with 'libbpf/master'.
-Already up to date.
-```
-
-Running setup script
--------------------
-
-First step is to always run `sync-kernel.sh` script. It expects three arguments:
-
-```
-$ scripts/sync-kernel.sh <libbpf-repo> <kernel-repo> <bpf-branch>
-```
-
-Note, that we'll store script's entire output in `/tmp/libbpf-sync.txt` and
-put it into PR summary later on. **Please store scripts output and include it
-in PR summary for others to check for anything unexpected and suspicious.**
-
-```
-$ scripts/sync-kernel.sh ~/libbpf ~/linux bpf-master | tee /tmp/libbpf-sync.txt
-Dumping existing libbpf commit signatures...
-WORKDIR:          /home/andriin/libbpf
-LINUX REPO:       /home/andriin/linux
-LIBBPF REPO:      /home/andriin/libbpf
-...
-```
-
-Most of the time this will go very uneventful. One expected case when sync
-script might require user intervention is if `bpf` tree has some libbpf fixes,
-which is nowadays not a very frequent occurence. But if that happens, script
-will show you a diff between expected state as of latest bpf-next and synced
-Github repo state. And will ask if these changes look good. Please use your
-best judgement to verify that differences are indeed from expected `bpf` tree
-fixes. E.g., it might look like below:
-
-```
-Comparing list of files...
-Comparing file contents...
--- /home/andriin/linux/include/uapi/linux/netdev.h     2023-02-27 16:54:42.270583372 -0800
-+++ /home/andriin/libbpf/include/uapi/linux/netdev.h    2023-02-27 16:54:34.615530796 -0800
-@@ -19,7 +19,7 @@
-  * @NETDEV_XDP_ACT_XSK_ZEROCOPY: This feature informs if netdev supports AF_XDP
-  *   in zero copy mode.
-  * @NETDEV_XDP_ACT_HW_OFFLOAD: This feature informs if netdev supports XDP hw
- *   oflloading.
-+ *   offloading.
-  * @NETDEV_XDP_ACT_RX_SG: This feature informs if netdev implements non-linear
-  *   XDP buffer support in the driver napi callback.
-  * @NETDEV_XDP_ACT_NDO_XMIT_SG: This feature informs if netdev implements
-/home/andriin/linux/include/uapi/linux/netdev.h and /home/andriin/libbpf/include/uapi/linux/netdev.h are different!
-Unfortunately, there are some inconsistencies, please double check.
-Does everything look good? [y/N]:
-```
-
-If it looks sensible and expected, type `y` and script will proceed.
-
-If sync is successful, your `~/linux` repo will be left in original state on
-the original HEAD commit. `~/libbpf` repo will now be on a new branch, named
-`libbpf-sync-<timestamp>` (e.g., `libbpf-sync-2023-02-28T00-53-40.072Z`).
-
-Push this branch into your fork of `libbpf/libbpf` Github repo and create a PR:
-
-```
-$ git push --set-upstream origin libbpf-sync-2023-02-28T00-53-40.072Z
-Enumerating objects: 130, done.
-Counting objects: 100% (115/115), done.
-Delta compression using up to 80 threads
-Compressing objects: 100% (28/28), done.
-Writing objects: 100% (32/32), 5.57 KiB | 1.86 MiB/s, done.
-Total 32 (delta 21), reused 0 (delta 0), pack-reused 0
-remote: Resolving deltas: 100% (21/21), completed with 9 local objects.
-remote:
-remote: Create a pull request for 'libbpf-sync-2023-02-28T00-53-40.072Z' on GitHub by visiting:
-remote:      https://github.com/anakryiko/libbpf/pull/new/libbpf-sync-2023-02-28T00-53-40.072Z
-remote:
-To github.com:anakryiko/libbpf.git
- * [new branch]                libbpf-sync-2023-02-28T00-53-40.072Z -> libbpf-sync-2023-02-28T00-53-40.072Z
-Branch 'libbpf-sync-2023-02-28T00-53-40.072Z' set up to track remote branch 'libbpf-sync-2023-02-28T00-53-40.072Z' from 'origin'.
-```
-
-**Please, adjust PR name to have a properly looking timestamp. Libbpf
-maintainers will be very thankful for that!**
-
-By default Github will turn above branch name into PR with subject "Libbpf sync
-2023 02 28 t00 53 40.072 z". Please fix this into a proper timestamp, e.g.:
-"Libbpf sync 2023-02-28T00:53:40.072Z". Thank you!
-
-**Please don't forget to paste contents of /tmp/libbpf-sync.txt into PR
-summary!**
-
-Once PR is created, libbpf CI will run a bunch of tests to check that
-everything is good. In simple cases that would be all you'd need to do. In more
-complicated cases some extra adjustments might be necessary.
-
-**Please, keep naming and style consistent.** Prefix CI-related fixes with `ci: `
-prefix. If you had to modify sync script, prefix it with `sync: `. Also make
-sure that each such commit has `Signed-off-by: Your Full Name <your@email.com>`,
-just like you'd do that for Linux upstream patch. Libbpf closely follows kernel
-conventions and styling, so please help maintaining that.
-
-Including new sources
---------------------
-
-If entirely new source files (typically `*.c`) were added to the library in the
-kernel repository, it may be necessary to add these to the build system
-manually (you may notice linker errors otherwise), because the script cannot
-handle such changes automatically. To that end, edit `src/Makefile` as
-necessary. Commit
-[c2495832ced4](https://github.com/libbpf/libbpf/commit/c2495832ced4239bcd376b9954db38a6addd89ca)
-is an example of how to go about doing that.
-
-Similarly, if new public API header files were added, the `Makefile` will need
-to be adjusted as well.
-
-Updating allow/deny lists
-------------------------
-
-Libbpf CI intentionally runs a subset of latest BPF selftests on old kernel
-(4.9 and 5.5, currently). It happens from time to time that some tests that
-previously were successfully running on old kernels now don't, typically due to
-reliance on some freshly added kernel feature. It might look something like this in [CI logs](https://github.com/libbpf/libbpf/actions/runs/4206303272/jobs/7299609578#step:4:2733):
-
-```
-  All error logs:
-  serial_test_xdp_info:FAIL:get_xdp_none errno=2
-  #283     xdp_info:FAIL
-  Summary: 49/166 PASSED, 5 SKIPPED, 1 FAILED
-```
-
-In such case we can either work with upstream to fix test to be compatible with
-old kernels, or we'll have to add a test into a denylist (or remove it from
-allowlist, like was [done](https://github.com/libbpf/libbpf/commit/ea284299025bf85b85b4923191de6463cd43ccd6)
-for the case above).
-
-```
-$ find . -name '*LIST*'
-./ci/vmtest/configs/ALLOWLIST-4.9.0
-./ci/vmtest/configs/DENYLIST-5.5.0
-./ci/vmtest/configs/DENYLIST-latest.s390x
-./ci/vmtest/configs/DENYLIST-latest
-./ci/vmtest/configs/ALLOWLIST-5.5.0
-```
-
-Please determine which tests need to be added/removed from which list. And then
-add that as a separate commit. **Please keep using the same branch name, so
-that the same PR can be updated.** There is no need to open new PRs for each
-such fix.
-
-Regenerating vmlinux.h header
-----------------------------
-
-To compile latest BPF selftests against old kernels, we check in pre-generated
-[vmlinux.h](https://github.com/libbpf/libbpf/blob/master/.github/actions/build-selftests/vmlinux.h)
-header file, located at `.github/actions/build-selftests/vmlinux.h`, which
-contains type definitions from latest upstream kernel. When after libbpf sync
-upstream BPF selftests require new kernel types, we'd need to regenerate
-`vmlinux.h` and check it in as well.
-
-This will looks something like this in [CI logs](https://github.com/libbpf/libbpf/actions/runs/4198939244/jobs/7283214243#step:4:1903):
-
-```
-  In file included from progs/test_spin_lock_fail.c:5:
-  /home/runner/work/libbpf/libbpf/.kernel/tools/testing/selftests/bpf/bpf_experimental.h:73:53: error: declaration of 'struct bpf_rb_root' will not be visible outside of this function [-Werror,-Wvisibility]
-  extern struct bpf_rb_node *bpf_rbtree_remove(struct bpf_rb_root *root,
-                                                      ^
-  /home/runner/work/libbpf/libbpf/.kernel/tools/testing/selftests/bpf/bpf_experimental.h:81:35: error: declaration of 'struct bpf_rb_root' will not be visible outside of this function [-Werror,-Wvisibility]
-  extern void bpf_rbtree_add(struct bpf_rb_root *root, struct bpf_rb_node *node,
-                                    ^
-  /home/runner/work/libbpf/libbpf/.kernel/tools/testing/selftests/bpf/bpf_experimental.h:90:52: error: declaration of 'struct bpf_rb_root' will not be visible outside of this function [-Werror,-Wvisibility]
-  extern struct bpf_rb_node *bpf_rbtree_first(struct bpf_rb_root *root) __ksym;
-                                                     ^
-  3 errors generated.
-  make: *** [Makefile:572: /home/runner/work/libbpf/libbpf/.kernel/tools/testing/selftests/bpf/test_spin_lock_fail.bpf.o] Error 1
-  make: *** Waiting for unfinished jobs....
-  Error: Process completed with exit code 2.
-```
-
-You'll need to build latest upstream kernel from `bpf-next` tree, using BPF
-selftest configs. Concat arch-agnostic and arch-specific configs, build kernel,
-then use bpftool to dump `vmlinux.h`:
-
-```
-$ cd ~/linux
-$ cat tools/testing/selftests/bpf/config \
-   tools/testing/selftests/bpf/config.x86_64 > .config
-$ make -j$(nproc) olddefconfig all
-...
-$ bpftool btf dump file ~/linux/vmlinux format c > ~/libbpf/.github/actions/build-selftests/vmlinux.h
-$ cd ~/libbpf && git add . && git commit -s
-```
-
-Check in generated `vmlinux.h`, don't forget to use `ci: ` commit prefix, add
-it on top of sync commits. Push to Github and let libbpf CI do the checking for
-you. See [this commit](https://github.com/libbpf/libbpf/commit/34212c94a64df8eeb1dd5d064630a65e1dfd4c20)
-for reference.
-
-Troubleshooting
---------------
-
-If something goes wrong and sync script exits early or is terminated early by
-user, you might end up with `~/linux` repo on temporary sync-related branch.
-Don't worry, though, sync script never destroys repo state, it follows
-"copy-on-write" philosophy and creates new branches where necessary. So it's
-very easy to restore previous state. So if anything goes wrong, it's easy to
-start fresh:
-
-```
-$ git branch | grep -E 'libbpf-.*Z'
-  libbpf-baseline-2023-02-28T00-43-35.146Z
-  libbpf-bpf-baseline-2023-02-28T00-43-35.146Z
-  libbpf-bpf-tip-2023-02-28T00-43-35.146Z
-  libbpf-squash-base-2023-02-28T00-43-35.146Z
-* libbpf-squash-tip-2023-02-28T00-43-35.146Z
-$ git cherry-pick --abort
-$ git checkout master && git branch | grep -E 'libbpf-.*Z' | xargs git br -D
-Switched to branch 'master'
-Your branch is up to date with 'bpf-next/master'.
-Deleted branch libbpf-baseline-2023-02-28T00-43-35.146Z (was 951bce29c898).
-Deleted branch libbpf-bpf-baseline-2023-02-28T00-43-35.146Z (was 3a70e0d4c9d7).
-Deleted branch libbpf-bpf-tip-2023-02-28T00-43-35.146Z (was 2d311f480b52).
-Deleted branch libbpf-squash-base-2023-02-28T00-43-35.146Z (was 957f109ef883).
-Deleted branch libbpf-squash-tip-2023-02-28T00-43-35.146Z (was be66130d2339).
-Deleted branch libbpf-tip-2023-02-28T00-43-35.146Z (was 2d311f480b52).
-```
-
-You might need to do the same for your `~/libbpf` repo sometimes, depending at
-which stage sync script was terminated.
--- a/assets/libbpf-logo-compact-darkbg.png
+++ b/assets/libbpf-logo-compact-darkbg.png
--- a/assets/libbpf-logo-compact-mono.png
+++ b/assets/libbpf-logo-compact-mono.png
--- a/assets/libbpf-logo-compact.png
+++ b/assets/libbpf-logo-compact.png
--- a/assets/libbpf-logo-sideways-darkbg.png
+++ b/assets/libbpf-logo-sideways-darkbg.png
--- a/assets/libbpf-logo-sideways-mono.png
+++ b/assets/libbpf-logo-sideways-mono.png
--- a/assets/libbpf-logo-sideways.png
+++ b/assets/libbpf-logo-sideways.png
--- a/assets/libbpf-logo-sparse-darkbg.png
+++ b/assets/libbpf-logo-sparse-darkbg.png
--- a/assets/libbpf-logo-sparse-mono.png
+++ b/assets/libbpf-logo-sparse-mono.png
--- a/assets/libbpf-logo-sparse.png
+++ b/assets/libbpf-logo-sparse.png
--- a/ci/diffs/.keep
+++ b/ci/diffs/.keep
--- a/ci/diffs/0001-arch-Kconfig-Move-SPECULATION_MITIGATIONS-to-arch-Kc.patch
+++ b/ci/diffs/0001-arch-Kconfig-Move-SPECULATION_MITIGATIONS-to-arch-Kc.patch
@@ -1,69 +0,0 @@
-From c71766e8ff7a7f950522d25896fba758585500df Mon Sep 17 00:00:00 2001
-From: Song Liu <song@kernel.org>
-Date: Mon, 22 Apr 2024 21:14:40 -0700
-Subject: [PATCH] arch/Kconfig: Move SPECULATION_MITIGATIONS to arch/Kconfig
-
-SPECULATION_MITIGATIONS is currently defined only for x86. As a result,
-IS_ENABLED(CONFIG_SPECULATION_MITIGATIONS) is always false for other
-archs. f337a6a21e2f effectively set "mitigations=off" by default on
-non-x86 archs, which is not desired behavior. Jakub observed this
-change when running bpf selftests on s390 and arm64.
-
-Fix this by moving SPECULATION_MITIGATIONS to arch/Kconfig so that it is
-available in all archs and thus can be used safely in kernel/cpu.c
-
-Fixes: f337a6a21e2f ("x86/cpu: Actually turn off mitigations by default for SPECULATION_MITIGATIONS=n")
-Cc: stable@vger.kernel.org
-Cc: Sean Christopherson <seanjc@google.com>
-Cc: Ingo Molnar <mingo@kernel.org>
-Cc: Daniel Sneddon <daniel.sneddon@linux.intel.com>
-Cc: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Song Liu <song@kernel.org>
---
- arch/Kconfig     | 10 ++++++++++
- arch/x86/Kconfig | 10 ----------
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/arch/Kconfig b/arch/Kconfig
-index 9f066785bb71..8f4af75005f8 100644
--- a/arch/Kconfig
-+++ b/arch/Kconfig
-@@ -1609,4 +1609,14 @@ config CC_HAS_SANE_FUNCTION_ALIGNMENT
- 	# strict alignment always, even with -falign-functions.
- 	def_bool CC_HAS_MIN_FUNCTION_ALIGNMENT || CC_IS_CLANG
- 
-+menuconfig SPECULATION_MITIGATIONS
-+	bool "Mitigations for speculative execution vulnerabilities"
-+	default y
-+	help
-+	  Say Y here to enable options which enable mitigations for
-+	  speculative execution hardware vulnerabilities.
-+
-+	  If you say N, all mitigations will be disabled. You really
-+	  should know what you are doing to say so.
-+
- endmenu
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 39886bab943a..50c890fce5e0 100644
--- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -2486,16 +2486,6 @@ config PREFIX_SYMBOLS
- 	def_bool y
- 	depends on CALL_PADDING && !CFI_CLANG
- 
-menuconfig SPECULATION_MITIGATIONS
-	bool "Mitigations for speculative execution vulnerabilities"
-	default y
-	help
-	  Say Y here to enable options which enable mitigations for
-	  speculative execution hardware vulnerabilities.
-
-	  If you say N, all mitigations will be disabled. You really
-	  should know what you are doing to say so.
-
- if SPECULATION_MITIGATIONS
- 
- config MITIGATION_PAGE_TABLE_ISOLATION
-- 
-2.43.0
-
--- a/ci/diffs/0001-selftests-bpf-fix-inet_csk_accept-prototype-in-test_.patch
+++ b/ci/diffs/0001-selftests-bpf-fix-inet_csk_accept-prototype-in-test_.patch
@@ -1,32 +0,0 @@
-From 0daad0a615e687e1247230f3d0c31ae60ba32314 Mon Sep 17 00:00:00 2001
-From: Andrii Nakryiko <andrii@kernel.org>
-Date: Tue, 28 May 2024 15:29:38 -0700
-Subject: [PATCH bpf-next] selftests/bpf: fix inet_csk_accept prototype in
- test_sk_storage_tracing.c
-
-Recent kernel change ([0]) changed inet_csk_accept() prototype. Adapt
-progs/test_sk_storage_tracing.c to take that into account.
-
-  [0] 92ef0fd55ac8 ("net: change proto and proto_ops accept type")
-
-Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
- tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c b/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c
-index 02e718f06e0f..40531e56776e 100644
--- a/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c
-+++ b/tools/testing/selftests/bpf/progs/test_sk_storage_tracing.c
-@@ -84,7 +84,7 @@ int BPF_PROG(trace_tcp_connect, struct sock *sk)
- }
- 
- SEC("fexit/inet_csk_accept")
-int BPF_PROG(inet_csk_accept, struct sock *sk, int flags, int *err, bool kern,
-+int BPF_PROG(inet_csk_accept, struct sock *sk, struct proto_accept_arg *arg,
- 	     struct sock *accepted_sk)
- {
- 	set_task_info(accepted_sk);
-- 
-2.43.0
-
--- a/ci/diffs/0002-xdp-bonding-Fix-feature-flags-when-there-are-no-slav.patch
+++ b/ci/diffs/0002-xdp-bonding-Fix-feature-flags-when-there-are-no-slav.patch
@@ -1,56 +0,0 @@
-From f267f262815033452195f46c43b572159262f533 Mon Sep 17 00:00:00 2001
-From: Daniel Borkmann <daniel@iogearbox.net>
-Date: Tue, 5 Mar 2024 10:08:28 +0100
-Subject: [PATCH 2/2] xdp, bonding: Fix feature flags when there are no slave
- devs anymore
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 9b0ed890ac2a ("bonding: do not report NETDEV_XDP_ACT_XSK_ZEROCOPY")
-changed the driver from reporting everything as supported before a device
-was bonded into having the driver report that no XDP feature is supported
-until a real device is bonded as it seems to be more truthful given
-eventually real underlying devices decide what XDP features are supported.
-
-The change however did not take into account when all slave devices get
-removed from the bond device. In this case after 9b0ed890ac2a, the driver
-keeps reporting a feature mask of 0x77, that is, NETDEV_XDP_ACT_MASK &
-~NETDEV_XDP_ACT_XSK_ZEROCOPY whereas it should have reported a feature
-mask of 0.
-
-Fix it by resetting XDP feature flags in the same way as if no XDP program
-is attached to the bond device. This was uncovered by the XDP bond selftest
-which let BPF CI fail. After adjusting the starting masks on the latter
-to 0 instead of NETDEV_XDP_ACT_MASK the test passes again together with
-this fix.
-
-Fixes: 9b0ed890ac2a ("bonding: do not report NETDEV_XDP_ACT_XSK_ZEROCOPY")
-Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-Cc: Magnus Karlsson <magnus.karlsson@intel.com>
-Cc: Prashant Batra <prbatra.mail@gmail.com>
-Cc: Toke Høiland-Jørgensen <toke@redhat.com>
-Cc: Jakub Kicinski <kuba@kernel.org>
-Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>
-Message-ID: <20240305090829.17131-1-daniel@iogearbox.net>
-Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---
- drivers/net/bonding/bond_main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
-index a11748b8d69b..cd0683bcca03 100644
--- a/drivers/net/bonding/bond_main.c
-+++ b/drivers/net/bonding/bond_main.c
-@@ -1811,7 +1811,7 @@ void bond_xdp_set_features(struct net_device *bond_dev)
- 
- 	ASSERT_RTNL();
- 
-	if (!bond_xdp_check(bond)) {
-+	if (!bond_xdp_check(bond) || !bond_has_slaves(bond)) {
- 		xdp_clear_features_flag(bond_dev);
- 		return;
- 	}
-- 
-2.43.0
-
--- a/ci/managers/test_compile.sh
+++ b/ci/managers/test_compile.sh
@@ -1,15 +0,0 @@
-#!/bin/bash
-set -euox pipefail
-
-EXTRA_CFLAGS=${EXTRA_CFLAGS:-}
-EXTRA_LDFLAGS=${EXTRA_LDFLAGS:-}
-
-cat << EOF > main.c
-#include <bpf/libbpf.h>
-int main() {
-  return bpf_object__open(0) < 0;
-}
-EOF
-
-# static linking
-${CC:-cc} ${EXTRA_CFLAGS} ${EXTRA_LDFLAGS} -o main -I./include/uapi -I./install/usr/include main.c ./build/libbpf.a -lelf -lz
--- a/ci/vmtest/configs/DENYLIST
+++ b/ci/vmtest/configs/DENYLIST
@@ -1,14 +0,0 @@
-# TEMPORARY
-btf_dump/btf_dump: syntax
-kprobe_multi_bench_attach
-core_reloc/enum64val
-core_reloc/size___diff_sz
-core_reloc/type_based___diff_sz
-test_ima	# All of CI is broken on it following 6.3-rc1 merge
-
-lwt_reroute      # crashes kernel after netnext merge from 2ab1efad60ad "net/sched: cls_api: complement tcf_tfilter_dump_policy"
-tc_links_ingress # started failing after net-next merge from 2ab1efad60ad "net/sched: cls_api: complement tcf_tfilter_dump_policy"
-xdp_bonding/xdp_bonding_features     # started failing after net merge from 359e54a93ab4 "l2tp: pass correct message length to ip6_append_data"
-tc_redirect/tc_redirect_dtime # uapi breakage after net-next commit 885c36e59f46 ("net: Re-use and set mono_delivery_time bit for userspace tstamp packets")
-migrate_reuseport/IPv4 TCP_NEW_SYN_RECV reqsk_timer_handler # flaky, under investigation
-migrate_reuseport/IPv6 TCP_NEW_SYN_RECV reqsk_timer_handler # flaky, under investigation
--- a/ci/vmtest/configs/DENYLIST-5.5.0
+++ b/ci/vmtest/configs/DENYLIST-5.5.0
@@ -1,5 +0,0 @@
-# This complements ALLOWLIST-5.5.0 but excludes subtest that can't work on 5.5
-
-btf			# "size check test", "func (Non zero vlen)"
-tailcalls		# tailcall_bpf2bpf_1, tailcall_bpf2bpf_2, tailcall_bpf2bpf_3
-tc_bpf/tc_bpf_non_root
--- a/ci/vmtest/configs/DENYLIST-latest
+++ b/ci/vmtest/configs/DENYLIST-latest
@@ -1,13 +0,0 @@
-decap_sanity  # weird failure with decap_sanity_ns netns already existing, TBD
-empty_skb # waiting the fix in bpf tree to make it to bpf-next
-bpf_nf/tc-bpf-ct # test consistently failing on x86: https://github.com/libbpf/libbpf/pull/698#issuecomment-1590341200
-bpf_nf/xdp-ct   # test consistently failing on x86: https://github.com/libbpf/libbpf/pull/698#issuecomment-1590341200
-kprobe_multi_bench_attach # suspected to cause crashes in CI
-find_vma # test consistently fails on latest kernel, see https://github.com/libbpf/libbpf/issues/754 for details
-bpf_cookie/perf_event
-send_signal/send_signal_nmi
-send_signal/send_signal_nmi_thread
-
-lwt_reroute # crashes kernel, fix pending upstream
-tc_links_ingress # fails, same fix is pending upstream
-tc_redirect		  # enough is enough, banned for life for flakiness
--- a/ci/vmtest/configs/DENYLIST-latest.s390x
+++ b/ci/vmtest/configs/DENYLIST-latest.s390x
@@ -1,17 +0,0 @@
-# TEMPORARY
-sockmap_listen/sockhash VSOCK test_vsock_redir
-usdt/basic                               # failing verifier due to bounds check after LLVM update
-usdt/multispec                           # same as above
-
-deny_namespace                           # not yet in bpf denylist
-tc_redirect/tc_redirect_dtime            # very flaky
-lru_bug                                  # not yet in bpf-next denylist
-
-# Disabled temporarily for a crash.
-# https://lore.kernel.org/bpf/c9923c1d-971d-4022-8dc8-1364e929d34c@gmail.com/
-dummy_st_ops/dummy_init_ptr_arg
-fexit_bpf2bpf
-tailcalls
-trace_ext
-xdp_bpf2bpf
-xdp_metadata
--- a/ci/vmtest/helpers.sh
+++ b/ci/vmtest/helpers.sh
@@ -1,38 +0,0 @@
-# shellcheck shell=bash
-
-# $1 - start or end
-# $2 - fold identifier, no spaces
-# $3 - fold section description
-foldable() {
-  local YELLOW='\033[1;33m'
-  local NOCOLOR='\033[0m'
-  if [ $1 = "start" ]; then
-    line="::group::$2"
-    if [ ! -z "${3:-}" ]; then
-      line="$line - ${YELLOW}$3${NOCOLOR}"
-    fi
-  else
-    line="::endgroup::"
-  fi
-  echo -e "$line"
-}
-
-__print() {
-  local TITLE=""
-  if [[ -n $2 ]]; then
-      TITLE=" title=$2"
-  fi
-  echo "::$1${TITLE}::$3"
-}
-
-# $1 - title
-# $2 - message
-print_error() {
-  __print error $1 $2
-}
-
-# $1 - title
-# $2 - message
-print_notice() {
-  __print notice $1 $2
-}
--- a/ci/vmtest/run_selftests.sh
+++ b/ci/vmtest/run_selftests.sh
@@ -1,94 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-source $(cd $(dirname $0) && pwd)/helpers.sh
-
-ARCH=$(uname -m)
-
-STATUS_FILE=/exitstatus
-
-read_lists() {
-	(for path in "$@"; do
-		if [[ -s "$path" ]]; then
-			cat "$path"
-		fi;
-	done) | cut -d'#' -f1 | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' | tr -s '\n' ','
-}
-
-test_progs() {
-	if [[ "${KERNEL}" != '4.9.0' ]]; then
-		foldable start test_progs "Testing test_progs"
-		# "&& true" does not change the return code (it is not executed
-		# if the Python script fails), but it prevents exiting on a
-		# failure due to the "set -e".
-		./test_progs ${DENYLIST:+-d"$DENYLIST"} ${ALLOWLIST:+-a"$ALLOWLIST"} && true
-		echo "test_progs:$?" >> "${STATUS_FILE}"
-		foldable end test_progs
-	fi
-}
-
-test_progs_no_alu32() {
-	foldable start test_progs-no_alu32 "Testing test_progs-no_alu32"
-	./test_progs-no_alu32 ${DENYLIST:+-d"$DENYLIST"} ${ALLOWLIST:+-a"$ALLOWLIST"} && true
-	echo "test_progs-no_alu32:$?" >> "${STATUS_FILE}"
-	foldable end test_progs-no_alu32
-}
-
-test_maps() {
-	if [[ "${KERNEL}" == 'latest' ]]; then
-		foldable start test_maps "Testing test_maps"
-		./test_maps && true
-		echo "test_maps:$?" >> "${STATUS_FILE}"
-		foldable end test_maps
-	fi
-}
-
-test_verifier() {
-	if [[ "${KERNEL}" == 'latest' ]]; then
-		foldable start test_verifier "Testing test_verifier"
-		./test_verifier && true
-		echo "test_verifier:$?" >> "${STATUS_FILE}"
-		foldable end test_verifier
-	fi
-}
-
-foldable end vm_init
-
-foldable start kernel_config "Kconfig"
-
-zcat /proc/config.gz
-
-foldable end kernel_config
-
-
-configs_path=/${PROJECT_NAME}/selftests/bpf
-local_configs_path=${PROJECT_NAME}/vmtest/configs
-DENYLIST=$(read_lists \
-	"$configs_path/DENYLIST" \
-	"$configs_path/DENYLIST.${ARCH}" \
-	"$local_configs_path/DENYLIST-${KERNEL}" \
-	"$local_configs_path/DENYLIST-${KERNEL}.${ARCH}" \
-)
-ALLOWLIST=$(read_lists \
-	"$configs_path/ALLOWLIST" \
-	"$configs_path/ALLOWLIST.${ARCH}" \
-	"$local_configs_path/ALLOWLIST-${KERNEL}" \
-	"$local_configs_path/ALLOWLIST-${KERNEL}.${ARCH}" \
-)
-
-echo "DENYLIST: ${DENYLIST}"
-echo "ALLOWLIST: ${ALLOWLIST}"
-
-cd ${PROJECT_NAME}/selftests/bpf
-
-if [ $# -eq 0 ]; then
-	test_progs
-	test_progs_no_alu32
-	# test_maps
-	test_verifier
-else
-	for test_name in "$@"; do
-		"${test_name}"
-	done
-fi
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -6,49 +6,7 @@


 LIBBPF API
-==========
-
-Error Handling
--------------
-
-When libbpf is used in "libbpf 1.0 mode", API functions can return errors in one of two ways.
-
-You can set "libbpf 1.0" mode with the following line:
-
-.. code-block::
-
-    libbpf_set_strict_mode(LIBBPF_STRICT_DIRECT_ERRS | LIBBPF_STRICT_CLEAN_PTRS);
-
-If the function returns an error code directly, it uses 0 to indicate success
-and a negative error code to indicate what caused the error. In this case the
-error code should be checked directly from the return, you do not need to check
-errno.
-
-For example:
-
-.. code-block::
-
-    err = some_libbpf_api_with_error_return(...);
-    if (err < 0) {
-        /* Handle error accordingly */
-    }
-
-If the function returns a pointer, it will return NULL to indicate there was
-an error. In this case errno should be checked for the error code.
-
-For example:
-
-.. code-block::
-
-    ptr = some_libbpf_api_returning_ptr();
-    if (!ptr) {
-        /* note no minus sign for EINVAL and E2BIG below */
-        if (errno == EINVAL) {
-           /* handle EINVAL error */
-        } else if (errno == E2BIG) {
-           /* handle E2BIG error */
-        }
-    }
+==================

 libbpf.h
 --------
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,7 +18,6 @@ extensions = [
    'sphinx.ext.viewcode',
    'sphinx.ext.imgmath',
    'sphinx.ext.todo',
-    'sphinx_rtd_theme',
    'breathe',
 ]

--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,33 +1,22 @@
 .. SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)

-.. _libbpf:
-
-======
 libbpf
 ======

-If you are looking to develop BPF applications using the libbpf library, this
-directory contains important documentation that you should read.
-
-To get started, it is recommended to begin with the :doc:`libbpf Overview
-<libbpf_overview>` document, which provides a high-level understanding of the
-libbpf APIs and their usage. This will give you a solid foundation to start
-exploring and utilizing the various features of libbpf to develop your BPF
-applications.
+For API documentation see the `versioned API documentation site <https://libbpf.readthedocs.io/en/latest/api.html>`_.

 .. toctree::
   :maxdepth: 1

-   libbpf_overview
-   API Documentation <https://libbpf.readthedocs.io/en/latest/api.html>
-   program_types
   libbpf_naming_convention
   libbpf_build

+This is documentation for libbpf, a userspace library for loading and
+interacting with bpf programs.

-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 <http://vger.kernel.org/vger-lists.html#bpf>`_ to the mailing list
-search its `archive <https://lore.kernel.org/bpf/>`_.  Please search the archive
-before asking new questions. It may be that this was already addressed or
-answered before.
+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 <http://vger.kernel.org/vger-lists.html#bpf>`_ to the
+mailing list search its `archive <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.
--- a/docs/libbpf_naming_convention.rst
+++ b/docs/libbpf_naming_convention.rst
@@ -9,8 +9,8 @@ described here. It's recommended to follow these conventions whenever a
 new function or type is added to keep libbpf API clean and consistent.

 All types and functions provided by libbpf API should have one of the
-following prefixes: ``bpf_``, ``btf_``, ``libbpf_``, ``btf_dump_``,
-``ring_buffer_``, ``perf_buffer_``.
+following prefixes: ``bpf_``, ``btf_``, ``libbpf_``, ``xsk_``,
+``btf_dump_``, ``ring_buffer_``, ``perf_buffer_``.

 System call wrappers
 --------------------
@@ -59,6 +59,15 @@ Auxiliary functions and types that don't fit well in any of categories
 described above should have ``libbpf_`` prefix, e.g.
 ``libbpf_get_error`` or ``libbpf_prog_type_by_name``.

+AF_XDP functions
+-------------------
+
+AF_XDP functions should have an ``xsk_`` prefix, e.g.
+``xsk_umem__get_data`` or ``xsk_umem__create``. The interface consists
+of both low-level ring access functions and high-level configuration
+functions. These can be mixed and matched. Note that these functions
+are not reentrant for performance reasons.
+
 ABI
 ---

@@ -83,8 +92,8 @@ This prevents from accidentally exporting a symbol, that is not supposed
 to be a part of ABI what, in turn, improves both libbpf developer- and
 user-experiences.

-ABI versioning
--------------
+ABI versionning
+---------------

 To make future ABI extensions possible libbpf ABI is versioned.
 Versioning is implemented by ``libbpf.map`` version script that is
@@ -148,7 +157,7 @@ API documentation convention
 The libbpf API is documented via comments above definitions in
 header files. These comments can be rendered by doxygen and sphinx
 for well organized html output. This section describes the
-convention in which these comments should be formatted.
+convention in which these comments should be formated.

 Here is an example from btf.h:

--- a/docs/libbpf_overview.rst
+++ b/docs/libbpf_overview.rst
@@ -1,236 +0,0 @@
-.. SPDX-License-Identifier: GPL-2.0
-
-===============
-libbpf Overview
-===============
-
-libbpf is a C-based library containing a BPF loader that takes compiled BPF
-object files and prepares and loads them into the Linux kernel. libbpf takes the
-heavy lifting of loading, verifying, and attaching BPF programs to various
-kernel hooks, allowing BPF application developers to focus only on BPF program
-correctness and performance.
-
-The following are the high-level features supported by libbpf:
-
-* Provides high-level and low-level APIs for user space programs to interact
-  with BPF programs. The low-level APIs wrap all the bpf system call
-  functionality, which is useful when users need more fine-grained control
-  over the interactions between user space and BPF programs.
-* Provides overall support for the BPF object skeleton generated by bpftool.
-  The skeleton file simplifies the process for the user space programs to access
-  global variables and work with BPF programs.
-* Provides BPF-side APIS, including BPF helper definitions, BPF maps support,
-  and tracing helpers, allowing developers to simplify BPF code writing.
-* Supports BPF CO-RE mechanism, enabling BPF developers to write portable
-  BPF programs that can be compiled once and run across different kernel
-  versions.
-
-This document will delve into the above concepts in detail, providing a deeper
-understanding of the capabilities and advantages of libbpf and how it can help
-you develop BPF applications efficiently.
-
-BPF App Lifecycle and libbpf APIs
-==================================
-
-A BPF application consists of one or more BPF programs (either cooperating or
-completely independent), BPF maps, and global variables. The global
-variables are shared between all BPF programs, which allows them to cooperate on
-a common set of data. libbpf provides APIs that user space programs can use to
-manipulate the BPF programs by triggering different phases of a BPF application
-lifecycle.
-
-The following section provides a brief overview of each phase in the BPF life
-cycle:
-
-* **Open phase**: In this phase, libbpf parses the BPF
-  object file and discovers BPF maps, BPF programs, and global variables. After
-  a BPF app is opened, user space apps can make additional adjustments
-  (setting BPF program types, if necessary; pre-setting initial values for
-  global variables, etc.) before all the entities are created and loaded.
-
-* **Load phase**: In the load phase, libbpf creates BPF
-  maps, resolves various relocations, and verifies and loads BPF programs into
-  the kernel. At this point, libbpf validates all the parts of a BPF application
-  and loads the BPF program into the kernel, but no BPF program has yet been
-  executed. After the load phase, it’s possible to set up the initial BPF map
-  state without racing with the BPF program code execution.
-
-* **Attachment phase**: In this phase, libbpf
-  attaches BPF programs to various BPF hook points (e.g., tracepoints, kprobes,
-  cgroup hooks, network packet processing pipeline, etc.). During this
-  phase, BPF programs perform useful work such as processing
-  packets, or updating BPF maps and global variables that can be read from user
-  space.
-
-* **Tear down phase**: In the tear down phase,
-  libbpf detaches BPF programs and unloads them from the kernel. BPF maps are
-  destroyed, and all the resources used by the BPF app are freed.
-
-BPF Object Skeleton File
-========================
-
-BPF skeleton is an alternative interface to libbpf APIs for working with BPF
-objects. Skeleton code abstract away generic libbpf APIs to significantly
-simplify code for manipulating BPF programs from user space. Skeleton code
-includes a bytecode representation of the BPF object file, simplifying the
-process of distributing your BPF code. With BPF bytecode embedded, there are no
-extra files to deploy along with your application binary.
-
-You can generate the skeleton header file ``(.skel.h)`` for a specific object
-file by passing the BPF object to the bpftool. The generated BPF skeleton
-provides the following custom functions that correspond to the BPF lifecycle,
-each of them prefixed with the specific object name:
-
-* ``<name>__open()`` – creates and opens BPF application (``<name>`` stands for
-  the specific bpf object name)
-* ``<name>__load()`` – instantiates, loads,and verifies BPF application parts
-* ``<name>__attach()`` – attaches all auto-attachable BPF programs (it’s
-  optional, you can have more control by using libbpf APIs directly)
-* ``<name>__destroy()`` – detaches all BPF programs and
-  frees up all used resources
-
-Using the skeleton code is the recommended way to work with bpf programs. Keep
-in mind, BPF skeleton provides access to the underlying BPF object, so whatever
-was possible to do with generic libbpf APIs is still possible even when the BPF
-skeleton is used. It's an additive convenience feature, with no syscalls, and no
-cumbersome code.
-
-Other Advantages of Using Skeleton File
---------------------------------------
-
-* BPF skeleton provides an interface for user space programs to work with BPF
-  global variables. The skeleton code memory maps global variables as a struct
-  into user space. The struct interface allows user space programs to initialize
-  BPF programs before the BPF load phase and fetch and update data from user
-  space afterward.
-
-* The ``skel.h`` file reflects the object file structure by listing out the
-  available maps, programs, etc. BPF skeleton provides direct access to all the
-  BPF maps and BPF programs as struct fields. This eliminates the need for
-  string-based lookups with ``bpf_object_find_map_by_name()`` and
-  ``bpf_object_find_program_by_name()`` APIs, reducing errors due to BPF source
-  code and user-space code getting out of sync.
-
-* The embedded bytecode representation of the object file ensures that the
-  skeleton and the BPF object file are always in sync.
-
-BPF Helpers
-===========
-
-libbpf provides BPF-side APIs that BPF programs can use to interact with the
-system. The BPF helpers definition allows developers to use them in BPF code as
-any other plain C function. For example, there are helper functions to print
-debugging messages, get the time since the system was booted, interact with BPF
-maps, manipulate network packets, etc.
-
-For a complete description of what the helpers do, the arguments they take, and
-the return value, see the `bpf-helpers
-<https://man7.org/linux/man-pages/man7/bpf-helpers.7.html>`_ man page.
-
-BPF CO-RE (Compile Once – Run Everywhere)
-=========================================
-
-BPF programs work in the kernel space and have access to kernel memory and data
-structures. One limitation that BPF applications come across is the lack of
-portability across different kernel versions and configurations. `BCC
-<https://github.com/iovisor/bcc/>`_ is one of the solutions for BPF
-portability. However, it comes with runtime overhead and a large binary size
-from embedding the compiler with the application.
-
-libbpf steps up the BPF program portability by supporting the BPF CO-RE concept.
-BPF CO-RE brings together BTF type information, libbpf, and the compiler to
-produce a single executable binary that you can run on multiple kernel versions
-and configurations.
-
-To make BPF programs portable libbpf relies on the BTF type information of the
-running kernel. Kernel also exposes this self-describing authoritative BTF
-information through ``sysfs`` at ``/sys/kernel/btf/vmlinux``.
-
-You can generate the BTF information for the running kernel with the following
-command:
-
-::
-
-  $ bpftool btf dump file /sys/kernel/btf/vmlinux format c > vmlinux.h
-
-The command generates a ``vmlinux.h`` header file with all kernel types
-(:doc:`BTF types <../btf>`) that the running kernel uses. Including
-``vmlinux.h`` in your BPF program eliminates dependency on system-wide kernel
-headers.
-
-libbpf enables portability of BPF programs by looking at the BPF program’s
-recorded BTF type and relocation information and matching them to BTF
-information (vmlinux) provided by the running kernel. libbpf then resolves and
-matches all the types and fields, and updates necessary offsets and other
-relocatable data to ensure that BPF program’s logic functions correctly for a
-specific kernel on the host. BPF CO-RE concept thus eliminates overhead
-associated with BPF development and allows developers to write portable BPF
-applications without modifications and runtime source code compilation on the
-target machine.
-
-The following code snippet shows how to read the parent field of a kernel
-``task_struct`` using BPF CO-RE and libbf. The basic helper to read a field in a
-CO-RE relocatable manner is ``bpf_core_read(dst, sz, src)``, which will read
-``sz`` bytes from the field referenced by ``src`` into the memory pointed to by
-``dst``.
-
-.. code-block:: C
-   :emphasize-lines: 6
-
-    //...
-    struct task_struct *task = (void *)bpf_get_current_task();
-    struct task_struct *parent_task;
-    int err;
-
-    err = bpf_core_read(&parent_task, sizeof(void *), &task->parent);
-    if (err) {
-      /* handle error */
-    }
-
-    /* parent_task contains the value of task->parent pointer */
-
-In the code snippet, we first get a pointer to the current ``task_struct`` using
-``bpf_get_current_task()``.  We then use ``bpf_core_read()`` to read the parent
-field of task struct into the ``parent_task`` variable. ``bpf_core_read()`` is
-just like ``bpf_probe_read_kernel()`` BPF helper, except it records information
-about the field that should be relocated on the target kernel. i.e, if the
-``parent`` field gets shifted to a different offset within
-``struct task_struct`` due to some new field added in front of it, libbpf will
-automatically adjust the actual offset to the proper value.
-
-Getting Started with libbpf
-===========================
-
-Check out the `libbpf-bootstrap <https://github.com/libbpf/libbpf-bootstrap>`_
-repository with simple examples of using libbpf to build various BPF
-applications.
-
-See also `libbpf API documentation
-<https://libbpf.readthedocs.io/en/latest/api.html>`_.
-
-libbpf and Rust
-===============
-
-If you are building BPF applications in Rust, it is recommended to use the
-`Libbpf-rs <https://github.com/libbpf/libbpf-rs>`_ library instead of bindgen
-bindings directly to libbpf. Libbpf-rs wraps libbpf functionality in
-Rust-idiomatic interfaces and provides libbpf-cargo plugin to handle BPF code
-compilation and skeleton generation. Using Libbpf-rs will make building user
-space part of the BPF application easier. Note that the BPF program themselves
-must still be written in plain C.
-
-libbpf logging
-==============
-
-By default, libbpf logs informational and warning messages to stderr. The
-verbosity of these messages can be controlled by setting the environment
-variable LIBBPF_LOG_LEVEL to either warn, info, or debug. A custom log
-callback can be set using ``libbpf_set_print()``.
-
-Additional Documentation
-========================
-
-* `Program types and ELF Sections <https://libbpf.readthedocs.io/en/latest/program_types.html>`_
-* `API naming convention <https://libbpf.readthedocs.io/en/latest/libbpf_naming_convention.html>`_
-* `Building libbpf <https://libbpf.readthedocs.io/en/latest/libbpf_build.html>`_
-* `API documentation Convention <https://libbpf.readthedocs.io/en/latest/libbpf_naming_convention.html#api-documentation-convention>`_
--- a/docs/program_types.rst
+++ b/docs/program_types.rst
@@ -1,213 +0,0 @@
-.. SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
-
-.. _program_types_and_elf:
-
-Program Types and ELF Sections
-==============================
-
-The table below lists the program types, their attach types where relevant and the ELF section
-names supported by libbpf for them. The ELF section names follow these rules:
-
- ``type`` is an exact match, e.g. ``SEC("socket")``
- ``type+`` means it can be either exact ``SEC("type")`` or well-formed ``SEC("type/extras")``
-  with a '``/``' separator between ``type`` and ``extras``.
-
-When ``extras`` are specified, they provide details of how to auto-attach the BPF program.  The
-format of ``extras`` depends on the program type, e.g. ``SEC("tracepoint/<category>/<name>")``
-for tracepoints or ``SEC("usdt/<path>:<provider>:<name>")`` for USDT probes. The extras are
-described in more detail in the footnotes.
-
-
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| Program Type                              | Attach Type                            | ELF Section Name                 | Sleepable |
-+===========================================+========================================+==================================+===========+
-| ``BPF_PROG_TYPE_CGROUP_DEVICE``           | ``BPF_CGROUP_DEVICE``                  | ``cgroup/dev``                   |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_CGROUP_SKB``              |                                        | ``cgroup/skb``                   |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_INET_EGRESS``             | ``cgroup_skb/egress``            |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_INET_INGRESS``            | ``cgroup_skb/ingress``           |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_CGROUP_SOCKOPT``          | ``BPF_CGROUP_GETSOCKOPT``              | ``cgroup/getsockopt``            |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_SETSOCKOPT``              | ``cgroup/setsockopt``            |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_CGROUP_SOCK_ADDR``        | ``BPF_CGROUP_INET4_BIND``              | ``cgroup/bind4``                 |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_INET4_CONNECT``           | ``cgroup/connect4``              |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_INET4_GETPEERNAME``       | ``cgroup/getpeername4``          |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_INET4_GETSOCKNAME``       | ``cgroup/getsockname4``          |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_INET6_BIND``              | ``cgroup/bind6``                 |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_INET6_CONNECT``           | ``cgroup/connect6``              |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_INET6_GETPEERNAME``       | ``cgroup/getpeername6``          |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_INET6_GETSOCKNAME``       | ``cgroup/getsockname6``          |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_UDP4_RECVMSG``            | ``cgroup/recvmsg4``              |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_UDP4_SENDMSG``            | ``cgroup/sendmsg4``              |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_UDP6_RECVMSG``            | ``cgroup/recvmsg6``              |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_UDP6_SENDMSG``            | ``cgroup/sendmsg6``              |           |
-|                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_UNIX_CONNECT``            | ``cgroup/connect_unix``          |           |
-|                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_UNIX_SENDMSG``            | ``cgroup/sendmsg_unix``          |           |
-|                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_UNIX_RECVMSG``            | ``cgroup/recvmsg_unix``          |           |
-|                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_UNIX_GETPEERNAME``        | ``cgroup/getpeername_unix``      |           |
-|                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_UNIX_GETSOCKNAME``        | ``cgroup/getsockname_unix``      |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_CGROUP_SOCK``             | ``BPF_CGROUP_INET4_POST_BIND``         | ``cgroup/post_bind4``            |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_INET6_POST_BIND``         | ``cgroup/post_bind6``            |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_INET_SOCK_CREATE``        | ``cgroup/sock_create``           |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``cgroup/sock``                  |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_CGROUP_INET_SOCK_RELEASE``       | ``cgroup/sock_release``          |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_CGROUP_SYSCTL``           | ``BPF_CGROUP_SYSCTL``                  | ``cgroup/sysctl``                |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_EXT``                     |                                        | ``freplace+`` [#fentry]_         |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_FLOW_DISSECTOR``          | ``BPF_FLOW_DISSECTOR``                 | ``flow_dissector``               |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_KPROBE``                  |                                        | ``kprobe+`` [#kprobe]_           |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``kretprobe+`` [#kprobe]_        |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``ksyscall+`` [#ksyscall]_       |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        |  ``kretsyscall+`` [#ksyscall]_   |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``uprobe+`` [#uprobe]_           |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``uprobe.s+`` [#uprobe]_         | Yes       |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``uretprobe+`` [#uprobe]_        |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``uretprobe.s+`` [#uprobe]_      | Yes       |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``usdt+`` [#usdt]_               |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_TRACE_KPROBE_MULTI``             | ``kprobe.multi+`` [#kpmulti]_    |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``kretprobe.multi+`` [#kpmulti]_ |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_LIRC_MODE2``              | ``BPF_LIRC_MODE2``                     | ``lirc_mode2``                   |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_LSM``                     | ``BPF_LSM_CGROUP``                     | ``lsm_cgroup+``                  |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_LSM_MAC``                        | ``lsm+`` [#lsm]_                 |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``lsm.s+`` [#lsm]_               | Yes       |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_LWT_IN``                  |                                        | ``lwt_in``                       |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_LWT_OUT``                 |                                        | ``lwt_out``                      |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_LWT_SEG6LOCAL``           |                                        | ``lwt_seg6local``                |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_LWT_XMIT``                |                                        | ``lwt_xmit``                     |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_PERF_EVENT``              |                                        | ``perf_event``                   |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE`` |                                        | ``raw_tp.w+`` [#rawtp]_          |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``raw_tracepoint.w+``            |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_RAW_TRACEPOINT``          |                                        | ``raw_tp+`` [#rawtp]_            |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``raw_tracepoint+``              |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_SCHED_ACT``               |                                        | ``action``                       |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_SCHED_CLS``               |                                        | ``classifier``                   |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``tc``                           |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_SK_LOOKUP``               | ``BPF_SK_LOOKUP``                      | ``sk_lookup``                    |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_SK_MSG``                  | ``BPF_SK_MSG_VERDICT``                 | ``sk_msg``                       |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_SK_REUSEPORT``            | ``BPF_SK_REUSEPORT_SELECT_OR_MIGRATE`` | ``sk_reuseport/migrate``         |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_SK_REUSEPORT_SELECT``            | ``sk_reuseport``                 |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_SK_SKB``                  |                                        | ``sk_skb``                       |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_SK_SKB_STREAM_PARSER``           | ``sk_skb/stream_parser``         |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_SK_SKB_STREAM_VERDICT``          | ``sk_skb/stream_verdict``        |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_SOCKET_FILTER``           |                                        | ``socket``                       |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_SOCK_OPS``                | ``BPF_CGROUP_SOCK_OPS``                | ``sockops``                      |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_STRUCT_OPS``              |                                        | ``struct_ops+``                  |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_SYSCALL``                 |                                        | ``syscall``                      | Yes       |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_TRACEPOINT``              |                                        | ``tp+`` [#tp]_                   |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``tracepoint+`` [#tp]_           |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_TRACING``                 | ``BPF_MODIFY_RETURN``                  | ``fmod_ret+`` [#fentry]_         |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``fmod_ret.s+`` [#fentry]_       | Yes       |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_TRACE_FENTRY``                   | ``fentry+`` [#fentry]_           |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``fentry.s+`` [#fentry]_         | Yes       |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_TRACE_FEXIT``                    | ``fexit+`` [#fentry]_            |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``fexit.s+`` [#fentry]_          | Yes       |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_TRACE_ITER``                     | ``iter+`` [#iter]_               |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``iter.s+`` [#iter]_             | Yes       |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_TRACE_RAW_TP``                   | ``tp_btf+`` [#fentry]_           |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-| ``BPF_PROG_TYPE_XDP``                     | ``BPF_XDP_CPUMAP``                     | ``xdp.frags/cpumap``             |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``xdp/cpumap``                   |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_XDP_DEVMAP``                     | ``xdp.frags/devmap``             |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``xdp/devmap``                   |           |
-+                                           +----------------------------------------+----------------------------------+-----------+
-|                                           | ``BPF_XDP``                            | ``xdp.frags``                    |           |
-+                                           +                                        +----------------------------------+-----------+
-|                                           |                                        | ``xdp``                          |           |
-+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
-
-
-.. rubric:: Footnotes
-
-.. [#fentry] The ``fentry`` attach format is ``fentry[.s]/<function>``.
-.. [#kprobe] The ``kprobe`` attach format is ``kprobe/<function>[+<offset>]``. Valid
-             characters for ``function`` are ``a-zA-Z0-9_.`` and ``offset`` must be a valid
-             non-negative integer.
-.. [#ksyscall] The ``ksyscall`` attach format is ``ksyscall/<syscall>``.
-.. [#uprobe] The ``uprobe`` attach format is ``uprobe[.s]/<path>:<function>[+<offset>]``.
-.. [#usdt] The ``usdt`` attach format is ``usdt/<path>:<provider>:<name>``.
-.. [#kpmulti] The ``kprobe.multi`` attach format is ``kprobe.multi/<pattern>`` where ``pattern``
-              supports ``*`` and ``?`` wildcards. Valid characters for pattern are
-              ``a-zA-Z0-9_.*?``.
-.. [#lsm] The ``lsm`` attachment format is ``lsm[.s]/<hook>``.
-.. [#rawtp] The ``raw_tp`` attach format is ``raw_tracepoint[.w]/<tracepoint>``.
-.. [#tp] The ``tracepoint`` attach format is ``tracepoint/<category>/<name>``.
-.. [#iter] The ``iter`` attach format is ``iter[.s]/<struct-name>``.
--- a/docs/sphinx/requirements.txt
+++ b/docs/sphinx/requirements.txt
@@ -1,2 +1 @@
-breathe
-sphinx_rtd_theme
+breathe
--- a/fuzz/bpf-object-fuzzer.c
+++ b/fuzz/bpf-object-fuzzer.c
@@ -1,23 +0,0 @@
-#include "libbpf.h"
-
-static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va_list args)
-{
-	return 0;
-}
-
-int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
-	struct bpf_object *obj = NULL;
-	DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts);
-	int err;
-
-	libbpf_set_print(libbpf_print_fn);
-
-	opts.object_name = "fuzz-object";
-	obj = bpf_object__open_mem(data, size, &opts);
-	err = libbpf_get_error(obj);
-	if (err)
-		return 0;
-
-	bpf_object__close(obj);
-	return 0;
-}
--- a/fuzz/bpf-object-fuzzer_seed_corpus.zip
+++ b/fuzz/bpf-object-fuzzer_seed_corpus.zip
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -37,14 +37,6 @@
 		.off   = 0,					\
 		.imm   = IMM })

-#define BPF_CALL_REL(DST)					\
-	((struct bpf_insn) {					\
-		.code = BPF_JMP | BPF_CALL,			\
-		.dst_reg = 0,					\
-		.src_reg = BPF_PSEUDO_CALL,			\
-		.off = 0,					\
-		.imm = DST })
-
 #define BPF_EXIT_INSN()						\
 	((struct bpf_insn) {					\
 		.code  = BPF_JMP | BPF_EXIT,			\
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -3,8 +3,6 @@
 #ifndef __LINUX_KERNEL_H
 #define __LINUX_KERNEL_H

-#include <linux/compiler.h>
-
 #ifndef offsetof
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -7,8 +7,6 @@
 #include <stddef.h>
 #include <stdint.h>

-#include <linux/stddef.h>
-
 #include <asm/types.h>
 #include <asm/posix_types.h>

--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
--- a/include/uapi/linux/btf.h
+++ b/include/uapi/linux/btf.h
@@ -33,17 +33,17 @@ struct btf_type {
 	/* "info" bits arrangement
 	 * bits  0-15: vlen (e.g. # of struct's members)
 	 * bits 16-23: unused
-	 * bits 24-28: kind (e.g. int, ptr, array...etc)
-	 * bits 29-30: unused
+	 * bits 24-27: kind (e.g. int, ptr, array...etc)
+	 * bits 28-30: unused
 	 * bit     31: kind_flag, currently used by
-	 *             struct, union, enum, fwd and enum64
+	 *             struct, union and fwd
 	 */
 	__u32 info;
-	/* "size" is used by INT, ENUM, STRUCT, UNION, DATASEC and ENUM64.
+	/* "size" is used by INT, ENUM, STRUCT, UNION and DATASEC.
 	 * "size" tells the size of the type it is describing.
 	 *
 	 * "type" is used by PTR, TYPEDEF, VOLATILE, CONST, RESTRICT,
-	 * FUNC, FUNC_PROTO, VAR, DECL_TAG and TYPE_TAG.
+	 * FUNC, FUNC_PROTO, VAR and DECL_TAG.
 	 * "type" is a type_id referring to another type.
 	 */
 	union {
@@ -63,7 +63,7 @@ enum {
 	BTF_KIND_ARRAY		= 3,	/* Array	*/
 	BTF_KIND_STRUCT		= 4,	/* Struct	*/
 	BTF_KIND_UNION		= 5,	/* Union	*/
-	BTF_KIND_ENUM		= 6,	/* Enumeration up to 32-bit values */
+	BTF_KIND_ENUM		= 6,	/* Enumeration	*/
 	BTF_KIND_FWD		= 7,	/* Forward	*/
 	BTF_KIND_TYPEDEF	= 8,	/* Typedef	*/
 	BTF_KIND_VOLATILE	= 9,	/* Volatile	*/
@@ -75,8 +75,6 @@ enum {
 	BTF_KIND_DATASEC	= 15,	/* Section	*/
 	BTF_KIND_FLOAT		= 16,	/* Floating point	*/
 	BTF_KIND_DECL_TAG	= 17,	/* Decl Tag */
-	BTF_KIND_TYPE_TAG	= 18,	/* Type Tag */
-	BTF_KIND_ENUM64		= 19,	/* Enumeration up to 64-bit values */

 	NR_BTF_KINDS,
 	BTF_KIND_MAX		= NR_BTF_KINDS - 1,
@@ -187,14 +185,4 @@ struct btf_decl_tag {
       __s32   component_idx;
 };

-/* BTF_KIND_ENUM64 is followed by multiple "struct btf_enum64".
- * The exact number of btf_enum64 is stored in the vlen (of the
- * info in "struct btf_type").
- */
-struct btf_enum64 {
-	__u32	name_off;
-	__u32	val_lo32;
-	__u32	val_hi32;
-};
-
 #endif /* _UAPI__LINUX_BTF_H__ */
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -7,23 +7,24 @@

 /* This struct should be in sync with struct rtnl_link_stats64 */
 struct rtnl_link_stats {
-	__u32	rx_packets;
-	__u32	tx_packets;
-	__u32	rx_bytes;
-	__u32	tx_bytes;
-	__u32	rx_errors;
-	__u32	tx_errors;
-	__u32	rx_dropped;
-	__u32	tx_dropped;
-	__u32	multicast;
+	__u32	rx_packets;		/* total packets received	*/
+	__u32	tx_packets;		/* total packets transmitted	*/
+	__u32	rx_bytes;		/* total bytes received 	*/
+	__u32	tx_bytes;		/* total bytes transmitted	*/
+	__u32	rx_errors;		/* bad packets received		*/
+	__u32	tx_errors;		/* packet transmit problems	*/
+	__u32	rx_dropped;		/* no space in linux buffers	*/
+	__u32	tx_dropped;		/* no space available in linux	*/
+	__u32	multicast;		/* multicast packets received	*/
 	__u32	collisions;
+
 	/* detailed rx_errors: */
 	__u32	rx_length_errors;
-	__u32	rx_over_errors;
-	__u32	rx_crc_errors;
-	__u32	rx_frame_errors;
-	__u32	rx_fifo_errors;
-	__u32	rx_missed_errors;
+	__u32	rx_over_errors;		/* receiver ring buff overflow	*/
+	__u32	rx_crc_errors;		/* recved pkt with crc error	*/
+	__u32	rx_frame_errors;	/* recv'd frame alignment error */
+	__u32	rx_fifo_errors;		/* recv'r fifo overrun		*/
+	__u32	rx_missed_errors;	/* receiver missed packet	*/

 	/* detailed tx_errors */
 	__u32	tx_aborted_errors;
@@ -36,204 +37,29 @@ struct rtnl_link_stats {
 	__u32	rx_compressed;
 	__u32	tx_compressed;

-	__u32	rx_nohandler;
+	__u32	rx_nohandler;		/* dropped, no handler found	*/
 };

-/**
- * struct rtnl_link_stats64 - The main device statistics structure.
- *
- * @rx_packets: Number of good packets received by the interface.
- *   For hardware interfaces counts all good packets received from the device
- *   by the host, including packets which host had to drop at various stages
- *   of processing (even in the driver).
- *
- * @tx_packets: Number of packets successfully transmitted.
- *   For hardware interfaces counts packets which host was able to successfully
- *   hand over to the device, which does not necessarily mean that packets
- *   had been successfully transmitted out of the device, only that device
- *   acknowledged it copied them out of host memory.
- *
- * @rx_bytes: Number of good received bytes, corresponding to @rx_packets.
- *
- *   For IEEE 802.3 devices should count the length of Ethernet Frames
- *   excluding the FCS.
- *
- * @tx_bytes: Number of good transmitted bytes, corresponding to @tx_packets.
- *
- *   For IEEE 802.3 devices should count the length of Ethernet Frames
- *   excluding the FCS.
- *
- * @rx_errors: Total number of bad packets received on this network device.
- *   This counter must include events counted by @rx_length_errors,
- *   @rx_crc_errors, @rx_frame_errors and other errors not otherwise
- *   counted.
- *
- * @tx_errors: Total number of transmit problems.
- *   This counter must include events counter by @tx_aborted_errors,
- *   @tx_carrier_errors, @tx_fifo_errors, @tx_heartbeat_errors,
- *   @tx_window_errors and other errors not otherwise counted.
- *
- * @rx_dropped: Number of packets received but not processed,
- *   e.g. due to lack of resources or unsupported protocol.
- *   For hardware interfaces this counter may include packets discarded
- *   due to L2 address filtering but should not include packets dropped
- *   by the device due to buffer exhaustion which are counted separately in
- *   @rx_missed_errors (since procfs folds those two counters together).
- *
- * @tx_dropped: Number of packets dropped on their way to transmission,
- *   e.g. due to lack of resources.
- *
- * @multicast: Multicast packets received.
- *   For hardware interfaces this statistic is commonly calculated
- *   at the device level (unlike @rx_packets) and therefore may include
- *   packets which did not reach the host.
- *
- *   For IEEE 802.3 devices this counter may be equivalent to:
- *
- *    - 30.3.1.1.21 aMulticastFramesReceivedOK
- *
- * @collisions: Number of collisions during packet transmissions.
- *
- * @rx_length_errors: Number of packets dropped due to invalid length.
- *   Part of aggregate "frame" errors in `/proc/net/dev`.
- *
- *   For IEEE 802.3 devices this counter should be equivalent to a sum
- *   of the following attributes:
- *
- *    - 30.3.1.1.23 aInRangeLengthErrors
- *    - 30.3.1.1.24 aOutOfRangeLengthField
- *    - 30.3.1.1.25 aFrameTooLongErrors
- *
- * @rx_over_errors: Receiver FIFO overflow event counter.
- *
- *   Historically the count of overflow events. Such events may be
- *   reported in the receive descriptors or via interrupts, and may
- *   not correspond one-to-one with dropped packets.
- *
- *   The recommended interpretation for high speed interfaces is -
- *   number of packets dropped because they did not fit into buffers
- *   provided by the host, e.g. packets larger than MTU or next buffer
- *   in the ring was not available for a scatter transfer.
- *
- *   Part of aggregate "frame" errors in `/proc/net/dev`.
- *
- *   This statistics was historically used interchangeably with
- *   @rx_fifo_errors.
- *
- *   This statistic corresponds to hardware events and is not commonly used
- *   on software devices.
- *
- * @rx_crc_errors: Number of packets received with a CRC error.
- *   Part of aggregate "frame" errors in `/proc/net/dev`.
- *
- *   For IEEE 802.3 devices this counter must be equivalent to:
- *
- *    - 30.3.1.1.6 aFrameCheckSequenceErrors
- *
- * @rx_frame_errors: Receiver frame alignment errors.
- *   Part of aggregate "frame" errors in `/proc/net/dev`.
- *
- *   For IEEE 802.3 devices this counter should be equivalent to:
- *
- *    - 30.3.1.1.7 aAlignmentErrors
- *
- * @rx_fifo_errors: Receiver FIFO error counter.
- *
- *   Historically the count of overflow events. Those events may be
- *   reported in the receive descriptors or via interrupts, and may
- *   not correspond one-to-one with dropped packets.
- *
- *   This statistics was used interchangeably with @rx_over_errors.
- *   Not recommended for use in drivers for high speed interfaces.
- *
- *   This statistic is used on software devices, e.g. to count software
- *   packet queue overflow (can) or sequencing errors (GRE).
- *
- * @rx_missed_errors: Count of packets missed by the host.
- *   Folded into the "drop" counter in `/proc/net/dev`.
- *
- *   Counts number of packets dropped by the device due to lack
- *   of buffer space. This usually indicates that the host interface
- *   is slower than the network interface, or host is not keeping up
- *   with the receive packet rate.
- *
- *   This statistic corresponds to hardware events and is not used
- *   on software devices.
- *
- * @tx_aborted_errors:
- *   Part of aggregate "carrier" errors in `/proc/net/dev`.
- *   For IEEE 802.3 devices capable of half-duplex operation this counter
- *   must be equivalent to:
- *
- *    - 30.3.1.1.11 aFramesAbortedDueToXSColls
- *
- *   High speed interfaces may use this counter as a general device
- *   discard counter.
- *
- * @tx_carrier_errors: Number of frame transmission errors due to loss
- *   of carrier during transmission.
- *   Part of aggregate "carrier" errors in `/proc/net/dev`.
- *
- *   For IEEE 802.3 devices this counter must be equivalent to:
- *
- *    - 30.3.1.1.13 aCarrierSenseErrors
- *
- * @tx_fifo_errors: Number of frame transmission errors due to device
- *   FIFO underrun / underflow. This condition occurs when the device
- *   begins transmission of a frame but is unable to deliver the
- *   entire frame to the transmitter in time for transmission.
- *   Part of aggregate "carrier" errors in `/proc/net/dev`.
- *
- * @tx_heartbeat_errors: Number of Heartbeat / SQE Test errors for
- *   old half-duplex Ethernet.
- *   Part of aggregate "carrier" errors in `/proc/net/dev`.
- *
- *   For IEEE 802.3 devices possibly equivalent to:
- *
- *    - 30.3.2.1.4 aSQETestErrors
- *
- * @tx_window_errors: Number of frame transmission errors due
- *   to late collisions (for Ethernet - after the first 64B of transmission).
- *   Part of aggregate "carrier" errors in `/proc/net/dev`.
- *
- *   For IEEE 802.3 devices this counter must be equivalent to:
- *
- *    - 30.3.1.1.10 aLateCollisions
- *
- * @rx_compressed: Number of correctly received compressed packets.
- *   This counters is only meaningful for interfaces which support
- *   packet compression (e.g. CSLIP, PPP).
- *
- * @tx_compressed: Number of transmitted compressed packets.
- *   This counters is only meaningful for interfaces which support
- *   packet compression (e.g. CSLIP, PPP).
- *
- * @rx_nohandler: Number of packets received on the interface
- *   but dropped by the networking stack because the device is
- *   not designated to receive packets (e.g. backup link in a bond).
- *
- * @rx_otherhost_dropped: Number of packets dropped due to mismatch
- *   in destination MAC address.
- */
+/* The main device statistics structure */
 struct rtnl_link_stats64 {
-	__u64	rx_packets;
-	__u64	tx_packets;
-	__u64	rx_bytes;
-	__u64	tx_bytes;
-	__u64	rx_errors;
-	__u64	tx_errors;
-	__u64	rx_dropped;
-	__u64	tx_dropped;
-	__u64	multicast;
+	__u64	rx_packets;		/* total packets received	*/
+	__u64	tx_packets;		/* total packets transmitted	*/
+	__u64	rx_bytes;		/* total bytes received 	*/
+	__u64	tx_bytes;		/* total bytes transmitted	*/
+	__u64	rx_errors;		/* bad packets received		*/
+	__u64	tx_errors;		/* packet transmit problems	*/
+	__u64	rx_dropped;		/* no space in linux buffers	*/
+	__u64	tx_dropped;		/* no space available in linux	*/
+	__u64	multicast;		/* multicast packets received	*/
 	__u64	collisions;

 	/* detailed rx_errors: */
 	__u64	rx_length_errors;
-	__u64	rx_over_errors;
-	__u64	rx_crc_errors;
-	__u64	rx_frame_errors;
-	__u64	rx_fifo_errors;
-	__u64	rx_missed_errors;
+	__u64	rx_over_errors;		/* receiver ring buff overflow	*/
+	__u64	rx_crc_errors;		/* recved pkt with crc error	*/
+	__u64	rx_frame_errors;	/* recv'd frame alignment error */
+	__u64	rx_fifo_errors;		/* recv'r fifo overrun		*/
+	__u64	rx_missed_errors;	/* receiver missed packet	*/

 	/* detailed tx_errors */
 	__u64	tx_aborted_errors;
@@ -245,24 +71,8 @@ struct rtnl_link_stats64 {
 	/* for cslip etc */
 	__u64	rx_compressed;
 	__u64	tx_compressed;
-	__u64	rx_nohandler;

-	__u64	rx_otherhost_dropped;
-};
-
-/* Subset of link stats useful for in-HW collection. Meaning of the fields is as
- * for struct rtnl_link_stats64.
- */
-struct rtnl_hw_stats64 {
-	__u64	rx_packets;
-	__u64	tx_packets;
-	__u64	rx_bytes;
-	__u64	tx_bytes;
-	__u64	rx_errors;
-	__u64	tx_errors;
-	__u64	rx_dropped;
-	__u64	tx_dropped;
-	__u64	multicast;
+	__u64	rx_nohandler;		/* dropped, no handler found	*/
 };

 /* The struct should be in sync with struct ifmap */
@@ -360,38 +170,12 @@ enum {
 	IFLA_PROP_LIST,
 	IFLA_ALT_IFNAME, /* Alternative ifname */
 	IFLA_PERM_ADDRESS,
-	IFLA_PROTO_DOWN_REASON,
-
-	/* device (sysfs) name as parent, used instead
-	 * of IFLA_LINK where there's no parent netdev
-	 */
-	IFLA_PARENT_DEV_NAME,
-	IFLA_PARENT_DEV_BUS_NAME,
-	IFLA_GRO_MAX_SIZE,
-	IFLA_TSO_MAX_SIZE,
-	IFLA_TSO_MAX_SEGS,
-	IFLA_ALLMULTI,		/* Allmulti count: > 0 means acts ALLMULTI */
-
-	IFLA_DEVLINK_PORT,
-
-	IFLA_GSO_IPV4_MAX_SIZE,
-	IFLA_GRO_IPV4_MAX_SIZE,
-	IFLA_DPLL_PIN,
 	__IFLA_MAX
 };


 #define IFLA_MAX (__IFLA_MAX - 1)

-enum {
-	IFLA_PROTO_DOWN_REASON_UNSPEC,
-	IFLA_PROTO_DOWN_REASON_MASK,	/* u32, mask for reason bits */
-	IFLA_PROTO_DOWN_REASON_VALUE,   /* u32, reason bit value */
-
-	__IFLA_PROTO_DOWN_REASON_CNT,
-	IFLA_PROTO_DOWN_REASON_MAX = __IFLA_PROTO_DOWN_REASON_CNT - 1
-};
-
 /* backwards compatibility for userspace */
 #ifndef __KERNEL__
 #define IFLA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
@@ -509,7 +293,6 @@ enum {
 	IFLA_BR_MCAST_MLD_VERSION,
 	IFLA_BR_VLAN_STATS_PER_PORT,
 	IFLA_BR_MULTI_BOOLOPT,
-	IFLA_BR_MCAST_QUERIER_STATE,
 	__IFLA_BR_MAX,
 };

@@ -563,14 +346,6 @@ enum {
 	IFLA_BRPORT_BACKUP_PORT,
 	IFLA_BRPORT_MRP_RING_OPEN,
 	IFLA_BRPORT_MRP_IN_OPEN,
-	IFLA_BRPORT_MCAST_EHT_HOSTS_LIMIT,
-	IFLA_BRPORT_MCAST_EHT_HOSTS_CNT,
-	IFLA_BRPORT_LOCKED,
-	IFLA_BRPORT_MAB,
-	IFLA_BRPORT_MCAST_N_GROUPS,
-	IFLA_BRPORT_MCAST_MAX_GROUPS,
-	IFLA_BRPORT_NEIGH_VLAN_SUPPRESS,
-	IFLA_BRPORT_BACKUP_NHID,
 	__IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -637,7 +412,6 @@ enum {
 	IFLA_MACVLAN_MACADDR_COUNT,
 	IFLA_MACVLAN_BC_QUEUE_LEN,
 	IFLA_MACVLAN_BC_QUEUE_LEN_USED,
-	IFLA_MACVLAN_BC_CUTOFF,
 	__IFLA_MACVLAN_MAX,
 };

@@ -659,7 +433,6 @@ enum macvlan_macaddr_mode {
 };

 #define MACVLAN_FLAG_NOPROMISC	1
-#define MACVLAN_FLAG_NODST	2 /* skip dst macvlan if matching src macvlan */

 /* VRF section */
 enum {
@@ -706,7 +479,6 @@ enum {
 	IFLA_XFRM_UNSPEC,
 	IFLA_XFRM_LINK,
 	IFLA_XFRM_IF_ID,
-	IFLA_XFRM_COLLECT_METADATA,
 	__IFLA_XFRM_MAX
 };

@@ -748,79 +520,7 @@ enum ipvlan_mode {
 #define IPVLAN_F_PRIVATE	0x01
 #define IPVLAN_F_VEPA		0x02

-/* Tunnel RTM header */
-struct tunnel_msg {
-	__u8 family;
-	__u8 flags;
-	__u16 reserved2;
-	__u32 ifindex;
-};
-
-/* netkit section */
-enum netkit_action {
-	NETKIT_NEXT	= -1,
-	NETKIT_PASS	= 0,
-	NETKIT_DROP	= 2,
-	NETKIT_REDIRECT	= 7,
-};
-
-enum netkit_mode {
-	NETKIT_L2,
-	NETKIT_L3,
-};
-
-enum {
-	IFLA_NETKIT_UNSPEC,
-	IFLA_NETKIT_PEER_INFO,
-	IFLA_NETKIT_PRIMARY,
-	IFLA_NETKIT_POLICY,
-	IFLA_NETKIT_PEER_POLICY,
-	IFLA_NETKIT_MODE,
-	__IFLA_NETKIT_MAX,
-};
-#define IFLA_NETKIT_MAX	(__IFLA_NETKIT_MAX - 1)
-
 /* VXLAN section */
-
-/* include statistics in the dump */
-#define TUNNEL_MSG_FLAG_STATS	0x01
-
-#define TUNNEL_MSG_VALID_USER_FLAGS TUNNEL_MSG_FLAG_STATS
-
-/* Embedded inside VXLAN_VNIFILTER_ENTRY_STATS */
-enum {
-	VNIFILTER_ENTRY_STATS_UNSPEC,
-	VNIFILTER_ENTRY_STATS_RX_BYTES,
-	VNIFILTER_ENTRY_STATS_RX_PKTS,
-	VNIFILTER_ENTRY_STATS_RX_DROPS,
-	VNIFILTER_ENTRY_STATS_RX_ERRORS,
-	VNIFILTER_ENTRY_STATS_TX_BYTES,
-	VNIFILTER_ENTRY_STATS_TX_PKTS,
-	VNIFILTER_ENTRY_STATS_TX_DROPS,
-	VNIFILTER_ENTRY_STATS_TX_ERRORS,
-	VNIFILTER_ENTRY_STATS_PAD,
-	__VNIFILTER_ENTRY_STATS_MAX
-};
-#define VNIFILTER_ENTRY_STATS_MAX (__VNIFILTER_ENTRY_STATS_MAX - 1)
-
-enum {
-	VXLAN_VNIFILTER_ENTRY_UNSPEC,
-	VXLAN_VNIFILTER_ENTRY_START,
-	VXLAN_VNIFILTER_ENTRY_END,
-	VXLAN_VNIFILTER_ENTRY_GROUP,
-	VXLAN_VNIFILTER_ENTRY_GROUP6,
-	VXLAN_VNIFILTER_ENTRY_STATS,
-	__VXLAN_VNIFILTER_ENTRY_MAX
-};
-#define VXLAN_VNIFILTER_ENTRY_MAX	(__VXLAN_VNIFILTER_ENTRY_MAX - 1)
-
-enum {
-	VXLAN_VNIFILTER_UNSPEC,
-	VXLAN_VNIFILTER_ENTRY,
-	__VXLAN_VNIFILTER_MAX
-};
-#define VXLAN_VNIFILTER_MAX	(__VXLAN_VNIFILTER_MAX - 1)
-
 enum {
 	IFLA_VXLAN_UNSPEC,
 	IFLA_VXLAN_ID,
@@ -852,8 +552,6 @@ enum {
 	IFLA_VXLAN_GPE,
 	IFLA_VXLAN_TTL_INHERIT,
 	IFLA_VXLAN_DF,
-	IFLA_VXLAN_VNIFILTER, /* only applicable with COLLECT_METADATA mode */
-	IFLA_VXLAN_LOCALBYPASS,
 	__IFLA_VXLAN_MAX
 };
 #define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)
@@ -887,7 +585,6 @@ enum {
 	IFLA_GENEVE_LABEL,
 	IFLA_GENEVE_TTL_INHERIT,
 	IFLA_GENEVE_DF,
-	IFLA_GENEVE_INNER_PROTO_INHERIT,
 	__IFLA_GENEVE_MAX
 };
 #define IFLA_GENEVE_MAX	(__IFLA_GENEVE_MAX - 1)
@@ -900,18 +597,6 @@ enum ifla_geneve_df {
 	GENEVE_DF_MAX = __GENEVE_DF_END - 1,
 };

-/* Bareudp section  */
-enum {
-	IFLA_BAREUDP_UNSPEC,
-	IFLA_BAREUDP_PORT,
-	IFLA_BAREUDP_ETHERTYPE,
-	IFLA_BAREUDP_SRCPORT_MIN,
-	IFLA_BAREUDP_MULTIPROTO_MODE,
-	__IFLA_BAREUDP_MAX
-};
-
-#define IFLA_BAREUDP_MAX (__IFLA_BAREUDP_MAX - 1)
-
 /* PPP section */
 enum {
 	IFLA_PPP_UNSPEC,
@@ -933,8 +618,6 @@ enum {
 	IFLA_GTP_FD1,
 	IFLA_GTP_PDP_HASHSIZE,
 	IFLA_GTP_ROLE,
-	IFLA_GTP_CREATE_SOCKETS,
-	IFLA_GTP_RESTART_COUNT,
 	__IFLA_GTP_MAX,
 };
 #define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1)
@@ -972,9 +655,6 @@ enum {
 	IFLA_BOND_TLB_DYNAMIC_LB,
 	IFLA_BOND_PEER_NOTIF_DELAY,
 	IFLA_BOND_AD_LACP_ACTIVE,
-	IFLA_BOND_MISSED_MAX,
-	IFLA_BOND_NS_IP6_TARGET,
-	IFLA_BOND_COUPLED_CONTROL,
 	__IFLA_BOND_MAX,
 };

@@ -1002,7 +682,6 @@ enum {
 	IFLA_BOND_SLAVE_AD_AGGREGATOR_ID,
 	IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE,
 	IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE,
-	IFLA_BOND_SLAVE_PRIO,
 	__IFLA_BOND_SLAVE_MAX,
 };

@@ -1220,14 +899,7 @@ enum {
 #define IFLA_IPOIB_MAX (__IFLA_IPOIB_MAX - 1)


-/* HSR/PRP section, both uses same interface */
-
-/* Different redundancy protocols for hsr device */
-enum {
-	HSR_PROTOCOL_HSR,
-	HSR_PROTOCOL_PRP,
-	HSR_PROTOCOL_MAX,
-};
+/* HSR section */

 enum {
 	IFLA_HSR_UNSPEC,
@@ -1237,9 +909,6 @@ enum {
 	IFLA_HSR_SUPERVISION_ADDR,	/* Supervision frame multicast addr */
 	IFLA_HSR_SEQ_NR,
 	IFLA_HSR_VERSION,		/* HSR version */
-	IFLA_HSR_PROTOCOL,		/* Indicate different protocol than
-					 * HSR. For example PRP.
-					 */
 	__IFLA_HSR_MAX,
 };

@@ -1272,17 +941,6 @@ enum {

 #define IFLA_STATS_FILTER_BIT(ATTR)	(1 << (ATTR - 1))

-enum {
-	IFLA_STATS_GETSET_UNSPEC,
-	IFLA_STATS_GET_FILTERS, /* Nest of IFLA_STATS_LINK_xxx, each a u32 with
-				 * a filter mask for the corresponding group.
-				 */
-	IFLA_STATS_SET_OFFLOAD_XSTATS_L3_STATS, /* 0 or 1 as u8 */
-	__IFLA_STATS_GETSET_MAX,
-};
-
-#define IFLA_STATS_GETSET_MAX (__IFLA_STATS_GETSET_MAX - 1)
-
 /* These are embedded into IFLA_STATS_LINK_XSTATS:
 * [IFLA_STATS_LINK_XSTATS]
 * -> [LINK_XSTATS_TYPE_xxx]
@@ -1300,21 +958,10 @@ enum {
 enum {
 	IFLA_OFFLOAD_XSTATS_UNSPEC,
 	IFLA_OFFLOAD_XSTATS_CPU_HIT, /* struct rtnl_link_stats64 */
-	IFLA_OFFLOAD_XSTATS_HW_S_INFO,	/* HW stats info. A nest */
-	IFLA_OFFLOAD_XSTATS_L3_STATS,	/* struct rtnl_hw_stats64 */
 	__IFLA_OFFLOAD_XSTATS_MAX
 };
 #define IFLA_OFFLOAD_XSTATS_MAX (__IFLA_OFFLOAD_XSTATS_MAX - 1)

-enum {
-	IFLA_OFFLOAD_XSTATS_HW_S_INFO_UNSPEC,
-	IFLA_OFFLOAD_XSTATS_HW_S_INFO_REQUEST,		/* u8 */
-	IFLA_OFFLOAD_XSTATS_HW_S_INFO_USED,		/* u8 */
-	__IFLA_OFFLOAD_XSTATS_HW_S_INFO_MAX,
-};
-#define IFLA_OFFLOAD_XSTATS_HW_S_INFO_MAX \
-	(__IFLA_OFFLOAD_XSTATS_HW_S_INFO_MAX - 1)
-
 /* XDP section */

 #define XDP_FLAGS_UPDATE_IF_NOEXIST	(1U << 0)
@@ -1386,8 +1033,6 @@ enum {
 #define RMNET_FLAGS_INGRESS_MAP_COMMANDS          (1U << 1)
 #define RMNET_FLAGS_INGRESS_MAP_CKSUMV4           (1U << 2)
 #define RMNET_FLAGS_EGRESS_MAP_CKSUMV4            (1U << 3)
-#define RMNET_FLAGS_INGRESS_MAP_CKSUMV5           (1U << 4)
-#define RMNET_FLAGS_EGRESS_MAP_CKSUMV5            (1U << 5)

 enum {
 	IFLA_RMNET_UNSPEC,
@@ -1403,24 +1048,4 @@ struct ifla_rmnet_flags {
 	__u32	mask;
 };

-/* MCTP section */
-
-enum {
-	IFLA_MCTP_UNSPEC,
-	IFLA_MCTP_NET,
-	__IFLA_MCTP_MAX,
-};
-
-#define IFLA_MCTP_MAX (__IFLA_MCTP_MAX - 1)
-
-/* DSA section */
-
-enum {
-	IFLA_DSA_UNSPEC,
-	IFLA_DSA_MASTER,
-	__IFLA_DSA_MAX,
-};
-
-#define IFLA_DSA_MAX	(__IFLA_DSA_MAX - 1)
-
 #endif /* _UAPI_LINUX_IF_LINK_H */
--- a/include/uapi/linux/if_xdp.h
+++ b/include/uapi/linux/if_xdp.h
@@ -25,21 +25,9 @@
 * application.
 */
 #define XDP_USE_NEED_WAKEUP (1 << 3)
-/* By setting this option, userspace application indicates that it can
- * handle multiple descriptors per packet thus enabling AF_XDP to split
- * multi-buffer XDP frames into multiple Rx descriptors. Without this set
- * such frames will be dropped.
- */
-#define XDP_USE_SG	(1 << 4)

 /* Flags for xsk_umem_config flags */
-#define XDP_UMEM_UNALIGNED_CHUNK_FLAG	(1 << 0)
-
-/* Force checksum calculation in software. Can be used for testing or
- * working around potential HW issues. This option causes performance
- * degradation and only works in XDP_COPY mode.
- */
-#define XDP_UMEM_TX_SW_CSUM		(1 << 1)
+#define XDP_UMEM_UNALIGNED_CHUNK_FLAG (1 << 0)

 struct sockaddr_xdp {
 	__u16 sxdp_family;
@@ -82,7 +70,6 @@ struct xdp_umem_reg {
 	__u32 chunk_size;
 	__u32 headroom;
 	__u32 flags;
-	__u32 tx_metadata_len;
 };

 struct xdp_statistics {
@@ -112,41 +99,6 @@ struct xdp_options {
 #define XSK_UNALIGNED_BUF_ADDR_MASK \
 	((1ULL << XSK_UNALIGNED_BUF_OFFSET_SHIFT) - 1)

-/* Request transmit timestamp. Upon completion, put it into tx_timestamp
- * field of union xsk_tx_metadata.
- */
-#define XDP_TXMD_FLAGS_TIMESTAMP		(1 << 0)
-
-/* Request transmit checksum offload. Checksum start position and offset
- * are communicated via csum_start and csum_offset fields of union
- * xsk_tx_metadata.
- */
-#define XDP_TXMD_FLAGS_CHECKSUM			(1 << 1)
-
-/* AF_XDP offloads request. 'request' union member is consumed by the driver
- * when the packet is being transmitted. 'completion' union member is
- * filled by the driver when the transmit completion arrives.
- */
-struct xsk_tx_metadata {
-	__u64 flags;
-
-	union {
-		struct {
-			/* XDP_TXMD_FLAGS_CHECKSUM */
-
-			/* Offset from desc->addr where checksumming should start. */
-			__u16 csum_start;
-			/* Offset from csum_start where checksum should be stored. */
-			__u16 csum_offset;
-		} request;
-
-		struct {
-			/* XDP_TXMD_FLAGS_TIMESTAMP */
-			__u64 tx_timestamp;
-		} completion;
-	};
-};
-
 /* Rx/Tx descriptor */
 struct xdp_desc {
 	__u64 addr;
@@ -156,14 +108,4 @@ struct xdp_desc {

 /* UMEM descriptor is __u64 */

-/* Flag indicating that the packet continues with the buffer pointed out by the
- * next frame in the ring. The end of the packet is signalled by setting this
- * bit to zero. For single buffer packets, every descriptor has 'options' set
- * to 0 and this maintains backward compatibility.
- */
-#define XDP_PKT_CONTD (1 << 0)
-
-/* TX packet carries valid metadata. */
-#define XDP_TX_METADATA (1 << 1)
-
 #endif /* _LINUX_IF_XDP_H */
--- a/include/uapi/linux/netdev.h
+++ b/include/uapi/linux/netdev.h
@@ -1,197 +0,0 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
-/* Do not edit directly, auto-generated from: */
-/*	Documentation/netlink/specs/netdev.yaml */
-/* YNL-GEN uapi header */
-
-#ifndef _UAPI_LINUX_NETDEV_H
-#define _UAPI_LINUX_NETDEV_H
-
-#define NETDEV_FAMILY_NAME	"netdev"
-#define NETDEV_FAMILY_VERSION	1
-
-/**
- * enum netdev_xdp_act
- * @NETDEV_XDP_ACT_BASIC: XDP features set supported by all drivers
- *   (XDP_ABORTED, XDP_DROP, XDP_PASS, XDP_TX)
- * @NETDEV_XDP_ACT_REDIRECT: The netdev supports XDP_REDIRECT
- * @NETDEV_XDP_ACT_NDO_XMIT: This feature informs if netdev implements
- *   ndo_xdp_xmit callback.
- * @NETDEV_XDP_ACT_XSK_ZEROCOPY: This feature informs if netdev supports AF_XDP
- *   in zero copy mode.
- * @NETDEV_XDP_ACT_HW_OFFLOAD: This feature informs if netdev supports XDP hw
- *   offloading.
- * @NETDEV_XDP_ACT_RX_SG: This feature informs if netdev implements non-linear
- *   XDP buffer support in the driver napi callback.
- * @NETDEV_XDP_ACT_NDO_XMIT_SG: This feature informs if netdev implements
- *   non-linear XDP buffer support in ndo_xdp_xmit callback.
- */
-enum netdev_xdp_act {
-	NETDEV_XDP_ACT_BASIC = 1,
-	NETDEV_XDP_ACT_REDIRECT = 2,
-	NETDEV_XDP_ACT_NDO_XMIT = 4,
-	NETDEV_XDP_ACT_XSK_ZEROCOPY = 8,
-	NETDEV_XDP_ACT_HW_OFFLOAD = 16,
-	NETDEV_XDP_ACT_RX_SG = 32,
-	NETDEV_XDP_ACT_NDO_XMIT_SG = 64,
-
-	/* private: */
-	NETDEV_XDP_ACT_MASK = 127,
-};
-
-/**
- * enum netdev_xdp_rx_metadata
- * @NETDEV_XDP_RX_METADATA_TIMESTAMP: Device is capable of exposing receive HW
- *   timestamp via bpf_xdp_metadata_rx_timestamp().
- * @NETDEV_XDP_RX_METADATA_HASH: Device is capable of exposing receive packet
- *   hash via bpf_xdp_metadata_rx_hash().
- * @NETDEV_XDP_RX_METADATA_VLAN_TAG: Device is capable of exposing receive
- *   packet VLAN tag via bpf_xdp_metadata_rx_vlan_tag().
- */
-enum netdev_xdp_rx_metadata {
-	NETDEV_XDP_RX_METADATA_TIMESTAMP = 1,
-	NETDEV_XDP_RX_METADATA_HASH = 2,
-	NETDEV_XDP_RX_METADATA_VLAN_TAG = 4,
-};
-
-/**
- * enum netdev_xsk_flags
- * @NETDEV_XSK_FLAGS_TX_TIMESTAMP: HW timestamping egress packets is supported
- *   by the driver.
- * @NETDEV_XSK_FLAGS_TX_CHECKSUM: L3 checksum HW offload is supported by the
- *   driver.
- */
-enum netdev_xsk_flags {
-	NETDEV_XSK_FLAGS_TX_TIMESTAMP = 1,
-	NETDEV_XSK_FLAGS_TX_CHECKSUM = 2,
-};
-
-enum netdev_queue_type {
-	NETDEV_QUEUE_TYPE_RX,
-	NETDEV_QUEUE_TYPE_TX,
-};
-
-enum netdev_qstats_scope {
-	NETDEV_QSTATS_SCOPE_QUEUE = 1,
-};
-
-enum {
-	NETDEV_A_DEV_IFINDEX = 1,
-	NETDEV_A_DEV_PAD,
-	NETDEV_A_DEV_XDP_FEATURES,
-	NETDEV_A_DEV_XDP_ZC_MAX_SEGS,
-	NETDEV_A_DEV_XDP_RX_METADATA_FEATURES,
-	NETDEV_A_DEV_XSK_FEATURES,
-
-	__NETDEV_A_DEV_MAX,
-	NETDEV_A_DEV_MAX = (__NETDEV_A_DEV_MAX - 1)
-};
-
-enum {
-	NETDEV_A_PAGE_POOL_ID = 1,
-	NETDEV_A_PAGE_POOL_IFINDEX,
-	NETDEV_A_PAGE_POOL_NAPI_ID,
-	NETDEV_A_PAGE_POOL_INFLIGHT,
-	NETDEV_A_PAGE_POOL_INFLIGHT_MEM,
-	NETDEV_A_PAGE_POOL_DETACH_TIME,
-
-	__NETDEV_A_PAGE_POOL_MAX,
-	NETDEV_A_PAGE_POOL_MAX = (__NETDEV_A_PAGE_POOL_MAX - 1)
-};
-
-enum {
-	NETDEV_A_PAGE_POOL_STATS_INFO = 1,
-	NETDEV_A_PAGE_POOL_STATS_ALLOC_FAST = 8,
-	NETDEV_A_PAGE_POOL_STATS_ALLOC_SLOW,
-	NETDEV_A_PAGE_POOL_STATS_ALLOC_SLOW_HIGH_ORDER,
-	NETDEV_A_PAGE_POOL_STATS_ALLOC_EMPTY,
-	NETDEV_A_PAGE_POOL_STATS_ALLOC_REFILL,
-	NETDEV_A_PAGE_POOL_STATS_ALLOC_WAIVE,
-	NETDEV_A_PAGE_POOL_STATS_RECYCLE_CACHED,
-	NETDEV_A_PAGE_POOL_STATS_RECYCLE_CACHE_FULL,
-	NETDEV_A_PAGE_POOL_STATS_RECYCLE_RING,
-	NETDEV_A_PAGE_POOL_STATS_RECYCLE_RING_FULL,
-	NETDEV_A_PAGE_POOL_STATS_RECYCLE_RELEASED_REFCNT,
-
-	__NETDEV_A_PAGE_POOL_STATS_MAX,
-	NETDEV_A_PAGE_POOL_STATS_MAX = (__NETDEV_A_PAGE_POOL_STATS_MAX - 1)
-};
-
-enum {
-	NETDEV_A_NAPI_IFINDEX = 1,
-	NETDEV_A_NAPI_ID,
-	NETDEV_A_NAPI_IRQ,
-	NETDEV_A_NAPI_PID,
-
-	__NETDEV_A_NAPI_MAX,
-	NETDEV_A_NAPI_MAX = (__NETDEV_A_NAPI_MAX - 1)
-};
-
-enum {
-	NETDEV_A_QUEUE_ID = 1,
-	NETDEV_A_QUEUE_IFINDEX,
-	NETDEV_A_QUEUE_TYPE,
-	NETDEV_A_QUEUE_NAPI_ID,
-
-	__NETDEV_A_QUEUE_MAX,
-	NETDEV_A_QUEUE_MAX = (__NETDEV_A_QUEUE_MAX - 1)
-};
-
-enum {
-	NETDEV_A_QSTATS_IFINDEX = 1,
-	NETDEV_A_QSTATS_QUEUE_TYPE,
-	NETDEV_A_QSTATS_QUEUE_ID,
-	NETDEV_A_QSTATS_SCOPE,
-	NETDEV_A_QSTATS_RX_PACKETS = 8,
-	NETDEV_A_QSTATS_RX_BYTES,
-	NETDEV_A_QSTATS_TX_PACKETS,
-	NETDEV_A_QSTATS_TX_BYTES,
-	NETDEV_A_QSTATS_RX_ALLOC_FAIL,
-	NETDEV_A_QSTATS_RX_HW_DROPS,
-	NETDEV_A_QSTATS_RX_HW_DROP_OVERRUNS,
-	NETDEV_A_QSTATS_RX_CSUM_COMPLETE,
-	NETDEV_A_QSTATS_RX_CSUM_UNNECESSARY,
-	NETDEV_A_QSTATS_RX_CSUM_NONE,
-	NETDEV_A_QSTATS_RX_CSUM_BAD,
-	NETDEV_A_QSTATS_RX_HW_GRO_PACKETS,
-	NETDEV_A_QSTATS_RX_HW_GRO_BYTES,
-	NETDEV_A_QSTATS_RX_HW_GRO_WIRE_PACKETS,
-	NETDEV_A_QSTATS_RX_HW_GRO_WIRE_BYTES,
-	NETDEV_A_QSTATS_RX_HW_DROP_RATELIMITS,
-	NETDEV_A_QSTATS_TX_HW_DROPS,
-	NETDEV_A_QSTATS_TX_HW_DROP_ERRORS,
-	NETDEV_A_QSTATS_TX_CSUM_NONE,
-	NETDEV_A_QSTATS_TX_NEEDS_CSUM,
-	NETDEV_A_QSTATS_TX_HW_GSO_PACKETS,
-	NETDEV_A_QSTATS_TX_HW_GSO_BYTES,
-	NETDEV_A_QSTATS_TX_HW_GSO_WIRE_PACKETS,
-	NETDEV_A_QSTATS_TX_HW_GSO_WIRE_BYTES,
-	NETDEV_A_QSTATS_TX_HW_DROP_RATELIMITS,
-	NETDEV_A_QSTATS_TX_STOP,
-	NETDEV_A_QSTATS_TX_WAKE,
-
-	__NETDEV_A_QSTATS_MAX,
-	NETDEV_A_QSTATS_MAX = (__NETDEV_A_QSTATS_MAX - 1)
-};
-
-enum {
-	NETDEV_CMD_DEV_GET = 1,
-	NETDEV_CMD_DEV_ADD_NTF,
-	NETDEV_CMD_DEV_DEL_NTF,
-	NETDEV_CMD_DEV_CHANGE_NTF,
-	NETDEV_CMD_PAGE_POOL_GET,
-	NETDEV_CMD_PAGE_POOL_ADD_NTF,
-	NETDEV_CMD_PAGE_POOL_DEL_NTF,
-	NETDEV_CMD_PAGE_POOL_CHANGE_NTF,
-	NETDEV_CMD_PAGE_POOL_STATS_GET,
-	NETDEV_CMD_QUEUE_GET,
-	NETDEV_CMD_NAPI_GET,
-	NETDEV_CMD_QSTATS_GET,
-
-	__NETDEV_CMD_MAX,
-	NETDEV_CMD_MAX = (__NETDEV_CMD_MAX - 1)
-};
-
-#define NETDEV_MCGRP_MGMT	"mgmt"
-#define NETDEV_MCGRP_PAGE_POOL	"page-pool"
-
-#endif /* _UAPI_LINUX_NETDEV_H */
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -180,7 +180,7 @@ struct tc_u32_sel {

 	short			hoff;
 	__be32			hmask;
-	struct tc_u32_key	keys[];
+	struct tc_u32_key	keys[0];
 };

 struct tc_u32_mark {
@@ -192,7 +192,7 @@ struct tc_u32_mark {
 struct tc_u32_pcnt {
 	__u64 rcnt;
 	__u64 rhit;
-	__u64 kcnts[];
+	__u64 kcnts[0];
 };

 /* Flags */
@@ -204,6 +204,37 @@ struct tc_u32_pcnt {

 #define TC_U32_MAXDEPTH 8

+
+/* RSVP filter */
+
+enum {
+	TCA_RSVP_UNSPEC,
+	TCA_RSVP_CLASSID,
+	TCA_RSVP_DST,
+	TCA_RSVP_SRC,
+	TCA_RSVP_PINFO,
+	TCA_RSVP_POLICE,
+	TCA_RSVP_ACT,
+	__TCA_RSVP_MAX
+};
+
+#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 )
+
+struct tc_rsvp_gpi {
+	__u32	key;
+	__u32	mask;
+	int	offset;
+};
+
+struct tc_rsvp_pinfo {
+	struct tc_rsvp_gpi dpi;
+	struct tc_rsvp_gpi spi;
+	__u8	protocol;
+	__u8	tunnelid;
+	__u8	tunnelhdr;
+	__u8	pad;
+};
+
 /* ROUTE filter */

 enum {
@@ -234,6 +265,22 @@ enum {

 #define TCA_FW_MAX (__TCA_FW_MAX - 1)

+/* TC index filter */
+
+enum {
+	TCA_TCINDEX_UNSPEC,
+	TCA_TCINDEX_HASH,
+	TCA_TCINDEX_MASK,
+	TCA_TCINDEX_SHIFT,
+	TCA_TCINDEX_FALL_THROUGH,
+	TCA_TCINDEX_CLASSID,
+	TCA_TCINDEX_POLICE,
+	TCA_TCINDEX_ACT,
+	__TCA_TCINDEX_MAX
+};
+
+#define TCA_TCINDEX_MAX     (__TCA_TCINDEX_MAX - 1)
+
 /* Flow filter */

 enum {
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -457,6 +457,115 @@ enum {

 #define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1)

+
+/* CBQ section */
+
+#define TC_CBQ_MAXPRIO		8
+#define TC_CBQ_MAXLEVEL		8
+#define TC_CBQ_DEF_EWMA		5
+
+struct tc_cbq_lssopt {
+	unsigned char	change;
+	unsigned char	flags;
+#define TCF_CBQ_LSS_BOUNDED	1
+#define TCF_CBQ_LSS_ISOLATED	2
+	unsigned char  	ewma_log;
+	unsigned char  	level;
+#define TCF_CBQ_LSS_FLAGS	1
+#define TCF_CBQ_LSS_EWMA	2
+#define TCF_CBQ_LSS_MAXIDLE	4
+#define TCF_CBQ_LSS_MINIDLE	8
+#define TCF_CBQ_LSS_OFFTIME	0x10
+#define TCF_CBQ_LSS_AVPKT	0x20
+	__u32		maxidle;
+	__u32		minidle;
+	__u32		offtime;
+	__u32		avpkt;
+};
+
+struct tc_cbq_wrropt {
+	unsigned char	flags;
+	unsigned char	priority;
+	unsigned char	cpriority;
+	unsigned char	__reserved;
+	__u32		allot;
+	__u32		weight;
+};
+
+struct tc_cbq_ovl {
+	unsigned char	strategy;
+#define	TC_CBQ_OVL_CLASSIC	0
+#define	TC_CBQ_OVL_DELAY	1
+#define	TC_CBQ_OVL_LOWPRIO	2
+#define	TC_CBQ_OVL_DROP		3
+#define	TC_CBQ_OVL_RCLASSIC	4
+	unsigned char	priority2;
+	__u16		pad;
+	__u32		penalty;
+};
+
+struct tc_cbq_police {
+	unsigned char	police;
+	unsigned char	__res1;
+	unsigned short	__res2;
+};
+
+struct tc_cbq_fopt {
+	__u32		split;
+	__u32		defmap;
+	__u32		defchange;
+};
+
+struct tc_cbq_xstats {
+	__u32		borrows;
+	__u32		overactions;
+	__s32		avgidle;
+	__s32		undertime;
+};
+
+enum {
+	TCA_CBQ_UNSPEC,
+	TCA_CBQ_LSSOPT,
+	TCA_CBQ_WRROPT,
+	TCA_CBQ_FOPT,
+	TCA_CBQ_OVL_STRATEGY,
+	TCA_CBQ_RATE,
+	TCA_CBQ_RTAB,
+	TCA_CBQ_POLICE,
+	__TCA_CBQ_MAX,
+};
+
+#define TCA_CBQ_MAX	(__TCA_CBQ_MAX - 1)
+
+/* dsmark section */
+
+enum {
+	TCA_DSMARK_UNSPEC,
+	TCA_DSMARK_INDICES,
+	TCA_DSMARK_DEFAULT_INDEX,
+	TCA_DSMARK_SET_TC_INDEX,
+	TCA_DSMARK_MASK,
+	TCA_DSMARK_VALUE,
+	__TCA_DSMARK_MAX,
+};
+
+#define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1)
+
+/* ATM  section */
+
+enum {
+	TCA_ATM_UNSPEC,
+	TCA_ATM_FD,		/* file/socket descriptor */
+	TCA_ATM_PTR,		/* pointer to descriptor - later */
+	TCA_ATM_HDR,		/* LL header */
+	TCA_ATM_EXCESS,		/* excess traffic class (0 for CLP)  */
+	TCA_ATM_ADDR,		/* PVC address (for output only) */
+	TCA_ATM_STATE,		/* VC state (ATM_VS_*; for output only) */
+	__TCA_ATM_MAX,
+};
+
+#define TCA_ATM_MAX	(__TCA_ATM_MAX - 1)
+
 /* Network emulator */

 enum {
--- a/scripts/build-fuzzers.sh
+++ b/scripts/build-fuzzers.sh
@@ -1,82 +0,0 @@
-#!/bin/bash
-set -eux
-
-SANITIZER=${SANITIZER:-address}
-flags="-O1 -fno-omit-frame-pointer -g -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fsanitize=$SANITIZER -fsanitize=fuzzer-no-link"
-
-export CC=${CC:-clang}
-export CFLAGS=${CFLAGS:-$flags}
-
-export CXX=${CXX:-clang++}
-export CXXFLAGS=${CXXFLAGS:-$flags}
-
-cd "$(dirname -- "$0")/.."
-
-export OUT=${OUT:-"$(pwd)/out"}
-mkdir -p "$OUT"
-
-export LIB_FUZZING_ENGINE=${LIB_FUZZING_ENGINE:--fsanitize=fuzzer}
-
-# libelf is compiled with _FORTIFY_SOURCE by default and it
-# isn't compatible with MSan. It was borrowed
-# from https://github.com/google/oss-fuzz/pull/7422
-if [[ "$SANITIZER" == memory ]]; then
-    CFLAGS+=" -U_FORTIFY_SOURCE"
-    CXXFLAGS+=" -U_FORTIFY_SOURCE"
-fi
-
-# The alignment check is turned off by default on OSS-Fuzz/CFLite so it should be
-# turned on explicitly there. It was borrowed from
-# https://github.com/google/oss-fuzz/pull/7092
-if [[ "$SANITIZER" == undefined ]]; then
-    additional_ubsan_checks=alignment
-    UBSAN_FLAGS="-fsanitize=$additional_ubsan_checks -fno-sanitize-recover=$additional_ubsan_checks"
-    CFLAGS+=" $UBSAN_FLAGS"
-    CXXFLAGS+=" $UBSAN_FLAGS"
-fi
-
-# Ideally libbelf should be built using release tarballs available
-# at https://sourceware.org/elfutils/ftp/. Unfortunately sometimes they
-# fail to compile (for example, elfutils-0.185 fails to compile with LDFLAGS enabled
-# due to https://bugs.gentoo.org/794601) so let's just point the script to
-# commits referring to versions of libelf that actually can be built
-rm -rf elfutils
-git clone https://sourceware.org/git/elfutils.git
-(
-cd elfutils
-git checkout 67a187d4c1790058fc7fd218317851cb68bb087c
-git log --oneline -1
-
-# ASan isn't compatible with -Wl,--no-undefined: https://github.com/google/sanitizers/issues/380
-sed -i 's/^\(NO_UNDEFINED=\).*/\1/' configure.ac
-
-# ASan isn't compatible with -Wl,-z,defs either:
-# https://clang.llvm.org/docs/AddressSanitizer.html#usage
-sed -i 's/^\(ZDEFS_LDFLAGS=\).*/\1/' configure.ac
-
-if [[ "$SANITIZER" == undefined ]]; then
-    # That's basicaly what --enable-sanitize-undefined does to turn off unaligned access
-    # elfutils heavily relies on on i386/x86_64 but without changing compiler flags along the way
-    sed -i 's/\(check_undefined_val\)=[0-9]/\1=1/' configure.ac
-fi
-
-autoreconf -i -f
-if ! ./configure --enable-maintainer-mode --disable-debuginfod --disable-libdebuginfod \
-            --disable-demangler --without-bzlib --without-lzma --without-zstd \
-	    CC="$CC" CFLAGS="-Wno-error $CFLAGS" CXX="$CXX" CXXFLAGS="-Wno-error $CXXFLAGS" LDFLAGS="$CFLAGS"; then
-    cat config.log
-    exit 1
-fi
-
-make -C config -j$(nproc) V=1
-make -C lib -j$(nproc) V=1
-make -C libelf -j$(nproc) V=1
-)
-
-make -C src BUILD_STATIC_ONLY=y V=1 clean
-make -C src -j$(nproc) CFLAGS="-I$(pwd)/elfutils/libelf $CFLAGS" BUILD_STATIC_ONLY=y V=1
-
-$CC $CFLAGS -Isrc -Iinclude -Iinclude/uapi -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -c fuzz/bpf-object-fuzzer.c -o bpf-object-fuzzer.o
-$CXX $CXXFLAGS $LIB_FUZZING_ENGINE bpf-object-fuzzer.o src/libbpf.a "$(pwd)/elfutils/libelf/libelf.a" -l:libz.a -o "$OUT/bpf-object-fuzzer"
-
-cp fuzz/bpf-object-fuzzer_seed_corpus.zip "$OUT"
--- a/scripts/mailmap-update.sh
+++ b/scripts/mailmap-update.sh
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-usage () {
-    echo "USAGE: ./mailmap-update.sh <libbpf-repo> <linux-repo>"
-    exit 1
-}
-
-LIBBPF_REPO="${1-""}"
-LINUX_REPO="${2-""}"
-
-if [ -z "${LIBBPF_REPO}" ] || [ -z "${LINUX_REPO}" ]; then
-    echo "Error: libbpf or linux repos are not specified"
-    usage
-fi
-
-LIBBPF_MAILMAP="${LIBBPF_REPO}/.mailmap"
-LINUX_MAILMAP="${LINUX_REPO}/.mailmap"
-
-tmpfile="$(mktemp)"
-cleanup() {
-    rm -f "${tmpfile}"
-}
-trap cleanup EXIT
-
-grep_lines() {
-    local pattern="$1"
-    local file="$2"
-    grep "${pattern}" "${file}" || true
-}
-
-while read -r email; do
-    grep_lines "${email}$" "${LINUX_MAILMAP}" >> "${tmpfile}"
-done < <(git log --format='<%ae>' | sort -u)
-
-sort -u "${tmpfile}" > "${LIBBPF_MAILMAP}"
--- a/scripts/sync-kernel.sh
+++ b/scripts/sync-kernel.sh
@@ -42,20 +42,16 @@ PATH_MAP=(									\
 	[tools/include/uapi/linux/bpf_common.h]=include/uapi/linux/bpf_common.h	\
 	[tools/include/uapi/linux/bpf.h]=include/uapi/linux/bpf.h		\
 	[tools/include/uapi/linux/btf.h]=include/uapi/linux/btf.h		\
-	[tools/include/uapi/linux/fcntl.h]=include/uapi/linux/fcntl.h		\
-	[tools/include/uapi/linux/openat2.h]=include/uapi/linux/openat2.h	\
 	[tools/include/uapi/linux/if_link.h]=include/uapi/linux/if_link.h	\
 	[tools/include/uapi/linux/if_xdp.h]=include/uapi/linux/if_xdp.h		\
-	[tools/include/uapi/linux/netdev.h]=include/uapi/linux/netdev.h		\
 	[tools/include/uapi/linux/netlink.h]=include/uapi/linux/netlink.h	\
 	[tools/include/uapi/linux/pkt_cls.h]=include/uapi/linux/pkt_cls.h	\
 	[tools/include/uapi/linux/pkt_sched.h]=include/uapi/linux/pkt_sched.h	\
-	[include/uapi/linux/perf_event.h]=include/uapi/linux/perf_event.h	\
 	[Documentation/bpf/libbpf]=docs						\
 )

-LIBBPF_PATHS=("${!PATH_MAP[@]}" ":^tools/lib/bpf/Makefile" ":^tools/lib/bpf/Build" ":^tools/lib/bpf/.gitignore" ":^tools/include/tools/libc_compat.h")
-LIBBPF_VIEW_PATHS=("${PATH_MAP[@]}")
+LIBBPF_PATHS="${!PATH_MAP[@]} :^tools/lib/bpf/Makefile :^tools/lib/bpf/Build :^tools/lib/bpf/.gitignore :^tools/include/tools/libc_compat.h"
+LIBBPF_VIEW_PATHS="${PATH_MAP[@]}"
 LIBBPF_VIEW_EXCLUDE_REGEX='^src/(Makefile|Build|test_libbpf\.c|bpf_helper_defs\.h|\.gitignore)$|^docs/(\.gitignore|api\.rst|conf\.py)$|^docs/sphinx/.*'
 LINUX_VIEW_EXCLUDE_REGEX='^include/tools/libc_compat.h$'

@@ -88,9 +84,7 @@ commit_desc()
 # $2 - paths filter
 commit_signature()
 {
-	local ref=$1
-	shift
-	git show --pretty='("%s")|%aI|%b' --shortstat $ref -- "${@-.}" | tr '\n' '|'
+	git show --pretty='("%s")|%aI|%b' --shortstat $1 -- ${2-.} | tr '\n' '|'
 }

 # Cherry-pick commits touching libbpf-related files
@@ -109,7 +103,7 @@ cherry_pick_commits()
 	local libbpf_conflict_cnt
 	local desc

-	new_commits=$(git rev-list --no-merges --topo-order --reverse ${baseline_tag}..${tip_tag} -- "${LIBBPF_PATHS[@]}")
+	new_commits=$(git rev-list --no-merges --topo-order --reverse ${baseline_tag}..${tip_tag} ${LIBBPF_PATHS[@]})
 	for new_commit in ${new_commits}; do
 		desc="$(commit_desc ${new_commit})"
 		signature="$(commit_signature ${new_commit} "${LIBBPF_PATHS[@]}")"
@@ -143,7 +137,7 @@ cherry_pick_commits()
 		echo "Picking '${desc}'..."
 		if ! git cherry-pick ${new_commit} &>/dev/null; then
 			echo "Warning! Cherry-picking '${desc} failed, checking if it's non-libbpf files causing problems..."
-			libbpf_conflict_cnt=$(git diff --name-only --diff-filter=U -- "${LIBBPF_PATHS[@]}" | wc -l)
+			libbpf_conflict_cnt=$(git diff --name-only --diff-filter=U -- ${LIBBPF_PATHS[@]} | wc -l)
 			conflict_cnt=$(git diff --name-only | wc -l)
 			prompt_resolution=1

@@ -262,18 +256,15 @@ if ((${COMMIT_CNT} <= 0)); then
 fi

 # Exclude baseline commit and generate nice cover letter with summary
-git format-patch --no-signature ${SQUASH_BASE_TAG}..${SQUASH_TIP_TAG} --cover-letter -o ${TMP_DIR}/patches
+git format-patch ${SQUASH_BASE_TAG}..${SQUASH_TIP_TAG} --cover-letter -o ${TMP_DIR}/patches

 # Now is time to re-apply libbpf-related linux patches to libbpf repo
 cd_to ${LIBBPF_REPO}
 git checkout -b ${LIBBPF_SYNC_TAG}

 for patch in $(ls -1 ${TMP_DIR}/patches | tail -n +2); do
-	if ! git am -3 --committer-date-is-author-date "${TMP_DIR}/patches/${patch}"; then
-		if ! patch -p1 --merge < "${TMP_DIR}/patches/${patch}"; then
-			read -p "Applying ${TMP_DIR}/patches/${patch} failed, please resolve manually and press <return> to proceed..."
-		fi
-		git am --continue
+	if ! git am --3way --committer-date-is-author-date "${TMP_DIR}/patches/${patch}"; then
+		read -p "Applying ${TMP_DIR}/patches/${patch} failed, please resolve manually and press <return> to proceed..."
 	fi
 done

@@ -289,28 +280,12 @@ cd_to ${LIBBPF_REPO}
 helpers_changes=$(git status --porcelain src/bpf_helper_defs.h | wc -l)
 if ((${helpers_changes} == 1)); then
 	git add src/bpf_helper_defs.h
-	git commit -s -m "sync: auto-generate latest BPF helpers
+	git commit -m "sync: auto-generate latest BPF helpers

 Latest changes to BPF helper definitions.
 " -- src/bpf_helper_defs.h
 fi

-echo "Regenerating .mailmap..."
-cd_to "${LINUX_REPO}"
-git checkout "${TIP_SYM_REF}"
-cd_to "${LIBBPF_REPO}"
-"${LIBBPF_REPO}"/scripts/mailmap-update.sh "${LIBBPF_REPO}" "${LINUX_REPO}"
-# if anything changed, commit it
-mailmap_changes=$(git status --porcelain .mailmap | wc -l)
-if ((${mailmap_changes} == 1)); then
-	git add .mailmap
-	git commit -s -m "sync: update .mailmap
-
-Update .mailmap based on libbpf's list of contributors and on the latest
-.mailmap version in the upstream repository.
-" -- .mailmap
-fi
-
 # Use generated cover-letter as a template for "sync commit" with
 # baseline and checkpoint commits from kernel repo (and leave summary
 # from cover letter intact, of course)
@@ -327,7 +302,7 @@ Baseline bpf-next commit:   ${BASELINE_COMMIT}\n\
 Checkpoint bpf-next commit: ${TIP_COMMIT}\n\
 Baseline bpf commit:        ${BPF_BASELINE_COMMIT}\n\
 Checkpoint bpf commit:      ${BPF_TIP_COMMIT}/" |				      \
-git commit -s --file=-
+git commit --file=-

 echo "SUCCESS! ${COMMIT_CNT} commits synced."

@@ -337,10 +312,10 @@ cd_to ${LINUX_REPO}
 git checkout -b ${VIEW_TAG} ${TIP_COMMIT}
 FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch -f --tree-filter "${LIBBPF_TREE_FILTER}" ${VIEW_TAG}^..${VIEW_TAG}
 FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch -f --subdirectory-filter __libbpf ${VIEW_TAG}^..${VIEW_TAG}
-git ls-files -- "${LIBBPF_VIEW_PATHS[@]}" | grep -v -E "${LINUX_VIEW_EXCLUDE_REGEX}" > ${TMP_DIR}/linux-view.ls
+git ls-files -- ${LIBBPF_VIEW_PATHS[@]} | grep -v -E "${LINUX_VIEW_EXCLUDE_REGEX}" > ${TMP_DIR}/linux-view.ls

 cd_to ${LIBBPF_REPO}
-git ls-files -- "${LIBBPF_VIEW_PATHS[@]}" | grep -v -E "${LIBBPF_VIEW_EXCLUDE_REGEX}" > ${TMP_DIR}/github-view.ls
+git ls-files -- ${LIBBPF_VIEW_PATHS[@]} | grep -v -E "${LIBBPF_VIEW_EXCLUDE_REGEX}" > ${TMP_DIR}/github-view.ls

 echo "Comparing list of files..."
 diff -u ${TMP_DIR}/linux-view.ls ${TMP_DIR}/github-view.ls
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,27 +5,13 @@ ifeq ($(V),1)
 	msg =
 else
 	Q = @
-	msg = @printf '  %-8s %s%s\n' "$(1)" "$(2)" "$(if $(3), $(3))";
+	msg = @printf '  %-8s %s%s\n' "$(1)" "$(notdir $(2))" "$(if $(3), $(3))";
 endif

-LIBBPF_MAJOR_VERSION := 1
-LIBBPF_MINOR_VERSION := 5
-LIBBPF_PATCH_VERSION := 0
-LIBBPF_VERSION := $(LIBBPF_MAJOR_VERSION).$(LIBBPF_MINOR_VERSION).$(LIBBPF_PATCH_VERSION)
-LIBBPF_MAJMIN_VERSION := $(LIBBPF_MAJOR_VERSION).$(LIBBPF_MINOR_VERSION).0
-LIBBPF_MAP_VERSION := $(shell grep -oE '^LIBBPF_([0-9.]+)' libbpf.map | sort -rV | head -n1 | cut -d'_' -f2)
-ifneq ($(LIBBPF_MAJMIN_VERSION), $(LIBBPF_MAP_VERSION))
-$(error Libbpf release ($(LIBBPF_VERSION)) and map ($(LIBBPF_MAP_VERSION)) versions are out of sync!)
-endif
-
-define allow-override
-  $(if $(or $(findstring environment,$(origin $(1))),\
-            $(findstring command line,$(origin $(1)))),,\
-    $(eval $(1) = $(2)))
-endef
-
-$(call allow-override,CC,$(CROSS_COMPILE)cc)
-$(call allow-override,LD,$(CROSS_COMPILE)ld)
+LIBBPF_VERSION := $(shell \
+	grep -oE '^LIBBPF_([0-9.]+)' libbpf.map | \
+	sort -rV | head -n1 | cut -d'_' -f2)
+LIBBPF_MAJOR_VERSION := $(firstword $(subst ., ,$(LIBBPF_VERSION)))

 TOPDIR = ..

@@ -34,13 +20,9 @@ ALL_CFLAGS := $(INCLUDES)

 SHARED_CFLAGS += -fPIC -fvisibility=hidden -DSHARED

-CFLAGS ?= -g -O2 -Werror -Wall -std=gnu89
-ALL_CFLAGS += $(CFLAGS) 						\
-	      -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64		\
-	      -Wno-unknown-warning-option -Wno-format-overflow		\
-	      $(EXTRA_CFLAGS)
-ALL_LDFLAGS += $(LDFLAGS) $(EXTRA_LDFLAGS)
-
+CFLAGS ?= -g -O2 -Werror -Wall
+ALL_CFLAGS += $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ALL_LDFLAGS += $(LDFLAGS)
 ifdef NO_PKG_CONFIG
 	ALL_LDFLAGS += -lelf -lz
 else
@@ -53,9 +35,9 @@ OBJDIR ?= .
 SHARED_OBJDIR := $(OBJDIR)/sharedobjs
 STATIC_OBJDIR := $(OBJDIR)/staticobjs
 OBJS := bpf.o btf.o libbpf.o libbpf_errno.o netlink.o \
-	nlattr.o str_error.o libbpf_probes.o bpf_prog_linfo.o \
+	nlattr.o str_error.o libbpf_probes.o bpf_prog_linfo.o xsk.o \
 	btf_dump.o hashmap.o ringbuf.o strset.o linker.o gen_loader.o \
-	relo_core.o usdt.o zip.o elf.o features.o btf_iter.o btf_relocate.o
+	relo_core.o
 SHARED_OBJS := $(addprefix $(SHARED_OBJDIR)/,$(OBJS))
 STATIC_OBJS := $(addprefix $(STATIC_OBJDIR)/,$(OBJS))

@@ -67,10 +49,9 @@ ifndef BUILD_STATIC_ONLY
 	VERSION_SCRIPT := libbpf.map
 endif

-HEADERS := bpf.h libbpf.h btf.h libbpf_common.h libbpf_legacy.h \
+HEADERS := bpf.h libbpf.h btf.h libbpf_common.h libbpf_legacy.h xsk.h \
 	   bpf_helpers.h bpf_helper_defs.h bpf_tracing.h \
-	   bpf_endian.h bpf_core_read.h skel_internal.h libbpf_version.h \
-	   usdt.bpf.h
+	   bpf_endian.h bpf_core_read.h skel_internal.h libbpf_version.h
 UAPI_HEADERS := $(addprefix $(TOPDIR)/include/uapi/linux/,\
 			    bpf.h bpf_common.h btf.h)

@@ -80,8 +61,7 @@ INSTALL = install

 DESTDIR ?=

-HOSTARCH = $(firstword $(subst -, ,$(shell $(CC) -dumpmachine)))
-ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(HOSTARCH)),)
+ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(shell uname -m)),)
 	LIBSUBDIR := lib64
 else
 	LIBSUBDIR := lib
@@ -119,7 +99,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
 		  -Wl,-soname,libbpf.so.$(LIBBPF_MAJOR_VERSION) \
 		  $^ $(ALL_LDFLAGS) -o $@

-$(OBJDIR)/libbpf.pc: force
+$(OBJDIR)/libbpf.pc:
 	$(Q)sed -e "s|@PREFIX@|$(PREFIX)|" \
 		-e "s|@LIBDIR@|$(LIBDIR_PC)|" \
 		-e "s|@VERSION@|$(LIBBPF_VERSION)|" \
@@ -172,7 +152,7 @@ clean:
 	$(call msg,CLEAN)
 	$(Q)rm -rf *.o *.a *.so *.so.* *.pc $(SHARED_OBJDIR) $(STATIC_OBJDIR)

-.PHONY: cscope tags force
+.PHONY: cscope tags
 cscope:
 	$(call msg,CSCOPE)
 	$(Q)ls *.c *.h > cscope.files
@@ -182,5 +162,3 @@ tags:
 	$(call msg,CTAGS)
 	$(Q)rm -f TAGS tags
 	$(Q)ls *.c *.h | xargs $(TAGS_PROG) -a
-
-force:
--- a/src/bpf.c
+++ b/src/bpf.c
--- a/src/bpf.h
+++ b/src/bpf.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */

 /*
- * Common BPF ELF operations.
+ * common eBPF ELF operations.
 *
 * Copyright (C) 2013-2015 Alexei Starovoitov <ast@kernel.org>
 * Copyright (C) 2015 Wang Nan <wangnan0@huawei.com>
@@ -29,121 +29,92 @@
 #include <stdint.h>

 #include "libbpf_common.h"
-#include "libbpf_legacy.h"

 #ifdef __cplusplus
 extern "C" {
 #endif

-LIBBPF_API int libbpf_set_memlock_rlim(size_t memlock_bytes);
-
-struct bpf_map_create_opts {
-	size_t sz; /* size of this struct for forward/backward compatibility */
-
+struct bpf_create_map_attr {
+	const char *name;
+	enum bpf_map_type map_type;
+	__u32 map_flags;
+	__u32 key_size;
+	__u32 value_size;
+	__u32 max_entries;
+	__u32 numa_node;
 	__u32 btf_fd;
 	__u32 btf_key_type_id;
 	__u32 btf_value_type_id;
-	__u32 btf_vmlinux_value_type_id;
-
-	__u32 inner_map_fd;
-	__u32 map_flags;
-	__u64 map_extra;
-
-	__u32 numa_node;
 	__u32 map_ifindex;
-	__s32 value_type_btf_obj_fd;
-
-	__u32 token_fd;
-	size_t :0;
+	union {
+		__u32 inner_map_fd;
+		__u32 btf_vmlinux_value_type_id;
+	};
 };
-#define bpf_map_create_opts__last_field token_fd

-LIBBPF_API int bpf_map_create(enum bpf_map_type map_type,
-			      const char *map_name,
-			      __u32 key_size,
-			      __u32 value_size,
-			      __u32 max_entries,
-			      const struct bpf_map_create_opts *opts);
-
-struct bpf_prog_load_opts {
-	size_t sz; /* size of this struct for forward/backward compatibility */
-
-	/* libbpf can retry BPF_PROG_LOAD command if bpf() syscall returns
-	 * -EAGAIN. This field determines how many attempts libbpf has to
-	 *  make. If not specified, libbpf will use default value of 5.
-	 */
-	int attempts;
+LIBBPF_API int
+bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr);
+LIBBPF_API int bpf_create_map_node(enum bpf_map_type map_type, const char *name,
+				   int key_size, int value_size,
+				   int max_entries, __u32 map_flags, int node);
+LIBBPF_API int bpf_create_map_name(enum bpf_map_type map_type, const char *name,
+				   int key_size, int value_size,
+				   int max_entries, __u32 map_flags);
+LIBBPF_API int bpf_create_map(enum bpf_map_type map_type, int key_size,
+			      int value_size, int max_entries, __u32 map_flags);
+LIBBPF_API int bpf_create_map_in_map_node(enum bpf_map_type map_type,
+					  const char *name, int key_size,
+					  int inner_map_fd, int max_entries,
+					  __u32 map_flags, int node);
+LIBBPF_API int bpf_create_map_in_map(enum bpf_map_type map_type,
+				     const char *name, int key_size,
+				     int inner_map_fd, int max_entries,
+				     __u32 map_flags);

+struct bpf_load_program_attr {
+	enum bpf_prog_type prog_type;
 	enum bpf_attach_type expected_attach_type;
+	const char *name;
+	const struct bpf_insn *insns;
+	size_t insns_cnt;
+	const char *license;
+	union {
+		__u32 kern_version;
+		__u32 attach_prog_fd;
+	};
+	union {
+		__u32 prog_ifindex;
+		__u32 attach_btf_id;
+	};
 	__u32 prog_btf_fd;
-	__u32 prog_flags;
-	__u32 prog_ifindex;
-	__u32 kern_version;
-
-	__u32 attach_btf_id;
-	__u32 attach_prog_fd;
-	__u32 attach_btf_obj_fd;
-
-	const int *fd_array;
-
-	/* .BTF.ext func info data */
+	__u32 func_info_rec_size;
 	const void *func_info;
 	__u32 func_info_cnt;
-	__u32 func_info_rec_size;
-
-	/* .BTF.ext line info data */
+	__u32 line_info_rec_size;
 	const void *line_info;
 	__u32 line_info_cnt;
-	__u32 line_info_rec_size;
-
-	/* verifier log options */
 	__u32 log_level;
-	__u32 log_size;
-	char *log_buf;
-	/* output: actual total log contents size (including termintaing zero).
-	 * It could be both larger than original log_size (if log was
-	 * truncated), or smaller (if log buffer wasn't filled completely).
-	 * If kernel doesn't support this feature, log_size is left unchanged.
-	 */
-	__u32 log_true_size;
-	__u32 token_fd;
-	size_t :0;
+	__u32 prog_flags;
 };
-#define bpf_prog_load_opts__last_field token_fd
-
-LIBBPF_API int bpf_prog_load(enum bpf_prog_type prog_type,
-			     const char *prog_name, const char *license,
-			     const struct bpf_insn *insns, size_t insn_cnt,
-			     struct bpf_prog_load_opts *opts);

 /* Flags to direct loading requirements */
 #define MAPS_RELAX_COMPAT	0x01

-/* Recommended log buffer size */
+/* Recommend log buffer size */
 #define BPF_LOG_BUF_SIZE (UINT32_MAX >> 8) /* verifier maximum in kernels <= 5.1 */
-
-struct bpf_btf_load_opts {
-	size_t sz; /* size of this struct for forward/backward compatibility */
-
-	/* kernel log options */
-	char *log_buf;
-	__u32 log_level;
-	__u32 log_size;
-	/* output: actual total log contents size (including termintaing zero).
-	 * It could be both larger than original log_size (if log was
-	 * truncated), or smaller (if log buffer wasn't filled completely).
-	 * If kernel doesn't support this feature, log_size is left unchanged.
-	 */
-	__u32 log_true_size;
-
-	__u32 btf_flags;
-	__u32 token_fd;
-	size_t :0;
-};
-#define bpf_btf_load_opts__last_field token_fd
-
-LIBBPF_API int bpf_btf_load(const void *btf_data, size_t btf_size,
-			    struct bpf_btf_load_opts *opts);
+LIBBPF_API int
+bpf_load_program_xattr(const struct bpf_load_program_attr *load_attr,
+		       char *log_buf, size_t log_buf_sz);
+LIBBPF_API int bpf_load_program(enum bpf_prog_type type,
+				const struct bpf_insn *insns, size_t insns_cnt,
+				const char *license, __u32 kern_version,
+				char *log_buf, size_t log_buf_sz);
+LIBBPF_API int bpf_verify_program(enum bpf_prog_type type,
+				  const struct bpf_insn *insns,
+				  size_t insns_cnt, __u32 prog_flags,
+				  const char *license, __u32 kern_version,
+				  char *log_buf, size_t log_buf_sz,
+				  int log_level);

 LIBBPF_API int bpf_map_update_elem(int fd, const void *key, const void *value,
 				   __u64 flags);
@@ -156,7 +127,6 @@ LIBBPF_API int bpf_map_lookup_and_delete_elem(int fd, const void *key,
 LIBBPF_API int bpf_map_lookup_and_delete_elem_flags(int fd, const void *key,
 						    void *value, __u64 flags);
 LIBBPF_API int bpf_map_delete_elem(int fd, const void *key);
-LIBBPF_API int bpf_map_delete_elem_flags(int fd, const void *key, __u64 flags);
 LIBBPF_API int bpf_map_get_next_key(int fd, const void *key, void *next_key);
 LIBBPF_API int bpf_map_freeze(int fd);

@@ -167,227 +137,38 @@ struct bpf_map_batch_opts {
 };
 #define bpf_map_batch_opts__last_field flags

-
-/**
- * @brief **bpf_map_delete_batch()** allows for batch deletion of multiple
- * elements in a BPF map.
- *
- * @param fd BPF map file descriptor
- * @param keys pointer to an array of *count* keys
- * @param count input and output parameter; on input **count** represents the
- * number of  elements in the map to delete in batch;
- * on output if a non-EFAULT error is returned, **count** represents the number of deleted
- * elements if the output **count** value is not equal to the input **count** value
- * If EFAULT is returned, **count** should not be trusted to be correct.
- * @param opts options for configuring the way the batch deletion works
- * @return 0, on success; negative error code, otherwise (errno is also set to
- * the error code)
- */
-LIBBPF_API int bpf_map_delete_batch(int fd, const void *keys,
+LIBBPF_API int bpf_map_delete_batch(int fd, void *keys,
 				    __u32 *count,
 				    const struct bpf_map_batch_opts *opts);
-
-/**
- * @brief **bpf_map_lookup_batch()** allows for batch lookup of BPF map elements.
- *
- * The parameter *in_batch* is the address of the first element in the batch to
- * read. *out_batch* is an output parameter that should be passed as *in_batch*
- * to subsequent calls to **bpf_map_lookup_batch()**. NULL can be passed for
- * *in_batch* to indicate that the batched lookup starts from the beginning of
- * the map. Both *in_batch* and *out_batch* must point to memory large enough to
- * hold a single key, except for maps of type **BPF_MAP_TYPE_{HASH, PERCPU_HASH,
- * LRU_HASH, LRU_PERCPU_HASH}**, for which the memory size must be at
- * least 4 bytes wide regardless of key size.
- *
- * The *keys* and *values* are output parameters which must point to memory large enough to
- * hold *count* items based on the key and value size of the map *map_fd*. The *keys*
- * buffer must be of *key_size* * *count*. The *values* buffer must be of
- * *value_size* * *count*.
- *
- * @param fd BPF map file descriptor
- * @param in_batch address of the first element in batch to read, can pass NULL to
- * indicate that the batched lookup starts from the beginning of the map.
- * @param out_batch output parameter that should be passed to next call as *in_batch*
- * @param keys pointer to an array large enough for *count* keys
- * @param values pointer to an array large enough for *count* values
- * @param count input and output parameter; on input it's the number of elements
- * in the map to read in batch; on output it's the number of elements that were
- * successfully read.
- * If a non-EFAULT error is returned, count will be set as the number of elements
- * that were read before the error occurred.
- * If EFAULT is returned, **count** should not be trusted to be correct.
- * @param opts options for configuring the way the batch lookup works
- * @return 0, on success; negative error code, otherwise (errno is also set to
- * the error code)
- */
 LIBBPF_API int bpf_map_lookup_batch(int fd, void *in_batch, void *out_batch,
 				    void *keys, void *values, __u32 *count,
 				    const struct bpf_map_batch_opts *opts);
-
-/**
- * @brief **bpf_map_lookup_and_delete_batch()** allows for batch lookup and deletion
- * of BPF map elements where each element is deleted after being retrieved.
- *
- * @param fd BPF map file descriptor
- * @param in_batch address of the first element in batch to read, can pass NULL to
- * get address of the first element in *out_batch*. If not NULL, must be large
- * enough to hold a key. For **BPF_MAP_TYPE_{HASH, PERCPU_HASH, LRU_HASH,
- * LRU_PERCPU_HASH}**, the memory size must be at least 4 bytes wide regardless
- * of key size.
- * @param out_batch output parameter that should be passed to next call as *in_batch*
- * @param keys pointer to an array of *count* keys
- * @param values pointer to an array large enough for *count* values
- * @param count input and output parameter; on input it's the number of elements
- * in the map to read and delete in batch; on output it represents the number of
- * elements that were successfully read and deleted
- * If a non-**EFAULT** error code is returned and if the output **count** value
- * is not equal to the input **count** value, up to **count** elements may
- * have been deleted.
- * if **EFAULT** is returned up to *count* elements may have been deleted without
- * being returned via the *keys* and *values* output parameters.
- * @param opts options for configuring the way the batch lookup and delete works
- * @return 0, on success; negative error code, otherwise (errno is also set to
- * the error code)
- */
 LIBBPF_API int bpf_map_lookup_and_delete_batch(int fd, void *in_batch,
 					void *out_batch, void *keys,
 					void *values, __u32 *count,
 					const struct bpf_map_batch_opts *opts);
-
-/**
- * @brief **bpf_map_update_batch()** updates multiple elements in a map
- * by specifying keys and their corresponding values.
- *
- * The *keys* and *values* parameters must point to memory large enough
- * to hold *count* items based on the key and value size of the map.
- *
- * The *opts* parameter can be used to control how *bpf_map_update_batch()*
- * should handle keys that either do or do not already exist in the map.
- * In particular the *flags* parameter of *bpf_map_batch_opts* can be
- * one of the following:
- *
- * Note that *count* is an input and output parameter, where on output it
- * represents how many elements were successfully updated. Also note that if
- * **EFAULT** then *count* should not be trusted to be correct.
- *
- * **BPF_ANY**
- *    Create new elements or update existing.
- *
- * **BPF_NOEXIST**
- *    Create new elements only if they do not exist.
- *
- * **BPF_EXIST**
- *    Update existing elements.
- *
- * **BPF_F_LOCK**
- *    Update spin_lock-ed map elements. This must be
- *    specified if the map value contains a spinlock.
- *
- * @param fd BPF map file descriptor
- * @param keys pointer to an array of *count* keys
- * @param values pointer to an array of *count* values
- * @param count input and output parameter; on input it's the number of elements
- * in the map to update in batch; on output if a non-EFAULT error is returned,
- * **count** represents the number of updated elements if the output **count**
- * value is not equal to the input **count** value.
- * If EFAULT is returned, **count** should not be trusted to be correct.
- * @param opts options for configuring the way the batch update works
- * @return 0, on success; negative error code, otherwise (errno is also set to
- * the error code)
- */
-LIBBPF_API int bpf_map_update_batch(int fd, const void *keys, const void *values,
+LIBBPF_API int bpf_map_update_batch(int fd, void *keys, void *values,
 				    __u32 *count,
 				    const struct bpf_map_batch_opts *opts);

-struct bpf_obj_pin_opts {
-	size_t sz; /* size of this struct for forward/backward compatibility */
-
-	__u32 file_flags;
-	int path_fd;
-
-	size_t :0;
-};
-#define bpf_obj_pin_opts__last_field path_fd
-
 LIBBPF_API int bpf_obj_pin(int fd, const char *pathname);
-LIBBPF_API int bpf_obj_pin_opts(int fd, const char *pathname,
-				const struct bpf_obj_pin_opts *opts);
-
-struct bpf_obj_get_opts {
-	size_t sz; /* size of this struct for forward/backward compatibility */
-
-	__u32 file_flags;
-	int path_fd;
-
-	size_t :0;
-};
-#define bpf_obj_get_opts__last_field path_fd
-
 LIBBPF_API int bpf_obj_get(const char *pathname);
-LIBBPF_API int bpf_obj_get_opts(const char *pathname,
-				const struct bpf_obj_get_opts *opts);
-
-LIBBPF_API int bpf_prog_attach(int prog_fd, int attachable_fd,
-			       enum bpf_attach_type type, unsigned int flags);
-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);

 struct bpf_prog_attach_opts {
 	size_t sz; /* size of this struct for forward/backward compatibility */
-	__u32 flags;
-	union {
-		int replace_prog_fd;
-		int replace_fd;
-	};
-	int relative_fd;
-	__u32 relative_id;
-	__u64 expected_revision;
-	size_t :0;
+	unsigned int flags;
+	int replace_prog_fd;
 };
-#define bpf_prog_attach_opts__last_field expected_revision
+#define bpf_prog_attach_opts__last_field replace_prog_fd

-struct bpf_prog_detach_opts {
-	size_t sz; /* size of this struct for forward/backward compatibility */
-	__u32 flags;
-	int relative_fd;
-	__u32 relative_id;
-	__u64 expected_revision;
-	size_t :0;
-};
-#define bpf_prog_detach_opts__last_field expected_revision
-
-/**
- * @brief **bpf_prog_attach_opts()** attaches the BPF program corresponding to
- * *prog_fd* to a *target* which can represent a file descriptor or netdevice
- * ifindex.
- *
- * @param prog_fd BPF program file descriptor
- * @param target attach location file descriptor or ifindex
- * @param type attach type for the BPF program
- * @param opts options for configuring the attachment
- * @return 0, on success; negative error code, otherwise (errno is also set to
- * the error code)
- */
-LIBBPF_API int bpf_prog_attach_opts(int prog_fd, int target,
-				    enum bpf_attach_type type,
-				    const struct bpf_prog_attach_opts *opts);
-
-/**
- * @brief **bpf_prog_detach_opts()** detaches the BPF program corresponding to
- * *prog_fd* from a *target* which can represent a file descriptor or netdevice
- * ifindex.
- *
- * @param prog_fd BPF program file descriptor
- * @param target detach location file descriptor or ifindex
- * @param type detach type for the BPF program
- * @param opts options for configuring the detachment
- * @return 0, on success; negative error code, otherwise (errno is also set to
- * the error code)
- */
-LIBBPF_API int bpf_prog_detach_opts(int prog_fd, int target,
-				    enum bpf_attach_type type,
-				    const struct bpf_prog_detach_opts *opts);
+LIBBPF_API int bpf_prog_attach(int prog_fd, int attachable_fd,
+			       enum bpf_attach_type type, unsigned int flags);
+LIBBPF_API int bpf_prog_attach_xattr(int prog_fd, int attachable_fd,
+				     enum bpf_attach_type type,
+				     const struct bpf_prog_attach_opts *opts);
+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 {
@@ -400,45 +181,10 @@ struct bpf_link_create_opts {
 		struct {
 			__u64 bpf_cookie;
 		} perf_event;
-		struct {
-			__u32 flags;
-			__u32 cnt;
-			const char **syms;
-			const unsigned long *addrs;
-			const __u64 *cookies;
-		} kprobe_multi;
-		struct {
-			__u32 flags;
-			__u32 cnt;
-			const char *path;
-			const unsigned long *offsets;
-			const unsigned long *ref_ctr_offsets;
-			const __u64 *cookies;
-			__u32 pid;
-		} uprobe_multi;
-		struct {
-			__u64 cookie;
-		} tracing;
-		struct {
-			__u32 pf;
-			__u32 hooknum;
-			__s32 priority;
-			__u32 flags;
-		} netfilter;
-		struct {
-			__u32 relative_fd;
-			__u32 relative_id;
-			__u64 expected_revision;
-		} tcx;
-		struct {
-			__u32 relative_fd;
-			__u32 relative_id;
-			__u64 expected_revision;
-		} netkit;
 	};
 	size_t :0;
 };
-#define bpf_link_create_opts__last_field uprobe_multi.pid
+#define bpf_link_create_opts__last_field perf_event

 LIBBPF_API int bpf_link_create(int prog_fd, int target_fd,
 			       enum bpf_attach_type attach_type,
@@ -450,9 +196,8 @@ struct bpf_link_update_opts {
 	size_t sz; /* size of this struct for forward/backward compatibility */
 	__u32 flags;	   /* extra flags */
 	__u32 old_prog_fd; /* expected old program FD */
-	__u32 old_map_fd;  /* expected old map FD */
 };
-#define bpf_link_update_opts__last_field old_map_fd
+#define bpf_link_update_opts__last_field old_prog_fd

 LIBBPF_API int bpf_link_update(int link_fd, int new_prog_fd,
 			       const struct bpf_link_update_opts *opts);
@@ -476,170 +221,36 @@ struct bpf_prog_test_run_attr {
 			     * out: length of cxt_out */
 };

+LIBBPF_API int bpf_prog_test_run_xattr(struct bpf_prog_test_run_attr *test_attr);
+
+/*
+ * bpf_prog_test_run does not check that data_out is large enough. Consider
+ * using bpf_prog_test_run_xattr instead.
+ */
+LIBBPF_API int bpf_prog_test_run(int prog_fd, int repeat, void *data,
+				 __u32 size, void *data_out, __u32 *size_out,
+				 __u32 *retval, __u32 *duration);
 LIBBPF_API int bpf_prog_get_next_id(__u32 start_id, __u32 *next_id);
 LIBBPF_API int bpf_map_get_next_id(__u32 start_id, __u32 *next_id);
 LIBBPF_API int bpf_btf_get_next_id(__u32 start_id, __u32 *next_id);
 LIBBPF_API int bpf_link_get_next_id(__u32 start_id, __u32 *next_id);
-
-struct bpf_get_fd_by_id_opts {
-	size_t sz; /* size of this struct for forward/backward compatibility */
-	__u32 open_flags; /* permissions requested for the operation on fd */
-	size_t :0;
-};
-#define bpf_get_fd_by_id_opts__last_field open_flags
-
 LIBBPF_API int bpf_prog_get_fd_by_id(__u32 id);
-LIBBPF_API int bpf_prog_get_fd_by_id_opts(__u32 id,
-				const struct bpf_get_fd_by_id_opts *opts);
 LIBBPF_API int bpf_map_get_fd_by_id(__u32 id);
-LIBBPF_API int bpf_map_get_fd_by_id_opts(__u32 id,
-				const struct bpf_get_fd_by_id_opts *opts);
 LIBBPF_API int bpf_btf_get_fd_by_id(__u32 id);
-LIBBPF_API int bpf_btf_get_fd_by_id_opts(__u32 id,
-				const struct bpf_get_fd_by_id_opts *opts);
 LIBBPF_API int bpf_link_get_fd_by_id(__u32 id);
-LIBBPF_API int bpf_link_get_fd_by_id_opts(__u32 id,
-				const struct bpf_get_fd_by_id_opts *opts);
 LIBBPF_API int bpf_obj_get_info_by_fd(int bpf_fd, void *info, __u32 *info_len);
-
-/**
- * @brief **bpf_prog_get_info_by_fd()** obtains information about the BPF
- * program corresponding to *prog_fd*.
- *
- * Populates up to *info_len* bytes of *info* and updates *info_len* with the
- * actual number of bytes written to *info*. Note that *info* should be
- * zero-initialized or initialized as expected by the requested *info*
- * type. Failing to (zero-)initialize *info* under certain circumstances can
- * result in this helper returning an error.
- *
- * @param prog_fd BPF program file descriptor
- * @param info pointer to **struct bpf_prog_info** that will be populated with
- * BPF program information
- * @param info_len pointer to the size of *info*; on success updated with the
- * number of bytes written to *info*
- * @return 0, on success; negative error code, otherwise (errno is also set to
- * the error code)
- */
-LIBBPF_API int bpf_prog_get_info_by_fd(int prog_fd, struct bpf_prog_info *info, __u32 *info_len);
-
-/**
- * @brief **bpf_map_get_info_by_fd()** obtains information about the BPF
- * map corresponding to *map_fd*.
- *
- * Populates up to *info_len* bytes of *info* and updates *info_len* with the
- * actual number of bytes written to *info*. Note that *info* should be
- * zero-initialized or initialized as expected by the requested *info*
- * type. Failing to (zero-)initialize *info* under certain circumstances can
- * result in this helper returning an error.
- *
- * @param map_fd BPF map file descriptor
- * @param info pointer to **struct bpf_map_info** that will be populated with
- * BPF map information
- * @param info_len pointer to the size of *info*; on success updated with the
- * number of bytes written to *info*
- * @return 0, on success; negative error code, otherwise (errno is also set to
- * the error code)
- */
-LIBBPF_API int bpf_map_get_info_by_fd(int map_fd, struct bpf_map_info *info, __u32 *info_len);
-
-/**
- * @brief **bpf_btf_get_info_by_fd()** obtains information about the
- * BTF object corresponding to *btf_fd*.
- *
- * Populates up to *info_len* bytes of *info* and updates *info_len* with the
- * actual number of bytes written to *info*. Note that *info* should be
- * zero-initialized or initialized as expected by the requested *info*
- * type. Failing to (zero-)initialize *info* under certain circumstances can
- * result in this helper returning an error.
- *
- * @param btf_fd BTF object file descriptor
- * @param info pointer to **struct bpf_btf_info** that will be populated with
- * BTF object information
- * @param info_len pointer to the size of *info*; on success updated with the
- * number of bytes written to *info*
- * @return 0, on success; negative error code, otherwise (errno is also set to
- * the error code)
- */
-LIBBPF_API int bpf_btf_get_info_by_fd(int btf_fd, struct bpf_btf_info *info, __u32 *info_len);
-
-/**
- * @brief **bpf_btf_get_info_by_fd()** obtains information about the BPF
- * link corresponding to *link_fd*.
- *
- * Populates up to *info_len* bytes of *info* and updates *info_len* with the
- * actual number of bytes written to *info*. Note that *info* should be
- * zero-initialized or initialized as expected by the requested *info*
- * type. Failing to (zero-)initialize *info* under certain circumstances can
- * result in this helper returning an error.
- *
- * @param link_fd BPF link file descriptor
- * @param info pointer to **struct bpf_link_info** that will be populated with
- * BPF link information
- * @param info_len pointer to the size of *info*; on success updated with the
- * number of bytes written to *info*
- * @return 0, on success; negative error code, otherwise (errno is also set to
- * the error code)
- */
-LIBBPF_API int bpf_link_get_info_by_fd(int link_fd, struct bpf_link_info *info, __u32 *info_len);
-
-struct bpf_prog_query_opts {
-	size_t sz; /* size of this struct for forward/backward compatibility */
-	__u32 query_flags;
-	__u32 attach_flags; /* output argument */
-	__u32 *prog_ids;
-	union {
-		/* input+output argument */
-		__u32 prog_cnt;
-		__u32 count;
-	};
-	__u32 *prog_attach_flags;
-	__u32 *link_ids;
-	__u32 *link_attach_flags;
-	__u64 revision;
-	size_t :0;
-};
-#define bpf_prog_query_opts__last_field revision
-
-/**
- * @brief **bpf_prog_query_opts()** queries the BPF programs and BPF links
- * which are attached to *target* which can represent a file descriptor or
- * netdevice ifindex.
- *
- * @param target query location file descriptor or ifindex
- * @param type attach type for the BPF program
- * @param opts options for configuring the query
- * @return 0, on success; negative error code, otherwise (errno is also set to
- * the error code)
- */
-LIBBPF_API int bpf_prog_query_opts(int target, enum bpf_attach_type type,
-				   struct bpf_prog_query_opts *opts);
 LIBBPF_API int bpf_prog_query(int target_fd, enum bpf_attach_type type,
 			      __u32 query_flags, __u32 *attach_flags,
 			      __u32 *prog_ids, __u32 *prog_cnt);
-
-struct bpf_raw_tp_opts {
-	size_t sz; /* size of this struct for forward/backward compatibility */
-	const char *tp_name;
-	__u64 cookie;
-	size_t :0;
-};
-#define bpf_raw_tp_opts__last_field cookie
-
-LIBBPF_API int bpf_raw_tracepoint_open_opts(int prog_fd, struct bpf_raw_tp_opts *opts);
 LIBBPF_API int bpf_raw_tracepoint_open(const char *name, int prog_fd);
+LIBBPF_API int bpf_load_btf(const void *btf, __u32 btf_size, char *log_buf,
+			    __u32 log_buf_size, bool do_log);
 LIBBPF_API int bpf_task_fd_query(int pid, int fd, __u32 flags, char *buf,
 				 __u32 *buf_len, __u32 *prog_id, __u32 *fd_type,
 				 __u64 *probe_offset, __u64 *probe_addr);

-#ifdef __cplusplus
-/* forward-declaring enums in C++ isn't compatible with pure C enums, so
- * instead define bpf_enable_stats() as accepting int as an input
- */
-LIBBPF_API int bpf_enable_stats(int type);
-#else
 enum bpf_stats_type; /* defined in up-to-date linux/bpf.h */
 LIBBPF_API int bpf_enable_stats(enum bpf_stats_type type);
-#endif

 struct bpf_prog_bind_opts {
 	size_t sz; /* size of this struct for forward/backward compatibility */
@@ -669,37 +280,12 @@ struct bpf_test_run_opts {
 	__u32 duration;      /* out: average per repetition in ns */
 	__u32 flags;
 	__u32 cpu;
-	__u32 batch_size;
 };
-#define bpf_test_run_opts__last_field batch_size
+#define bpf_test_run_opts__last_field cpu

 LIBBPF_API int bpf_prog_test_run_opts(int prog_fd,
 				      struct bpf_test_run_opts *opts);

-struct bpf_token_create_opts {
-	size_t sz; /* size of this struct for forward/backward compatibility */
-	__u32 flags;
-	size_t :0;
-};
-#define bpf_token_create_opts__last_field flags
-
-/**
- * @brief **bpf_token_create()** creates a new instance of BPF token derived
- * from specified BPF FS mount point.
- *
- * BPF token created with this API can be passed to bpf() syscall for
- * commands like BPF_PROG_LOAD, BPF_MAP_CREATE, etc.
- *
- * @param bpffs_fd FD for BPF FS instance from which to derive a BPF token
- * instance.
- * @param opts optional BPF token creation options, can be NULL
- *
- * @return BPF token FD > 0, on success; negative error code, otherwise (errno
- * is also set to the error code)
- */
-LIBBPF_API int bpf_token_create(int bpffs_fd,
-				struct bpf_token_create_opts *opts);
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
--- a/src/bpf_core_read.h
+++ b/src/bpf_core_read.h
@@ -2,8 +2,6 @@
 #ifndef __BPF_CORE_READ_H__
 #define __BPF_CORE_READ_H__

-#include "bpf_helpers.h"
-
 /*
 * enum bpf_field_info_kind is passed as a second argument into
 * __builtin_preserve_field_info() built-in to get a specific aspect of
@@ -31,7 +29,6 @@ enum bpf_type_id_kind {
 enum bpf_type_info_kind {
 	BPF_TYPE_EXISTS = 0,		/* type existence in target kernel */
 	BPF_TYPE_SIZE = 1,		/* type size in target kernel */
-	BPF_TYPE_MATCHES = 2,		/* type match in target kernel */
 };

 /* second argument to __builtin_preserve_enum_value() built-in */
@@ -46,7 +43,7 @@ enum bpf_enum_value_kind {
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
 #define __CORE_BITFIELD_PROBE_READ(dst, src, fld)			      \
 	bpf_probe_read_kernel(						      \
-			(void *)dst,					      \
+			(void *)dst,				      \
 			__CORE_RELO(src, fld, BYTE_SIZE),		      \
 			(const void *)src + __CORE_RELO(src, fld, BYTE_OFFSET))
 #else
@@ -104,7 +101,6 @@ enum bpf_enum_value_kind {
 	case 2: val = *(const unsigned short *)p; break;		      \
 	case 4: val = *(const unsigned int *)p; break;			      \
 	case 8: val = *(const unsigned long long *)p; break;		      \
-	default: val = 0; break;					      \
 	}								      \
 	val <<= __CORE_RELO(s, field, LSHIFT_U64);			      \
 	if (__CORE_RELO(s, field, SIGNED))				      \
@@ -114,103 +110,21 @@ enum bpf_enum_value_kind {
 	val;								      \
 })

-/*
- * Write to a bitfield, identified by s->field.
- * This is the inverse of BPF_CORE_WRITE_BITFIELD().
- */
-#define BPF_CORE_WRITE_BITFIELD(s, field, new_val) ({			\
-	void *p = (void *)s + __CORE_RELO(s, field, BYTE_OFFSET);	\
-	unsigned int byte_size = __CORE_RELO(s, field, BYTE_SIZE);	\
-	unsigned int lshift = __CORE_RELO(s, field, LSHIFT_U64);	\
-	unsigned int rshift = __CORE_RELO(s, field, RSHIFT_U64);	\
-	unsigned long long mask, val, nval = new_val;			\
-	unsigned int rpad = rshift - lshift;				\
-									\
-	asm volatile("" : "+r"(p));					\
-									\
-	switch (byte_size) {						\
-	case 1: val = *(unsigned char *)p; break;			\
-	case 2: val = *(unsigned short *)p; break;			\
-	case 4: val = *(unsigned int *)p; break;			\
-	case 8: val = *(unsigned long long *)p; break;			\
-	}								\
-									\
-	mask = (~0ULL << rshift) >> lshift;				\
-	val = (val & ~mask) | ((nval << rpad) & mask);			\
-									\
-	switch (byte_size) {						\
-	case 1: *(unsigned char *)p      = val; break;			\
-	case 2: *(unsigned short *)p     = val; break;			\
-	case 4: *(unsigned int *)p       = val; break;			\
-	case 8: *(unsigned long long *)p = val; break;			\
-	}								\
-})
-
-/* Differentiator between compilers builtin implementations. This is a
- * requirement due to the compiler parsing differences where GCC optimizes
- * early in parsing those constructs of type pointers to the builtin specific
- * type, resulting in not being possible to collect the required type
- * information in the builtin expansion.
- */
-#ifdef __clang__
-#define ___bpf_typeof(type) ((typeof(type) *) 0)
-#else
-#define ___bpf_typeof1(type, NR) ({					    \
-	extern typeof(type) *___concat(bpf_type_tmp_, NR);		    \
-	___concat(bpf_type_tmp_, NR);					    \
-})
-#define ___bpf_typeof(type) ___bpf_typeof1(type, __COUNTER__)
-#endif
-
-#ifdef __clang__
-#define ___bpf_field_ref1(field)	(field)
-#define ___bpf_field_ref2(type, field)	(___bpf_typeof(type)->field)
-#else
-#define ___bpf_field_ref1(field)	(&(field))
-#define ___bpf_field_ref2(type, field)	(&(___bpf_typeof(type)->field))
-#endif
-#define ___bpf_field_ref(args...)					    \
-	___bpf_apply(___bpf_field_ref, ___bpf_narg(args))(args)
-
 /*
 * Convenience macro to check that field actually exists in target kernel's.
 * Returns:
 *    1, if matching field is present in target kernel;
 *    0, if no matching field found.
- *
- * Supports two forms:
- *   - field reference through variable access:
- *     bpf_core_field_exists(p->my_field);
- *   - field reference through type and field names:
- *     bpf_core_field_exists(struct my_type, my_field).
 */
-#define bpf_core_field_exists(field...)					    \
-	__builtin_preserve_field_info(___bpf_field_ref(field), BPF_FIELD_EXISTS)
+#define bpf_core_field_exists(field)					    \
+	__builtin_preserve_field_info(field, BPF_FIELD_EXISTS)

 /*
 * Convenience macro to get the byte size of a field. Works for integers,
 * struct/unions, pointers, arrays, and enums.
- *
- * Supports two forms:
- *   - field reference through variable access:
- *     bpf_core_field_size(p->my_field);
- *   - field reference through type and field names:
- *     bpf_core_field_size(struct my_type, my_field).
 */
-#define bpf_core_field_size(field...)					    \
-	__builtin_preserve_field_info(___bpf_field_ref(field), BPF_FIELD_BYTE_SIZE)
-
-/*
- * Convenience macro to get field's byte offset.
- *
- * Supports two forms:
- *   - field reference through variable access:
- *     bpf_core_field_offset(p->my_field);
- *   - field reference through type and field names:
- *     bpf_core_field_offset(struct my_type, my_field).
- */
-#define bpf_core_field_offset(field...)					    \
-	__builtin_preserve_field_info(___bpf_field_ref(field), BPF_FIELD_BYTE_OFFSET)
+#define bpf_core_field_size(field)					    \
+	__builtin_preserve_field_info(field, BPF_FIELD_BYTE_SIZE)

 /*
 * Convenience macro to get BTF type ID of a specified type, using a local BTF
@@ -218,7 +132,7 @@ enum bpf_enum_value_kind {
 * BTF. Always succeeds.
 */
 #define bpf_core_type_id_local(type)					    \
-	__builtin_btf_type_id(*___bpf_typeof(type), BPF_TYPE_ID_LOCAL)
+	__builtin_btf_type_id(*(typeof(type) *)0, BPF_TYPE_ID_LOCAL)

 /*
 * Convenience macro to get BTF type ID of a target kernel's type that matches
@@ -228,7 +142,7 @@ enum bpf_enum_value_kind {
 *    - 0, if no matching type was found in a target kernel BTF.
 */
 #define bpf_core_type_id_kernel(type)					    \
-	__builtin_btf_type_id(*___bpf_typeof(type), BPF_TYPE_ID_TARGET)
+	__builtin_btf_type_id(*(typeof(type) *)0, BPF_TYPE_ID_TARGET)

 /*
 * Convenience macro to check that provided named type
@@ -238,17 +152,7 @@ enum bpf_enum_value_kind {
 *    0, if no matching type is found.
 */
 #define bpf_core_type_exists(type)					    \
-	__builtin_preserve_type_info(*___bpf_typeof(type), BPF_TYPE_EXISTS)
-
-/*
- * Convenience macro to check that provided named type
- * (struct/union/enum/typedef) "matches" that in a target kernel.
- * Returns:
- *    1, if the type matches in the target kernel's BTF;
- *    0, if the type does not match any in the target kernel
- */
-#define bpf_core_type_matches(type)					    \
-	__builtin_preserve_type_info(*___bpf_typeof(type), BPF_TYPE_MATCHES)
+	__builtin_preserve_type_info(*(typeof(type) *)0, BPF_TYPE_EXISTS)

 /*
 * Convenience macro to get the byte size of a provided named type
@@ -258,7 +162,7 @@ enum bpf_enum_value_kind {
 *    0, if no matching type is found.
 */
 #define bpf_core_type_size(type)					    \
-	__builtin_preserve_type_info(*___bpf_typeof(type), BPF_TYPE_SIZE)
+	__builtin_preserve_type_info(*(typeof(type) *)0, BPF_TYPE_SIZE)

 /*
 * Convenience macro to check that provided enumerator value is defined in
@@ -268,13 +172,8 @@ enum bpf_enum_value_kind {
 *    kernel's BTF;
 *    0, if no matching enum and/or enum value within that enum is found.
 */
-#ifdef __clang__
 #define bpf_core_enum_value_exists(enum_type, enum_value)		    \
 	__builtin_preserve_enum_value(*(typeof(enum_type) *)enum_value, BPF_ENUMVAL_EXISTS)
-#else
-#define bpf_core_enum_value_exists(enum_type, enum_value)		    \
-	__builtin_preserve_enum_value(___bpf_typeof(enum_type), enum_value, BPF_ENUMVAL_EXISTS)
-#endif

 /*
 * Convenience macro to get the integer value of an enumerator value in
@@ -284,13 +183,8 @@ enum bpf_enum_value_kind {
 *    present in target kernel's BTF;
 *    0, if no matching enum and/or enum value within that enum is found.
 */
-#ifdef __clang__
 #define bpf_core_enum_value(enum_type, enum_value)			    \
 	__builtin_preserve_enum_value(*(typeof(enum_type) *)enum_value, BPF_ENUMVAL_VALUE)
-#else
-#define bpf_core_enum_value(enum_type, enum_value)			    \
-	__builtin_preserve_enum_value(___bpf_typeof(enum_type), enum_value, BPF_ENUMVAL_VALUE)
-#endif

 /*
 * bpf_core_read() abstracts away bpf_probe_read_kernel() call and captures
@@ -302,7 +196,7 @@ enum bpf_enum_value_kind {
 * a relocation, which records BTF type ID describing root struct/union and an
 * accessor string which describes exact embedded field that was used to take
 * an address. See detailed description of this relocation format and
- * semantics in comments to struct bpf_core_relo in include/uapi/linux/bpf.h.
+ * semantics in comments to struct bpf_field_reloc in libbpf_internal.h.
 *
 * This relocation allows libbpf to adjust BPF instruction to use correct
 * actual field offset, based on target kernel BTF type that matches original
@@ -326,17 +220,6 @@ enum bpf_enum_value_kind {
 #define bpf_core_read_user_str(dst, sz, src)				    \
 	bpf_probe_read_user_str(dst, sz, (const void *)__builtin_preserve_access_index(src))

-extern void *bpf_rdonly_cast(const void *obj, __u32 btf_id) __ksym __weak;
-
-/*
- * Cast provided pointer *ptr* into a pointer to a specified *type* in such
- * a way that BPF verifier will become aware of associated kernel-side BTF
- * type. This allows to access members of kernel types directly without the
- * need to use BPF_CORE_READ() macros.
- */
-#define bpf_core_cast(ptr, type)					    \
-	((typeof(type) *)bpf_rdonly_cast((ptr), bpf_core_type_id_kernel(type)))
-
 #define ___concat(a, b) a ## b
 #define ___apply(fn, n) ___concat(fn, n)
 #define ___nth(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, __11, N, ...) N
@@ -441,7 +324,7 @@ extern void *bpf_rdonly_cast(const void *obj, __u32 btf_id) __ksym __weak;

 /* Non-CO-RE variant of BPF_CORE_READ_INTO() */
 #define BPF_PROBE_READ_INTO(dst, src, a, ...) ({			    \
-	___core_read(bpf_probe_read_kernel, bpf_probe_read_kernel,	    \
+	___core_read(bpf_probe_read, bpf_probe_read,			    \
 		     dst, (src), a, ##__VA_ARGS__)			    \
 })

@@ -477,7 +360,7 @@ extern void *bpf_rdonly_cast(const void *obj, __u32 btf_id) __ksym __weak;

 /* Non-CO-RE variant of BPF_CORE_READ_STR_INTO() */
 #define BPF_PROBE_READ_STR_INTO(dst, src, a, ...) ({			    \
-	___core_read(bpf_probe_read_kernel_str, bpf_probe_read_kernel,	    \
+	___core_read(bpf_probe_read_str, bpf_probe_read,		    \
 		     dst, (src), a, ##__VA_ARGS__)			    \
 })

--- a/src/bpf_gen_internal.h
+++ b/src/bpf_gen_internal.h
@@ -3,15 +3,12 @@
 #ifndef __BPF_GEN_INTERNAL_H
 #define __BPF_GEN_INTERNAL_H

-#include "bpf.h"
-
 struct ksym_relo_desc {
 	const char *name;
 	int kind;
 	int insn_idx;
 	bool is_weak;
 	bool is_typeless;
-	bool is_ld64;
 };

 struct ksym_desc {
@@ -25,7 +22,6 @@ struct ksym_desc {
 		bool typeless;
 	};
 	int insn;
-	bool is_ld64;
 };

 struct bpf_gen {
@@ -41,8 +37,6 @@ struct bpf_gen {
 	int error;
 	struct ksym_relo_desc *relos;
 	int relo_cnt;
-	struct bpf_core_relo *core_relos;
-	int core_relo_cnt;
 	char attach_target[128];
 	int attach_kind;
 	struct ksym_desc *ksyms;
@@ -51,24 +45,17 @@ struct bpf_gen {
 	int nr_fd_array;
 };

-void bpf_gen__init(struct bpf_gen *gen, int log_level, int nr_progs, int nr_maps);
-int bpf_gen__finish(struct bpf_gen *gen, int nr_progs, int nr_maps);
+void bpf_gen__init(struct bpf_gen *gen, int log_level);
+int bpf_gen__finish(struct bpf_gen *gen);
 void bpf_gen__free(struct bpf_gen *gen);
 void bpf_gen__load_btf(struct bpf_gen *gen, const void *raw_data, __u32 raw_size);
-void bpf_gen__map_create(struct bpf_gen *gen,
-			 enum bpf_map_type map_type, const char *map_name,
-			 __u32 key_size, __u32 value_size, __u32 max_entries,
-			 struct bpf_map_create_opts *map_attr, int map_idx);
-void bpf_gen__prog_load(struct bpf_gen *gen,
-			enum bpf_prog_type prog_type, const char *prog_name,
-			const char *license, struct bpf_insn *insns, size_t insn_cnt,
-			struct bpf_prog_load_opts *load_attr, int prog_idx);
+void bpf_gen__map_create(struct bpf_gen *gen, struct bpf_create_map_params *map_attr, int map_idx);
+struct bpf_prog_load_params;
+void bpf_gen__prog_load(struct bpf_gen *gen, struct bpf_prog_load_params *load_attr, int prog_idx);
 void bpf_gen__map_update_elem(struct bpf_gen *gen, int map_idx, void *value, __u32 value_size);
 void bpf_gen__map_freeze(struct bpf_gen *gen, int map_idx);
 void bpf_gen__record_attach_target(struct bpf_gen *gen, const char *name, enum bpf_attach_type type);
 void bpf_gen__record_extern(struct bpf_gen *gen, const char *name, bool is_weak,
-			    bool is_typeless, bool is_ld64, int kind, int insn_idx);
-void bpf_gen__record_relo_core(struct bpf_gen *gen, const struct bpf_core_relo *core_relo);
-void bpf_gen__populate_outer_map(struct bpf_gen *gen, int outer_map_idx, int key, int inner_map_idx);
+			    bool is_typeless, int kind, int insn_idx);

 #endif
--- a/src/bpf_helper_defs.h
+++ b/src/bpf_helper_defs.h
--- a/src/bpf_helpers.h
+++ b/src/bpf_helpers.h
@@ -13,7 +13,6 @@
 #define __uint(name, val) int (*name)[val]
 #define __type(name, val) typeof(val) *name
 #define __array(name, val) typeof(val) *name[]
-#define __ulong(name, val) enum { ___bpf_concat(__unique_value, __COUNTER__) = val } name

 /*
 * Helper macro to place programs, maps, license in
@@ -23,25 +22,12 @@
 * To allow use of SEC() with externs (e.g., for extern .maps declarations),
 * make sure __attribute__((unused)) doesn't trigger compilation warning.
 */
-#if __GNUC__ && !__clang__
-
-/*
- * Pragma macros are broken on GCC
- * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55578
- * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90400
- */
-#define SEC(name) __attribute__((section(name), used))
-
-#else
-
 #define SEC(name) \
 	_Pragma("GCC diagnostic push")					    \
 	_Pragma("GCC diagnostic ignored \"-Wignored-attributes\"")	    \
 	__attribute__((section(name), used))				    \
 	_Pragma("GCC diagnostic pop")					    \

-#endif
-
 /* Avoid 'linux/stddef.h' definition of '__always_inline'. */
 #undef __always_inline
 #define __always_inline inline __attribute__((always_inline))
@@ -78,44 +64,15 @@
 /*
 * Helper macros to manipulate data structures
 */
-
-/* offsetof() definition that uses __builtin_offset() might not preserve field
- * offset CO-RE relocation properly, so force-redefine offsetof() using
- * old-school approach which works with CO-RE correctly
- */
-#undef offsetof
-#define offsetof(type, member)	((unsigned long)&((type *)0)->member)
-
-/* redefined container_of() to ensure we use the above offsetof() macro */
-#undef container_of
+#ifndef offsetof
+#define offsetof(TYPE, MEMBER)	((unsigned long)&((TYPE *)0)->MEMBER)
+#endif
+#ifndef container_of
 #define container_of(ptr, type, member)				\
 	({							\
 		void *__mptr = (void *)(ptr);			\
 		((type *)(__mptr - offsetof(type, member)));	\
 	})
-
-/*
- * Compiler (optimization) barrier.
- */
-#ifndef barrier
-#define barrier() asm volatile("" ::: "memory")
-#endif
-
-/* Variable-specific compiler (optimization) barrier. It's a no-op which makes
- * compiler believe that there is some black box modification of a given
- * variable and thus prevents compiler from making extra assumption about its
- * value and potential simplifications and optimizations on this variable.
- *
- * E.g., compiler might often delay or even omit 32-bit to 64-bit casting of
- * a variable, making some code patterns unverifiable. Putting barrier_var()
- * in place will ensure that cast is performed before the barrier_var()
- * invocation, because compiler has to pessimistically assume that embedded
- * asm section might perform some extra operations on that variable.
- *
- * This is a variable-specific variant of more global barrier().
- */
-#ifndef barrier_var
-#define barrier_var(var) asm volatile("" : "+r"(var))
 #endif

 /*
@@ -137,8 +94,7 @@
 /*
 * Helper function to perform a tail call with a constant/immediate map slot.
 */
-#if (defined(__clang__) && __clang_major__ >= 8) || (!defined(__clang__) && __GNUC__ > 12)
-#if defined(__bpf__)
+#if __clang_major__ >= 8 && defined(__bpf__)
 static __always_inline void
 bpf_tail_call_static(void *ctx, const void *map, const __u32 slot)
 {
@@ -166,7 +122,18 @@ bpf_tail_call_static(void *ctx, const void *map, const __u32 slot)
 		     : "r0", "r1", "r2", "r3", "r4", "r5");
 }
 #endif
-#endif
+
+/*
+ * Helper structure used by eBPF C program
+ * to describe BPF map attributes to libbpf loader
+ */
+struct bpf_map_def {
+	unsigned int type;
+	unsigned int key_size;
+	unsigned int value_size;
+	unsigned int max_entries;
+	unsigned int map_flags;
+};

 enum libbpf_pin_type {
 	LIBBPF_PIN_NONE,
@@ -182,31 +149,6 @@ enum libbpf_tristate {

 #define __kconfig __attribute__((section(".kconfig")))
 #define __ksym __attribute__((section(".ksyms")))
-#define __kptr_untrusted __attribute__((btf_type_tag("kptr_untrusted")))
-#define __kptr __attribute__((btf_type_tag("kptr")))
-#define __percpu_kptr __attribute__((btf_type_tag("percpu_kptr")))
-
-#if defined (__clang__)
-#define bpf_ksym_exists(sym) ({						\
-	_Static_assert(!__builtin_constant_p(!!sym),			\
-		       #sym " should be marked as __weak");		\
-	!!sym;								\
-})
-#elif __GNUC__ > 8
-#define bpf_ksym_exists(sym) ({						\
-	_Static_assert(__builtin_has_attribute (*sym, __weak__),	\
-		       #sym " should be marked as __weak");		\
-	!!sym;								\
-})
-#else
-#define bpf_ksym_exists(sym) !!sym
-#endif
-
-#define __arg_ctx __attribute__((btf_decl_tag("arg:ctx")))
-#define __arg_nonnull __attribute((btf_decl_tag("arg:nonnull")))
-#define __arg_nullable __attribute((btf_decl_tag("arg:nullable")))
-#define __arg_trusted __attribute((btf_decl_tag("arg:trusted")))
-#define __arg_arena __attribute((btf_decl_tag("arg:arena")))

 #ifndef ___bpf_concat
 #define ___bpf_concat(a, b) a ## b
@@ -317,107 +259,4 @@ enum libbpf_tristate {
 /* Helper macro to print out debug messages */
 #define bpf_printk(fmt, args...) ___bpf_pick_printk(args)(fmt, ##args)

-struct bpf_iter_num;
-
-extern int bpf_iter_num_new(struct bpf_iter_num *it, int start, int end) __weak __ksym;
-extern int *bpf_iter_num_next(struct bpf_iter_num *it) __weak __ksym;
-extern void bpf_iter_num_destroy(struct bpf_iter_num *it) __weak __ksym;
-
-#ifndef bpf_for_each
-/* bpf_for_each(iter_type, cur_elem, args...) provides generic construct for
- * using BPF open-coded iterators without having to write mundane explicit
- * low-level loop logic. Instead, it provides for()-like generic construct
- * that can be used pretty naturally. E.g., for some hypothetical cgroup
- * iterator, you'd write:
- *
- * struct cgroup *cg, *parent_cg = <...>;
- *
- * bpf_for_each(cgroup, cg, parent_cg, CG_ITER_CHILDREN) {
- *     bpf_printk("Child cgroup id = %d", cg->cgroup_id);
- *     if (cg->cgroup_id == 123)
- *         break;
- * }
- *
- * I.e., it looks almost like high-level for each loop in other languages,
- * supports continue/break, and is verifiable by BPF verifier.
- *
- * For iterating integers, the difference betwen bpf_for_each(num, i, N, M)
- * and bpf_for(i, N, M) is in that bpf_for() provides additional proof to
- * verifier that i is in [N, M) range, and in bpf_for_each() case i is `int
- * *`, not just `int`. So for integers bpf_for() is more convenient.
- *
- * Note: this macro relies on C99 feature of allowing to declare variables
- * inside for() loop, bound to for() loop lifetime. It also utilizes GCC
- * extension: __attribute__((cleanup(<func>))), supported by both GCC and
- * Clang.
- */
-#define bpf_for_each(type, cur, args...) for (							\
-	/* initialize and define destructor */							\
-	struct bpf_iter_##type ___it __attribute__((aligned(8), /* enforce, just in case */,	\
-						    cleanup(bpf_iter_##type##_destroy))),	\
-	/* ___p pointer is just to call bpf_iter_##type##_new() *once* to init ___it */		\
-			       *___p __attribute__((unused)) = (				\
-					bpf_iter_##type##_new(&___it, ##args),			\
-	/* this is a workaround for Clang bug: it currently doesn't emit BTF */			\
-	/* for bpf_iter_##type##_destroy() when used from cleanup() attribute */		\
-					(void)bpf_iter_##type##_destroy, (void *)0);		\
-	/* iteration and termination check */							\
-	(((cur) = bpf_iter_##type##_next(&___it)));						\
-)
-#endif /* bpf_for_each */
-
-#ifndef bpf_for
-/* bpf_for(i, start, end) implements a for()-like looping construct that sets
- * provided integer variable *i* to values starting from *start* through,
- * but not including, *end*. It also proves to BPF verifier that *i* belongs
- * to range [start, end), so this can be used for accessing arrays without
- * extra checks.
- *
- * Note: *start* and *end* are assumed to be expressions with no side effects
- * and whose values do not change throughout bpf_for() loop execution. They do
- * not have to be statically known or constant, though.
- *
- * Note: similarly to bpf_for_each(), it relies on C99 feature of declaring for()
- * loop bound variables and cleanup attribute, supported by GCC and Clang.
- */
-#define bpf_for(i, start, end) for (								\
-	/* initialize and define destructor */							\
-	struct bpf_iter_num ___it __attribute__((aligned(8), /* enforce, just in case */	\
-						 cleanup(bpf_iter_num_destroy))),		\
-	/* ___p pointer is necessary to call bpf_iter_num_new() *once* to init ___it */		\
-			    *___p __attribute__((unused)) = (					\
-				bpf_iter_num_new(&___it, (start), (end)),			\
-	/* this is a workaround for Clang bug: it currently doesn't emit BTF */			\
-	/* for bpf_iter_num_destroy() when used from cleanup() attribute */			\
-				(void)bpf_iter_num_destroy, (void *)0);				\
-	({											\
-		/* iteration step */								\
-		int *___t = bpf_iter_num_next(&___it);						\
-		/* termination and bounds check */						\
-		(___t && ((i) = *___t, (i) >= (start) && (i) < (end)));				\
-	});											\
-)
-#endif /* bpf_for */
-
-#ifndef bpf_repeat
-/* bpf_repeat(N) performs N iterations without exposing iteration number
- *
- * Note: similarly to bpf_for_each(), it relies on C99 feature of declaring for()
- * loop bound variables and cleanup attribute, supported by GCC and Clang.
- */
-#define bpf_repeat(N) for (									\
-	/* initialize and define destructor */							\
-	struct bpf_iter_num ___it __attribute__((aligned(8), /* enforce, just in case */	\
-						 cleanup(bpf_iter_num_destroy))),		\
-	/* ___p pointer is necessary to call bpf_iter_num_new() *once* to init ___it */		\
-			    *___p __attribute__((unused)) = (					\
-				bpf_iter_num_new(&___it, 0, (N)),				\
-	/* this is a workaround for Clang bug: it currently doesn't emit BTF */			\
-	/* for bpf_iter_num_destroy() when used from cleanup() attribute */			\
-				(void)bpf_iter_num_destroy, (void *)0);				\
-	bpf_iter_num_next(&___it);								\
-	/* nothing here  */									\
-)
-#endif /* bpf_repeat */
-
 #endif
--- a/src/bpf_tracing.h
+++ b/src/bpf_tracing.h
--- a/src/btf.c
+++ b/src/btf.c
--- a/src/btf.h
+++ b/src/btf.h
@@ -18,7 +18,6 @@ extern "C" {

 #define BTF_ELF_SEC ".BTF"
 #define BTF_EXT_ELF_SEC ".BTF.ext"
-#define BTF_BASE_ELF_SEC ".BTF.base"
 #define MAPS_ELF_SEC ".maps"

 struct btf;
@@ -108,27 +107,6 @@ LIBBPF_API struct btf *btf__new_empty(void);
 */
 LIBBPF_API struct btf *btf__new_empty_split(struct btf *base_btf);

-/**
- * @brief **btf__distill_base()** creates new versions of the split BTF
- * *src_btf* and its base BTF. The new base BTF will only contain the types
- * needed to improve robustness of the split BTF to small changes in base BTF.
- * When that split BTF is loaded against a (possibly changed) base, this
- * distilled base BTF will help update references to that (possibly changed)
- * base BTF.
- *
- * Both the new split and its associated new base BTF must be freed by
- * the caller.
- *
- * If successful, 0 is returned and **new_base_btf** and **new_split_btf**
- * will point at new base/split BTF. Both the new split and its associated
- * new base BTF must be freed by the caller.
- *
- * A negative value is returned on error and the thread-local `errno` variable
- * is set to the error code as well.
- */
-LIBBPF_API int btf__distill_base(const struct btf *src_btf, struct btf **new_base_btf,
-				 struct btf **new_split_btf);
-
 LIBBPF_API struct btf *btf__parse(const char *path, struct btf_ext **btf_ext);
 LIBBPF_API struct btf *btf__parse_split(const char *path, struct btf *base_btf);
 LIBBPF_API struct btf *btf__parse_elf(const char *path, struct btf_ext **btf_ext);
@@ -138,15 +116,24 @@ LIBBPF_API struct btf *btf__parse_raw_split(const char *path, struct btf *base_b

 LIBBPF_API struct btf *btf__load_vmlinux_btf(void);
 LIBBPF_API struct btf *btf__load_module_btf(const char *module_name, struct btf *vmlinux_btf);
+LIBBPF_API struct btf *libbpf_find_kernel_btf(void);

 LIBBPF_API struct btf *btf__load_from_kernel_by_id(__u32 id);
 LIBBPF_API struct btf *btf__load_from_kernel_by_id_split(__u32 id, struct btf *base_btf);
+LIBBPF_DEPRECATED_SINCE(0, 6, "use btf__load_from_kernel_by_id instead")
+LIBBPF_API int btf__get_from_id(__u32 id, struct btf **btf);

+LIBBPF_DEPRECATED_SINCE(0, 6, "intended for internal libbpf use only")
+LIBBPF_API int btf__finalize_data(struct bpf_object *obj, struct btf *btf);
+LIBBPF_DEPRECATED_SINCE(0, 6, "use btf__load_into_kernel instead")
+LIBBPF_API int btf__load(struct btf *btf);
 LIBBPF_API int btf__load_into_kernel(struct btf *btf);
 LIBBPF_API __s32 btf__find_by_name(const struct btf *btf,
 				   const char *type_name);
 LIBBPF_API __s32 btf__find_by_name_kind(const struct btf *btf,
 					const char *type_name, __u32 kind);
+LIBBPF_DEPRECATED_SINCE(0, 7, "use btf__type_cnt() instead; note that btf__get_nr_types() == btf__type_cnt() - 1")
+LIBBPF_API __u32 btf__get_nr_types(const struct btf *btf);
 LIBBPF_API __u32 btf__type_cnt(const struct btf *btf);
 LIBBPF_API const struct btf *btf__base_btf(const struct btf *btf);
 LIBBPF_API const struct btf_type *btf__type_by_id(const struct btf *btf,
@@ -160,13 +147,32 @@ 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_DEPRECATED_SINCE(0, 7, "use btf__raw_data() instead")
+LIBBPF_API const void *btf__get_raw_data(const struct btf *btf, __u32 *size);
 LIBBPF_API const void *btf__raw_data(const struct btf *btf, __u32 *size);
 LIBBPF_API const char *btf__name_by_offset(const struct btf *btf, __u32 offset);
 LIBBPF_API const char *btf__str_by_offset(const struct btf *btf, __u32 offset);
+LIBBPF_API int btf__get_map_kv_tids(const struct btf *btf, const char *map_name,
+				    __u32 expected_key_size,
+				    __u32 expected_value_size,
+				    __u32 *key_type_id, __u32 *value_type_id);

-LIBBPF_API struct btf_ext *btf_ext__new(const __u8 *data, __u32 size);
+LIBBPF_API struct btf_ext *btf_ext__new(__u8 *data, __u32 size);
 LIBBPF_API void btf_ext__free(struct btf_ext *btf_ext);
-LIBBPF_API const void *btf_ext__raw_data(const struct btf_ext *btf_ext, __u32 *size);
+LIBBPF_API const void *btf_ext__get_raw_data(const struct btf_ext *btf_ext,
+					     __u32 *size);
+LIBBPF_API LIBBPF_DEPRECATED("btf_ext__reloc_func_info was never meant as a public API and has wrong assumptions embedded in it; it will be removed in the future libbpf versions")
+int btf_ext__reloc_func_info(const struct btf *btf,
+			     const struct btf_ext *btf_ext,
+			     const char *sec_name, __u32 insns_cnt,
+			     void **func_info, __u32 *cnt);
+LIBBPF_API LIBBPF_DEPRECATED("btf_ext__reloc_line_info was never meant as a public API and has wrong assumptions embedded in it; it will be removed in the future libbpf versions")
+int btf_ext__reloc_line_info(const struct btf *btf,
+			     const struct btf_ext *btf_ext,
+			     const char *sec_name, __u32 insns_cnt,
+			     void **line_info, __u32 *cnt);
+LIBBPF_API __u32 btf_ext__func_info_rec_size(const struct btf_ext *btf_ext);
+LIBBPF_API __u32 btf_ext__line_info_rec_size(const struct btf_ext *btf_ext);

 LIBBPF_API int btf__find_str(struct btf *btf, const char *s);
 LIBBPF_API int btf__add_str(struct btf *btf, const char *s);
@@ -209,8 +215,6 @@ LIBBPF_API int btf__add_field(struct btf *btf, const char *name, int field_type_
 /* enum construction APIs */
 LIBBPF_API int btf__add_enum(struct btf *btf, const char *name, __u32 bytes_sz);
 LIBBPF_API int btf__add_enum_value(struct btf *btf, const char *name, __s64 value);
-LIBBPF_API int btf__add_enum64(struct btf *btf, const char *name, __u32 bytes_sz, bool is_signed);
-LIBBPF_API int btf__add_enum64_value(struct btf *btf, const char *name, __u64 value);

 enum btf_fwd_kind {
 	BTF_FWD_STRUCT = 0,
@@ -223,7 +227,6 @@ LIBBPF_API int btf__add_typedef(struct btf *btf, const char *name, int ref_type_
 LIBBPF_API int btf__add_volatile(struct btf *btf, int ref_type_id);
 LIBBPF_API int btf__add_const(struct btf *btf, int ref_type_id);
 LIBBPF_API int btf__add_restrict(struct btf *btf, int ref_type_id);
-LIBBPF_API int btf__add_type_tag(struct btf *btf, const char *value, int ref_type_id);

 /* func and func_proto construction APIs */
 LIBBPF_API int btf__add_func(struct btf *btf, const char *name,
@@ -242,45 +245,25 @@ LIBBPF_API int btf__add_decl_tag(struct btf *btf, const char *value, int ref_typ
 			    int component_idx);

 struct btf_dedup_opts {
-	size_t sz;
-	/* optional .BTF.ext info to dedup along the main BTF info */
-	struct btf_ext *btf_ext;
-	/* force hash collisions (used for testing) */
-	bool force_collisions;
-	size_t :0;
+	unsigned int dedup_table_size;
+	bool dont_resolve_fwds;
 };
-#define btf_dedup_opts__last_field force_collisions

-LIBBPF_API int btf__dedup(struct btf *btf, const struct btf_dedup_opts *opts);
-
-/**
- * @brief **btf__relocate()** will check the split BTF *btf* for references
- * to base BTF kinds, and verify those references are compatible with
- * *base_btf*; if they are, *btf* is adjusted such that is re-parented to
- * *base_btf* and type ids and strings are adjusted to accommodate this.
- *
- * If successful, 0 is returned and **btf** now has **base_btf** as its
- * base.
- *
- * A negative value is returned on error and the thread-local `errno` variable
- * is set to the error code as well.
- */
-LIBBPF_API int btf__relocate(struct btf *btf, const struct btf *base_btf);
+LIBBPF_API int btf__dedup(struct btf *btf, struct btf_ext *btf_ext,
+			  const struct btf_dedup_opts *opts);

 struct btf_dump;

 struct btf_dump_opts {
-	size_t sz;
+	void *ctx;
 };
-#define btf_dump_opts__last_field sz

 typedef void (*btf_dump_printf_fn_t)(void *ctx, const char *fmt, va_list args);

 LIBBPF_API struct btf_dump *btf_dump__new(const struct btf *btf,
-					  btf_dump_printf_fn_t printf_fn,
-					  void *ctx,
-					  const struct btf_dump_opts *opts);
-
+					  const struct btf_ext *btf_ext,
+					  const struct btf_dump_opts *opts,
+					  btf_dump_printf_fn_t printf_fn);
 LIBBPF_API void btf_dump__free(struct btf_dump *d);

 LIBBPF_API int btf_dump__dump_type(struct btf_dump *d, __u32 id);
@@ -330,29 +313,8 @@ btf_dump__dump_type_data(struct btf_dump *d, __u32 id,
 			 const struct btf_dump_type_data_opts *opts);

 /*
- * A set of helpers for easier BTF types handling.
- *
- * The inline functions below rely on constants from the kernel headers which
- * may not be available for applications including this header file. To avoid
- * compilation errors, we define all the constants here that were added after
- * the initial introduction of the BTF_KIND* constants.
+ * A set of helpers for easier BTF types handling
 */
-#ifndef BTF_KIND_FUNC
-#define BTF_KIND_FUNC		12	/* Function	*/
-#define BTF_KIND_FUNC_PROTO	13	/* Function Proto	*/
-#endif
-#ifndef BTF_KIND_VAR
-#define BTF_KIND_VAR		14	/* Variable	*/
-#define BTF_KIND_DATASEC	15	/* Section	*/
-#endif
-#ifndef BTF_KIND_FLOAT
-#define BTF_KIND_FLOAT		16	/* Floating point	*/
-#endif
-/* The kernel header switched to enums, so the following were never #defined */
-#define BTF_KIND_DECL_TAG	17	/* Decl Tag */
-#define BTF_KIND_TYPE_TAG	18	/* Type Tag */
-#define BTF_KIND_ENUM64		19	/* Enum for up-to 64bit values */
-
 static inline __u16 btf_kind(const struct btf_type *t)
 {
 	return BTF_INFO_KIND(t->info);
@@ -410,11 +372,6 @@ static inline bool btf_is_enum(const struct btf_type *t)
 	return btf_kind(t) == BTF_KIND_ENUM;
 }

-static inline bool btf_is_enum64(const struct btf_type *t)
-{
-	return btf_kind(t) == BTF_KIND_ENUM64;
-}
-
 static inline bool btf_is_fwd(const struct btf_type *t)
 {
 	return btf_kind(t) == BTF_KIND_FWD;
@@ -446,8 +403,7 @@ static inline bool btf_is_mod(const struct btf_type *t)

 	return kind == BTF_KIND_VOLATILE ||
 	       kind == BTF_KIND_CONST ||
-	       kind == BTF_KIND_RESTRICT ||
-	       kind == BTF_KIND_TYPE_TAG;
+	       kind == BTF_KIND_RESTRICT;
 }

 static inline bool btf_is_func(const struct btf_type *t)
@@ -480,23 +436,6 @@ static inline bool btf_is_decl_tag(const struct btf_type *t)
 	return btf_kind(t) == BTF_KIND_DECL_TAG;
 }

-static inline bool btf_is_type_tag(const struct btf_type *t)
-{
-	return btf_kind(t) == BTF_KIND_TYPE_TAG;
-}
-
-static inline bool btf_is_any_enum(const struct btf_type *t)
-{
-	return btf_is_enum(t) || btf_is_enum64(t);
-}
-
-static inline bool btf_kind_core_compat(const struct btf_type *t1,
-					const struct btf_type *t2)
-{
-	return btf_kind(t1) == btf_kind(t2) ||
-	       (btf_is_any_enum(t1) && btf_is_any_enum(t2));
-}
-
 static inline __u8 btf_int_encoding(const struct btf_type *t)
 {
 	return BTF_INT_ENCODING(*(__u32 *)(t + 1));
@@ -522,39 +461,6 @@ static inline struct btf_enum *btf_enum(const struct btf_type *t)
 	return (struct btf_enum *)(t + 1);
 }

-struct btf_enum64;
-
-static inline struct btf_enum64 *btf_enum64(const struct btf_type *t)
-{
-	return (struct btf_enum64 *)(t + 1);
-}
-
-static inline __u64 btf_enum64_value(const struct btf_enum64 *e)
-{
-	/* struct btf_enum64 is introduced in Linux 6.0, which is very
-	 * bleeding-edge. Here we are avoiding relying on struct btf_enum64
-	 * definition coming from kernel UAPI headers to support wider range
-	 * of system-wide kernel headers.
-	 *
-	 * Given this header can be also included from C++ applications, that
-	 * further restricts C tricks we can use (like using compatible
-	 * anonymous struct). So just treat struct btf_enum64 as
-	 * a three-element array of u32 and access second (lo32) and third
-	 * (hi32) elements directly.
-	 *
-	 * For reference, here is a struct btf_enum64 definition:
-	 *
-	 * const struct btf_enum64 {
-	 *	__u32	name_off;
-	 *	__u32	val_lo32;
-	 *	__u32	val_hi32;
-	 * };
-	 */
-	const __u32 *e64 = (const __u32 *)e;
-
-	return ((__u64)e64[2] << 32) | e64[1];
-}
-
 static inline struct btf_member *btf_members(const struct btf_type *t)
 {
 	return (struct btf_member *)(t + 1);
--- a/src/btf_dump.c
+++ b/src/btf_dump.c
@@ -13,7 +13,6 @@
 #include <ctype.h>
 #include <endian.h>
 #include <errno.h>
-#include <limits.h>
 #include <linux/err.h>
 #include <linux/btf.h>
 #include <linux/kernel.h>
@@ -78,8 +77,9 @@ struct btf_dump_data {

 struct btf_dump {
 	const struct btf *btf;
+	const struct btf_ext *btf_ext;
 	btf_dump_printf_fn_t printf_fn;
-	void *cb_ctx;
+	struct btf_dump_opts opts;
 	int ptr_sz;
 	bool strip_mods;
 	bool skip_anon_defs;
@@ -118,14 +118,14 @@ struct btf_dump {
 	struct btf_dump_data *typed_dump;
 };

-static size_t str_hash_fn(long key, void *ctx)
+static size_t str_hash_fn(const void *key, void *ctx)
 {
-	return str_hash((void *)key);
+	return str_hash(key);
 }

-static bool str_equal_fn(long a, long b, void *ctx)
+static bool str_equal_fn(const void *a, const void *b, void *ctx)
 {
-	return strcmp((void *)a, (void *)b) == 0;
+	return strcmp(a, b) == 0;
 }

 static const char *btf_name_of(const struct btf_dump *d, __u32 name_off)
@@ -138,7 +138,7 @@ static void btf_dump_printf(const struct btf_dump *d, const char *fmt, ...)
 	va_list args;

 	va_start(args, fmt);
-	d->printf_fn(d->cb_ctx, fmt, args);
+	d->printf_fn(d->opts.ctx, fmt, args);
 	va_end(args);
 }

@@ -146,26 +146,21 @@ static int btf_dump_mark_referenced(struct btf_dump *d);
 static int btf_dump_resize(struct btf_dump *d);

 struct btf_dump *btf_dump__new(const struct btf *btf,
-			       btf_dump_printf_fn_t printf_fn,
-			       void *ctx,
-			       const struct btf_dump_opts *opts)
+			       const struct btf_ext *btf_ext,
+			       const struct btf_dump_opts *opts,
+			       btf_dump_printf_fn_t printf_fn)
 {
 	struct btf_dump *d;
 	int err;

-	if (!OPTS_VALID(opts, btf_dump_opts))
-		return libbpf_err_ptr(-EINVAL);
-
-	if (!printf_fn)
-		return libbpf_err_ptr(-EINVAL);
-
 	d = calloc(1, sizeof(struct btf_dump));
 	if (!d)
 		return libbpf_err_ptr(-ENOMEM);

 	d->btf = btf;
+	d->btf_ext = btf_ext;
 	d->printf_fn = printf_fn;
-	d->cb_ctx = ctx;
+	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);
@@ -220,17 +215,6 @@ static int btf_dump_resize(struct btf_dump *d)
 	return 0;
 }

-static void btf_dump_free_names(struct hashmap *map)
-{
-	size_t bkt;
-	struct hashmap_entry *cur;
-
-	hashmap__for_each_entry(map, cur, bkt)
-		free((void *)cur->pkey);
-
-	hashmap__free(map);
-}
-
 void btf_dump__free(struct btf_dump *d)
 {
 	int i;
@@ -249,8 +233,8 @@ void btf_dump__free(struct btf_dump *d)
 	free(d->cached_names);
 	free(d->emit_queue);
 	free(d->decl_stack);
-	btf_dump_free_names(d->type_names);
-	btf_dump_free_names(d->ident_names);
+	hashmap__free(d->type_names);
+	hashmap__free(d->ident_names);

 	free(d);
 }
@@ -321,7 +305,6 @@ static int btf_dump_mark_referenced(struct btf_dump *d)
 		switch (btf_kind(t)) {
 		case BTF_KIND_INT:
 		case BTF_KIND_ENUM:
-		case BTF_KIND_ENUM64:
 		case BTF_KIND_FWD:
 		case BTF_KIND_FLOAT:
 			break;
@@ -334,7 +317,6 @@ static int btf_dump_mark_referenced(struct btf_dump *d)
 		case BTF_KIND_FUNC:
 		case BTF_KIND_VAR:
 		case BTF_KIND_DECL_TAG:
-		case BTF_KIND_TYPE_TAG:
 			d->type_states[t->type].referenced = 1;
 			break;

@@ -542,7 +524,6 @@ static int btf_dump_order_type(struct btf_dump *d, __u32 id, bool through_ptr)
 		return 1;
 	}
 	case BTF_KIND_ENUM:
-	case BTF_KIND_ENUM64:
 	case BTF_KIND_FWD:
 		/*
 		 * non-anonymous or non-referenced enums are top-level
@@ -579,7 +560,6 @@ static int btf_dump_order_type(struct btf_dump *d, __u32 id, bool through_ptr)
 	case BTF_KIND_VOLATILE:
 	case BTF_KIND_CONST:
 	case BTF_KIND_RESTRICT:
-	case BTF_KIND_TYPE_TAG:
 		return btf_dump_order_type(d, t->type, through_ptr);

 	case BTF_KIND_FUNC_PROTO: {
@@ -744,7 +724,6 @@ static void btf_dump_emit_type(struct btf_dump *d, __u32 id, __u32 cont_id)
 		tstate->emit_state = EMITTED;
 		break;
 	case BTF_KIND_ENUM:
-	case BTF_KIND_ENUM64:
 		if (top_level_def) {
 			btf_dump_emit_enum_def(d, id, t, 0);
 			btf_dump_printf(d, ";\n\n");
@@ -755,7 +734,6 @@ static void btf_dump_emit_type(struct btf_dump *d, __u32 id, __u32 cont_id)
 	case BTF_KIND_VOLATILE:
 	case BTF_KIND_CONST:
 	case BTF_KIND_RESTRICT:
-	case BTF_KIND_TYPE_TAG:
 		btf_dump_emit_type(d, t->type, cont_id);
 		break;
 	case BTF_KIND_ARRAY:
@@ -834,9 +812,14 @@ static bool btf_is_struct_packed(const struct btf *btf, __u32 id,
 				 const struct btf_type *t)
 {
 	const struct btf_member *m;
-	int max_align = 1, align, i, bit_sz;
+	int align, i, bit_sz;
 	__u16 vlen;

+	align = btf__align_of(btf, id);
+	/* size of a non-packed struct has to be a multiple of its alignment*/
+	if (align && t->size % align)
+		return true;
+
 	m = btf_members(t);
 	vlen = btf_vlen(t);
 	/* all non-bitfield fields have to be naturally aligned */
@@ -845,11 +828,8 @@ static bool btf_is_struct_packed(const struct btf *btf, __u32 id,
 		bit_sz = btf_member_bitfield_size(t, i);
 		if (align && bit_sz == 0 && m->offset % (8 * align) != 0)
 			return true;
-		max_align = max(align, max_align);
 	}
-	/* size of a non-packed struct has to be a multiple of its alignment */
-	if (t->size % max_align != 0)
-		return true;
+
 	/*
 	 * if original struct was marked as packed, but its layout is
 	 * naturally aligned, we'll detect that it's not packed
@@ -857,97 +837,44 @@ static bool btf_is_struct_packed(const struct btf *btf, __u32 id,
 	return false;
 }

-static void btf_dump_emit_bit_padding(const struct btf_dump *d,
-				      int cur_off, int next_off, int next_align,
-				      bool in_bitfield, int lvl)
+static int chip_away_bits(int total, int at_most)
 {
-	const struct {
-		const char *name;
-		int bits;
-	} pads[] = {
-		{"long", d->ptr_sz * 8}, {"int", 32}, {"short", 16}, {"char", 8}
-	};
-	int new_off, pad_bits, bits, i;
-	const char *pad_type;
+	return total % at_most ? : at_most;
+}

-	if (cur_off >= next_off)
-		return; /* no gap */
+static void btf_dump_emit_bit_padding(const struct btf_dump *d,
+				      int cur_off, int m_off, int m_bit_sz,
+				      int align, int lvl)
+{
+	int off_diff = m_off - cur_off;
+	int ptr_bits = d->ptr_sz * 8;

-	/* For filling out padding we want to take advantage of
-	 * natural alignment rules to minimize unnecessary explicit
-	 * padding. First, we find the largest type (among long, int,
-	 * short, or char) that can be used to force naturally aligned
-	 * boundary. Once determined, we'll use such type to fill in
-	 * the remaining padding gap. In some cases we can rely on
-	 * compiler filling some gaps, but sometimes we need to force
-	 * alignment to close natural alignment with markers like
-	 * `long: 0` (this is always the case for bitfields).  Note
-	 * that even if struct itself has, let's say 4-byte alignment
-	 * (i.e., it only uses up to int-aligned types), using `long:
-	 * X;` explicit padding doesn't actually change struct's
-	 * overall alignment requirements, but compiler does take into
-	 * account that type's (long, in this example) natural
-	 * alignment requirements when adding implicit padding. We use
-	 * this fact heavily and don't worry about ruining correct
-	 * struct alignment requirement.
-	 */
-	for (i = 0; i < ARRAY_SIZE(pads); i++) {
-		pad_bits = pads[i].bits;
-		pad_type = pads[i].name;
+	if (off_diff <= 0)
+		/* no gap */
+		return;
+	if (m_bit_sz == 0 && off_diff < align * 8)
+		/* natural padding will take care of a gap */
+		return;

-		new_off = roundup(cur_off, pad_bits);
-		if (new_off <= next_off)
-			break;
-	}
+	while (off_diff > 0) {
+		const char *pad_type;
+		int pad_bits;

-	if (new_off > cur_off && new_off <= next_off) {
-		/* We need explicit `<type>: 0` aligning mark if next
-		 * field is right on alignment offset and its
-		 * alignment requirement is less strict than <type>'s
-		 * alignment (so compiler won't naturally align to the
-		 * offset we expect), or if subsequent `<type>: X`,
-		 * will actually completely fit in the remaining hole,
-		 * making compiler basically ignore `<type>: X`
-		 * completely.
-		 */
-		if (in_bitfield ||
-		    (new_off == next_off && roundup(cur_off, next_align * 8) != new_off) ||
-		    (new_off != next_off && next_off - new_off <= new_off - cur_off))
-			/* but for bitfields we'll emit explicit bit count */
-			btf_dump_printf(d, "\n%s%s: %d;", pfx(lvl), pad_type,
-					in_bitfield ? new_off - cur_off : 0);
-		cur_off = new_off;
-	}
-
-	/* Now we know we start at naturally aligned offset for a chosen
-	 * padding type (long, int, short, or char), and so the rest is just
-	 * a straightforward filling of remaining padding gap with full
-	 * `<type>: sizeof(<type>);` markers, except for the last one, which
-	 * might need smaller than sizeof(<type>) padding.
-	 */
-	while (cur_off != next_off) {
-		bits = min(next_off - cur_off, pad_bits);
-		if (bits == pad_bits) {
-			btf_dump_printf(d, "\n%s%s: %d;", pfx(lvl), pad_type, pad_bits);
-			cur_off += bits;
-			continue;
-		}
-		/* For the remainder padding that doesn't cover entire
-		 * pad_type bit length, we pick the smallest necessary type.
-		 * This is pure aesthetics, we could have just used `long`,
-		 * but having smallest necessary one communicates better the
-		 * scale of the padding gap.
-		 */
-		for (i = ARRAY_SIZE(pads) - 1; i >= 0; i--) {
-			pad_type = pads[i].name;
-			pad_bits = pads[i].bits;
-			if (pad_bits < bits)
-				continue;
-
-			btf_dump_printf(d, "\n%s%s: %d;", pfx(lvl), pad_type, bits);
-			cur_off += bits;
-			break;
+		if (ptr_bits > 32 && off_diff > 32) {
+			pad_type = "long";
+			pad_bits = chip_away_bits(off_diff, ptr_bits);
+		} else if (off_diff > 16) {
+			pad_type = "int";
+			pad_bits = chip_away_bits(off_diff, 32);
+		} else if (off_diff > 8) {
+			pad_type = "short";
+			pad_bits = chip_away_bits(off_diff, 16);
+		} else {
+			pad_type = "char";
+			pad_bits = chip_away_bits(off_diff, 8);
 		}
+		btf_dump_printf(d, "\n%s%s: %d;", pfx(lvl), pad_type, pad_bits);
+		off_diff -= pad_bits;
 	}
 }

@@ -967,11 +894,9 @@ static void btf_dump_emit_struct_def(struct btf_dump *d,
 {
 	const struct btf_member *m = btf_members(t);
 	bool is_struct = btf_is_struct(t);
-	bool packed, prev_bitfield = false;
-	int align, i, off = 0;
+	int align, i, packed, off = 0;
 	__u16 vlen = btf_vlen(t);

-	align = btf__align_of(d->btf, id);
 	packed = is_struct ? btf_is_struct_packed(d->btf, id, t) : 0;

 	btf_dump_printf(d, "%s%s%s {",
@@ -981,47 +906,37 @@ static void btf_dump_emit_struct_def(struct btf_dump *d,

 	for (i = 0; i < vlen; i++, m++) {
 		const char *fname;
-		int m_off, m_sz, m_align;
-		bool in_bitfield;
+		int m_off, m_sz;

 		fname = btf_name_of(d, m->name_off);
 		m_sz = btf_member_bitfield_size(t, i);
 		m_off = btf_member_bit_offset(t, i);
-		m_align = packed ? 1 : btf__align_of(d->btf, m->type);
+		align = packed ? 1 : btf__align_of(d->btf, m->type);

-		in_bitfield = prev_bitfield && m_sz != 0;
-
-		btf_dump_emit_bit_padding(d, off, m_off, m_align, in_bitfield, lvl + 1);
+		btf_dump_emit_bit_padding(d, off, m_off, m_sz, align, lvl + 1);
 		btf_dump_printf(d, "\n%s", pfx(lvl + 1));
 		btf_dump_emit_type_decl(d, m->type, fname, lvl + 1);

 		if (m_sz) {
 			btf_dump_printf(d, ": %d", m_sz);
 			off = m_off + m_sz;
-			prev_bitfield = true;
 		} else {
 			m_sz = max((__s64)0, btf__resolve_size(d->btf, m->type));
 			off = m_off + m_sz * 8;
-			prev_bitfield = false;
 		}
-
 		btf_dump_printf(d, ";");
 	}

 	/* pad at the end, if necessary */
-	if (is_struct)
-		btf_dump_emit_bit_padding(d, off, t->size * 8, align, false, lvl + 1);
-
-	/*
-	 * Keep `struct empty {}` on a single line,
-	 * only print newline when there are regular or padding fields.
-	 */
-	if (vlen || t->size) {
-		btf_dump_printf(d, "\n");
-		btf_dump_printf(d, "%s}", pfx(lvl));
-	} else {
-		btf_dump_printf(d, "}");
+	if (is_struct) {
+		align = packed ? 1 : btf__align_of(d->btf, id);
+		btf_dump_emit_bit_padding(d, off, t->size * 8, 0, align,
+					  lvl + 1);
 	}
+
+	if (vlen)
+		btf_dump_printf(d, "\n");
+	btf_dump_printf(d, "%s}", pfx(lvl));
 	if (packed)
 		btf_dump_printf(d, " __attribute__((packed))");
 }
@@ -1058,118 +973,38 @@ static void btf_dump_emit_enum_fwd(struct btf_dump *d, __u32 id,
 	btf_dump_printf(d, "enum %s", btf_dump_type_name(d, id));
 }

-static void btf_dump_emit_enum32_val(struct btf_dump *d,
-				     const struct btf_type *t,
-				     int lvl, __u16 vlen)
-{
-	const struct btf_enum *v = btf_enum(t);
-	bool is_signed = btf_kflag(t);
-	const char *fmt_str;
-	const char *name;
-	size_t dup_cnt;
-	int i;
-
-	for (i = 0; i < vlen; i++, v++) {
-		name = btf_name_of(d, v->name_off);
-		/* enumerators share namespace with typedef idents */
-		dup_cnt = btf_dump_name_dups(d, d->ident_names, name);
-		if (dup_cnt > 1) {
-			fmt_str = is_signed ? "\n%s%s___%zd = %d," : "\n%s%s___%zd = %u,";
-			btf_dump_printf(d, fmt_str, pfx(lvl + 1), name, dup_cnt, v->val);
-		} else {
-			fmt_str = is_signed ? "\n%s%s = %d," : "\n%s%s = %u,";
-			btf_dump_printf(d, fmt_str, pfx(lvl + 1), name, v->val);
-		}
-	}
-}
-
-static void btf_dump_emit_enum64_val(struct btf_dump *d,
-				     const struct btf_type *t,
-				     int lvl, __u16 vlen)
-{
-	const struct btf_enum64 *v = btf_enum64(t);
-	bool is_signed = btf_kflag(t);
-	const char *fmt_str;
-	const char *name;
-	size_t dup_cnt;
-	__u64 val;
-	int i;
-
-	for (i = 0; i < vlen; i++, v++) {
-		name = btf_name_of(d, v->name_off);
-		dup_cnt = btf_dump_name_dups(d, d->ident_names, name);
-		val = btf_enum64_value(v);
-		if (dup_cnt > 1) {
-			fmt_str = is_signed ? "\n%s%s___%zd = %lldLL,"
-					    : "\n%s%s___%zd = %lluULL,";
-			btf_dump_printf(d, fmt_str,
-					pfx(lvl + 1), name, dup_cnt,
-					(unsigned long long)val);
-		} else {
-			fmt_str = is_signed ? "\n%s%s = %lldLL,"
-					    : "\n%s%s = %lluULL,";
-			btf_dump_printf(d, fmt_str,
-					pfx(lvl + 1), name,
-					(unsigned long long)val);
-		}
-	}
-}
 static void btf_dump_emit_enum_def(struct btf_dump *d, __u32 id,
 				   const struct btf_type *t,
 				   int lvl)
 {
+	const struct btf_enum *v = btf_enum(t);
 	__u16 vlen = btf_vlen(t);
+	const char *name;
+	size_t dup_cnt;
+	int i;

 	btf_dump_printf(d, "enum%s%s",
 			t->name_off ? " " : "",
 			btf_dump_type_name(d, id));

-	if (!vlen)
-		return;
-
-	btf_dump_printf(d, " {");
-	if (btf_is_enum(t))
-		btf_dump_emit_enum32_val(d, t, lvl, vlen);
-	else
-		btf_dump_emit_enum64_val(d, t, lvl, vlen);
-	btf_dump_printf(d, "\n%s}", pfx(lvl));
-
-	/* special case enums with special sizes */
-	if (t->size == 1) {
-		/* one-byte enums can be forced with mode(byte) attribute */
-		btf_dump_printf(d, " __attribute__((mode(byte)))");
-	} else if (t->size == 8 && d->ptr_sz == 8) {
-		/* enum can be 8-byte sized if one of the enumerator values
-		 * doesn't fit in 32-bit integer, or by adding mode(word)
-		 * attribute (but probably only on 64-bit architectures); do
-		 * our best here to try to satisfy the contract without adding
-		 * unnecessary attributes
-		 */
-		bool needs_word_mode;
-
-		if (btf_is_enum(t)) {
-			/* enum can't represent 64-bit values, so we need word mode */
-			needs_word_mode = true;
-		} else {
-			/* enum64 needs mode(word) if none of its values has
-			 * non-zero upper 32-bits (which means that all values
-			 * fit in 32-bit integers and won't cause compiler to
-			 * bump enum to be 64-bit naturally
-			 */
-			int i;
-
-			needs_word_mode = true;
-			for (i = 0; i < vlen; i++) {
-				if (btf_enum64(t)[i].val_hi32 != 0) {
-					needs_word_mode = false;
-					break;
-				}
+	if (vlen) {
+		btf_dump_printf(d, " {");
+		for (i = 0; i < vlen; i++, v++) {
+			name = btf_name_of(d, v->name_off);
+			/* enumerators share namespace with typedef idents */
+			dup_cnt = btf_dump_name_dups(d, d->ident_names, name);
+			if (dup_cnt > 1) {
+				btf_dump_printf(d, "\n%s%s___%zu = %u,",
+						pfx(lvl + 1), name, dup_cnt,
+						(__u32)v->val);
+			} else {
+				btf_dump_printf(d, "\n%s%s = %u,",
+						pfx(lvl + 1), name,
+						(__u32)v->val);
 			}
 		}
-		if (needs_word_mode)
-			btf_dump_printf(d, " __attribute__((mode(word)))");
+		btf_dump_printf(d, "\n%s}", pfx(lvl));
 	}
-
 }

 static void btf_dump_emit_fwd_def(struct btf_dump *d, __u32 id,
@@ -1319,7 +1154,6 @@ skip_mod:
 		case BTF_KIND_CONST:
 		case BTF_KIND_RESTRICT:
 		case BTF_KIND_FUNC_PROTO:
-		case BTF_KIND_TYPE_TAG:
 			id = t->type;
 			break;
 		case BTF_KIND_ARRAY:
@@ -1327,7 +1161,6 @@ skip_mod:
 			break;
 		case BTF_KIND_INT:
 		case BTF_KIND_ENUM:
-		case BTF_KIND_ENUM64:
 		case BTF_KIND_FWD:
 		case BTF_KIND_STRUCT:
 		case BTF_KIND_UNION:
@@ -1462,7 +1295,6 @@ static void btf_dump_emit_type_chain(struct btf_dump *d,
 				btf_dump_emit_struct_fwd(d, id, t);
 			break;
 		case BTF_KIND_ENUM:
-		case BTF_KIND_ENUM64:
 			btf_dump_emit_mods(d, decls);
 			/* inline anonymous enum */
 			if (t->name_off == 0 && !d->skip_anon_defs)
@@ -1490,11 +1322,6 @@ static void btf_dump_emit_type_chain(struct btf_dump *d,
 		case BTF_KIND_RESTRICT:
 			btf_dump_printf(d, " restrict");
 			break;
-		case BTF_KIND_TYPE_TAG:
-			btf_dump_emit_mods(d, decls);
-			name = btf_name_of(d, t->name_off);
-			btf_dump_printf(d, " __attribute__((btf_type_tag(\"%s\")))", name);
-			break;
 		case BTF_KIND_ARRAY: {
 			const struct btf_array *a = btf_array(t);
 			const struct btf_type *next_t;
@@ -1632,22 +1459,11 @@ static void btf_dump_emit_type_cast(struct btf_dump *d, __u32 id,
 static size_t btf_dump_name_dups(struct btf_dump *d, struct hashmap *name_map,
 				 const char *orig_name)
 {
-	char *old_name, *new_name;
 	size_t dup_cnt = 0;
-	int err;

-	new_name = strdup(orig_name);
-	if (!new_name)
-		return 1;
-
-	(void)hashmap__find(name_map, orig_name, &dup_cnt);
+	hashmap__find(name_map, orig_name, (void **)&dup_cnt);
 	dup_cnt++;
-
-	err = hashmap__set(name_map, new_name, dup_cnt, &old_name, NULL);
-	if (err)
-		free(new_name);
-
-	free(old_name);
+	hashmap__set(name_map, orig_name, (void *)dup_cnt, NULL, NULL);

 	return dup_cnt;
 }
@@ -1667,11 +1483,6 @@ static const char *btf_dump_resolve_name(struct btf_dump *d, __u32 id,
 	if (s->name_resolved)
 		return *cached_name ? *cached_name : orig_name;

-	if (btf_is_fwd(t) || (btf_is_enum(t) && btf_vlen(t) == 0)) {
-		s->name_resolved = 1;
-		return orig_name;
-	}
-
 	dup_cnt = btf_dump_name_dups(d, name_map, orig_name);
 	if (dup_cnt > 1) {
 		const size_t max_len = 256;
@@ -1929,7 +1740,6 @@ static int btf_dump_int_data(struct btf_dump *d,
 			if (d->typed_dump->is_array_terminated)
 				break;
 			if (*(char *)data == '\0') {
-				btf_dump_type_values(d, "'\\0'");
 				d->typed_dump->is_array_terminated = true;
 				break;
 			}
@@ -2029,17 +1839,14 @@ static int btf_dump_array_data(struct btf_dump *d,
 {
 	const struct btf_array *array = btf_array(t);
 	const struct btf_type *elem_type;
-	__u32 i, elem_type_id;
-	__s64 elem_size;
+	__u32 i, elem_size = 0, elem_type_id;
 	bool is_array_member;
-	bool is_array_terminated;

 	elem_type_id = array->type;
 	elem_type = skip_mods_and_typedefs(d->btf, elem_type_id, NULL);
 	elem_size = btf__resolve_size(d->btf, elem_type_id);
 	if (elem_size <= 0) {
-		pr_warn("unexpected elem size %zd for array type [%u]\n",
-			(ssize_t)elem_size, id);
+		pr_warn("unexpected elem size %d for array type [%u]\n", elem_size, id);
 		return -EINVAL;
 	}

@@ -2068,15 +1875,12 @@ static int btf_dump_array_data(struct btf_dump *d,
 	 */
 	is_array_member = d->typed_dump->is_array_member;
 	d->typed_dump->is_array_member = true;
-	is_array_terminated = d->typed_dump->is_array_terminated;
-	d->typed_dump->is_array_terminated = false;
 	for (i = 0; i < array->nelems; i++, data += elem_size) {
 		if (d->typed_dump->is_array_terminated)
 			break;
 		btf_dump_dump_type_data(d, NULL, elem_type, elem_type_id, data, 0, 0);
 	}
 	d->typed_dump->is_array_member = is_array_member;
-	d->typed_dump->is_array_terminated = is_array_terminated;
 	d->typed_dump->depth--;
 	btf_dump_data_pfx(d);
 	btf_dump_type_values(d, "]");
@@ -2091,7 +1895,7 @@ static int btf_dump_struct_data(struct btf_dump *d,
 {
 	const struct btf_member *m = btf_members(t);
 	__u16 n = btf_vlen(t);
-	int i, err = 0;
+	int i, err;

 	/* note that we increment depth before calling btf_dump_print() below;
 	 * this is intentional.  btf_dump_data_newline() will not print a
@@ -2155,8 +1959,7 @@ static int btf_dump_get_enum_value(struct btf_dump *d,
 				   __u32 id,
 				   __s64 *value)
 {
-	bool is_signed = btf_kflag(t);
-
+	/* handle unaligned enum value */
 	if (!ptr_is_aligned(d->btf, id, data)) {
 		__u64 val;
 		int err;
@@ -2173,13 +1976,13 @@ static int btf_dump_get_enum_value(struct btf_dump *d,
 		*value = *(__s64 *)data;
 		return 0;
 	case 4:
-		*value = is_signed ? (__s64)*(__s32 *)data : *(__u32 *)data;
+		*value = *(__s32 *)data;
 		return 0;
 	case 2:
-		*value = is_signed ? *(__s16 *)data : *(__u16 *)data;
+		*value = *(__s16 *)data;
 		return 0;
 	case 1:
-		*value = is_signed ? *(__s8 *)data : *(__u8 *)data;
+		*value = *(__s8 *)data;
 		return 0;
 	default:
 		pr_warn("unexpected size %d for enum, id:[%u]\n", t->size, id);
@@ -2192,7 +1995,7 @@ static int btf_dump_enum_data(struct btf_dump *d,
 			      __u32 id,
 			      const void *data)
 {
-	bool is_signed;
+	const struct btf_enum *e;
 	__s64 value;
 	int i, err;

@@ -2200,31 +2003,14 @@ static int btf_dump_enum_data(struct btf_dump *d,
 	if (err)
 		return err;

-	is_signed = btf_kflag(t);
-	if (btf_is_enum(t)) {
-		const struct btf_enum *e;
-
-		for (i = 0, e = btf_enum(t); i < btf_vlen(t); i++, e++) {
-			if (value != e->val)
-				continue;
-			btf_dump_type_values(d, "%s", btf_name_of(d, e->name_off));
-			return 0;
-		}
-
-		btf_dump_type_values(d, is_signed ? "%d" : "%u", value);
-	} else {
-		const struct btf_enum64 *e;
-
-		for (i = 0, e = btf_enum64(t); i < btf_vlen(t); i++, e++) {
-			if (value != btf_enum64_value(e))
-				continue;
-			btf_dump_type_values(d, "%s", btf_name_of(d, e->name_off));
-			return 0;
-		}
-
-		btf_dump_type_values(d, is_signed ? "%lldLL" : "%lluULL",
-				     (unsigned long long)value);
+	for (i = 0, e = btf_enum(t); i < btf_vlen(t); i++, e++) {
+		if (value != e->val)
+			continue;
+		btf_dump_type_values(d, "%s", btf_name_of(d, e->name_off));
+		return 0;
 	}
+
+	btf_dump_type_values(d, "%d", value);
 	return 0;
 }

@@ -2255,25 +2041,9 @@ static int btf_dump_type_data_check_overflow(struct btf_dump *d,
 					     const struct btf_type *t,
 					     __u32 id,
 					     const void *data,
-					     __u8 bits_offset,
-					     __u8 bit_sz)
+					     __u8 bits_offset)
 {
-	__s64 size;
-
-	if (bit_sz) {
-		/* bits_offset is at most 7. bit_sz is at most 128. */
-		__u8 nr_bytes = (bits_offset + bit_sz + 7) / 8;
-
-		/* When bit_sz is non zero, it is called from
-		 * btf_dump_struct_data() where it only cares about
-		 * negative error value.
-		 * Return nr_bytes in success case to make it
-		 * consistent as the regular integer case below.
-		 */
-		return data + nr_bytes > d->typed_dump->data_end ? -E2BIG : nr_bytes;
-	}
-
-	size = btf__resolve_size(d->btf, id);
+	__s64 size = btf__resolve_size(d->btf, id);

 	if (size < 0 || size >= INT_MAX) {
 		pr_warn("unexpected size [%zu] for id [%u]\n",
@@ -2300,7 +2070,6 @@ static int btf_dump_type_data_check_overflow(struct btf_dump *d,
 	case BTF_KIND_FLOAT:
 	case BTF_KIND_PTR:
 	case BTF_KIND_ENUM:
-	case BTF_KIND_ENUM64:
 		if (data + bits_offset / 8 + size > d->typed_dump->data_end)
 			return -E2BIG;
 		break;
@@ -2405,7 +2174,6 @@ static int btf_dump_type_data_check_zero(struct btf_dump *d,
 		return -ENODATA;
 	}
 	case BTF_KIND_ENUM:
-	case BTF_KIND_ENUM64:
 		err = btf_dump_get_enum_value(d, t, data, id, &value);
 		if (err)
 			return err;
@@ -2426,9 +2194,9 @@ static int btf_dump_dump_type_data(struct btf_dump *d,
 				   __u8 bits_offset,
 				   __u8 bit_sz)
 {
-	int size, err = 0;
+	int size, err;

-	size = btf_dump_type_data_check_overflow(d, t, id, data, bits_offset, bit_sz);
+	size = btf_dump_type_data_check_overflow(d, t, id, data, bits_offset);
 	if (size < 0)
 		return size;
 	err = btf_dump_type_data_check_zero(d, t, id, data, bits_offset, bit_sz);
@@ -2478,7 +2246,6 @@ static int btf_dump_dump_type_data(struct btf_dump *d,
 		err = btf_dump_struct_data(d, t, id, data);
 		break;
 	case BTF_KIND_ENUM:
-	case BTF_KIND_ENUM64:
 		/* handle bitfield and int enum values */
 		if (bit_sz) {
 			__u64 print_num;
@@ -2529,11 +2296,11 @@ int btf_dump__dump_type_data(struct btf_dump *d, __u32 id,
 	d->typed_dump->indent_lvl = OPTS_GET(opts, indent_level, 0);

 	/* default indent string is a tab */
-	if (!OPTS_GET(opts, indent_str, NULL))
+	if (!opts->indent_str)
 		d->typed_dump->indent_str[0] = '\t';
 	else
-		libbpf_strlcpy(d->typed_dump->indent_str, opts->indent_str,
-			       sizeof(d->typed_dump->indent_str));
+		strncat(d->typed_dump->indent_str, opts->indent_str,
+			sizeof(d->typed_dump->indent_str) - 1);

 	d->typed_dump->compact = OPTS_GET(opts, compact, false);
 	d->typed_dump->skip_names = OPTS_GET(opts, skip_names, false);
--- a/src/btf_iter.c
+++ b/src/btf_iter.c
@@ -1,177 +0,0 @@
-// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
-/* Copyright (c) 2021 Facebook */
-/* Copyright (c) 2024, Oracle and/or its affiliates. */
-
-#ifdef __KERNEL__
-#include <linux/bpf.h>
-#include <linux/btf.h>
-
-#define btf_var_secinfos(t)	(struct btf_var_secinfo *)btf_type_var_secinfo(t)
-
-#else
-#include "btf.h"
-#include "libbpf_internal.h"
-#endif
-
-int btf_field_iter_init(struct btf_field_iter *it, struct btf_type *t,
-			enum btf_field_iter_kind iter_kind)
-{
-	it->p = NULL;
-	it->m_idx = -1;
-	it->off_idx = 0;
-	it->vlen = 0;
-
-	switch (iter_kind) {
-	case BTF_FIELD_ITER_IDS:
-		switch (btf_kind(t)) {
-		case BTF_KIND_UNKN:
-		case BTF_KIND_INT:
-		case BTF_KIND_FLOAT:
-		case BTF_KIND_ENUM:
-		case BTF_KIND_ENUM64:
-			it->desc = (struct btf_field_desc) {};
-			break;
-		case BTF_KIND_FWD:
-		case BTF_KIND_CONST:
-		case BTF_KIND_VOLATILE:
-		case BTF_KIND_RESTRICT:
-		case BTF_KIND_PTR:
-		case BTF_KIND_TYPEDEF:
-		case BTF_KIND_FUNC:
-		case BTF_KIND_VAR:
-		case BTF_KIND_DECL_TAG:
-		case BTF_KIND_TYPE_TAG:
-			it->desc = (struct btf_field_desc) { 1, {offsetof(struct btf_type, type)} };
-			break;
-		case BTF_KIND_ARRAY:
-			it->desc = (struct btf_field_desc) {
-				2, {sizeof(struct btf_type) + offsetof(struct btf_array, type),
-				sizeof(struct btf_type) + offsetof(struct btf_array, index_type)}
-			};
-			break;
-		case BTF_KIND_STRUCT:
-		case BTF_KIND_UNION:
-			it->desc = (struct btf_field_desc) {
-				0, {},
-				sizeof(struct btf_member),
-				1, {offsetof(struct btf_member, type)}
-			};
-			break;
-		case BTF_KIND_FUNC_PROTO:
-			it->desc = (struct btf_field_desc) {
-				1, {offsetof(struct btf_type, type)},
-				sizeof(struct btf_param),
-				1, {offsetof(struct btf_param, type)}
-			};
-			break;
-		case BTF_KIND_DATASEC:
-			it->desc = (struct btf_field_desc) {
-				0, {},
-				sizeof(struct btf_var_secinfo),
-				1, {offsetof(struct btf_var_secinfo, type)}
-			};
-			break;
-		default:
-			return -EINVAL;
-		}
-		break;
-	case BTF_FIELD_ITER_STRS:
-		switch (btf_kind(t)) {
-		case BTF_KIND_UNKN:
-			it->desc = (struct btf_field_desc) {};
-			break;
-		case BTF_KIND_INT:
-		case BTF_KIND_FLOAT:
-		case BTF_KIND_FWD:
-		case BTF_KIND_ARRAY:
-		case BTF_KIND_CONST:
-		case BTF_KIND_VOLATILE:
-		case BTF_KIND_RESTRICT:
-		case BTF_KIND_PTR:
-		case BTF_KIND_TYPEDEF:
-		case BTF_KIND_FUNC:
-		case BTF_KIND_VAR:
-		case BTF_KIND_DECL_TAG:
-		case BTF_KIND_TYPE_TAG:
-		case BTF_KIND_DATASEC:
-			it->desc = (struct btf_field_desc) {
-				1, {offsetof(struct btf_type, name_off)}
-			};
-			break;
-		case BTF_KIND_ENUM:
-			it->desc = (struct btf_field_desc) {
-				1, {offsetof(struct btf_type, name_off)},
-				sizeof(struct btf_enum),
-				1, {offsetof(struct btf_enum, name_off)}
-			};
-			break;
-		case BTF_KIND_ENUM64:
-			it->desc = (struct btf_field_desc) {
-				1, {offsetof(struct btf_type, name_off)},
-				sizeof(struct btf_enum64),
-				1, {offsetof(struct btf_enum64, name_off)}
-			};
-			break;
-		case BTF_KIND_STRUCT:
-		case BTF_KIND_UNION:
-			it->desc = (struct btf_field_desc) {
-				1, {offsetof(struct btf_type, name_off)},
-				sizeof(struct btf_member),
-				1, {offsetof(struct btf_member, name_off)}
-			};
-			break;
-		case BTF_KIND_FUNC_PROTO:
-			it->desc = (struct btf_field_desc) {
-				1, {offsetof(struct btf_type, name_off)},
-				sizeof(struct btf_param),
-				1, {offsetof(struct btf_param, name_off)}
-			};
-			break;
-		default:
-			return -EINVAL;
-		}
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	if (it->desc.m_sz)
-		it->vlen = btf_vlen(t);
-
-	it->p = t;
-	return 0;
-}
-
-__u32 *btf_field_iter_next(struct btf_field_iter *it)
-{
-	if (!it->p)
-		return NULL;
-
-	if (it->m_idx < 0) {
-		if (it->off_idx < it->desc.t_off_cnt)
-			return it->p + it->desc.t_offs[it->off_idx++];
-		/* move to per-member iteration */
-		it->m_idx = 0;
-		it->p += sizeof(struct btf_type);
-		it->off_idx = 0;
-	}
-
-	/* if type doesn't have members, stop */
-	if (it->desc.m_sz == 0) {
-		it->p = NULL;
-		return NULL;
-	}
-
-	if (it->off_idx >= it->desc.m_off_cnt) {
-		/* exhausted this member's fields, go to the next member */
-		it->m_idx++;
-		it->p += it->desc.m_sz;
-		it->off_idx = 0;
-	}
-
-	if (it->m_idx < it->vlen)
-		return it->p + it->desc.m_offs[it->off_idx++];
-
-	it->p = NULL;
-	return NULL;
-}
--- a/src/btf_relocate.c
+++ b/src/btf_relocate.c
@@ -1,519 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/* Copyright (c) 2024, Oracle and/or its affiliates. */
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#ifdef __KERNEL__
-#include <linux/bpf.h>
-#include <linux/bsearch.h>
-#include <linux/btf.h>
-#include <linux/sort.h>
-#include <linux/string.h>
-#include <linux/bpf_verifier.h>
-
-#define btf_type_by_id				(struct btf_type *)btf_type_by_id
-#define btf__type_cnt				btf_nr_types
-#define btf__base_btf				btf_base_btf
-#define btf__name_by_offset			btf_name_by_offset
-#define btf__str_by_offset			btf_str_by_offset
-#define btf_kflag				btf_type_kflag
-
-#define calloc(nmemb, sz)			kvcalloc(nmemb, sz, GFP_KERNEL | __GFP_NOWARN)
-#define free(ptr)				kvfree(ptr)
-#define qsort(base, num, sz, cmp)		sort(base, num, sz, cmp, NULL)
-
-#else
-
-#include "btf.h"
-#include "bpf.h"
-#include "libbpf.h"
-#include "libbpf_internal.h"
-
-#endif /* __KERNEL__ */
-
-struct btf;
-
-struct btf_relocate {
-	struct btf *btf;
-	const struct btf *base_btf;
-	const struct btf *dist_base_btf;
-	unsigned int nr_base_types;
-	unsigned int nr_split_types;
-	unsigned int nr_dist_base_types;
-	int dist_str_len;
-	int base_str_len;
-	__u32 *id_map;
-	__u32 *str_map;
-};
-
-/* Set temporarily in relocation id_map if distilled base struct/union is
- * embedded in a split BTF struct/union; in such a case, size information must
- * match between distilled base BTF and base BTF representation of type.
- */
-#define BTF_IS_EMBEDDED ((__u32)-1)
-
-/* <name, size, id> triple used in sorting/searching distilled base BTF. */
-struct btf_name_info {
-	const char *name;
-	/* set when search requires a size match */
-	bool needs_size: 1;
-	unsigned int size: 31;
-	__u32 id;
-};
-
-static int btf_relocate_rewrite_type_id(struct btf_relocate *r, __u32 i)
-{
-	struct btf_type *t = btf_type_by_id(r->btf, i);
-	struct btf_field_iter it;
-	__u32 *id;
-	int err;
-
-	err = btf_field_iter_init(&it, t, BTF_FIELD_ITER_IDS);
-	if (err)
-		return err;
-
-	while ((id = btf_field_iter_next(&it)))
-		*id = r->id_map[*id];
-	return 0;
-}
-
-/* Simple string comparison used for sorting within BTF, since all distilled
- * types are named.  If strings match, and size is non-zero for both elements
- * fall back to using size for ordering.
- */
-static int cmp_btf_name_size(const void *n1, const void *n2)
-{
-	const struct btf_name_info *ni1 = n1;
-	const struct btf_name_info *ni2 = n2;
-	int name_diff = strcmp(ni1->name, ni2->name);
-
-	if (!name_diff && ni1->needs_size && ni2->needs_size)
-		return ni2->size - ni1->size;
-	return name_diff;
-}
-
-/* Binary search with a small twist; find leftmost element that matches
- * so that we can then iterate through all exact matches.  So for example
- * searching { "a", "bb", "bb", "c" }  we would always match on the
- * leftmost "bb".
- */
-static struct btf_name_info *search_btf_name_size(struct btf_name_info *key,
-						  struct btf_name_info *vals,
-						  int nelems)
-{
-	struct btf_name_info *ret = NULL;
-	int high = nelems - 1;
-	int low = 0;
-
-	while (low <= high) {
-		int mid = (low + high)/2;
-		struct btf_name_info *val = &vals[mid];
-		int diff = cmp_btf_name_size(key, val);
-
-		if (diff == 0)
-			ret = val;
-		/* even if found, keep searching for leftmost match */
-		if (diff <= 0)
-			high = mid - 1;
-		else
-			low = mid + 1;
-	}
-	return ret;
-}
-
-/* If a member of a split BTF struct/union refers to a base BTF
- * struct/union, mark that struct/union id temporarily in the id_map
- * with BTF_IS_EMBEDDED.  Members can be const/restrict/volatile/typedef
- * reference types, but if a pointer is encountered, the type is no longer
- * considered embedded.
- */
-static int btf_mark_embedded_composite_type_ids(struct btf_relocate *r, __u32 i)
-{
-	struct btf_type *t = btf_type_by_id(r->btf, i);
-	struct btf_field_iter it;
-	__u32 *id;
-	int err;
-
-	if (!btf_is_composite(t))
-		return 0;
-
-	err = btf_field_iter_init(&it, t, BTF_FIELD_ITER_IDS);
-	if (err)
-		return err;
-
-	while ((id = btf_field_iter_next(&it))) {
-		__u32 next_id = *id;
-
-		while (next_id) {
-			t = btf_type_by_id(r->btf, next_id);
-			switch (btf_kind(t)) {
-			case BTF_KIND_CONST:
-			case BTF_KIND_RESTRICT:
-			case BTF_KIND_VOLATILE:
-			case BTF_KIND_TYPEDEF:
-			case BTF_KIND_TYPE_TAG:
-				next_id = t->type;
-				break;
-			case BTF_KIND_ARRAY: {
-				struct btf_array *a = btf_array(t);
-
-				next_id = a->type;
-				break;
-			}
-			case BTF_KIND_STRUCT:
-			case BTF_KIND_UNION:
-				if (next_id < r->nr_dist_base_types)
-					r->id_map[next_id] = BTF_IS_EMBEDDED;
-				next_id = 0;
-				break;
-			default:
-				next_id = 0;
-				break;
-			}
-		}
-	}
-
-	return 0;
-}
-
-/* Build a map from distilled base BTF ids to base BTF ids. To do so, iterate
- * through base BTF looking up distilled type (using binary search) equivalents.
- */
-static int btf_relocate_map_distilled_base(struct btf_relocate *r)
-{
-	struct btf_name_info *info, *info_end;
-	struct btf_type *base_t, *dist_t;
-	__u8 *base_name_cnt = NULL;
-	int err = 0;
-	__u32 id;
-
-	/* generate a sort index array of name/type ids sorted by name for
-	 * distilled base BTF to speed name-based lookups.
-	 */
-	info = calloc(r->nr_dist_base_types, sizeof(*info));
-	if (!info) {
-		err = -ENOMEM;
-		goto done;
-	}
-	info_end = info + r->nr_dist_base_types;
-	for (id = 0; id < r->nr_dist_base_types; id++) {
-		dist_t = btf_type_by_id(r->dist_base_btf, id);
-		info[id].name = btf__name_by_offset(r->dist_base_btf, dist_t->name_off);
-		info[id].id = id;
-		info[id].size = dist_t->size;
-		info[id].needs_size = true;
-	}
-	qsort(info, r->nr_dist_base_types, sizeof(*info), cmp_btf_name_size);
-
-	/* Mark distilled base struct/union members of split BTF structs/unions
-	 * in id_map with BTF_IS_EMBEDDED; this signals that these types
-	 * need to match both name and size, otherwise embedding the base
-	 * struct/union in the split type is invalid.
-	 */
-	for (id = r->nr_dist_base_types; id < r->nr_split_types; id++) {
-		err = btf_mark_embedded_composite_type_ids(r, id);
-		if (err)
-			goto done;
-	}
-
-	/* Collect name counts for composite types in base BTF.  If multiple
-	 * instances of a struct/union of the same name exist, we need to use
-	 * size to determine which to map to since name alone is ambiguous.
-	 */
-	base_name_cnt = calloc(r->base_str_len, sizeof(*base_name_cnt));
-	if (!base_name_cnt) {
-		err = -ENOMEM;
-		goto done;
-	}
-	for (id = 1; id < r->nr_base_types; id++) {
-		base_t = btf_type_by_id(r->base_btf, id);
-		if (!btf_is_composite(base_t) || !base_t->name_off)
-			continue;
-		if (base_name_cnt[base_t->name_off] < 255)
-			base_name_cnt[base_t->name_off]++;
-	}
-
-	/* Now search base BTF for matching distilled base BTF types. */
-	for (id = 1; id < r->nr_base_types; id++) {
-		struct btf_name_info *dist_info, base_info = {};
-		int dist_kind, base_kind;
-
-		base_t = btf_type_by_id(r->base_btf, id);
-		/* distilled base consists of named types only. */
-		if (!base_t->name_off)
-			continue;
-		base_kind = btf_kind(base_t);
-		base_info.id = id;
-		base_info.name = btf__name_by_offset(r->base_btf, base_t->name_off);
-		switch (base_kind) {
-		case BTF_KIND_INT:
-		case BTF_KIND_FLOAT:
-		case BTF_KIND_ENUM:
-		case BTF_KIND_ENUM64:
-			/* These types should match both name and size */
-			base_info.needs_size = true;
-			base_info.size = base_t->size;
-			break;
-		case BTF_KIND_FWD:
-			/* No size considerations for fwds. */
-			break;
-		case BTF_KIND_STRUCT:
-		case BTF_KIND_UNION:
-			/* Size only needs to be used for struct/union if there
-			 * are multiple types in base BTF with the same name.
-			 * If there are multiple _distilled_ types with the same
-			 * name (a very unlikely scenario), that doesn't matter
-			 * unless corresponding _base_ types to match them are
-			 * missing.
-			 */
-			base_info.needs_size = base_name_cnt[base_t->name_off] > 1;
-			base_info.size = base_t->size;
-			break;
-		default:
-			continue;
-		}
-		/* iterate over all matching distilled base types */
-		for (dist_info = search_btf_name_size(&base_info, info, r->nr_dist_base_types);
-		     dist_info != NULL && dist_info < info_end &&
-		     cmp_btf_name_size(&base_info, dist_info) == 0;
-		     dist_info++) {
-			if (!dist_info->id || dist_info->id >= r->nr_dist_base_types) {
-				pr_warn("base BTF id [%d] maps to invalid distilled base BTF id [%d]\n",
-					id, dist_info->id);
-				err = -EINVAL;
-				goto done;
-			}
-			dist_t = btf_type_by_id(r->dist_base_btf, dist_info->id);
-			dist_kind = btf_kind(dist_t);
-
-			/* Validate that the found distilled type is compatible.
-			 * Do not error out on mismatch as another match may
-			 * occur for an identically-named type.
-			 */
-			switch (dist_kind) {
-			case BTF_KIND_FWD:
-				switch (base_kind) {
-				case BTF_KIND_FWD:
-					if (btf_kflag(dist_t) != btf_kflag(base_t))
-						continue;
-					break;
-				case BTF_KIND_STRUCT:
-					if (btf_kflag(base_t))
-						continue;
-					break;
-				case BTF_KIND_UNION:
-					if (!btf_kflag(base_t))
-						continue;
-					break;
-				default:
-					continue;
-				}
-				break;
-			case BTF_KIND_INT:
-				if (dist_kind != base_kind ||
-				    btf_int_encoding(base_t) != btf_int_encoding(dist_t))
-					continue;
-				break;
-			case BTF_KIND_FLOAT:
-				if (dist_kind != base_kind)
-					continue;
-				break;
-			case BTF_KIND_ENUM:
-				/* ENUM and ENUM64 are encoded as sized ENUM in
-				 * distilled base BTF.
-				 */
-				if (base_kind != dist_kind && base_kind != BTF_KIND_ENUM64)
-					continue;
-				break;
-			case BTF_KIND_STRUCT:
-			case BTF_KIND_UNION:
-				/* size verification is required for embedded
-				 * struct/unions.
-				 */
-				if (r->id_map[dist_info->id] == BTF_IS_EMBEDDED &&
-				    base_t->size != dist_t->size)
-					continue;
-				break;
-			default:
-				continue;
-			}
-			if (r->id_map[dist_info->id] &&
-			    r->id_map[dist_info->id] != BTF_IS_EMBEDDED) {
-				/* we already have a match; this tells us that
-				 * multiple base types of the same name
-				 * have the same size, since for cases where
-				 * multiple types have the same name we match
-				 * on name and size.  In this case, we have
-				 * no way of determining which to relocate
-				 * to in base BTF, so error out.
-				 */
-				pr_warn("distilled base BTF type '%s' [%u], size %u has multiple candidates of the same size (ids [%u, %u]) in base BTF\n",
-					base_info.name, dist_info->id,
-					base_t->size, id, r->id_map[dist_info->id]);
-				err = -EINVAL;
-				goto done;
-			}
-			/* map id and name */
-			r->id_map[dist_info->id] = id;
-			r->str_map[dist_t->name_off] = base_t->name_off;
-		}
-	}
-	/* ensure all distilled BTF ids now have a mapping... */
-	for (id = 1; id < r->nr_dist_base_types; id++) {
-		const char *name;
-
-		if (r->id_map[id] && r->id_map[id] != BTF_IS_EMBEDDED)
-			continue;
-		dist_t = btf_type_by_id(r->dist_base_btf, id);
-		name = btf__name_by_offset(r->dist_base_btf, dist_t->name_off);
-		pr_warn("distilled base BTF type '%s' [%d] is not mapped to base BTF id\n",
-			name, id);
-		err = -EINVAL;
-		break;
-	}
-done:
-	free(base_name_cnt);
-	free(info);
-	return err;
-}
-
-/* distilled base should only have named int/float/enum/fwd/struct/union types. */
-static int btf_relocate_validate_distilled_base(struct btf_relocate *r)
-{
-	unsigned int i;
-
-	for (i = 1; i < r->nr_dist_base_types; i++) {
-		struct btf_type *t = btf_type_by_id(r->dist_base_btf, i);
-		int kind = btf_kind(t);
-
-		switch (kind) {
-		case BTF_KIND_INT:
-		case BTF_KIND_FLOAT:
-		case BTF_KIND_ENUM:
-		case BTF_KIND_STRUCT:
-		case BTF_KIND_UNION:
-		case BTF_KIND_FWD:
-			if (t->name_off)
-				break;
-			pr_warn("type [%d], kind [%d] is invalid for distilled base BTF; it is anonymous\n",
-				i, kind);
-			return -EINVAL;
-		default:
-			pr_warn("type [%d] in distilled based BTF has unexpected kind [%d]\n",
-				i, kind);
-			return -EINVAL;
-		}
-	}
-	return 0;
-}
-
-static int btf_relocate_rewrite_strs(struct btf_relocate *r, __u32 i)
-{
-	struct btf_type *t = btf_type_by_id(r->btf, i);
-	struct btf_field_iter it;
-	__u32 *str_off;
-	int off, err;
-
-	err = btf_field_iter_init(&it, t, BTF_FIELD_ITER_STRS);
-	if (err)
-		return err;
-
-	while ((str_off = btf_field_iter_next(&it))) {
-		if (!*str_off)
-			continue;
-		if (*str_off >= r->dist_str_len) {
-			*str_off += r->base_str_len - r->dist_str_len;
-		} else {
-			off = r->str_map[*str_off];
-			if (!off) {
-				pr_warn("string '%s' [offset %u] is not mapped to base BTF",
-					btf__str_by_offset(r->btf, off), *str_off);
-				return -ENOENT;
-			}
-			*str_off = off;
-		}
-	}
-	return 0;
-}
-
-/* If successful, output of relocation is updated BTF with base BTF pointing
- * at base_btf, and type ids, strings adjusted accordingly.
- */
-int btf_relocate(struct btf *btf, const struct btf *base_btf, __u32 **id_map)
-{
-	unsigned int nr_types = btf__type_cnt(btf);
-	const struct btf_header *dist_base_hdr;
-	const struct btf_header *base_hdr;
-	struct btf_relocate r = {};
-	int err = 0;
-	__u32 id, i;
-
-	r.dist_base_btf = btf__base_btf(btf);
-	if (!base_btf || r.dist_base_btf == base_btf)
-		return -EINVAL;
-
-	r.nr_dist_base_types = btf__type_cnt(r.dist_base_btf);
-	r.nr_base_types = btf__type_cnt(base_btf);
-	r.nr_split_types = nr_types - r.nr_dist_base_types;
-	r.btf = btf;
-	r.base_btf = base_btf;
-
-	r.id_map = calloc(nr_types, sizeof(*r.id_map));
-	r.str_map = calloc(btf_header(r.dist_base_btf)->str_len, sizeof(*r.str_map));
-	dist_base_hdr = btf_header(r.dist_base_btf);
-	base_hdr = btf_header(r.base_btf);
-	r.dist_str_len = dist_base_hdr->str_len;
-	r.base_str_len = base_hdr->str_len;
-	if (!r.id_map || !r.str_map) {
-		err = -ENOMEM;
-		goto err_out;
-	}
-
-	err = btf_relocate_validate_distilled_base(&r);
-	if (err)
-		goto err_out;
-
-	/* Split BTF ids need to be adjusted as base and distilled base
-	 * have different numbers of types, changing the start id of split
-	 * BTF.
-	 */
-	for (id = r.nr_dist_base_types; id < nr_types; id++)
-		r.id_map[id] = id + r.nr_base_types - r.nr_dist_base_types;
-
-	/* Build a map from distilled base ids to actual base BTF ids; it is used
-	 * to update split BTF id references.  Also build a str_map mapping from
-	 * distilled base BTF names to base BTF names.
-	 */
-	err = btf_relocate_map_distilled_base(&r);
-	if (err)
-		goto err_out;
-
-	/* Next, rewrite type ids in split BTF, replacing split ids with updated
-	 * ids based on number of types in base BTF, and base ids with
-	 * relocated ids from base_btf.
-	 */
-	for (i = 0, id = r.nr_dist_base_types; i < r.nr_split_types; i++, id++) {
-		err = btf_relocate_rewrite_type_id(&r, id);
-		if (err)
-			goto err_out;
-	}
-	/* String offsets now need to be updated using the str_map. */
-	for (i = 0; i < r.nr_split_types; i++) {
-		err = btf_relocate_rewrite_strs(&r, i + r.nr_dist_base_types);
-		if (err)
-			goto err_out;
-	}
-	/* Finally reset base BTF to be base_btf */
-	btf_set_base_btf(btf, base_btf);
-
-	if (id_map) {
-		*id_map = r.id_map;
-		r.id_map = NULL;
-	}
-err_out:
-	free(r.id_map);
-	free(r.str_map);
-	return err;
-}
--- a/src/elf.c
+++ b/src/elf.c
@@ -1,558 +0,0 @@
-// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#include <libelf.h>
-#include <gelf.h>
-#include <fcntl.h>
-#include <linux/kernel.h>
-
-#include "libbpf_internal.h"
-#include "str_error.h"
-
-/* A SHT_GNU_versym section holds 16-bit words. This bit is set if
- * the symbol is hidden and can only be seen when referenced using an
- * explicit version number. This is a GNU extension.
- */
-#define VERSYM_HIDDEN	0x8000
-
-/* This is the mask for the rest of the data in a word read from a
- * SHT_GNU_versym section.
- */
-#define VERSYM_VERSION	0x7fff
-
-int elf_open(const char *binary_path, struct elf_fd *elf_fd)
-{
-	char errmsg[STRERR_BUFSIZE];
-	int fd, ret;
-	Elf *elf;
-
-	if (elf_version(EV_CURRENT) == EV_NONE) {
-		pr_warn("elf: failed to init libelf for %s\n", binary_path);
-		return -LIBBPF_ERRNO__LIBELF;
-	}
-	fd = open(binary_path, O_RDONLY | O_CLOEXEC);
-	if (fd < 0) {
-		ret = -errno;
-		pr_warn("elf: failed to open %s: %s\n", binary_path,
-			libbpf_strerror_r(ret, errmsg, sizeof(errmsg)));
-		return ret;
-	}
-	elf = elf_begin(fd, ELF_C_READ_MMAP, NULL);
-	if (!elf) {
-		pr_warn("elf: could not read elf from %s: %s\n", binary_path, elf_errmsg(-1));
-		close(fd);
-		return -LIBBPF_ERRNO__FORMAT;
-	}
-	elf_fd->fd = fd;
-	elf_fd->elf = elf;
-	return 0;
-}
-
-void elf_close(struct elf_fd *elf_fd)
-{
-	if (!elf_fd)
-		return;
-	elf_end(elf_fd->elf);
-	close(elf_fd->fd);
-}
-
-/* Return next ELF section of sh_type after scn, or first of that type if scn is NULL. */
-static Elf_Scn *elf_find_next_scn_by_type(Elf *elf, int sh_type, Elf_Scn *scn)
-{
-	while ((scn = elf_nextscn(elf, scn)) != NULL) {
-		GElf_Shdr sh;
-
-		if (!gelf_getshdr(scn, &sh))
-			continue;
-		if (sh.sh_type == sh_type)
-			return scn;
-	}
-	return NULL;
-}
-
-struct elf_sym {
-	const char *name;
-	GElf_Sym sym;
-	GElf_Shdr sh;
-	int ver;
-	bool hidden;
-};
-
-struct elf_sym_iter {
-	Elf *elf;
-	Elf_Data *syms;
-	Elf_Data *versyms;
-	Elf_Data *verdefs;
-	size_t nr_syms;
-	size_t strtabidx;
-	size_t verdef_strtabidx;
-	size_t next_sym_idx;
-	struct elf_sym sym;
-	int st_type;
-};
-
-static int elf_sym_iter_new(struct elf_sym_iter *iter,
-			    Elf *elf, const char *binary_path,
-			    int sh_type, int st_type)
-{
-	Elf_Scn *scn = NULL;
-	GElf_Ehdr ehdr;
-	GElf_Shdr sh;
-
-	memset(iter, 0, sizeof(*iter));
-
-	if (!gelf_getehdr(elf, &ehdr)) {
-		pr_warn("elf: failed to get ehdr from %s: %s\n", binary_path, elf_errmsg(-1));
-		return -EINVAL;
-	}
-
-	scn = elf_find_next_scn_by_type(elf, sh_type, NULL);
-	if (!scn) {
-		pr_debug("elf: failed to find symbol table ELF sections in '%s'\n",
-			 binary_path);
-		return -ENOENT;
-	}
-
-	if (!gelf_getshdr(scn, &sh))
-		return -EINVAL;
-
-	iter->strtabidx = sh.sh_link;
-	iter->syms = elf_getdata(scn, 0);
-	if (!iter->syms) {
-		pr_warn("elf: failed to get symbols for symtab section in '%s': %s\n",
-			binary_path, elf_errmsg(-1));
-		return -EINVAL;
-	}
-	iter->nr_syms = iter->syms->d_size / sh.sh_entsize;
-	iter->elf = elf;
-	iter->st_type = st_type;
-
-	/* Version symbol table is meaningful to dynsym only */
-	if (sh_type != SHT_DYNSYM)
-		return 0;
-
-	scn = elf_find_next_scn_by_type(elf, SHT_GNU_versym, NULL);
-	if (!scn)
-		return 0;
-	iter->versyms = elf_getdata(scn, 0);
-
-	scn = elf_find_next_scn_by_type(elf, SHT_GNU_verdef, NULL);
-	if (!scn)
-		return 0;
-
-	iter->verdefs = elf_getdata(scn, 0);
-	if (!iter->verdefs || !gelf_getshdr(scn, &sh)) {
-		pr_warn("elf: failed to get verdef ELF section in '%s'\n", binary_path);
-		return -EINVAL;
-	}
-	iter->verdef_strtabidx = sh.sh_link;
-
-	return 0;
-}
-
-static struct elf_sym *elf_sym_iter_next(struct elf_sym_iter *iter)
-{
-	struct elf_sym *ret = &iter->sym;
-	GElf_Sym *sym = &ret->sym;
-	const char *name = NULL;
-	GElf_Versym versym;
-	Elf_Scn *sym_scn;
-	size_t idx;
-
-	for (idx = iter->next_sym_idx; idx < iter->nr_syms; idx++) {
-		if (!gelf_getsym(iter->syms, idx, sym))
-			continue;
-		if (GELF_ST_TYPE(sym->st_info) != iter->st_type)
-			continue;
-		name = elf_strptr(iter->elf, iter->strtabidx, sym->st_name);
-		if (!name)
-			continue;
-		sym_scn = elf_getscn(iter->elf, sym->st_shndx);
-		if (!sym_scn)
-			continue;
-		if (!gelf_getshdr(sym_scn, &ret->sh))
-			continue;
-
-		iter->next_sym_idx = idx + 1;
-		ret->name = name;
-		ret->ver = 0;
-		ret->hidden = false;
-
-		if (iter->versyms) {
-			if (!gelf_getversym(iter->versyms, idx, &versym))
-				continue;
-			ret->ver = versym & VERSYM_VERSION;
-			ret->hidden = versym & VERSYM_HIDDEN;
-		}
-		return ret;
-	}
-
-	return NULL;
-}
-
-static const char *elf_get_vername(struct elf_sym_iter *iter, int ver)
-{
-	GElf_Verdaux verdaux;
-	GElf_Verdef verdef;
-	int offset;
-
-	if (!iter->verdefs)
-		return NULL;
-
-	offset = 0;
-	while (gelf_getverdef(iter->verdefs, offset, &verdef)) {
-		if (verdef.vd_ndx != ver) {
-			if (!verdef.vd_next)
-				break;
-
-			offset += verdef.vd_next;
-			continue;
-		}
-
-		if (!gelf_getverdaux(iter->verdefs, offset + verdef.vd_aux, &verdaux))
-			break;
-
-		return elf_strptr(iter->elf, iter->verdef_strtabidx, verdaux.vda_name);
-
-	}
-	return NULL;
-}
-
-static bool symbol_match(struct elf_sym_iter *iter, int sh_type, struct elf_sym *sym,
-			 const char *name, size_t name_len, const char *lib_ver)
-{
-	const char *ver_name;
-
-	/* Symbols are in forms of func, func@LIB_VER or func@@LIB_VER
-	 * make sure the func part matches the user specified name
-	 */
-	if (strncmp(sym->name, name, name_len) != 0)
-		return false;
-
-	/* ...but we don't want a search for "foo" to match 'foo2" also, so any
-	 * additional characters in sname should be of the form "@@LIB".
-	 */
-	if (sym->name[name_len] != '\0' && sym->name[name_len] != '@')
-		return false;
-
-	/* If user does not specify symbol version, then we got a match */
-	if (!lib_ver)
-		return true;
-
-	/* If user specifies symbol version, for dynamic symbols,
-	 * get version name from ELF verdef section for comparison.
-	 */
-	if (sh_type == SHT_DYNSYM) {
-		ver_name = elf_get_vername(iter, sym->ver);
-		if (!ver_name)
-			return false;
-		return strcmp(ver_name, lib_ver) == 0;
-	}
-
-	/* For normal symbols, it is already in form of func@LIB_VER */
-	return strcmp(sym->name, name) == 0;
-}
-
-/* Transform symbol's virtual address (absolute for binaries and relative
- * for shared libs) into file offset, which is what kernel is expecting
- * for uprobe/uretprobe attachment.
- * See Documentation/trace/uprobetracer.rst for more details. This is done
- * by looking up symbol's containing section's header and using iter's virtual
- * address (sh_addr) and corresponding file offset (sh_offset) to transform
- * sym.st_value (virtual address) into desired final file offset.
- */
-static unsigned long elf_sym_offset(struct elf_sym *sym)
-{
-	return sym->sym.st_value - sym->sh.sh_addr + sym->sh.sh_offset;
-}
-
-/* Find offset of function name in the provided ELF object. "binary_path" is
- * the path to the ELF binary represented by "elf", and only used for error
- * reporting matters. "name" matches symbol name or name@@LIB for library
- * functions.
- */
-long elf_find_func_offset(Elf *elf, const char *binary_path, const char *name)
-{
-	int i, sh_types[2] = { SHT_DYNSYM, SHT_SYMTAB };
-	const char *at_symbol, *lib_ver;
-	bool is_shared_lib;
-	long ret = -ENOENT;
-	size_t name_len;
-	GElf_Ehdr ehdr;
-
-	if (!gelf_getehdr(elf, &ehdr)) {
-		pr_warn("elf: failed to get ehdr from %s: %s\n", binary_path, elf_errmsg(-1));
-		ret = -LIBBPF_ERRNO__FORMAT;
-		goto out;
-	}
-	/* for shared lib case, we do not need to calculate relative offset */
-	is_shared_lib = ehdr.e_type == ET_DYN;
-
-	/* Does name specify "@@LIB_VER" or "@LIB_VER" ? */
-	at_symbol = strchr(name, '@');
-	if (at_symbol) {
-		name_len = at_symbol - name;
-		/* skip second @ if it's @@LIB_VER case */
-		if (at_symbol[1] == '@')
-			at_symbol++;
-		lib_ver = at_symbol + 1;
-	} else {
-		name_len = strlen(name);
-		lib_ver = NULL;
-	}
-
-	/* Search SHT_DYNSYM, SHT_SYMTAB for symbol. This search order is used because if
-	 * a binary is stripped, it may only have SHT_DYNSYM, and a fully-statically
-	 * linked binary may not have SHT_DYMSYM, so absence of a section should not be
-	 * reported as a warning/error.
-	 */
-	for (i = 0; i < ARRAY_SIZE(sh_types); i++) {
-		struct elf_sym_iter iter;
-		struct elf_sym *sym;
-		int last_bind = -1;
-		int cur_bind;
-
-		ret = elf_sym_iter_new(&iter, elf, binary_path, sh_types[i], STT_FUNC);
-		if (ret == -ENOENT)
-			continue;
-		if (ret)
-			goto out;
-
-		while ((sym = elf_sym_iter_next(&iter))) {
-			if (!symbol_match(&iter, sh_types[i], sym, name, name_len, lib_ver))
-				continue;
-
-			cur_bind = GELF_ST_BIND(sym->sym.st_info);
-
-			if (ret > 0) {
-				/* handle multiple matches */
-				if (elf_sym_offset(sym) == ret) {
-					/* same offset, no problem */
-					continue;
-				} else if (last_bind != STB_WEAK && cur_bind != STB_WEAK) {
-					/* Only accept one non-weak bind. */
-					pr_warn("elf: ambiguous match for '%s', '%s' in '%s'\n",
-						sym->name, name, binary_path);
-					ret = -LIBBPF_ERRNO__FORMAT;
-					goto out;
-				} else if (cur_bind == STB_WEAK) {
-					/* already have a non-weak bind, and
-					 * this is a weak bind, so ignore.
-					 */
-					continue;
-				}
-			}
-
-			ret = elf_sym_offset(sym);
-			last_bind = cur_bind;
-		}
-		if (ret > 0)
-			break;
-	}
-
-	if (ret > 0) {
-		pr_debug("elf: symbol address match for '%s' in '%s': 0x%lx\n", name, binary_path,
-			 ret);
-	} else {
-		if (ret == 0) {
-			pr_warn("elf: '%s' is 0 in symtab for '%s': %s\n", name, binary_path,
-				is_shared_lib ? "should not be 0 in a shared library" :
-						"try using shared library path instead");
-			ret = -ENOENT;
-		} else {
-			pr_warn("elf: failed to find symbol '%s' in '%s'\n", name, binary_path);
-		}
-	}
-out:
-	return ret;
-}
-
-/* Find offset of function name in ELF object specified by path. "name" matches
- * symbol name or name@@LIB for library functions.
- */
-long elf_find_func_offset_from_file(const char *binary_path, const char *name)
-{
-	struct elf_fd elf_fd;
-	long ret = -ENOENT;
-
-	ret = elf_open(binary_path, &elf_fd);
-	if (ret)
-		return ret;
-	ret = elf_find_func_offset(elf_fd.elf, binary_path, name);
-	elf_close(&elf_fd);
-	return ret;
-}
-
-struct symbol {
-	const char *name;
-	int bind;
-	int idx;
-};
-
-static int symbol_cmp(const void *a, const void *b)
-{
-	const struct symbol *sym_a = a;
-	const struct symbol *sym_b = b;
-
-	return strcmp(sym_a->name, sym_b->name);
-}
-
-/*
- * Return offsets in @poffsets for symbols specified in @syms array argument.
- * On success returns 0 and offsets are returned in allocated array with @cnt
- * size, that needs to be released by the caller.
- */
-int elf_resolve_syms_offsets(const char *binary_path, int cnt,
-			     const char **syms, unsigned long **poffsets,
-			     int st_type)
-{
-	int sh_types[2] = { SHT_DYNSYM, SHT_SYMTAB };
-	int err = 0, i, cnt_done = 0;
-	unsigned long *offsets;
-	struct symbol *symbols;
-	struct elf_fd elf_fd;
-
-	err = elf_open(binary_path, &elf_fd);
-	if (err)
-		return err;
-
-	offsets = calloc(cnt, sizeof(*offsets));
-	symbols = calloc(cnt, sizeof(*symbols));
-
-	if (!offsets || !symbols) {
-		err = -ENOMEM;
-		goto out;
-	}
-
-	for (i = 0; i < cnt; i++) {
-		symbols[i].name = syms[i];
-		symbols[i].idx = i;
-	}
-
-	qsort(symbols, cnt, sizeof(*symbols), symbol_cmp);
-
-	for (i = 0; i < ARRAY_SIZE(sh_types); i++) {
-		struct elf_sym_iter iter;
-		struct elf_sym *sym;
-
-		err = elf_sym_iter_new(&iter, elf_fd.elf, binary_path, sh_types[i], st_type);
-		if (err == -ENOENT)
-			continue;
-		if (err)
-			goto out;
-
-		while ((sym = elf_sym_iter_next(&iter))) {
-			unsigned long sym_offset = elf_sym_offset(sym);
-			int bind = GELF_ST_BIND(sym->sym.st_info);
-			struct symbol *found, tmp = {
-				.name = sym->name,
-			};
-			unsigned long *offset;
-
-			found = bsearch(&tmp, symbols, cnt, sizeof(*symbols), symbol_cmp);
-			if (!found)
-				continue;
-
-			offset = &offsets[found->idx];
-			if (*offset > 0) {
-				/* same offset, no problem */
-				if (*offset == sym_offset)
-					continue;
-				/* handle multiple matches */
-				if (found->bind != STB_WEAK && bind != STB_WEAK) {
-					/* Only accept one non-weak bind. */
-					pr_warn("elf: ambiguous match found '%s@%lu' in '%s' previous offset %lu\n",
-						sym->name, sym_offset, binary_path, *offset);
-					err = -ESRCH;
-					goto out;
-				} else if (bind == STB_WEAK) {
-					/* already have a non-weak bind, and
-					 * this is a weak bind, so ignore.
-					 */
-					continue;
-				}
-			} else {
-				cnt_done++;
-			}
-			*offset = sym_offset;
-			found->bind = bind;
-		}
-	}
-
-	if (cnt != cnt_done) {
-		err = -ENOENT;
-		goto out;
-	}
-
-	*poffsets = offsets;
-
-out:
-	free(symbols);
-	if (err)
-		free(offsets);
-	elf_close(&elf_fd);
-	return err;
-}
-
-/*
- * Return offsets in @poffsets for symbols specified by @pattern argument.
- * On success returns 0 and offsets are returned in allocated @poffsets
- * array with the @pctn size, that needs to be released by the caller.
- */
-int elf_resolve_pattern_offsets(const char *binary_path, const char *pattern,
-				unsigned long **poffsets, size_t *pcnt)
-{
-	int sh_types[2] = { SHT_SYMTAB, SHT_DYNSYM };
-	unsigned long *offsets = NULL;
-	size_t cap = 0, cnt = 0;
-	struct elf_fd elf_fd;
-	int err = 0, i;
-
-	err = elf_open(binary_path, &elf_fd);
-	if (err)
-		return err;
-
-	for (i = 0; i < ARRAY_SIZE(sh_types); i++) {
-		struct elf_sym_iter iter;
-		struct elf_sym *sym;
-
-		err = elf_sym_iter_new(&iter, elf_fd.elf, binary_path, sh_types[i], STT_FUNC);
-		if (err == -ENOENT)
-			continue;
-		if (err)
-			goto out;
-
-		while ((sym = elf_sym_iter_next(&iter))) {
-			if (!glob_match(sym->name, pattern))
-				continue;
-
-			err = libbpf_ensure_mem((void **) &offsets, &cap, sizeof(*offsets),
-						cnt + 1);
-			if (err)
-				goto out;
-
-			offsets[cnt++] = elf_sym_offset(sym);
-		}
-
-		/* If we found anything in the first symbol section,
-		 * do not search others to avoid duplicates.
-		 */
-		if (cnt)
-			break;
-	}
-
-	if (cnt) {
-		*poffsets = offsets;
-		*pcnt = cnt;
-	} else {
-		err = -ENOENT;
-	}
-
-out:
-	if (err)
-		free(offsets);
-	elf_close(&elf_fd);
-	return err;
-}
--- a/src/features.c
+++ b/src/features.c
@@ -1,613 +0,0 @@
-// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
-/* Copyright (c) 2023 Meta Platforms, Inc. and affiliates. */
-#include <linux/kernel.h>
-#include <linux/filter.h>
-#include "bpf.h"
-#include "libbpf.h"
-#include "libbpf_common.h"
-#include "libbpf_internal.h"
-#include "str_error.h"
-
-static inline __u64 ptr_to_u64(const void *ptr)
-{
-	return (__u64)(unsigned long)ptr;
-}
-
-int probe_fd(int fd)
-{
-	if (fd >= 0)
-		close(fd);
-	return fd >= 0;
-}
-
-static int probe_kern_prog_name(int token_fd)
-{
-	const size_t attr_sz = offsetofend(union bpf_attr, prog_token_fd);
-	struct bpf_insn insns[] = {
-		BPF_MOV64_IMM(BPF_REG_0, 0),
-		BPF_EXIT_INSN(),
-	};
-	union bpf_attr attr;
-	int ret;
-
-	memset(&attr, 0, attr_sz);
-	attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER;
-	attr.license = ptr_to_u64("GPL");
-	attr.insns = ptr_to_u64(insns);
-	attr.insn_cnt = (__u32)ARRAY_SIZE(insns);
-	attr.prog_token_fd = token_fd;
-	if (token_fd)
-		attr.prog_flags |= BPF_F_TOKEN_FD;
-	libbpf_strlcpy(attr.prog_name, "libbpf_nametest", sizeof(attr.prog_name));
-
-	/* make sure loading with name works */
-	ret = sys_bpf_prog_load(&attr, attr_sz, PROG_LOAD_ATTEMPTS);
-	return probe_fd(ret);
-}
-
-static int probe_kern_global_data(int token_fd)
-{
-	char *cp, errmsg[STRERR_BUFSIZE];
-	struct bpf_insn insns[] = {
-		BPF_LD_MAP_VALUE(BPF_REG_1, 0, 16),
-		BPF_ST_MEM(BPF_DW, BPF_REG_1, 0, 42),
-		BPF_MOV64_IMM(BPF_REG_0, 0),
-		BPF_EXIT_INSN(),
-	};
-	LIBBPF_OPTS(bpf_map_create_opts, map_opts,
-		.token_fd = token_fd,
-		.map_flags = token_fd ? BPF_F_TOKEN_FD : 0,
-	);
-	LIBBPF_OPTS(bpf_prog_load_opts, prog_opts,
-		.token_fd = token_fd,
-		.prog_flags = token_fd ? BPF_F_TOKEN_FD : 0,
-	);
-	int ret, map, insn_cnt = ARRAY_SIZE(insns);
-
-	map = bpf_map_create(BPF_MAP_TYPE_ARRAY, "libbpf_global", sizeof(int), 32, 1, &map_opts);
-	if (map < 0) {
-		ret = -errno;
-		cp = libbpf_strerror_r(ret, errmsg, sizeof(errmsg));
-		pr_warn("Error in %s():%s(%d). Couldn't create simple array map.\n",
-			__func__, cp, -ret);
-		return ret;
-	}
-
-	insns[0].imm = map;
-
-	ret = bpf_prog_load(BPF_PROG_TYPE_SOCKET_FILTER, NULL, "GPL", insns, insn_cnt, &prog_opts);
-	close(map);
-	return probe_fd(ret);
-}
-
-static int probe_kern_btf(int token_fd)
-{
-	static const char strs[] = "\0int";
-	__u32 types[] = {
-		/* int */
-		BTF_TYPE_INT_ENC(1, BTF_INT_SIGNED, 0, 32, 4),
-	};
-
-	return probe_fd(libbpf__load_raw_btf((char *)types, sizeof(types),
-					     strs, sizeof(strs), token_fd));
-}
-
-static int probe_kern_btf_func(int token_fd)
-{
-	static const char strs[] = "\0int\0x\0a";
-	/* void x(int a) {} */
-	__u32 types[] = {
-		/* int */
-		BTF_TYPE_INT_ENC(1, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
-		/* FUNC_PROTO */                                /* [2] */
-		BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_FUNC_PROTO, 0, 1), 0),
-		BTF_PARAM_ENC(7, 1),
-		/* FUNC x */                                    /* [3] */
-		BTF_TYPE_ENC(5, BTF_INFO_ENC(BTF_KIND_FUNC, 0, 0), 2),
-	};
-
-	return probe_fd(libbpf__load_raw_btf((char *)types, sizeof(types),
-					     strs, sizeof(strs), token_fd));
-}
-
-static int probe_kern_btf_func_global(int token_fd)
-{
-	static const char strs[] = "\0int\0x\0a";
-	/* static void x(int a) {} */
-	__u32 types[] = {
-		/* int */
-		BTF_TYPE_INT_ENC(1, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
-		/* FUNC_PROTO */                                /* [2] */
-		BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_FUNC_PROTO, 0, 1), 0),
-		BTF_PARAM_ENC(7, 1),
-		/* FUNC x BTF_FUNC_GLOBAL */                    /* [3] */
-		BTF_TYPE_ENC(5, BTF_INFO_ENC(BTF_KIND_FUNC, 0, BTF_FUNC_GLOBAL), 2),
-	};
-
-	return probe_fd(libbpf__load_raw_btf((char *)types, sizeof(types),
-					     strs, sizeof(strs), token_fd));
-}
-
-static int probe_kern_btf_datasec(int token_fd)
-{
-	static const char strs[] = "\0x\0.data";
-	/* static int a; */
-	__u32 types[] = {
-		/* int */
-		BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
-		/* VAR x */                                     /* [2] */
-		BTF_TYPE_ENC(1, BTF_INFO_ENC(BTF_KIND_VAR, 0, 0), 1),
-		BTF_VAR_STATIC,
-		/* DATASEC val */                               /* [3] */
-		BTF_TYPE_ENC(3, BTF_INFO_ENC(BTF_KIND_DATASEC, 0, 1), 4),
-		BTF_VAR_SECINFO_ENC(2, 0, 4),
-	};
-
-	return probe_fd(libbpf__load_raw_btf((char *)types, sizeof(types),
-					     strs, sizeof(strs), token_fd));
-}
-
-static int probe_kern_btf_qmark_datasec(int token_fd)
-{
-	static const char strs[] = "\0x\0?.data";
-	/* static int a; */
-	__u32 types[] = {
-		/* int */
-		BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
-		/* VAR x */                                     /* [2] */
-		BTF_TYPE_ENC(1, BTF_INFO_ENC(BTF_KIND_VAR, 0, 0), 1),
-		BTF_VAR_STATIC,
-		/* DATASEC ?.data */                            /* [3] */
-		BTF_TYPE_ENC(3, BTF_INFO_ENC(BTF_KIND_DATASEC, 0, 1), 4),
-		BTF_VAR_SECINFO_ENC(2, 0, 4),
-	};
-
-	return probe_fd(libbpf__load_raw_btf((char *)types, sizeof(types),
-					     strs, sizeof(strs), token_fd));
-}
-
-static int probe_kern_btf_float(int token_fd)
-{
-	static const char strs[] = "\0float";
-	__u32 types[] = {
-		/* float */
-		BTF_TYPE_FLOAT_ENC(1, 4),
-	};
-
-	return probe_fd(libbpf__load_raw_btf((char *)types, sizeof(types),
-					     strs, sizeof(strs), token_fd));
-}
-
-static int probe_kern_btf_decl_tag(int token_fd)
-{
-	static const char strs[] = "\0tag";
-	__u32 types[] = {
-		/* int */
-		BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),  /* [1] */
-		/* VAR x */                                     /* [2] */
-		BTF_TYPE_ENC(1, BTF_INFO_ENC(BTF_KIND_VAR, 0, 0), 1),
-		BTF_VAR_STATIC,
-		/* attr */
-		BTF_TYPE_DECL_TAG_ENC(1, 2, -1),
-	};
-
-	return probe_fd(libbpf__load_raw_btf((char *)types, sizeof(types),
-					     strs, sizeof(strs), token_fd));
-}
-
-static int probe_kern_btf_type_tag(int token_fd)
-{
-	static const char strs[] = "\0tag";
-	__u32 types[] = {
-		/* int */
-		BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),		/* [1] */
-		/* attr */
-		BTF_TYPE_TYPE_TAG_ENC(1, 1),				/* [2] */
-		/* ptr */
-		BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 2),	/* [3] */
-	};
-
-	return probe_fd(libbpf__load_raw_btf((char *)types, sizeof(types),
-					     strs, sizeof(strs), token_fd));
-}
-
-static int probe_kern_array_mmap(int token_fd)
-{
-	LIBBPF_OPTS(bpf_map_create_opts, opts,
-		.map_flags = BPF_F_MMAPABLE | (token_fd ? BPF_F_TOKEN_FD : 0),
-		.token_fd = token_fd,
-	);
-	int fd;
-
-	fd = bpf_map_create(BPF_MAP_TYPE_ARRAY, "libbpf_mmap", sizeof(int), sizeof(int), 1, &opts);
-	return probe_fd(fd);
-}
-
-static int probe_kern_exp_attach_type(int token_fd)
-{
-	LIBBPF_OPTS(bpf_prog_load_opts, opts,
-		.expected_attach_type = BPF_CGROUP_INET_SOCK_CREATE,
-		.token_fd = token_fd,
-		.prog_flags = token_fd ? BPF_F_TOKEN_FD : 0,
-	);
-	struct bpf_insn insns[] = {
-		BPF_MOV64_IMM(BPF_REG_0, 0),
-		BPF_EXIT_INSN(),
-	};
-	int fd, insn_cnt = ARRAY_SIZE(insns);
-
-	/* use any valid combination of program type and (optional)
-	 * non-zero expected attach type (i.e., not a BPF_CGROUP_INET_INGRESS)
-	 * to see if kernel supports expected_attach_type field for
-	 * BPF_PROG_LOAD command
-	 */
-	fd = bpf_prog_load(BPF_PROG_TYPE_CGROUP_SOCK, NULL, "GPL", insns, insn_cnt, &opts);
-	return probe_fd(fd);
-}
-
-static int probe_kern_probe_read_kernel(int token_fd)
-{
-	LIBBPF_OPTS(bpf_prog_load_opts, opts,
-		.token_fd = token_fd,
-		.prog_flags = token_fd ? BPF_F_TOKEN_FD : 0,
-	);
-	struct bpf_insn insns[] = {
-		BPF_MOV64_REG(BPF_REG_1, BPF_REG_10),	/* r1 = r10 (fp) */
-		BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -8),	/* r1 += -8 */
-		BPF_MOV64_IMM(BPF_REG_2, 8),		/* r2 = 8 */
-		BPF_MOV64_IMM(BPF_REG_3, 0),		/* r3 = 0 */
-		BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_probe_read_kernel),
-		BPF_EXIT_INSN(),
-	};
-	int fd, insn_cnt = ARRAY_SIZE(insns);
-
-	fd = bpf_prog_load(BPF_PROG_TYPE_TRACEPOINT, NULL, "GPL", insns, insn_cnt, &opts);
-	return probe_fd(fd);
-}
-
-static int probe_prog_bind_map(int token_fd)
-{
-	char *cp, errmsg[STRERR_BUFSIZE];
-	struct bpf_insn insns[] = {
-		BPF_MOV64_IMM(BPF_REG_0, 0),
-		BPF_EXIT_INSN(),
-	};
-	LIBBPF_OPTS(bpf_map_create_opts, map_opts,
-		.token_fd = token_fd,
-		.map_flags = token_fd ? BPF_F_TOKEN_FD : 0,
-	);
-	LIBBPF_OPTS(bpf_prog_load_opts, prog_opts,
-		.token_fd = token_fd,
-		.prog_flags = token_fd ? BPF_F_TOKEN_FD : 0,
-	);
-	int ret, map, prog, insn_cnt = ARRAY_SIZE(insns);
-
-	map = bpf_map_create(BPF_MAP_TYPE_ARRAY, "libbpf_det_bind", sizeof(int), 32, 1, &map_opts);
-	if (map < 0) {
-		ret = -errno;
-		cp = libbpf_strerror_r(ret, errmsg, sizeof(errmsg));
-		pr_warn("Error in %s():%s(%d). Couldn't create simple array map.\n",
-			__func__, cp, -ret);
-		return ret;
-	}
-
-	prog = bpf_prog_load(BPF_PROG_TYPE_SOCKET_FILTER, NULL, "GPL", insns, insn_cnt, &prog_opts);
-	if (prog < 0) {
-		close(map);
-		return 0;
-	}
-
-	ret = bpf_prog_bind_map(prog, map, NULL);
-
-	close(map);
-	close(prog);
-
-	return ret >= 0;
-}
-
-static int probe_module_btf(int token_fd)
-{
-	static const char strs[] = "\0int";
-	__u32 types[] = {
-		/* int */
-		BTF_TYPE_INT_ENC(1, BTF_INT_SIGNED, 0, 32, 4),
-	};
-	struct bpf_btf_info info;
-	__u32 len = sizeof(info);
-	char name[16];
-	int fd, err;
-
-	fd = libbpf__load_raw_btf((char *)types, sizeof(types), strs, sizeof(strs), token_fd);
-	if (fd < 0)
-		return 0; /* BTF not supported at all */
-
-	memset(&info, 0, sizeof(info));
-	info.name = ptr_to_u64(name);
-	info.name_len = sizeof(name);
-
-	/* check that BPF_OBJ_GET_INFO_BY_FD supports specifying name pointer;
-	 * kernel's module BTF support coincides with support for
-	 * name/name_len fields in struct bpf_btf_info.
-	 */
-	err = bpf_btf_get_info_by_fd(fd, &info, &len);
-	close(fd);
-	return !err;
-}
-
-static int probe_perf_link(int token_fd)
-{
-	struct bpf_insn insns[] = {
-		BPF_MOV64_IMM(BPF_REG_0, 0),
-		BPF_EXIT_INSN(),
-	};
-	LIBBPF_OPTS(bpf_prog_load_opts, opts,
-		.token_fd = token_fd,
-		.prog_flags = token_fd ? BPF_F_TOKEN_FD : 0,
-	);
-	int prog_fd, link_fd, err;
-
-	prog_fd = bpf_prog_load(BPF_PROG_TYPE_TRACEPOINT, NULL, "GPL",
-				insns, ARRAY_SIZE(insns), &opts);
-	if (prog_fd < 0)
-		return -errno;
-
-	/* use invalid perf_event FD to get EBADF, if link is supported;
-	 * otherwise EINVAL should be returned
-	 */
-	link_fd = bpf_link_create(prog_fd, -1, BPF_PERF_EVENT, NULL);
-	err = -errno; /* close() can clobber errno */
-
-	if (link_fd >= 0)
-		close(link_fd);
-	close(prog_fd);
-
-	return link_fd < 0 && err == -EBADF;
-}
-
-static int probe_uprobe_multi_link(int token_fd)
-{
-	LIBBPF_OPTS(bpf_prog_load_opts, load_opts,
-		.expected_attach_type = BPF_TRACE_UPROBE_MULTI,
-		.token_fd = token_fd,
-		.prog_flags = token_fd ? BPF_F_TOKEN_FD : 0,
-	);
-	LIBBPF_OPTS(bpf_link_create_opts, link_opts);
-	struct bpf_insn insns[] = {
-		BPF_MOV64_IMM(BPF_REG_0, 0),
-		BPF_EXIT_INSN(),
-	};
-	int prog_fd, link_fd, err;
-	unsigned long offset = 0;
-
-	prog_fd = bpf_prog_load(BPF_PROG_TYPE_KPROBE, NULL, "GPL",
-				insns, ARRAY_SIZE(insns), &load_opts);
-	if (prog_fd < 0)
-		return -errno;
-
-	/* Creating uprobe in '/' binary should fail with -EBADF. */
-	link_opts.uprobe_multi.path = "/";
-	link_opts.uprobe_multi.offsets = &offset;
-	link_opts.uprobe_multi.cnt = 1;
-
-	link_fd = bpf_link_create(prog_fd, -1, BPF_TRACE_UPROBE_MULTI, &link_opts);
-	err = -errno; /* close() can clobber errno */
-
-	if (link_fd >= 0 || err != -EBADF) {
-		if (link_fd >= 0)
-			close(link_fd);
-		close(prog_fd);
-		return 0;
-	}
-
-	/* Initial multi-uprobe support in kernel didn't handle PID filtering
-	 * correctly (it was doing thread filtering, not process filtering).
-	 * So now we'll detect if PID filtering logic was fixed, and, if not,
-	 * we'll pretend multi-uprobes are not supported, if not.
-	 * Multi-uprobes are used in USDT attachment logic, and we need to be
-	 * conservative here, because multi-uprobe selection happens early at
-	 * load time, while the use of PID filtering is known late at
-	 * attachment time, at which point it's too late to undo multi-uprobe
-	 * selection.
-	 *
-	 * Creating uprobe with pid == -1 for (invalid) '/' binary will fail
-	 * early with -EINVAL on kernels with fixed PID filtering logic;
-	 * otherwise -ESRCH would be returned if passed correct binary path
-	 * (but we'll just get -BADF, of course).
-	 */
-	link_opts.uprobe_multi.pid = -1; /* invalid PID */
-	link_opts.uprobe_multi.path = "/"; /* invalid path */
-	link_opts.uprobe_multi.offsets = &offset;
-	link_opts.uprobe_multi.cnt = 1;
-
-	link_fd = bpf_link_create(prog_fd, -1, BPF_TRACE_UPROBE_MULTI, &link_opts);
-	err = -errno; /* close() can clobber errno */
-
-	if (link_fd >= 0)
-		close(link_fd);
-	close(prog_fd);
-
-	return link_fd < 0 && err == -EINVAL;
-}
-
-static int probe_kern_bpf_cookie(int token_fd)
-{
-	struct bpf_insn insns[] = {
-		BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0, BPF_FUNC_get_attach_cookie),
-		BPF_EXIT_INSN(),
-	};
-	LIBBPF_OPTS(bpf_prog_load_opts, opts,
-		.token_fd = token_fd,
-		.prog_flags = token_fd ? BPF_F_TOKEN_FD : 0,
-	);
-	int ret, insn_cnt = ARRAY_SIZE(insns);
-
-	ret = bpf_prog_load(BPF_PROG_TYPE_TRACEPOINT, NULL, "GPL", insns, insn_cnt, &opts);
-	return probe_fd(ret);
-}
-
-static int probe_kern_btf_enum64(int token_fd)
-{
-	static const char strs[] = "\0enum64";
-	__u32 types[] = {
-		BTF_TYPE_ENC(1, BTF_INFO_ENC(BTF_KIND_ENUM64, 0, 0), 8),
-	};
-
-	return probe_fd(libbpf__load_raw_btf((char *)types, sizeof(types),
-					     strs, sizeof(strs), token_fd));
-}
-
-static int probe_kern_arg_ctx_tag(int token_fd)
-{
-	static const char strs[] = "\0a\0b\0arg:ctx\0";
-	const __u32 types[] = {
-		/* [1] INT */
-		BTF_TYPE_INT_ENC(1 /* "a" */, BTF_INT_SIGNED, 0, 32, 4),
-		/* [2] PTR -> VOID */
-		BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 0),
-		/* [3] FUNC_PROTO `int(void *a)` */
-		BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_FUNC_PROTO, 0, 1), 1),
-		BTF_PARAM_ENC(1 /* "a" */, 2),
-		/* [4] FUNC 'a' -> FUNC_PROTO (main prog) */
-		BTF_TYPE_ENC(1 /* "a" */, BTF_INFO_ENC(BTF_KIND_FUNC, 0, BTF_FUNC_GLOBAL), 3),
-		/* [5] FUNC_PROTO `int(void *b __arg_ctx)` */
-		BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_FUNC_PROTO, 0, 1), 1),
-		BTF_PARAM_ENC(3 /* "b" */, 2),
-		/* [6] FUNC 'b' -> FUNC_PROTO (subprog) */
-		BTF_TYPE_ENC(3 /* "b" */, BTF_INFO_ENC(BTF_KIND_FUNC, 0, BTF_FUNC_GLOBAL), 5),
-		/* [7] DECL_TAG 'arg:ctx' -> func 'b' arg 'b' */
-		BTF_TYPE_DECL_TAG_ENC(5 /* "arg:ctx" */, 6, 0),
-	};
-	const struct bpf_insn insns[] = {
-		/* main prog */
-		BPF_CALL_REL(+1),
-		BPF_EXIT_INSN(),
-		/* global subprog */
-		BPF_EMIT_CALL(BPF_FUNC_get_func_ip), /* needs PTR_TO_CTX */
-		BPF_EXIT_INSN(),
-	};
-	const struct bpf_func_info_min func_infos[] = {
-		{ 0, 4 }, /* main prog -> FUNC 'a' */
-		{ 2, 6 }, /* subprog -> FUNC 'b' */
-	};
-	LIBBPF_OPTS(bpf_prog_load_opts, opts,
-		.token_fd = token_fd,
-		.prog_flags = token_fd ? BPF_F_TOKEN_FD : 0,
-	);
-	int prog_fd, btf_fd, insn_cnt = ARRAY_SIZE(insns);
-
-	btf_fd = libbpf__load_raw_btf((char *)types, sizeof(types), strs, sizeof(strs), token_fd);
-	if (btf_fd < 0)
-		return 0;
-
-	opts.prog_btf_fd = btf_fd;
-	opts.func_info = &func_infos;
-	opts.func_info_cnt = ARRAY_SIZE(func_infos);
-	opts.func_info_rec_size = sizeof(func_infos[0]);
-
-	prog_fd = bpf_prog_load(BPF_PROG_TYPE_KPROBE, "det_arg_ctx",
-				"GPL", insns, insn_cnt, &opts);
-	close(btf_fd);
-
-	return probe_fd(prog_fd);
-}
-
-typedef int (*feature_probe_fn)(int /* token_fd */);
-
-static struct kern_feature_cache feature_cache;
-
-static struct kern_feature_desc {
-	const char *desc;
-	feature_probe_fn probe;
-} feature_probes[__FEAT_CNT] = {
-	[FEAT_PROG_NAME] = {
-		"BPF program name", probe_kern_prog_name,
-	},
-	[FEAT_GLOBAL_DATA] = {
-		"global variables", probe_kern_global_data,
-	},
-	[FEAT_BTF] = {
-		"minimal BTF", probe_kern_btf,
-	},
-	[FEAT_BTF_FUNC] = {
-		"BTF functions", probe_kern_btf_func,
-	},
-	[FEAT_BTF_GLOBAL_FUNC] = {
-		"BTF global function", probe_kern_btf_func_global,
-	},
-	[FEAT_BTF_DATASEC] = {
-		"BTF data section and variable", probe_kern_btf_datasec,
-	},
-	[FEAT_ARRAY_MMAP] = {
-		"ARRAY map mmap()", probe_kern_array_mmap,
-	},
-	[FEAT_EXP_ATTACH_TYPE] = {
-		"BPF_PROG_LOAD expected_attach_type attribute",
-		probe_kern_exp_attach_type,
-	},
-	[FEAT_PROBE_READ_KERN] = {
-		"bpf_probe_read_kernel() helper", probe_kern_probe_read_kernel,
-	},
-	[FEAT_PROG_BIND_MAP] = {
-		"BPF_PROG_BIND_MAP support", probe_prog_bind_map,
-	},
-	[FEAT_MODULE_BTF] = {
-		"module BTF support", probe_module_btf,
-	},
-	[FEAT_BTF_FLOAT] = {
-		"BTF_KIND_FLOAT support", probe_kern_btf_float,
-	},
-	[FEAT_PERF_LINK] = {
-		"BPF perf link support", probe_perf_link,
-	},
-	[FEAT_BTF_DECL_TAG] = {
-		"BTF_KIND_DECL_TAG support", probe_kern_btf_decl_tag,
-	},
-	[FEAT_BTF_TYPE_TAG] = {
-		"BTF_KIND_TYPE_TAG support", probe_kern_btf_type_tag,
-	},
-	[FEAT_MEMCG_ACCOUNT] = {
-		"memcg-based memory accounting", probe_memcg_account,
-	},
-	[FEAT_BPF_COOKIE] = {
-		"BPF cookie support", probe_kern_bpf_cookie,
-	},
-	[FEAT_BTF_ENUM64] = {
-		"BTF_KIND_ENUM64 support", probe_kern_btf_enum64,
-	},
-	[FEAT_SYSCALL_WRAPPER] = {
-		"Kernel using syscall wrapper", probe_kern_syscall_wrapper,
-	},
-	[FEAT_UPROBE_MULTI_LINK] = {
-		"BPF multi-uprobe link support", probe_uprobe_multi_link,
-	},
-	[FEAT_ARG_CTX_TAG] = {
-		"kernel-side __arg_ctx tag", probe_kern_arg_ctx_tag,
-	},
-	[FEAT_BTF_QMARK_DATASEC] = {
-		"BTF DATASEC names starting from '?'", probe_kern_btf_qmark_datasec,
-	},
-};
-
-bool feat_supported(struct kern_feature_cache *cache, enum kern_feature_id feat_id)
-{
-	struct kern_feature_desc *feat = &feature_probes[feat_id];
-	int ret;
-
-	/* assume global feature cache, unless custom one is provided */
-	if (!cache)
-		cache = &feature_cache;
-
-	if (READ_ONCE(cache->res[feat_id]) == FEAT_UNKNOWN) {
-		ret = feat->probe(cache->token_fd);
-		if (ret > 0) {
-			WRITE_ONCE(cache->res[feat_id], FEAT_SUPPORTED);
-		} else if (ret == 0) {
-			WRITE_ONCE(cache->res[feat_id], FEAT_MISSING);
-		} else {
-			pr_warn("Detection of kernel %s support failed: %d\n", feat->desc, ret);
-			WRITE_ONCE(cache->res[feat_id], FEAT_MISSING);
-		}
-	}
-
-	return READ_ONCE(cache->res[feat_id]) == FEAT_SUPPORTED;
-}
--- a/src/gen_loader.c
+++ b/src/gen_loader.c
@@ -18,7 +18,7 @@
 #define MAX_USED_MAPS	64
 #define MAX_USED_PROGS	32
 #define MAX_KFUNC_DESCS 256
-#define MAX_FD_ARRAY_SZ (MAX_USED_MAPS + MAX_KFUNC_DESCS)
+#define MAX_FD_ARRAY_SZ (MAX_USED_PROGS + MAX_KFUNC_DESCS)

 /* The following structure describes the stack layout of the loader program.
 * In addition R6 contains the pointer to context.
@@ -33,8 +33,8 @@
 */
 struct loader_stack {
 	__u32 btf_fd;
-	__u32 inner_map_fd;
 	__u32 prog_fd[MAX_USED_PROGS];
+	__u32 inner_map_fd;
 };

 #define stack_off(field) \
@@ -42,11 +42,6 @@ struct loader_stack {

 #define attr_field(attr, field) (attr + offsetof(union bpf_attr, field))

-static int blob_fd_array_off(struct bpf_gen *gen, int index)
-{
-	return gen->fd_array + index * sizeof(int);
-}
-
 static int realloc_insn_buf(struct bpf_gen *gen, __u32 size)
 {
 	size_t off = gen->insn_cur - gen->insn_start;
@@ -107,15 +102,11 @@ static void emit2(struct bpf_gen *gen, struct bpf_insn insn1, struct bpf_insn in
 	emit(gen, insn2);
 }

-static int add_data(struct bpf_gen *gen, const void *data, __u32 size);
-static void emit_sys_close_blob(struct bpf_gen *gen, int blob_off);
-
-void bpf_gen__init(struct bpf_gen *gen, int log_level, int nr_progs, int nr_maps)
+void bpf_gen__init(struct bpf_gen *gen, int log_level)
 {
-	size_t stack_sz = sizeof(struct loader_stack), nr_progs_sz;
+	size_t stack_sz = sizeof(struct loader_stack);
 	int i;

-	gen->fd_array = add_data(gen, NULL, MAX_FD_ARRAY_SZ * sizeof(int));
 	gen->log_level = log_level;
 	/* save ctx pointer into R6 */
 	emit(gen, BPF_MOV64_REG(BPF_REG_6, BPF_REG_1));
@@ -127,27 +118,19 @@ void bpf_gen__init(struct bpf_gen *gen, int log_level, int nr_progs, int nr_maps
 	emit(gen, BPF_MOV64_IMM(BPF_REG_3, 0));
 	emit(gen, BPF_EMIT_CALL(BPF_FUNC_probe_read_kernel));

-	/* amount of stack actually used, only used to calculate iterations, not stack offset */
-	nr_progs_sz = offsetof(struct loader_stack, prog_fd[nr_progs]);
 	/* jump over cleanup code */
 	emit(gen, BPF_JMP_IMM(BPF_JA, 0, 0,
-			      /* size of cleanup code below (including map fd cleanup) */
-			      (nr_progs_sz / 4) * 3 + 2 +
-			      /* 6 insns for emit_sys_close_blob,
-			       * 6 insns for debug_regs in emit_sys_close_blob
-			       */
-			      nr_maps * (6 + (gen->log_level ? 6 : 0))));
+			      /* size of cleanup code below */
+			      (stack_sz / 4) * 3 + 2));

 	/* remember the label where all error branches will jump to */
 	gen->cleanup_label = gen->insn_cur - gen->insn_start;
 	/* emit cleanup code: close all temp FDs */
-	for (i = 0; i < nr_progs_sz; i += 4) {
+	for (i = 0; i < stack_sz; i += 4) {
 		emit(gen, BPF_LDX_MEM(BPF_W, BPF_REG_1, BPF_REG_10, -stack_sz + i));
 		emit(gen, BPF_JMP_IMM(BPF_JSLE, BPF_REG_1, 0, 1));
 		emit(gen, BPF_EMIT_CALL(BPF_FUNC_sys_close));
 	}
-	for (i = 0; i < nr_maps; i++)
-		emit_sys_close_blob(gen, blob_fd_array_off(gen, i));
 	/* R7 contains the error code from sys_bpf. Copy it into R0 and exit. */
 	emit(gen, BPF_MOV64_REG(BPF_REG_0, BPF_REG_7));
 	emit(gen, BPF_EXIT_INSN());
@@ -177,6 +160,8 @@ static int add_data(struct bpf_gen *gen, const void *data, __u32 size)
 */
 static int add_map_fd(struct bpf_gen *gen)
 {
+	if (!gen->fd_array)
+		gen->fd_array = add_data(gen, NULL, MAX_FD_ARRAY_SZ * sizeof(int));
 	if (gen->nr_maps == MAX_USED_MAPS) {
 		pr_warn("Total maps exceeds %d\n", MAX_USED_MAPS);
 		gen->error = -E2BIG;
@@ -189,6 +174,8 @@ static int add_kfunc_btf_fd(struct bpf_gen *gen)
 {
 	int cur;

+	if (!gen->fd_array)
+		gen->fd_array = add_data(gen, NULL, MAX_FD_ARRAY_SZ * sizeof(int));
 	if (gen->nr_fd_array == MAX_KFUNC_DESCS) {
 		cur = add_data(gen, NULL, sizeof(int));
 		return (cur - gen->fd_array) / sizeof(int);
@@ -196,6 +183,11 @@ static int add_kfunc_btf_fd(struct bpf_gen *gen)
 	return MAX_USED_MAPS + gen->nr_fd_array++;
 }

+static int blob_fd_array_off(struct bpf_gen *gen, int index)
+{
+	return gen->fd_array + index * sizeof(int);
+}
+
 static int insn_bytes_to_bpf_size(__u32 sz)
 {
 	switch (sz) {
@@ -367,16 +359,10 @@ static void emit_sys_close_blob(struct bpf_gen *gen, int blob_off)
 	__emit_sys_close(gen);
 }

-int bpf_gen__finish(struct bpf_gen *gen, int nr_progs, int nr_maps)
+int bpf_gen__finish(struct bpf_gen *gen)
 {
 	int i;

-	if (nr_progs < gen->nr_progs || nr_maps != gen->nr_maps) {
-		pr_warn("nr_progs %d/%d nr_maps %d/%d mismatch\n",
-			nr_progs, gen->nr_progs, nr_maps, gen->nr_maps);
-		gen->error = -EFAULT;
-		return gen->error;
-	}
 	emit_sys_close_stack(gen, stack_off(btf_fd));
 	for (i = 0; i < gen->nr_progs; i++)
 		move_stack2ctx(gen,
@@ -446,32 +432,47 @@ void bpf_gen__load_btf(struct bpf_gen *gen, const void *btf_raw_data,
 }

 void bpf_gen__map_create(struct bpf_gen *gen,
-			 enum bpf_map_type map_type,
-			 const char *map_name,
-			 __u32 key_size, __u32 value_size, __u32 max_entries,
-			 struct bpf_map_create_opts *map_attr, int map_idx)
+			 struct bpf_create_map_params *map_attr, int map_idx)
 {
-	int attr_size = offsetofend(union bpf_attr, map_extra);
+	int attr_size = offsetofend(union bpf_attr, btf_vmlinux_value_type_id);
 	bool close_inner_map_fd = false;
 	int map_create_attr, idx;
 	union bpf_attr attr;

 	memset(&attr, 0, attr_size);
-	attr.map_type = map_type;
-	attr.key_size = key_size;
-	attr.value_size = value_size;
+	attr.map_type = map_attr->map_type;
+	attr.key_size = map_attr->key_size;
+	attr.value_size = map_attr->value_size;
 	attr.map_flags = map_attr->map_flags;
 	attr.map_extra = map_attr->map_extra;
-	if (map_name)
-		libbpf_strlcpy(attr.map_name, map_name, sizeof(attr.map_name));
+	memcpy(attr.map_name, map_attr->name,
+	       min((unsigned)strlen(map_attr->name), BPF_OBJ_NAME_LEN - 1));
 	attr.numa_node = map_attr->numa_node;
 	attr.map_ifindex = map_attr->map_ifindex;
-	attr.max_entries = max_entries;
-	attr.btf_key_type_id = map_attr->btf_key_type_id;
-	attr.btf_value_type_id = map_attr->btf_value_type_id;
+	attr.max_entries = map_attr->max_entries;
+	switch (attr.map_type) {
+	case BPF_MAP_TYPE_PERF_EVENT_ARRAY:
+	case BPF_MAP_TYPE_CGROUP_ARRAY:
+	case BPF_MAP_TYPE_STACK_TRACE:
+	case BPF_MAP_TYPE_ARRAY_OF_MAPS:
+	case BPF_MAP_TYPE_HASH_OF_MAPS:
+	case BPF_MAP_TYPE_DEVMAP:
+	case BPF_MAP_TYPE_DEVMAP_HASH:
+	case BPF_MAP_TYPE_CPUMAP:
+	case BPF_MAP_TYPE_XSKMAP:
+	case BPF_MAP_TYPE_SOCKMAP:
+	case BPF_MAP_TYPE_SOCKHASH:
+	case BPF_MAP_TYPE_QUEUE:
+	case BPF_MAP_TYPE_STACK:
+	case BPF_MAP_TYPE_RINGBUF:
+		break;
+	default:
+		attr.btf_key_type_id = map_attr->btf_key_type_id;
+		attr.btf_value_type_id = map_attr->btf_value_type_id;
+	}

 	pr_debug("gen: map_create: %s idx %d type %d value_type_id %d\n",
-		 attr.map_name, map_idx, map_type, attr.btf_value_type_id);
+		 attr.map_name, map_idx, map_attr->map_type, attr.btf_value_type_id);

 	map_create_attr = add_data(gen, &attr, attr_size);
 	if (attr.btf_value_type_id)
@@ -498,7 +499,7 @@ void bpf_gen__map_create(struct bpf_gen *gen,
 	/* emit MAP_CREATE command */
 	emit_sys_bpf(gen, BPF_MAP_CREATE, map_create_attr, attr_size);
 	debug_ret(gen, "map_create %s idx %d type %d value_size %d value_btf_id %d",
-		  attr.map_name, map_idx, map_type, value_size,
+		  attr.map_name, map_idx, map_attr->map_type, attr.value_size,
 		  attr.btf_value_type_id);
 	emit_check_err(gen);
 	/* remember map_fd in the stack, if successful */
@@ -533,7 +534,7 @@ void bpf_gen__record_attach_target(struct bpf_gen *gen, const char *attach_name,
 	gen->attach_kind = kind;
 	ret = snprintf(gen->attach_target, sizeof(gen->attach_target), "%s%s",
 		       prefix, attach_name);
-	if (ret >= sizeof(gen->attach_target))
+	if (ret == sizeof(gen->attach_target))
 		gen->error = -ENOSPC;
 }

@@ -560,7 +561,7 @@ static void emit_find_attach_target(struct bpf_gen *gen)
 }

 void bpf_gen__record_extern(struct bpf_gen *gen, const char *name, bool is_weak,
-			    bool is_typeless, bool is_ld64, int kind, int insn_idx)
+			    bool is_typeless, int kind, int insn_idx)
 {
 	struct ksym_relo_desc *relo;

@@ -574,7 +575,6 @@ void bpf_gen__record_extern(struct bpf_gen *gen, const char *name, bool is_weak,
 	relo->name = name;
 	relo->is_weak = is_weak;
 	relo->is_typeless = is_typeless;
-	relo->is_ld64 = is_ld64;
 	relo->kind = kind;
 	relo->insn_idx = insn_idx;
 	gen->relo_cnt++;
@@ -587,11 +587,9 @@ static struct ksym_desc *get_ksym_desc(struct bpf_gen *gen, struct ksym_relo_des
 	int i;

 	for (i = 0; i < gen->nr_ksyms; i++) {
-		kdesc = &gen->ksyms[i];
-		if (kdesc->kind == relo->kind && kdesc->is_ld64 == relo->is_ld64 &&
-		    !strcmp(kdesc->name, relo->name)) {
-			kdesc->ref++;
-			return kdesc;
+		if (!strcmp(gen->ksyms[i].name, relo->name)) {
+			gen->ksyms[i].ref++;
+			return &gen->ksyms[i];
 		}
 	}
 	kdesc = libbpf_reallocarray(gen->ksyms, gen->nr_ksyms + 1, sizeof(*kdesc));
@@ -606,7 +604,6 @@ static struct ksym_desc *get_ksym_desc(struct bpf_gen *gen, struct ksym_relo_des
 	kdesc->ref = 1;
 	kdesc->off = 0;
 	kdesc->insn = 0;
-	kdesc->is_ld64 = relo->is_ld64;
 	return kdesc;
 }

@@ -691,29 +688,27 @@ static void emit_relo_kfunc_btf(struct bpf_gen *gen, struct ksym_relo_desc *relo
 		return;
 	}
 	kdesc->off = btf_fd_idx;
-	/* jump to success case */
-	emit(gen, BPF_JMP_IMM(BPF_JSGE, BPF_REG_7, 0, 3));
-	/* set value for imm, off as 0 */
+	/* set a default value for imm */
 	emit(gen, BPF_ST_MEM(BPF_W, BPF_REG_8, offsetof(struct bpf_insn, imm), 0));
-	emit(gen, BPF_ST_MEM(BPF_H, BPF_REG_8, offsetof(struct bpf_insn, off), 0));
-	/* skip success case for ret < 0 */
-	emit(gen, BPF_JMP_IMM(BPF_JA, 0, 0, 10));
+	/* skip success case store if ret < 0 */
+	emit(gen, BPF_JMP_IMM(BPF_JSLT, BPF_REG_7, 0, 1));
 	/* store btf_id into insn[insn_idx].imm */
 	emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_8, BPF_REG_7, offsetof(struct bpf_insn, imm)));
-	/* obtain fd in BPF_REG_9 */
-	emit(gen, BPF_MOV64_REG(BPF_REG_9, BPF_REG_7));
-	emit(gen, BPF_ALU64_IMM(BPF_RSH, BPF_REG_9, 32));
 	/* load fd_array slot pointer */
 	emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_0, BPF_PSEUDO_MAP_IDX_VALUE,
 					 0, 0, 0, blob_fd_array_off(gen, btf_fd_idx)));
-	/* store BTF fd in slot, 0 for vmlinux */
+	/* skip store of BTF fd if ret < 0 */
+	emit(gen, BPF_JMP_IMM(BPF_JSLT, BPF_REG_7, 0, 3));
+	/* store BTF fd in slot */
+	emit(gen, BPF_MOV64_REG(BPF_REG_9, BPF_REG_7));
+	emit(gen, BPF_ALU64_IMM(BPF_RSH, BPF_REG_9, 32));
 	emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_0, BPF_REG_9, 0));
-	/* jump to insn[insn_idx].off store if fd denotes module BTF */
-	emit(gen, BPF_JMP_IMM(BPF_JNE, BPF_REG_9, 0, 2));
-	/* set the default value for off */
+	/* set a default value for off */
 	emit(gen, BPF_ST_MEM(BPF_H, BPF_REG_8, offsetof(struct bpf_insn, off), 0));
-	/* skip BTF fd store for vmlinux BTF */
-	emit(gen, BPF_JMP_IMM(BPF_JA, 0, 0, 1));
+	/* skip insn->off store if ret < 0 */
+	emit(gen, BPF_JMP_IMM(BPF_JSLT, BPF_REG_7, 0, 2));
+	/* skip if vmlinux BTF */
+	emit(gen, BPF_JMP_IMM(BPF_JEQ, BPF_REG_9, 0, 1));
 	/* store index into insn[insn_idx].off */
 	emit(gen, BPF_ST_MEM(BPF_H, BPF_REG_8, offsetof(struct bpf_insn, off), btf_fd_idx));
 log:
@@ -808,14 +803,13 @@ static void emit_relo_ksym_btf(struct bpf_gen *gen, struct ksym_relo_desc *relo,
 		return;
 	/* try to copy from existing ldimm64 insn */
 	if (kdesc->ref > 1) {
-		move_blob2blob(gen, insn + sizeof(struct bpf_insn) + offsetof(struct bpf_insn, imm), 4,
-			       kdesc->insn + sizeof(struct bpf_insn) + offsetof(struct bpf_insn, imm));
 		move_blob2blob(gen, insn + offsetof(struct bpf_insn, imm), 4,
 			       kdesc->insn + offsetof(struct bpf_insn, imm));
-		/* jump over src_reg adjustment if imm (btf_id) is not 0, reuse BPF_REG_0 from move_blob2blob
-		 * If btf_id is zero, clear BPF_PSEUDO_BTF_ID flag in src_reg of ld_imm64 insn
-		 */
-		emit(gen, BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 3));
+		move_blob2blob(gen, insn + sizeof(struct bpf_insn) + offsetof(struct bpf_insn, imm), 4,
+			       kdesc->insn + sizeof(struct bpf_insn) + offsetof(struct bpf_insn, imm));
+		emit(gen, BPF_LDX_MEM(BPF_W, BPF_REG_9, BPF_REG_8, offsetof(struct bpf_insn, imm)));
+		/* jump over src_reg adjustment if imm is not 0 */
+		emit(gen, BPF_JMP_IMM(BPF_JNE, BPF_REG_9, 0, 3));
 		goto clear_src_reg;
 	}
 	/* remember insn offset, so we can copy BTF ID and FD later */
@@ -823,21 +817,18 @@ static void emit_relo_ksym_btf(struct bpf_gen *gen, struct ksym_relo_desc *relo,
 	emit_bpf_find_by_name_kind(gen, relo);
 	if (!relo->is_weak)
 		emit_check_err(gen);
-	/* jump to success case */
-	emit(gen, BPF_JMP_IMM(BPF_JSGE, BPF_REG_7, 0, 3));
-	/* set values for insn[insn_idx].imm, insn[insn_idx + 1].imm as 0 */
+	/* set default values as 0 */
 	emit(gen, BPF_ST_MEM(BPF_W, BPF_REG_8, offsetof(struct bpf_insn, imm), 0));
 	emit(gen, BPF_ST_MEM(BPF_W, BPF_REG_8, sizeof(struct bpf_insn) + offsetof(struct bpf_insn, imm), 0));
-	/* skip success case for ret < 0 */
-	emit(gen, BPF_JMP_IMM(BPF_JA, 0, 0, 4));
+	/* skip success case stores if ret < 0 */
+	emit(gen, BPF_JMP_IMM(BPF_JSLT, BPF_REG_7, 0, 4));
 	/* store btf_id into insn[insn_idx].imm */
 	emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_8, BPF_REG_7, offsetof(struct bpf_insn, imm)));
 	/* store btf_obj_fd into insn[insn_idx + 1].imm */
 	emit(gen, BPF_ALU64_IMM(BPF_RSH, BPF_REG_7, 32));
 	emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_8, BPF_REG_7,
 			      sizeof(struct bpf_insn) + offsetof(struct bpf_insn, imm)));
-	/* skip src_reg adjustment */
-	emit(gen, BPF_JMP_IMM(BPF_JA, 0, 0, 3));
+	emit(gen, BPF_JMP_IMM(BPF_JSGE, BPF_REG_7, 0, 3));
 clear_src_reg:
 	/* clear bpf_object__relocate_data's src_reg assignment, otherwise we get a verifier failure */
 	reg_mask = src_reg_mask();
@@ -848,37 +839,27 @@ clear_src_reg:
 	emit_ksym_relo_log(gen, relo, kdesc->ref);
 }

-void bpf_gen__record_relo_core(struct bpf_gen *gen,
-			       const struct bpf_core_relo *core_relo)
-{
-	struct bpf_core_relo *relos;
-
-	relos = libbpf_reallocarray(gen->core_relos, gen->core_relo_cnt + 1, sizeof(*relos));
-	if (!relos) {
-		gen->error = -ENOMEM;
-		return;
-	}
-	gen->core_relos = relos;
-	relos += gen->core_relo_cnt;
-	memcpy(relos, core_relo, sizeof(*relos));
-	gen->core_relo_cnt++;
-}
-
 static void emit_relo(struct bpf_gen *gen, struct ksym_relo_desc *relo, int insns)
 {
 	int insn;

-	pr_debug("gen: emit_relo (%d): %s at %d %s\n",
-		 relo->kind, relo->name, relo->insn_idx, relo->is_ld64 ? "ld64" : "call");
+	pr_debug("gen: emit_relo (%d): %s at %d\n", relo->kind, relo->name, relo->insn_idx);
 	insn = insns + sizeof(struct bpf_insn) * relo->insn_idx;
 	emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_8, BPF_PSEUDO_MAP_IDX_VALUE, 0, 0, 0, insn));
-	if (relo->is_ld64) {
+	switch (relo->kind) {
+	case BTF_KIND_VAR:
 		if (relo->is_typeless)
 			emit_relo_ksym_typeless(gen, relo, insn);
 		else
 			emit_relo_ksym_btf(gen, relo, insn);
-	} else {
+		break;
+	case BTF_KIND_FUNC:
 		emit_relo_kfunc_btf(gen, relo, insn);
+		break;
+	default:
+		pr_warn("Unknown relocation kind '%d'\n", relo->kind);
+		gen->error = -EDOM;
+		return;
 	}
 }

@@ -890,31 +871,20 @@ static void emit_relos(struct bpf_gen *gen, int insns)
 		emit_relo(gen, gen->relos + i, insns);
 }

-static void cleanup_core_relo(struct bpf_gen *gen)
-{
-	if (!gen->core_relo_cnt)
-		return;
-	free(gen->core_relos);
-	gen->core_relo_cnt = 0;
-	gen->core_relos = NULL;
-}
-
 static void cleanup_relos(struct bpf_gen *gen, int insns)
 {
-	struct ksym_desc *kdesc;
 	int i, insn;

 	for (i = 0; i < gen->nr_ksyms; i++) {
-		kdesc = &gen->ksyms[i];
 		/* only close fds for typed ksyms and kfuncs */
-		if (kdesc->is_ld64 && !kdesc->typeless) {
+		if (gen->ksyms[i].kind == BTF_KIND_VAR && !gen->ksyms[i].typeless) {
 			/* close fd recorded in insn[insn_idx + 1].imm */
-			insn = kdesc->insn;
+			insn = gen->ksyms[i].insn;
 			insn += sizeof(struct bpf_insn) + offsetof(struct bpf_insn, imm);
 			emit_sys_close_blob(gen, insn);
-		} else if (!kdesc->is_ld64) {
-			emit_sys_close_blob(gen, blob_fd_array_off(gen, kdesc->off));
-			if (kdesc->off < MAX_FD_ARRAY_SZ)
+		} else if (gen->ksyms[i].kind == BTF_KIND_FUNC) {
+			emit_sys_close_blob(gen, blob_fd_array_off(gen, gen->ksyms[i].off));
+			if (gen->ksyms[i].off < MAX_FD_ARRAY_SZ)
 				gen->nr_fd_array--;
 		}
 	}
@@ -928,32 +898,30 @@ static void cleanup_relos(struct bpf_gen *gen, int insns)
 		gen->relo_cnt = 0;
 		gen->relos = NULL;
 	}
-	cleanup_core_relo(gen);
 }

 void bpf_gen__prog_load(struct bpf_gen *gen,
-			enum bpf_prog_type prog_type, const char *prog_name,
-			const char *license, struct bpf_insn *insns, size_t insn_cnt,
-			struct bpf_prog_load_opts *load_attr, int prog_idx)
+			struct bpf_prog_load_params *load_attr, int prog_idx)
 {
-	int prog_load_attr, license_off, insns_off, func_info, line_info, core_relos;
-	int attr_size = offsetofend(union bpf_attr, core_relo_rec_size);
+	int attr_size = offsetofend(union bpf_attr, fd_array);
+	int prog_load_attr, license, insns, func_info, line_info;
 	union bpf_attr attr;

 	memset(&attr, 0, attr_size);
-	pr_debug("gen: prog_load: type %d insns_cnt %zd progi_idx %d\n",
-		 prog_type, insn_cnt, prog_idx);
+	pr_debug("gen: prog_load: type %d insns_cnt %zd\n",
+		 load_attr->prog_type, load_attr->insn_cnt);
 	/* add license string to blob of bytes */
-	license_off = add_data(gen, license, strlen(license) + 1);
+	license = add_data(gen, load_attr->license, strlen(load_attr->license) + 1);
 	/* add insns to blob of bytes */
-	insns_off = add_data(gen, insns, insn_cnt * sizeof(struct bpf_insn));
+	insns = add_data(gen, load_attr->insns,
+			 load_attr->insn_cnt * sizeof(struct bpf_insn));

-	attr.prog_type = prog_type;
+	attr.prog_type = load_attr->prog_type;
 	attr.expected_attach_type = load_attr->expected_attach_type;
 	attr.attach_btf_id = load_attr->attach_btf_id;
 	attr.prog_ifindex = load_attr->prog_ifindex;
 	attr.kern_version = 0;
-	attr.insn_cnt = (__u32)insn_cnt;
+	attr.insn_cnt = (__u32)load_attr->insn_cnt;
 	attr.prog_flags = load_attr->prog_flags;

 	attr.func_info_rec_size = load_attr->func_info_rec_size;
@@ -966,19 +934,15 @@ void bpf_gen__prog_load(struct bpf_gen *gen,
 	line_info = add_data(gen, load_attr->line_info,
 			     attr.line_info_cnt * attr.line_info_rec_size);

-	attr.core_relo_rec_size = sizeof(struct bpf_core_relo);
-	attr.core_relo_cnt = gen->core_relo_cnt;
-	core_relos = add_data(gen, gen->core_relos,
-			     attr.core_relo_cnt * attr.core_relo_rec_size);
-
-	libbpf_strlcpy(attr.prog_name, prog_name, sizeof(attr.prog_name));
+	memcpy(attr.prog_name, load_attr->name,
+	       min((unsigned)strlen(load_attr->name), BPF_OBJ_NAME_LEN - 1));
 	prog_load_attr = add_data(gen, &attr, attr_size);

 	/* populate union bpf_attr with a pointer to license */
-	emit_rel_store(gen, attr_field(prog_load_attr, license), license_off);
+	emit_rel_store(gen, attr_field(prog_load_attr, license), license);

 	/* populate union bpf_attr with a pointer to instructions */
-	emit_rel_store(gen, attr_field(prog_load_attr, insns), insns_off);
+	emit_rel_store(gen, attr_field(prog_load_attr, insns), insns);

 	/* populate union bpf_attr with a pointer to func_info */
 	emit_rel_store(gen, attr_field(prog_load_attr, func_info), func_info);
@@ -986,9 +950,6 @@ void bpf_gen__prog_load(struct bpf_gen *gen,
 	/* populate union bpf_attr with a pointer to line_info */
 	emit_rel_store(gen, attr_field(prog_load_attr, line_info), line_info);

-	/* populate union bpf_attr with a pointer to core_relos */
-	emit_rel_store(gen, attr_field(prog_load_attr, core_relos), core_relos);
-
 	/* populate union bpf_attr fd_array with a pointer to data where map_fds are saved */
 	emit_rel_store(gen, attr_field(prog_load_attr, fd_array), gen->fd_array);

@@ -1013,17 +974,15 @@ void bpf_gen__prog_load(struct bpf_gen *gen,
 		emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_0, BPF_REG_7,
 				      offsetof(union bpf_attr, attach_btf_obj_fd)));
 	}
-	emit_relos(gen, insns_off);
+	emit_relos(gen, insns);
 	/* emit PROG_LOAD command */
 	emit_sys_bpf(gen, BPF_PROG_LOAD, prog_load_attr, attr_size);
 	debug_ret(gen, "prog_load %s insn_cnt %d", attr.prog_name, attr.insn_cnt);
 	/* successful or not, close btf module FDs used in extern ksyms and attach_btf_obj_fd */
-	cleanup_relos(gen, insns_off);
-	if (gen->attach_kind) {
+	cleanup_relos(gen, insns);
+	if (gen->attach_kind)
 		emit_sys_close_blob(gen,
 				    attr_field(prog_load_attr, attach_btf_obj_fd));
-		gen->attach_kind = 0;
-	}
 	emit_check_err(gen);
 	/* remember prog_fd in the stack, if successful */
 	emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_10, BPF_REG_7,
@@ -1045,27 +1004,18 @@ void bpf_gen__map_update_elem(struct bpf_gen *gen, int map_idx, void *pvalue,
 	value = add_data(gen, pvalue, value_size);
 	key = add_data(gen, &zero, sizeof(zero));

-	/* if (map_desc[map_idx].initial_value) {
-	 *    if (ctx->flags & BPF_SKEL_KERNEL)
-	 *        bpf_probe_read_kernel(value, value_size, initial_value);
-	 *    else
-	 *        bpf_copy_from_user(value, value_size, initial_value);
-	 * }
+	/* if (map_desc[map_idx].initial_value)
+	 *    copy_from_user(value, initial_value, value_size);
 	 */
 	emit(gen, BPF_LDX_MEM(BPF_DW, BPF_REG_3, BPF_REG_6,
 			      sizeof(struct bpf_loader_ctx) +
 			      sizeof(struct bpf_map_desc) * map_idx +
 			      offsetof(struct bpf_map_desc, initial_value)));
-	emit(gen, BPF_JMP_IMM(BPF_JEQ, BPF_REG_3, 0, 8));
+	emit(gen, BPF_JMP_IMM(BPF_JEQ, BPF_REG_3, 0, 4));
 	emit2(gen, BPF_LD_IMM64_RAW_FULL(BPF_REG_1, BPF_PSEUDO_MAP_IDX_VALUE,
 					 0, 0, 0, value));
 	emit(gen, BPF_MOV64_IMM(BPF_REG_2, value_size));
-	emit(gen, BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_6,
-			      offsetof(struct bpf_loader_ctx, flags)));
-	emit(gen, BPF_JMP_IMM(BPF_JSET, BPF_REG_0, BPF_SKEL_KERNEL, 2));
 	emit(gen, BPF_EMIT_CALL(BPF_FUNC_copy_from_user));
-	emit(gen, BPF_JMP_IMM(BPF_JA, 0, 0, 1));
-	emit(gen, BPF_EMIT_CALL(BPF_FUNC_probe_read_kernel));

 	map_update_attr = add_data(gen, &attr, attr_size);
 	move_blob2blob(gen, attr_field(map_update_attr, map_fd), 4,
@@ -1078,33 +1028,6 @@ void bpf_gen__map_update_elem(struct bpf_gen *gen, int map_idx, void *pvalue,
 	emit_check_err(gen);
 }

-void bpf_gen__populate_outer_map(struct bpf_gen *gen, int outer_map_idx, int slot,
-				 int inner_map_idx)
-{
-	int attr_size = offsetofend(union bpf_attr, flags);
-	int map_update_attr, key;
-	union bpf_attr attr;
-
-	memset(&attr, 0, attr_size);
-	pr_debug("gen: populate_outer_map: outer %d key %d inner %d\n",
-		 outer_map_idx, slot, inner_map_idx);
-
-	key = add_data(gen, &slot, sizeof(slot));
-
-	map_update_attr = add_data(gen, &attr, attr_size);
-	move_blob2blob(gen, attr_field(map_update_attr, map_fd), 4,
-		       blob_fd_array_off(gen, outer_map_idx));
-	emit_rel_store(gen, attr_field(map_update_attr, key), key);
-	emit_rel_store(gen, attr_field(map_update_attr, value),
-		       blob_fd_array_off(gen, inner_map_idx));
-
-	/* emit MAP_UPDATE_ELEM command */
-	emit_sys_bpf(gen, BPF_MAP_UPDATE_ELEM, map_update_attr, attr_size);
-	debug_ret(gen, "populate_outer_map outer %d key %d inner %d",
-		  outer_map_idx, slot, inner_map_idx);
-	emit_check_err(gen);
-}
-
 void bpf_gen__map_freeze(struct bpf_gen *gen, int map_idx)
 {
 	int attr_size = offsetofend(union bpf_attr, map_fd);
--- a/src/hashmap.c
+++ b/src/hashmap.c
@@ -75,7 +75,7 @@ void hashmap__clear(struct hashmap *map)

 void hashmap__free(struct hashmap *map)
 {
-	if (IS_ERR_OR_NULL(map))
+	if (!map)
 		return;

 	hashmap__clear(map);
@@ -128,7 +128,7 @@ static int hashmap_grow(struct hashmap *map)
 }

 static bool hashmap_find_entry(const struct hashmap *map,
-			       const long key, size_t hash,
+			       const void *key, size_t hash,
 			       struct hashmap_entry ***pprev,
 			       struct hashmap_entry **entry)
 {
@@ -151,18 +151,18 @@ static bool hashmap_find_entry(const struct hashmap *map,
 	return false;
 }

-int hashmap_insert(struct hashmap *map, long key, long value,
-		   enum hashmap_insert_strategy strategy,
-		   long *old_key, long *old_value)
+int hashmap__insert(struct hashmap *map, const void *key, void *value,
+		    enum hashmap_insert_strategy strategy,
+		    const void **old_key, void **old_value)
 {
 	struct hashmap_entry *entry;
 	size_t h;
 	int err;

 	if (old_key)
-		*old_key = 0;
+		*old_key = NULL;
 	if (old_value)
-		*old_value = 0;
+		*old_value = NULL;

 	h = hash_bits(map->hash_fn(key, map->ctx), map->cap_bits);
 	if (strategy != HASHMAP_APPEND &&
@@ -203,7 +203,7 @@ int hashmap_insert(struct hashmap *map, long key, long value,
 	return 0;
 }

-bool hashmap_find(const struct hashmap *map, long key, long *value)
+bool hashmap__find(const struct hashmap *map, const void *key, void **value)
 {
 	struct hashmap_entry *entry;
 	size_t h;
@@ -217,8 +217,8 @@ bool hashmap_find(const struct hashmap *map, long key, long *value)
 	return true;
 }

-bool hashmap_delete(struct hashmap *map, long key,
-		    long *old_key, long *old_value)
+bool hashmap__delete(struct hashmap *map, const void *key,
+		     const void **old_key, void **old_value)
 {
 	struct hashmap_entry **pprev, *entry;
 	size_t h;
@@ -238,3 +238,4 @@ bool hashmap_delete(struct hashmap *map, long key,

 	return true;
 }
+
--- a/src/hashmap.h
+++ b/src/hashmap.h
@@ -40,32 +40,12 @@ static inline size_t str_hash(const char *s)
 	return h;
 }

-typedef size_t (*hashmap_hash_fn)(long key, void *ctx);
-typedef bool (*hashmap_equal_fn)(long key1, long key2, void *ctx);
+typedef size_t (*hashmap_hash_fn)(const void *key, void *ctx);
+typedef bool (*hashmap_equal_fn)(const void *key1, const void *key2, void *ctx);

-/*
- * Hashmap interface is polymorphic, keys and values could be either
- * long-sized integers or pointers, this is achieved as follows:
- * - interface functions that operate on keys and values are hidden
- *   behind auxiliary macros, e.g. hashmap_insert <-> hashmap__insert;
- * - these auxiliary macros cast the key and value parameters as
- *   long or long *, so the user does not have to specify the casts explicitly;
- * - for pointer parameters (e.g. old_key) the size of the pointed
- *   type is verified by hashmap_cast_ptr using _Static_assert;
- * - when iterating using hashmap__for_each_* forms
- *   hasmap_entry->key should be used for integer keys and
- *   hasmap_entry->pkey should be used for pointer keys,
- *   same goes for values.
- */
 struct hashmap_entry {
-	union {
-		long key;
-		const void *pkey;
-	};
-	union {
-		long value;
-		void *pvalue;
-	};
+	const void *key;
+	void *value;
 	struct hashmap_entry *next;
 };

@@ -80,6 +60,16 @@ struct hashmap {
 	size_t sz;
 };

+#define HASHMAP_INIT(hash_fn, equal_fn, ctx) {	\
+	.hash_fn = (hash_fn),			\
+	.equal_fn = (equal_fn),			\
+	.ctx = (ctx),				\
+	.buckets = NULL,			\
+	.cap = 0,				\
+	.cap_bits = 0,				\
+	.sz = 0,				\
+}
+
 void hashmap__init(struct hashmap *map, hashmap_hash_fn hash_fn,
 		   hashmap_equal_fn equal_fn, void *ctx);
 struct hashmap *hashmap__new(hashmap_hash_fn hash_fn,
@@ -112,13 +102,6 @@ enum hashmap_insert_strategy {
 	HASHMAP_APPEND,
 };

-#define hashmap_cast_ptr(p) ({								\
-	_Static_assert((__builtin_constant_p((p)) ? (p) == NULL : 0) ||			\
-				sizeof(*(p)) == sizeof(long),				\
-		       #p " pointee should be a long-sized integer or a pointer");	\
-	(long *)(p);									\
-})
-
 /*
 * hashmap__insert() adds key/value entry w/ various semantics, depending on
 * provided strategy value. If a given key/value pair replaced already
@@ -126,38 +109,42 @@ enum hashmap_insert_strategy {
 * through old_key and old_value to allow calling code do proper memory
 * management.
 */
-int hashmap_insert(struct hashmap *map, long key, long value,
-		   enum hashmap_insert_strategy strategy,
-		   long *old_key, long *old_value);
+int hashmap__insert(struct hashmap *map, const void *key, void *value,
+		    enum hashmap_insert_strategy strategy,
+		    const void **old_key, void **old_value);

-#define hashmap__insert(map, key, value, strategy, old_key, old_value) \
-	hashmap_insert((map), (long)(key), (long)(value), (strategy),  \
-		       hashmap_cast_ptr(old_key),		       \
-		       hashmap_cast_ptr(old_value))
+static inline int hashmap__add(struct hashmap *map,
+			       const void *key, void *value)
+{
+	return hashmap__insert(map, key, value, HASHMAP_ADD, NULL, NULL);
+}

-#define hashmap__add(map, key, value) \
-	hashmap__insert((map), (key), (value), HASHMAP_ADD, NULL, NULL)
+static inline int hashmap__set(struct hashmap *map,
+			       const void *key, void *value,
+			       const void **old_key, void **old_value)
+{
+	return hashmap__insert(map, key, value, HASHMAP_SET,
+			       old_key, old_value);
+}

-#define hashmap__set(map, key, value, old_key, old_value) \
-	hashmap__insert((map), (key), (value), HASHMAP_SET, (old_key), (old_value))
+static inline int hashmap__update(struct hashmap *map,
+				  const void *key, void *value,
+				  const void **old_key, void **old_value)
+{
+	return hashmap__insert(map, key, value, HASHMAP_UPDATE,
+			       old_key, old_value);
+}

-#define hashmap__update(map, key, value, old_key, old_value) \
-	hashmap__insert((map), (key), (value), HASHMAP_UPDATE, (old_key), (old_value))
+static inline int hashmap__append(struct hashmap *map,
+				  const void *key, void *value)
+{
+	return hashmap__insert(map, key, value, HASHMAP_APPEND, NULL, NULL);
+}

-#define hashmap__append(map, key, value) \
-	hashmap__insert((map), (key), (value), HASHMAP_APPEND, NULL, NULL)
+bool hashmap__delete(struct hashmap *map, const void *key,
+		     const void **old_key, void **old_value);

-bool hashmap_delete(struct hashmap *map, long key, long *old_key, long *old_value);
-
-#define hashmap__delete(map, key, old_key, old_value)		       \
-	hashmap_delete((map), (long)(key),			       \
-		       hashmap_cast_ptr(old_key),		       \
-		       hashmap_cast_ptr(old_value))
-
-bool hashmap_find(const struct hashmap *map, long key, long *value);
-
-#define hashmap__find(map, key, value) \
-	hashmap_find((map), (long)(key), hashmap_cast_ptr(value))
+bool hashmap__find(const struct hashmap *map, const void *key, void **value);

 /*
 * hashmap__for_each_entry - iterate over all entries in hashmap
--- a/src/libbpf.c
+++ b/src/libbpf.c
--- a/src/libbpf.h
+++ b/src/libbpf.h
--- a/src/libbpf.map
+++ b/src/libbpf.map
@@ -1,14 +1,29 @@
 LIBBPF_0.0.1 {
 	global:
 		bpf_btf_get_fd_by_id;
+		bpf_create_map;
+		bpf_create_map_in_map;
+		bpf_create_map_in_map_node;
+		bpf_create_map_name;
+		bpf_create_map_node;
+		bpf_create_map_xattr;
+		bpf_load_btf;
+		bpf_load_program;
+		bpf_load_program_xattr;
 		bpf_map__btf_key_type_id;
 		bpf_map__btf_value_type_id;
+		bpf_map__def;
 		bpf_map__fd;
+		bpf_map__is_offload_neutral;
 		bpf_map__name;
+		bpf_map__next;
 		bpf_map__pin;
+		bpf_map__prev;
+		bpf_map__priv;
 		bpf_map__reuse_fd;
 		bpf_map__set_ifindex;
 		bpf_map__set_inner_map_fd;
+		bpf_map__set_priv;
 		bpf_map__unpin;
 		bpf_map_delete_elem;
 		bpf_map_get_fd_by_id;
@@ -23,37 +38,79 @@ LIBBPF_0.0.1 {
 		bpf_object__btf_fd;
 		bpf_object__close;
 		bpf_object__find_map_by_name;
+		bpf_object__find_map_by_offset;
+		bpf_object__find_program_by_title;
 		bpf_object__kversion;
 		bpf_object__load;
 		bpf_object__name;
+		bpf_object__next;
 		bpf_object__open;
+		bpf_object__open_buffer;
+		bpf_object__open_xattr;
 		bpf_object__pin;
 		bpf_object__pin_maps;
 		bpf_object__pin_programs;
+		bpf_object__priv;
+		bpf_object__set_priv;
+		bpf_object__unload;
 		bpf_object__unpin_maps;
 		bpf_object__unpin_programs;
+		bpf_perf_event_read_simple;
 		bpf_prog_attach;
 		bpf_prog_detach;
 		bpf_prog_detach2;
 		bpf_prog_get_fd_by_id;
 		bpf_prog_get_next_id;
+		bpf_prog_load;
+		bpf_prog_load_xattr;
 		bpf_prog_query;
+		bpf_prog_test_run;
+		bpf_prog_test_run_xattr;
 		bpf_program__fd;
+		bpf_program__is_kprobe;
+		bpf_program__is_perf_event;
+		bpf_program__is_raw_tracepoint;
+		bpf_program__is_sched_act;
+		bpf_program__is_sched_cls;
+		bpf_program__is_socket_filter;
+		bpf_program__is_tracepoint;
+		bpf_program__is_xdp;
+		bpf_program__load;
+		bpf_program__next;
+		bpf_program__nth_fd;
 		bpf_program__pin;
+		bpf_program__pin_instance;
+		bpf_program__prev;
+		bpf_program__priv;
 		bpf_program__set_expected_attach_type;
 		bpf_program__set_ifindex;
+		bpf_program__set_kprobe;
+		bpf_program__set_perf_event;
+		bpf_program__set_prep;
+		bpf_program__set_priv;
+		bpf_program__set_raw_tracepoint;
+		bpf_program__set_sched_act;
+		bpf_program__set_sched_cls;
+		bpf_program__set_socket_filter;
+		bpf_program__set_tracepoint;
 		bpf_program__set_type;
+		bpf_program__set_xdp;
+		bpf_program__title;
 		bpf_program__unload;
 		bpf_program__unpin;
+		bpf_program__unpin_instance;
 		bpf_prog_linfo__free;
 		bpf_prog_linfo__new;
 		bpf_prog_linfo__lfind_addr_func;
 		bpf_prog_linfo__lfind;
 		bpf_raw_tracepoint_open;
+		bpf_set_link_xdp_fd;
 		bpf_task_fd_query;
+		bpf_verify_program;
 		btf__fd;
 		btf__find_by_name;
 		btf__free;
+		btf__get_from_id;
 		btf__name_by_offset;
 		btf__new;
 		btf__resolve_size;
@@ -70,24 +127,48 @@ LIBBPF_0.0.1 {

 LIBBPF_0.0.2 {
 	global:
+		bpf_probe_helper;
+		bpf_probe_map_type;
+		bpf_probe_prog_type;
+		bpf_map__resize;
 		bpf_map_lookup_elem_flags;
 		bpf_object__btf;
 		bpf_object__find_map_fd_by_name;
+		bpf_get_link_xdp_id;
+		btf__dedup;
+		btf__get_map_kv_tids;
+		btf__get_nr_types;
 		btf__get_raw_data;
+		btf__load;
 		btf_ext__free;
+		btf_ext__func_info_rec_size;
 		btf_ext__get_raw_data;
+		btf_ext__line_info_rec_size;
 		btf_ext__new;
+		btf_ext__reloc_func_info;
+		btf_ext__reloc_line_info;
+		xsk_umem__create;
+		xsk_socket__create;
+		xsk_umem__delete;
+		xsk_socket__delete;
+		xsk_umem__fd;
+		xsk_socket__fd;
+		bpf_program__get_prog_info_linear;
+		bpf_program__bpil_addr_to_offs;
+		bpf_program__bpil_offs_to_addr;
 } LIBBPF_0.0.1;

 LIBBPF_0.0.3 {
 	global:
 		bpf_map__is_internal;
 		bpf_map_freeze;
+		btf__finalize_data;
 } LIBBPF_0.0.2;

 LIBBPF_0.0.4 {
 	global:
 		bpf_link__destroy;
+		bpf_object__load_xattr;
 		bpf_program__attach_kprobe;
 		bpf_program__attach_perf_event;
 		bpf_program__attach_raw_tracepoint;
@@ -95,10 +176,14 @@ LIBBPF_0.0.4 {
 		bpf_program__attach_uprobe;
 		btf_dump__dump_type;
 		btf_dump__free;
+		btf_dump__new;
 		btf__parse_elf;
 		libbpf_num_possible_cpus;
 		perf_buffer__free;
+		perf_buffer__new;
+		perf_buffer__new_raw;
 		perf_buffer__poll;
+		xsk_umem__create;
 } LIBBPF_0.0.3;

 LIBBPF_0.0.5 {
@@ -108,6 +193,7 @@ LIBBPF_0.0.5 {

 LIBBPF_0.0.6 {
 	global:
+		bpf_get_link_xdp_info;
 		bpf_map__get_pin_path;
 		bpf_map__is_pinned;
 		bpf_map__set_pin_path;
@@ -116,6 +202,9 @@ LIBBPF_0.0.6 {
 		bpf_program__attach_trace;
 		bpf_program__get_expected_attach_type;
 		bpf_program__get_type;
+		bpf_program__is_tracing;
+		bpf_program__set_tracing;
+		bpf_program__size;
 		btf__find_by_name_kind;
 		libbpf_find_vmlinux_btf_id;
 } LIBBPF_0.0.5;
@@ -135,8 +224,14 @@ LIBBPF_0.0.7 {
 		bpf_object__detach_skeleton;
 		bpf_object__load_skeleton;
 		bpf_object__open_skeleton;
+		bpf_probe_large_insn_limit;
+		bpf_prog_attach_xattr;
 		bpf_program__attach;
 		bpf_program__name;
+		bpf_program__is_extension;
+		bpf_program__is_struct_ops;
+		bpf_program__set_extension;
+		bpf_program__set_struct_ops;
 		btf__align_of;
 		libbpf_find_kernel_btf;
 } LIBBPF_0.0.6;
@@ -152,10 +247,12 @@ LIBBPF_0.0.8 {
 		bpf_link_create;
 		bpf_link_update;
 		bpf_map__set_initial_value;
-		bpf_prog_attach_opts;
 		bpf_program__attach_cgroup;
 		bpf_program__attach_lsm;
+		bpf_program__is_lsm;
 		bpf_program__set_attach_target;
+		bpf_program__set_lsm;
+		bpf_set_link_xdp_fd_opts;
 } LIBBPF_0.0.7;

 LIBBPF_0.0.9 {
@@ -193,7 +290,9 @@ LIBBPF_0.1.0 {
 		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;
@@ -236,6 +335,7 @@ LIBBPF_0.2.0 {
 		perf_buffer__buffer_fd;
 		perf_buffer__epoll_fd;
 		perf_buffer__consume_buffer;
+		xsk_socket__create_shared;
 } LIBBPF_0.1.0;

 LIBBPF_0.3.0 {
@@ -245,7 +345,10 @@ LIBBPF_0.3.0 {
 		btf__parse_raw_split;
 		btf__parse_split;
 		btf__new_empty_split;
+		btf__new_split;
 		ring_buffer__epoll_fd;
+		xsk_setup_xdp_prog;
+		xsk_socket__update_xskmap;
 } LIBBPF_0.2.0;

 LIBBPF_0.4.0 {
@@ -288,142 +391,14 @@ LIBBPF_0.6.0 {
 	global:
 		bpf_map__map_extra;
 		bpf_map__set_map_extra;
-		bpf_map_create;
 		bpf_object__next_map;
 		bpf_object__next_program;
 		bpf_object__prev_map;
 		bpf_object__prev_program;
-		bpf_prog_load;
-		bpf_program__flags;
 		bpf_program__insn_cnt;
 		bpf_program__insns;
-		bpf_program__set_flags;
 		btf__add_btf;
 		btf__add_decl_tag;
-		btf__add_type_tag;
-		btf__dedup;
 		btf__raw_data;
 		btf__type_cnt;
-		btf_dump__new;
-		libbpf_major_version;
-		libbpf_minor_version;
-		libbpf_version_string;
-		perf_buffer__new;
-		perf_buffer__new_raw;
 } LIBBPF_0.5.0;
-
-LIBBPF_0.7.0 {
-	global:
-		bpf_btf_load;
-		bpf_program__expected_attach_type;
-		bpf_program__log_buf;
-		bpf_program__log_level;
-		bpf_program__set_log_buf;
-		bpf_program__set_log_level;
-		bpf_program__type;
-		bpf_xdp_attach;
-		bpf_xdp_detach;
-		bpf_xdp_query;
-		bpf_xdp_query_id;
-		libbpf_probe_bpf_helper;
-		libbpf_probe_bpf_map_type;
-		libbpf_probe_bpf_prog_type;
-		libbpf_set_memlock_rlim;
-} LIBBPF_0.6.0;
-
-LIBBPF_0.8.0 {
-	global:
-		bpf_map__autocreate;
-		bpf_map__get_next_key;
-		bpf_map__delete_elem;
-		bpf_map__lookup_and_delete_elem;
-		bpf_map__lookup_elem;
-		bpf_map__set_autocreate;
-		bpf_map__update_elem;
-		bpf_map_delete_elem_flags;
-		bpf_object__destroy_subskeleton;
-		bpf_object__open_subskeleton;
-		bpf_program__attach_kprobe_multi_opts;
-		bpf_program__attach_trace_opts;
-		bpf_program__attach_usdt;
-		bpf_program__set_insns;
-		libbpf_register_prog_handler;
-		libbpf_unregister_prog_handler;
-} LIBBPF_0.7.0;
-
-LIBBPF_1.0.0 {
-	global:
-		bpf_obj_get_opts;
-		bpf_prog_query_opts;
-		bpf_program__attach_ksyscall;
-		bpf_program__autoattach;
-		bpf_program__set_autoattach;
-		btf__add_enum64;
-		btf__add_enum64_value;
-		libbpf_bpf_attach_type_str;
-		libbpf_bpf_link_type_str;
-		libbpf_bpf_map_type_str;
-		libbpf_bpf_prog_type_str;
-		perf_buffer__buffer;
-} LIBBPF_0.8.0;
-
-LIBBPF_1.1.0 {
-	global:
-		bpf_btf_get_fd_by_id_opts;
-		bpf_link_get_fd_by_id_opts;
-		bpf_map_get_fd_by_id_opts;
-		bpf_prog_get_fd_by_id_opts;
-		user_ring_buffer__discard;
-		user_ring_buffer__free;
-		user_ring_buffer__new;
-		user_ring_buffer__reserve;
-		user_ring_buffer__reserve_blocking;
-		user_ring_buffer__submit;
-} LIBBPF_1.0.0;
-
-LIBBPF_1.2.0 {
-	global:
-		bpf_btf_get_info_by_fd;
-		bpf_link__update_map;
-		bpf_link_get_info_by_fd;
-		bpf_map_get_info_by_fd;
-		bpf_prog_get_info_by_fd;
-} LIBBPF_1.1.0;
-
-LIBBPF_1.3.0 {
-	global:
-		bpf_obj_pin_opts;
-		bpf_object__unpin;
-		bpf_prog_detach_opts;
-		bpf_program__attach_netfilter;
-		bpf_program__attach_netkit;
-		bpf_program__attach_tcx;
-		bpf_program__attach_uprobe_multi;
-		ring__avail_data_size;
-		ring__consume;
-		ring__consumer_pos;
-		ring__map_fd;
-		ring__producer_pos;
-		ring__size;
-		ring_buffer__ring;
-} LIBBPF_1.2.0;
-
-LIBBPF_1.4.0 {
-	global:
-		bpf_program__attach_raw_tracepoint_opts;
-		bpf_raw_tracepoint_open_opts;
-		bpf_token_create;
-		btf__new_split;
-		btf_ext__raw_data;
-} LIBBPF_1.3.0;
-
-LIBBPF_1.5.0 {
-	global:
-		btf__distill_base;
-		btf__relocate;
-		bpf_map__autoattach;
-		bpf_map__set_autoattach;
-		bpf_program__attach_sockmap;
-		ring__consume_n;
-		ring_buffer__consume_n;
-} LIBBPF_1.4.0;
--- a/src/libbpf_common.h
+++ b/src/libbpf_common.h
@@ -30,23 +30,16 @@
 /* Add checks for other versions below when planning deprecation of API symbols
 * with the LIBBPF_DEPRECATED_SINCE macro.
 */
-#if __LIBBPF_CURRENT_VERSION_GEQ(1, 0)
-#define __LIBBPF_MARK_DEPRECATED_1_0(X) X
+#if __LIBBPF_CURRENT_VERSION_GEQ(0, 6)
+#define __LIBBPF_MARK_DEPRECATED_0_6(X) X
 #else
-#define __LIBBPF_MARK_DEPRECATED_1_0(X)
+#define __LIBBPF_MARK_DEPRECATED_0_6(X)
+#endif
+#if __LIBBPF_CURRENT_VERSION_GEQ(0, 7)
+#define __LIBBPF_MARK_DEPRECATED_0_7(X) X
+#else
+#define __LIBBPF_MARK_DEPRECATED_0_7(X)
 #endif
-
-/* This set of internal macros allows to do "function overloading" based on
- * number of arguments provided by used in backwards-compatible way during the
- * transition to libbpf 1.0
- * It's ugly but necessary evil that will be cleaned up when we get to 1.0.
- * See bpf_prog_load() overload for example.
- */
-#define ___libbpf_cat(A, B) A ## B
-#define ___libbpf_select(NAME, NUM) ___libbpf_cat(NAME, NUM)
-#define ___libbpf_nth(_1, _2, _3, _4, _5, _6, N, ...) N
-#define ___libbpf_cnt(...) ___libbpf_nth(__VA_ARGS__, 6, 5, 4, 3, 2, 1)
-#define ___libbpf_overload(NAME, ...) ___libbpf_select(NAME, ___libbpf_cnt(__VA_ARGS__))(__VA_ARGS__)

 /* Helper macro to declare and initialize libbpf options struct
 *
@@ -61,7 +54,7 @@
 * including any extra padding, it with memset() and then assigns initial
 * values provided by users in struct initializer-syntax as varargs.
 */
-#define LIBBPF_OPTS(TYPE, NAME, ...)					    \
+#define DECLARE_LIBBPF_OPTS(TYPE, NAME, ...)				    \
 	struct TYPE NAME = ({ 						    \
 		memset(&NAME, 0, sizeof(struct TYPE));			    \
 		(struct TYPE) {						    \
@@ -70,23 +63,4 @@
 		};							    \
 	})

-/* Helper macro to clear and optionally reinitialize libbpf options struct
- *
- * Small helper macro to reset all fields and to reinitialize the common
- * structure size member. Values provided by users in struct initializer-
- * syntax as varargs can be provided as well to reinitialize options struct
- * specific members.
- */
-#define LIBBPF_OPTS_RESET(NAME, ...)					    \
-	do {								    \
-		typeof(NAME) ___##NAME = ({ 				    \
-			memset(&___##NAME, 0, sizeof(NAME));		    \
-			(typeof(NAME)) {				    \
-				.sz = sizeof(NAME),			    \
-				__VA_ARGS__				    \
-			};						    \
-		});							    \
-		memcpy(&NAME, &___##NAME, sizeof(NAME));		    \
-	} while (0)
-
 #endif /* __LIBBPF_LIBBPF_COMMON_H */
--- a/src/libbpf_errno.c
+++ b/src/libbpf_errno.c
@@ -39,14 +39,14 @@ static const char *libbpf_strerror_table[NR_ERRNO] = {

 int libbpf_strerror(int err, char *buf, size_t size)
 {
-	int ret;
-
 	if (!buf || !size)
 		return libbpf_err(-EINVAL);

 	err = err > 0 ? err : -err;

 	if (err < __LIBBPF_ERRNO__START) {
+		int ret;
+
 		ret = strerror_r(err, buf, size);
 		buf[size - 1] = '\0';
 		return libbpf_err_errno(ret);
@@ -56,20 +56,12 @@ int libbpf_strerror(int err, char *buf, size_t size)
 		const char *msg;

 		msg = libbpf_strerror_table[ERRNO_OFFSET(err)];
-		ret = snprintf(buf, size, "%s", msg);
+		snprintf(buf, size, "%s", msg);
 		buf[size - 1] = '\0';
-		/* The length of the buf and msg is positive.
-		 * A negative number may be returned only when the
-		 * size exceeds INT_MAX. Not likely to appear.
-		 */
-		if (ret >= size)
-			return libbpf_err(-ERANGE);
 		return 0;
 	}

-	ret = snprintf(buf, size, "Unknown libbpf error %d", err);
+	snprintf(buf, size, "Unknown libbpf error %d", err);
 	buf[size - 1] = '\0';
-	if (ret >= size)
-		return libbpf_err(-ERANGE);
 	return libbpf_err(-ENOENT);
 }
--- a/src/libbpf_internal.h
+++ b/src/libbpf_internal.h
@@ -15,24 +15,9 @@
 #include <linux/err.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <sys/syscall.h>
-#include <libelf.h>
+#include "libbpf_legacy.h"
 #include "relo_core.h"

-/* Android's libc doesn't support AT_EACCESS in faccessat() implementation
- * ([0]), and just returns -EINVAL even if file exists and is accessible.
- * See [1] for issues caused by this.
- *
- * So just redefine it to 0 on Android.
- *
- * [0] https://android.googlesource.com/platform/bionic/+/refs/heads/android13-release/libc/bionic/faccessat.cpp#50
- * [1] https://github.com/libbpf/libbpf-bootstrap/issues/250#issuecomment-1911324250
- */
-#ifdef __ANDROID__
-#undef AT_EACCESS
-#define AT_EACCESS 0
-#endif
-
 /* make sure libbpf doesn't use kernel-only integer typedefs */
 #pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64

@@ -88,8 +73,6 @@
 	BTF_TYPE_ENC(name, BTF_INFO_ENC(BTF_KIND_FLOAT, 0, 0), sz)
 #define BTF_TYPE_DECL_TAG_ENC(value, type, component_idx) \
 	BTF_TYPE_ENC(value, BTF_INFO_ENC(BTF_KIND_DECL_TAG, 0, 0), type), (component_idx)
-#define BTF_TYPE_TYPE_TAG_ENC(value, type) \
-	BTF_TYPE_ENC(value, BTF_INFO_ENC(BTF_KIND_TYPE_TAG, 0, 0), type)

 #ifndef likely
 #define likely(x) __builtin_expect(!!(x), 1)
@@ -107,9 +90,6 @@
 # define offsetofend(TYPE, FIELD) \
 	(offsetof(TYPE, FIELD) + sizeof(((TYPE *)0)->FIELD))
 #endif
-#ifndef __alias
-#define __alias(symbol) __attribute__((alias(#symbol)))
-#endif

 /* Check whether a string `str` has prefix `pfx`, regardless if `pfx` is
 * a string literal known at compilation time or char * pointer known only at
@@ -118,17 +98,6 @@
 #define str_has_pfx(str, pfx) \
 	(strncmp(str, pfx, __builtin_constant_p(pfx) ? sizeof(pfx) - 1 : strlen(pfx)) == 0)

-/* suffix check */
-static inline bool str_has_sfx(const char *str, const char *sfx)
-{
-	size_t str_len = strlen(str);
-	size_t sfx_len = strlen(sfx);
-
-	if (sfx_len > str_len)
-		return false;
-	return strcmp(str + str_len - sfx_len, sfx) == 0;
-}
-
 /* Symbol versioning is different between static and shared library.
 * Properly versioned symbols are needed for shared library, but
 * only the symbol of the new version is needed for static library.
@@ -174,15 +143,6 @@ do {				\
 #ifndef __has_builtin
 #define __has_builtin(x) 0
 #endif
-
-struct bpf_link {
-	int (*detach)(struct bpf_link *link);
-	void (*dealloc)(struct bpf_link *link);
-	char *pin_path;		/* NULL, if not pinned */
-	int fd;			/* hook FD, -1 if not applicable */
-	bool disconnected;
-};
-
 /*
 * Re-implement glibc's reallocarray() for libbpf internal-only use.
 * reallocarray(), unfortunately, is not available in all versions of glibc,
@@ -207,36 +167,12 @@ static inline void *libbpf_reallocarray(void *ptr, size_t nmemb, size_t size)
 	return realloc(ptr, total);
 }

-/* Copy up to sz - 1 bytes from zero-terminated src string and ensure that dst
- * is zero-terminated string no matter what (unless sz == 0, in which case
- * it's a no-op). It's conceptually close to FreeBSD's strlcpy(), but differs
- * in what is returned. Given this is internal helper, it's trivial to extend
- * this, when necessary. Use this instead of strncpy inside libbpf source code.
- */
-static inline void libbpf_strlcpy(char *dst, const char *src, size_t sz)
-{
-	size_t i;
-
-	if (sz == 0)
-		return;
-
-	sz--;
-	for (i = 0; i < sz && src[i]; i++)
-		dst[i] = src[i];
-	dst[i] = '\0';
-}
-
-__u32 get_kernel_version(void);
-
 struct btf;
 struct btf_type;

-struct btf_type *btf_type_by_id(const struct btf *btf, __u32 type_id);
+struct btf_type *btf_type_by_id(struct btf *btf, __u32 type_id);
 const char *btf_kind_str(const struct btf_type *t);
 const struct btf_type *skip_mods_and_typedefs(const struct btf *btf, __u32 id, __u32 *res_id);
-const struct btf_header *btf_header(const struct btf *btf);
-void btf_set_base_btf(struct btf *btf, const struct btf *base_btf);
-int btf_relocate(struct btf *btf, const struct btf *base_btf, __u32 **id_map);

 static inline enum btf_func_linkage btf_func_linkage(const struct btf_type *t)
 {
@@ -334,80 +270,63 @@ static inline bool libbpf_validate_opts(const char *opts,
 					(opts)->sz - __off);		      \
 })

-enum kern_feature_id {
-	/* v4.14: kernel support for program & map names. */
-	FEAT_PROG_NAME,
-	/* v5.2: kernel support for global data sections. */
-	FEAT_GLOBAL_DATA,
-	/* BTF support */
-	FEAT_BTF,
-	/* BTF_KIND_FUNC and BTF_KIND_FUNC_PROTO support */
-	FEAT_BTF_FUNC,
-	/* BTF_KIND_VAR and BTF_KIND_DATASEC support */
-	FEAT_BTF_DATASEC,
-	/* BTF_FUNC_GLOBAL is supported */
-	FEAT_BTF_GLOBAL_FUNC,
-	/* BPF_F_MMAPABLE is supported for arrays */
-	FEAT_ARRAY_MMAP,
-	/* kernel support for expected_attach_type in BPF_PROG_LOAD */
-	FEAT_EXP_ATTACH_TYPE,
-	/* bpf_probe_read_{kernel,user}[_str] helpers */
-	FEAT_PROBE_READ_KERN,
-	/* BPF_PROG_BIND_MAP is supported */
-	FEAT_PROG_BIND_MAP,
-	/* Kernel support for module BTFs */
-	FEAT_MODULE_BTF,
-	/* BTF_KIND_FLOAT support */
-	FEAT_BTF_FLOAT,
-	/* BPF perf link support */
-	FEAT_PERF_LINK,
-	/* BTF_KIND_DECL_TAG support */
-	FEAT_BTF_DECL_TAG,
-	/* BTF_KIND_TYPE_TAG support */
-	FEAT_BTF_TYPE_TAG,
-	/* memcg-based accounting for BPF maps and progs */
-	FEAT_MEMCG_ACCOUNT,
-	/* BPF cookie (bpf_get_attach_cookie() BPF helper) support */
-	FEAT_BPF_COOKIE,
-	/* BTF_KIND_ENUM64 support and BTF_KIND_ENUM kflag support */
-	FEAT_BTF_ENUM64,
-	/* Kernel uses syscall wrapper (CONFIG_ARCH_HAS_SYSCALL_WRAPPER) */
-	FEAT_SYSCALL_WRAPPER,
-	/* BPF multi-uprobe link support */
-	FEAT_UPROBE_MULTI_LINK,
-	/* Kernel supports arg:ctx tag (__arg_ctx) for global subprogs natively */
-	FEAT_ARG_CTX_TAG,
-	/* Kernel supports '?' at the front of datasec names */
-	FEAT_BTF_QMARK_DATASEC,
-	__FEAT_CNT,
-};
-
-enum kern_feature_result {
-	FEAT_UNKNOWN = 0,
-	FEAT_SUPPORTED = 1,
-	FEAT_MISSING = 2,
-};
-
-struct kern_feature_cache {
-	enum kern_feature_result res[__FEAT_CNT];
-	int token_fd;
-};
-
-bool feat_supported(struct kern_feature_cache *cache, enum kern_feature_id feat_id);
-bool kernel_supports(const struct bpf_object *obj, enum kern_feature_id feat_id);
-
-int probe_kern_syscall_wrapper(int token_fd);
-int probe_memcg_account(int token_fd);
-int bump_rlimit_memlock(void);

 int parse_cpu_mask_str(const char *s, bool **mask, int *mask_sz);
 int parse_cpu_mask_file(const char *fcpu, bool **mask, int *mask_sz);
 int libbpf__load_raw_btf(const char *raw_types, size_t types_len,
-			 const char *str_sec, size_t str_len,
-			 int token_fd);
-int btf_load_into_kernel(struct btf *btf,
-			 char *log_buf, size_t log_sz, __u32 log_level,
-			 int token_fd);
+			 const char *str_sec, size_t str_len);
+
+struct bpf_prog_load_params {
+	enum bpf_prog_type prog_type;
+	enum bpf_attach_type expected_attach_type;
+	const char *name;
+	const struct bpf_insn *insns;
+	size_t insn_cnt;
+	const char *license;
+	__u32 kern_version;
+	__u32 attach_prog_fd;
+	__u32 attach_btf_obj_fd;
+	__u32 attach_btf_id;
+	__u32 prog_ifindex;
+	__u32 prog_btf_fd;
+	__u32 prog_flags;
+
+	__u32 func_info_rec_size;
+	const void *func_info;
+	__u32 func_info_cnt;
+
+	__u32 line_info_rec_size;
+	const void *line_info;
+	__u32 line_info_cnt;
+
+	__u32 log_level;
+	char *log_buf;
+	size_t log_buf_sz;
+	int *fd_array;
+};
+
+int libbpf__bpf_prog_load(const struct bpf_prog_load_params *load_attr);
+
+struct bpf_create_map_params {
+	const char *name;
+	enum bpf_map_type map_type;
+	__u32 map_flags;
+	__u32 key_size;
+	__u32 value_size;
+	__u32 max_entries;
+	__u32 numa_node;
+	__u32 btf_fd;
+	__u32 btf_key_type_id;
+	__u32 btf_value_type_id;
+	__u32 map_ifindex;
+	union {
+		__u32 inner_map_fd;
+		__u32 btf_vmlinux_value_type_id;
+	};
+	__u64 map_extra;
+};
+
+int libbpf__bpf_create_map_xattr(const struct bpf_create_map_params *create_attr);

 struct btf *btf_get_from_fd(int btf_fd, struct btf *base_btf);
 void btf_get_kernel_prefix_kind(enum bpf_attach_type attach_type,
@@ -421,13 +340,6 @@ struct btf_ext_info {
 	void *info;
 	__u32 rec_size;
 	__u32 len;
-	/* optional (maintained internally by libbpf) mapping between .BTF.ext
-	 * section and corresponding ELF section. This is used to join
-	 * information like CO-RE relocation records with corresponding BPF
-	 * programs defined in ELF sections
-	 */
-	__u32 *sec_idxs;
-	int sec_cnt;
 };

 #define for_each_btf_ext_sec(seg, sec)					\
@@ -511,38 +423,18 @@ struct bpf_line_info_min {
 	__u32	line_col;
 };

-enum btf_field_iter_kind {
-	BTF_FIELD_ITER_IDS,
-	BTF_FIELD_ITER_STRS,
-};
-
-struct btf_field_desc {
-	/* once-per-type offsets */
-	int t_off_cnt, t_offs[2];
-	/* member struct size, or zero, if no members */
-	int m_sz;
-	/* repeated per-member offsets */
-	int m_off_cnt, m_offs[1];
-};
-
-struct btf_field_iter {
-	struct btf_field_desc desc;
-	void *p;
-	int m_idx;
-	int off_idx;
-	int vlen;
-};
-
-int btf_field_iter_init(struct btf_field_iter *it, struct btf_type *t, enum btf_field_iter_kind iter_kind);
-__u32 *btf_field_iter_next(struct btf_field_iter *it);

 typedef int (*type_id_visit_fn)(__u32 *type_id, void *ctx);
 typedef int (*str_off_visit_fn)(__u32 *str_off, void *ctx);
+int btf_type_visit_type_ids(struct btf_type *t, type_id_visit_fn visit, void *ctx);
+int btf_type_visit_str_offs(struct btf_type *t, str_off_visit_fn visit, void *ctx);
 int btf_ext_visit_type_ids(struct btf_ext *btf_ext, type_id_visit_fn visit, void *ctx);
 int btf_ext_visit_str_offs(struct btf_ext *btf_ext, str_off_visit_fn visit, void *ctx);
 __s32 btf__find_by_name_kind_own(const struct btf *btf, const char *type_name,
 				 __u32 kind);

+extern enum libbpf_strict_mode libbpf_mode;
+
 /* handle direct returned errors */
 static inline int libbpf_err(int ret)
 {
@@ -556,8 +448,12 @@ static inline int libbpf_err(int ret)
 */
 static inline int libbpf_err_errno(int ret)
 {
-	/* errno is already assumed to be set on error */
-	return ret < 0 ? -errno : ret;
+	if (libbpf_mode & LIBBPF_STRICT_DIRECT_ERRS)
+		/* errno is already assumed to be set on error */
+		return ret < 0 ? -errno : ret;
+
+	/* legacy: on error return -1 directly and don't touch errno */
+	return ret;
 }

 /* handle error for pointer-returning APIs, err is assumed to be < 0 always */
@@ -565,7 +461,12 @@ static inline void *libbpf_err_ptr(int err)
 {
 	/* set errno on error, this doesn't break anything */
 	errno = -err;
-	return NULL;
+
+	if (libbpf_mode & LIBBPF_STRICT_CLEAN_PTRS)
+		return NULL;
+
+	/* legacy: encode err as ptr */
+	return ERR_PTR(err);
 }

 /* handle pointer-returning APIs' error handling */
@@ -575,7 +476,11 @@ static inline void *libbpf_ptr(void *ret)
 	if (IS_ERR(ret))
 		errno = -PTR_ERR(ret);

-	return IS_ERR(ret) ? NULL : ret;
+	if (libbpf_mode & LIBBPF_STRICT_CLEAN_PTRS)
+		return IS_ERR(ret) ? NULL : ret;
+
+	/* legacy: pass-through original pointer */
+	return ret;
 }

 static inline bool str_is_empty(const char *s)
@@ -588,17 +493,6 @@ static inline bool is_ldimm64_insn(struct bpf_insn *insn)
 	return insn->code == (BPF_LD | BPF_IMM | BPF_DW);
 }

-/* Unconditionally dup FD, ensuring it doesn't use [0, 2] range.
- * Original FD is not closed or altered in any other way.
- * Preserves original FD value, if it's invalid (negative).
- */
-static inline int dup_good_fd(int fd)
-{
-	if (fd < 0)
-		return fd;
-	return fcntl(fd, F_DUPFD_CLOEXEC, 3);
-}
-
 /* if fd is stdin, stdout, or stderr, dup to a fd greater than 2
 * Takes ownership of the fd passed in, and closes it if calling
 * fcntl(fd, F_DUPFD_CLOEXEC, 3).
@@ -610,10 +504,9 @@ static inline int ensure_good_fd(int fd)
 	if (fd < 0)
 		return fd;
 	if (fd < 3) {
-		fd = dup_good_fd(fd);
+		fd = fcntl(fd, F_DUPFD_CLOEXEC, 3);
 		saved_errno = errno;
 		close(old_fd);
-		errno = saved_errno;
 		if (fd < 0) {
 			pr_warn("failed to dup FD %d to FD > 2: %d\n", old_fd, -saved_errno);
 			errno = saved_errno;
@@ -622,69 +515,4 @@ static inline int ensure_good_fd(int fd)
 	return fd;
 }

-static inline int sys_dup3(int oldfd, int newfd, int flags)
-{
-	return syscall(__NR_dup3, oldfd, newfd, flags);
-}
-
-/* Point *fixed_fd* to the same file that *tmp_fd* points to.
- * Regardless of success, *tmp_fd* is closed.
- * Whatever *fixed_fd* pointed to is closed silently.
- */
-static inline int reuse_fd(int fixed_fd, int tmp_fd)
-{
-	int err;
-
-	err = sys_dup3(tmp_fd, fixed_fd, O_CLOEXEC);
-	err = err < 0 ? -errno : 0;
-	close(tmp_fd); /* clean up temporary FD */
-	return err;
-}
-
-/* The following two functions are exposed to bpftool */
-int bpf_core_add_cands(struct bpf_core_cand *local_cand,
-		       size_t local_essent_len,
-		       const struct btf *targ_btf,
-		       const char *targ_btf_name,
-		       int targ_start_id,
-		       struct bpf_core_cand_list *cands);
-void bpf_core_free_cands(struct bpf_core_cand_list *cands);
-
-struct usdt_manager *usdt_manager_new(struct bpf_object *obj);
-void usdt_manager_free(struct usdt_manager *man);
-struct bpf_link * usdt_manager_attach_usdt(struct usdt_manager *man,
-					   const struct bpf_program *prog,
-					   pid_t pid, const char *path,
-					   const char *usdt_provider, const char *usdt_name,
-					   __u64 usdt_cookie);
-
-static inline bool is_pow_of_2(size_t x)
-{
-	return x && (x & (x - 1)) == 0;
-}
-
-#define PROG_LOAD_ATTEMPTS 5
-int sys_bpf_prog_load(union bpf_attr *attr, unsigned int size, int attempts);
-
-bool glob_match(const char *str, const char *pat);
-
-long elf_find_func_offset(Elf *elf, const char *binary_path, const char *name);
-long elf_find_func_offset_from_file(const char *binary_path, const char *name);
-
-struct elf_fd {
-	Elf *elf;
-	int fd;
-};
-
-int elf_open(const char *binary_path, struct elf_fd *elf_fd);
-void elf_close(struct elf_fd *elf_fd);
-
-int elf_resolve_syms_offsets(const char *binary_path, int cnt,
-			     const char **syms, unsigned long **poffsets,
-			     int st_type);
-int elf_resolve_pattern_offsets(const char *binary_path, const char *pattern,
-				 unsigned long **poffsets, size_t *pcnt);
-
-int probe_fd(int fd);
-
 #endif /* __LIBBPF_LIBBPF_INTERNAL_H */
--- a/src/libbpf_legacy.h
+++ b/src/libbpf_legacy.h
@@ -20,11 +20,6 @@
 extern "C" {
 #endif

-/* As of libbpf 1.0 libbpf_set_strict_mode() and enum libbpf_struct_mode have
- * no effect. But they are left in libbpf_legacy.h so that applications that
- * prepared for libbpf 1.0 before final release by using
- * libbpf_set_strict_mode() still work with libbpf 1.0+ without any changes.
- */
 enum libbpf_strict_mode {
 	/* Turn on all supported strict features of libbpf to simulate libbpf
 	 * v1.0 behavior.
@@ -50,6 +45,7 @@ enum libbpf_strict_mode {
 	 * (positive) error code.
 	 */
 	LIBBPF_STRICT_DIRECT_ERRS = 0x02,
+
 	/*
 	 * Enforce strict BPF program section (SEC()) names.
 	 * E.g., while prefiously SEC("xdp_whatever") or SEC("perf_event_blah") were
@@ -59,10 +55,6 @@ enum libbpf_strict_mode {
 	 *
 	 * Note, in this mode the program pin path will be based on the
 	 * function name instead of section name.
-	 *
-	 * Additionally, routines in the .text section are always considered
-	 * sub-programs. Legacy behavior allows for a single routine in .text
-	 * to be a program.
 	 */
 	LIBBPF_STRICT_SEC_NAME = 0x04,
 	/*
@@ -71,67 +63,12 @@ enum libbpf_strict_mode {
 	 * Clients can maintain it on their own if it is valuable for them.
 	 */
 	LIBBPF_STRICT_NO_OBJECT_LIST = 0x08,
-	/*
-	 * Automatically bump RLIMIT_MEMLOCK using setrlimit() before the
-	 * first BPF program or map creation operation. This is done only if
-	 * kernel is too old to support memcg-based memory accounting for BPF
-	 * subsystem. By default, RLIMIT_MEMLOCK limit is set to RLIM_INFINITY,
-	 * but it can be overriden with libbpf_set_memlock_rlim() API.
-	 * Note that libbpf_set_memlock_rlim() needs to be called before
-	 * the very first bpf_prog_load(), bpf_map_create() or bpf_object__load()
-	 * operation.
-	 */
-	LIBBPF_STRICT_AUTO_RLIMIT_MEMLOCK = 0x10,
-	/*
-	 * Error out on any SEC("maps") map definition, which are deprecated
-	 * in favor of BTF-defined map definitions in SEC(".maps").
-	 */
-	LIBBPF_STRICT_MAP_DEFINITIONS = 0x20,

 	__LIBBPF_STRICT_LAST,
 };

 LIBBPF_API int libbpf_set_strict_mode(enum libbpf_strict_mode mode);

-/**
- * @brief **libbpf_get_error()** extracts the error code from the passed
- * pointer
- * @param ptr pointer returned from libbpf API function
- * @return error code; or 0 if no error occured
- *
- * Note, as of libbpf 1.0 this function is not necessary and not recommended
- * to be used. Libbpf doesn't return error code embedded into the pointer
- * itself. Instead, NULL is returned on error and error code is passed through
- * thread-local errno variable. **libbpf_get_error()** is just returning -errno
- * value if it receives NULL, which is correct only if errno hasn't been
- * modified between libbpf API call and corresponding **libbpf_get_error()**
- * call. Prefer to check return for NULL and use errno directly.
- *
- * This API is left in libbpf 1.0 to allow applications that were 1.0-ready
- * before final libbpf 1.0 without needing to change them.
- */
-LIBBPF_API long libbpf_get_error(const void *ptr);
-
-#define DECLARE_LIBBPF_OPTS LIBBPF_OPTS
-
-/* "Discouraged" APIs which don't follow consistent libbpf naming patterns.
- * They are normally a trivial aliases or wrappers for proper APIs and are
- * left to minimize unnecessary disruption for users of libbpf. But they
- * shouldn't be used going forward.
- */
-
-struct bpf_program;
-struct bpf_map;
-struct btf;
-struct btf_ext;
-
-LIBBPF_API struct btf *libbpf_find_kernel_btf(void);
-
-LIBBPF_API enum bpf_prog_type bpf_program__get_type(const struct bpf_program *prog);
-LIBBPF_API enum bpf_attach_type bpf_program__get_expected_attach_type(const struct bpf_program *prog);
-LIBBPF_API const char *bpf_map__get_pin_path(const struct bpf_map *map);
-LIBBPF_API const void *btf__get_raw_data(const struct btf *btf, __u32 *size);
-LIBBPF_API const void *btf_ext__get_raw_data(const struct btf_ext *btf_ext, __u32 *size);

 #ifdef __cplusplus
 } /* extern "C" */
--- a/src/libbpf_probes.c
+++ b/src/libbpf_probes.c
@@ -12,154 +12,77 @@
 #include <linux/btf.h>
 #include <linux/filter.h>
 #include <linux/kernel.h>
-#include <linux/version.h>

 #include "bpf.h"
 #include "libbpf.h"
 #include "libbpf_internal.h"

-/* On Ubuntu LINUX_VERSION_CODE doesn't correspond to info.release,
- * but Ubuntu provides /proc/version_signature file, as described at
- * https://ubuntu.com/kernel, with an example contents below, which we
- * can use to get a proper LINUX_VERSION_CODE.
- *
- *   Ubuntu 5.4.0-12.15-generic 5.4.8
- *
- * In the above, 5.4.8 is what kernel is actually expecting, while
- * uname() call will return 5.4.0 in info.release.
- */
-static __u32 get_ubuntu_kernel_version(void)
+static bool grep(const char *buffer, const char *pattern)
 {
-	const char *ubuntu_kver_file = "/proc/version_signature";
-	__u32 major, minor, patch;
-	int ret;
-	FILE *f;
-
-	if (faccessat(AT_FDCWD, ubuntu_kver_file, R_OK, AT_EACCESS) != 0)
-		return 0;
-
-	f = fopen(ubuntu_kver_file, "re");
-	if (!f)
-		return 0;
-
-	ret = fscanf(f, "%*s %*s %u.%u.%u\n", &major, &minor, &patch);
-	fclose(f);
-	if (ret != 3)
-		return 0;
-
-	return KERNEL_VERSION(major, minor, patch);
+	return !!strstr(buffer, pattern);
 }

-/* On Debian LINUX_VERSION_CODE doesn't correspond to info.release.
- * Instead, it is provided in info.version. An example content of
- * Debian 10 looks like the below.
- *
- *   utsname::release   4.19.0-22-amd64
- *   utsname::version   #1 SMP Debian 4.19.260-1 (2022-09-29)
- *
- * In the above, 4.19.260 is what kernel is actually expecting, while
- * uname() call will return 4.19.0 in info.release.
- */
-static __u32 get_debian_kernel_version(struct utsname *info)
+static int get_vendor_id(int ifindex)
 {
-	__u32 major, minor, patch;
-	char *p;
+	char ifname[IF_NAMESIZE], path[64], buf[8];
+	ssize_t len;
+	int fd;

-	p = strstr(info->version, "Debian ");
-	if (!p) {
-		/* This is not a Debian kernel. */
-		return 0;
-	}
+	if (!if_indextoname(ifindex, ifname))
+		return -1;

-	if (sscanf(p, "Debian %u.%u.%u", &major, &minor, &patch) != 3)
-		return 0;
+	snprintf(path, sizeof(path), "/sys/class/net/%s/device/vendor", ifname);

-	return KERNEL_VERSION(major, minor, patch);
+	fd = open(path, O_RDONLY | O_CLOEXEC);
+	if (fd < 0)
+		return -1;
+
+	len = read(fd, buf, sizeof(buf));
+	close(fd);
+	if (len < 0)
+		return -1;
+	if (len >= (ssize_t)sizeof(buf))
+		return -1;
+	buf[len] = '\0';
+
+	return strtol(buf, NULL, 0);
 }

-__u32 get_kernel_version(void)
+static int get_kernel_version(void)
 {
-	__u32 major, minor, patch, version;
-	struct utsname info;
+	int version, subversion, patchlevel;
+	struct utsname utsn;

-	/* Check if this is an Ubuntu kernel. */
-	version = get_ubuntu_kernel_version();
-	if (version != 0)
-		return version;
-
-	uname(&info);
-
-	/* Check if this is a Debian kernel. */
-	version = get_debian_kernel_version(&info);
-	if (version != 0)
-		return version;
-
-	if (sscanf(info.release, "%u.%u.%u", &major, &minor, &patch) != 3)
+	/* Return 0 on failure, and attempt to probe with empty kversion */
+	if (uname(&utsn))
 		return 0;

-	if (major == 4 && minor == 19 && patch > 255)
-		return KERNEL_VERSION(major, minor, 255);
+	if (sscanf(utsn.release, "%d.%d.%d",
+		   &version, &subversion, &patchlevel) != 3)
+		return 0;

-	return KERNEL_VERSION(major, minor, patch);
+	return (version << 16) + (subversion << 8) + patchlevel;
 }

-static int probe_prog_load(enum bpf_prog_type prog_type,
-			   const struct bpf_insn *insns, size_t insns_cnt,
-			   char *log_buf, size_t log_buf_sz)
+static void
+probe_load(enum bpf_prog_type prog_type, const struct bpf_insn *insns,
+	   size_t insns_cnt, char *buf, size_t buf_len, __u32 ifindex)
 {
-	LIBBPF_OPTS(bpf_prog_load_opts, opts,
-		.log_buf = log_buf,
-		.log_size = log_buf_sz,
-		.log_level = log_buf ? 1 : 0,
-	);
-	int fd, err, exp_err = 0;
-	const char *exp_msg = NULL;
-	char buf[4096];
+	struct bpf_load_program_attr xattr = {};
+	int fd;

 	switch (prog_type) {
 	case BPF_PROG_TYPE_CGROUP_SOCK_ADDR:
-		opts.expected_attach_type = BPF_CGROUP_INET4_CONNECT;
+		xattr.expected_attach_type = BPF_CGROUP_INET4_CONNECT;
 		break;
 	case BPF_PROG_TYPE_CGROUP_SOCKOPT:
-		opts.expected_attach_type = BPF_CGROUP_GETSOCKOPT;
+		xattr.expected_attach_type = BPF_CGROUP_GETSOCKOPT;
 		break;
 	case BPF_PROG_TYPE_SK_LOOKUP:
-		opts.expected_attach_type = BPF_SK_LOOKUP;
+		xattr.expected_attach_type = BPF_SK_LOOKUP;
 		break;
 	case BPF_PROG_TYPE_KPROBE:
-		opts.kern_version = get_kernel_version();
-		break;
-	case BPF_PROG_TYPE_LIRC_MODE2:
-		opts.expected_attach_type = BPF_LIRC_MODE2;
-		break;
-	case BPF_PROG_TYPE_TRACING:
-	case BPF_PROG_TYPE_LSM:
-		opts.log_buf = buf;
-		opts.log_size = sizeof(buf);
-		opts.log_level = 1;
-		if (prog_type == BPF_PROG_TYPE_TRACING)
-			opts.expected_attach_type = BPF_TRACE_FENTRY;
-		else
-			opts.expected_attach_type = BPF_MODIFY_RETURN;
-		opts.attach_btf_id = 1;
-
-		exp_err = -EINVAL;
-		exp_msg = "attach_btf_id 1 is not a function";
-		break;
-	case BPF_PROG_TYPE_EXT:
-		opts.log_buf = buf;
-		opts.log_size = sizeof(buf);
-		opts.log_level = 1;
-		opts.attach_btf_id = 1;
-
-		exp_err = -EINVAL;
-		exp_msg = "Cannot replace kernel functions";
-		break;
-	case BPF_PROG_TYPE_SYSCALL:
-		opts.prog_flags = BPF_F_SLEEPABLE;
-		break;
-	case BPF_PROG_TYPE_STRUCT_OPS:
-		exp_err = -524; /* -ENOTSUPP */
+		xattr.kern_version = get_kernel_version();
 		break;
 	case BPF_PROG_TYPE_UNSPEC:
 	case BPF_PROG_TYPE_SOCKET_FILTER:
@@ -180,50 +103,48 @@ static int probe_prog_load(enum bpf_prog_type prog_type,
 	case BPF_PROG_TYPE_RAW_TRACEPOINT:
 	case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE:
 	case BPF_PROG_TYPE_LWT_SEG6LOCAL:
+	case BPF_PROG_TYPE_LIRC_MODE2:
 	case BPF_PROG_TYPE_SK_REUSEPORT:
 	case BPF_PROG_TYPE_FLOW_DISSECTOR:
 	case BPF_PROG_TYPE_CGROUP_SYSCTL:
-		break;
-	case BPF_PROG_TYPE_NETFILTER:
-		opts.expected_attach_type = BPF_NETFILTER;
-		break;
+	case BPF_PROG_TYPE_TRACING:
+	case BPF_PROG_TYPE_STRUCT_OPS:
+	case BPF_PROG_TYPE_EXT:
+	case BPF_PROG_TYPE_LSM:
 	default:
-		return -EOPNOTSUPP;
+		break;
 	}

-	fd = bpf_prog_load(prog_type, NULL, "GPL", insns, insns_cnt, &opts);
-	err = -errno;
+	xattr.prog_type = prog_type;
+	xattr.insns = insns;
+	xattr.insns_cnt = insns_cnt;
+	xattr.license = "GPL";
+	xattr.prog_ifindex = ifindex;
+
+	fd = bpf_load_program_xattr(&xattr, buf, buf_len);
 	if (fd >= 0)
 		close(fd);
-	if (exp_err) {
-		if (fd >= 0 || err != exp_err)
-			return 0;
-		if (exp_msg && !strstr(buf, exp_msg))
-			return 0;
-		return 1;
-	}
-	return fd >= 0 ? 1 : 0;
 }

-int libbpf_probe_bpf_prog_type(enum bpf_prog_type prog_type, const void *opts)
+bool bpf_probe_prog_type(enum bpf_prog_type prog_type, __u32 ifindex)
 {
-	struct bpf_insn insns[] = {
+	struct bpf_insn insns[2] = {
 		BPF_MOV64_IMM(BPF_REG_0, 0),
 		BPF_EXIT_INSN()
 	};
-	const size_t insn_cnt = ARRAY_SIZE(insns);
-	int ret;

-	if (opts)
-		return libbpf_err(-EINVAL);
+	if (ifindex && prog_type == BPF_PROG_TYPE_SCHED_CLS)
+		/* nfp returns -EINVAL on exit(0) with TC offload */
+		insns[0].imm = 2;

-	ret = probe_prog_load(prog_type, insns, insn_cnt, NULL, 0);
-	return libbpf_err(ret);
+	errno = 0;
+	probe_load(prog_type, insns, ARRAY_SIZE(insns), NULL, 0, ifindex);
+
+	return errno != EINVAL && errno != EOPNOTSUPP;
 }

 int libbpf__load_raw_btf(const char *raw_types, size_t types_len,
-			 const char *str_sec, size_t str_len,
-			 int token_fd)
+			 const char *str_sec, size_t str_len)
 {
 	struct btf_header hdr = {
 		.magic = BTF_MAGIC,
@@ -233,10 +154,6 @@ int libbpf__load_raw_btf(const char *raw_types, size_t types_len,
 		.str_off = types_len,
 		.str_len = str_len,
 	};
-	LIBBPF_OPTS(bpf_btf_load_opts, opts,
-		.token_fd = token_fd,
-		.btf_flags = token_fd ? BPF_F_TOKEN_FD : 0,
-	);
 	int btf_fd, btf_len;
 	__u8 *raw_btf;

@@ -249,7 +166,7 @@ int libbpf__load_raw_btf(const char *raw_types, size_t types_len,
 	memcpy(raw_btf + hdr.hdr_len, raw_types, hdr.type_len);
 	memcpy(raw_btf + hdr.hdr_len + hdr.type_len, str_sec, hdr.str_len);

-	btf_fd = bpf_btf_load(raw_btf, btf_len, &opts);
+	btf_fd = bpf_load_btf(raw_btf, btf_len, NULL, 0, false);

 	free(raw_btf);
 	return btf_fd;
@@ -279,19 +196,20 @@ static int load_local_storage_btf(void)
 	};

 	return libbpf__load_raw_btf((char *)types, sizeof(types),
-				     strs, sizeof(strs), 0);
+				     strs, sizeof(strs));
 }

-static int probe_map_create(enum bpf_map_type map_type)
+bool bpf_probe_map_type(enum bpf_map_type map_type, __u32 ifindex)
 {
-	LIBBPF_OPTS(bpf_map_create_opts, opts);
-	int key_size, value_size, max_entries;
+	int key_size, value_size, max_entries, map_flags;
 	__u32 btf_key_type_id = 0, btf_value_type_id = 0;
-	int fd = -1, btf_fd = -1, fd_inner = -1, exp_err = 0, err = 0;
+	struct bpf_create_map_attr attr = {};
+	int fd = -1, btf_fd = -1, fd_inner;

 	key_size	= sizeof(__u32);
 	value_size	= sizeof(__u32);
 	max_entries	= 1;
+	map_flags	= 0;

 	switch (map_type) {
 	case BPF_MAP_TYPE_STACK_TRACE:
@@ -300,7 +218,7 @@ static int probe_map_create(enum bpf_map_type map_type)
 	case BPF_MAP_TYPE_LPM_TRIE:
 		key_size	= sizeof(__u64);
 		value_size	= sizeof(__u64);
-		opts.map_flags	= BPF_F_NO_PREALLOC;
+		map_flags	= BPF_F_NO_PREALLOC;
 		break;
 	case BPF_MAP_TYPE_CGROUP_STORAGE:
 	case BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE:
@@ -315,39 +233,21 @@ static int probe_map_create(enum bpf_map_type map_type)
 	case BPF_MAP_TYPE_SK_STORAGE:
 	case BPF_MAP_TYPE_INODE_STORAGE:
 	case BPF_MAP_TYPE_TASK_STORAGE:
-	case BPF_MAP_TYPE_CGRP_STORAGE:
 		btf_key_type_id = 1;
 		btf_value_type_id = 3;
 		value_size = 8;
 		max_entries = 0;
-		opts.map_flags = BPF_F_NO_PREALLOC;
+		map_flags = BPF_F_NO_PREALLOC;
 		btf_fd = load_local_storage_btf();
 		if (btf_fd < 0)
-			return btf_fd;
+			return false;
 		break;
 	case BPF_MAP_TYPE_RINGBUF:
-	case BPF_MAP_TYPE_USER_RINGBUF:
 		key_size = 0;
 		value_size = 0;
-		max_entries = sysconf(_SC_PAGE_SIZE);
-		break;
-	case BPF_MAP_TYPE_STRUCT_OPS:
-		/* we'll get -ENOTSUPP for invalid BTF type ID for struct_ops */
-		opts.btf_vmlinux_value_type_id = 1;
-		opts.value_type_btf_obj_fd = -1;
-		exp_err = -524; /* -ENOTSUPP */
-		break;
-	case BPF_MAP_TYPE_BLOOM_FILTER:
-		key_size = 0;
-		max_entries = 1;
-		break;
-	case BPF_MAP_TYPE_ARENA:
-		key_size	= 0;
-		value_size	= 0;
-		max_entries	= 1; /* one page */
-		opts.map_extra	= 0; /* can mmap() at any address */
-		opts.map_flags	= BPF_F_MMAPABLE;
+		max_entries = 4096;
 		break;
+	case BPF_MAP_TYPE_UNSPEC:
 	case BPF_MAP_TYPE_HASH:
 	case BPF_MAP_TYPE_ARRAY:
 	case BPF_MAP_TYPE_PROG_ARRAY:
@@ -366,103 +266,95 @@ static int probe_map_create(enum bpf_map_type map_type)
 	case BPF_MAP_TYPE_XSKMAP:
 	case BPF_MAP_TYPE_SOCKHASH:
 	case BPF_MAP_TYPE_REUSEPORT_SOCKARRAY:
-		break;
-	case BPF_MAP_TYPE_UNSPEC:
+	case BPF_MAP_TYPE_STRUCT_OPS:
 	default:
-		return -EOPNOTSUPP;
+		break;
 	}

 	if (map_type == BPF_MAP_TYPE_ARRAY_OF_MAPS ||
 	    map_type == BPF_MAP_TYPE_HASH_OF_MAPS) {
-		fd_inner = bpf_map_create(BPF_MAP_TYPE_HASH, NULL,
-					  sizeof(__u32), sizeof(__u32), 1, NULL);
+		/* TODO: probe for device, once libbpf has a function to create
+		 * map-in-map for offload
+		 */
+		if (ifindex)
+			return false;
+
+		fd_inner = bpf_create_map(BPF_MAP_TYPE_HASH,
+					  sizeof(__u32), sizeof(__u32), 1, 0);
 		if (fd_inner < 0)
-			goto cleanup;
+			return false;
+		fd = bpf_create_map_in_map(map_type, NULL, sizeof(__u32),
+					   fd_inner, 1, 0);
+		close(fd_inner);
+	} else {
+		/* Note: No other restriction on map type probes for offload */
+		attr.map_type = map_type;
+		attr.key_size = key_size;
+		attr.value_size = value_size;
+		attr.max_entries = max_entries;
+		attr.map_flags = map_flags;
+		attr.map_ifindex = ifindex;
+		if (btf_fd >= 0) {
+			attr.btf_fd = btf_fd;
+			attr.btf_key_type_id = btf_key_type_id;
+			attr.btf_value_type_id = btf_value_type_id;
+		}

-		opts.inner_map_fd = fd_inner;
+		fd = bpf_create_map_xattr(&attr);
 	}
-
-	if (btf_fd >= 0) {
-		opts.btf_fd = btf_fd;
-		opts.btf_key_type_id = btf_key_type_id;
-		opts.btf_value_type_id = btf_value_type_id;
-	}
-
-	fd = bpf_map_create(map_type, NULL, key_size, value_size, max_entries, &opts);
-	err = -errno;
-
-cleanup:
 	if (fd >= 0)
 		close(fd);
-	if (fd_inner >= 0)
-		close(fd_inner);
 	if (btf_fd >= 0)
 		close(btf_fd);

-	if (exp_err)
-		return fd < 0 && err == exp_err ? 1 : 0;
-	else
-		return fd >= 0 ? 1 : 0;
+	return fd >= 0;
 }

-int libbpf_probe_bpf_map_type(enum bpf_map_type map_type, const void *opts)
+bool bpf_probe_helper(enum bpf_func_id id, enum bpf_prog_type prog_type,
+		      __u32 ifindex)
 {
-	int ret;
-
-	if (opts)
-		return libbpf_err(-EINVAL);
-
-	ret = probe_map_create(map_type);
-	return libbpf_err(ret);
-}
-
-int libbpf_probe_bpf_helper(enum bpf_prog_type prog_type, enum bpf_func_id helper_id,
-			    const void *opts)
-{
-	struct bpf_insn insns[] = {
-		BPF_EMIT_CALL((__u32)helper_id),
-		BPF_EXIT_INSN(),
+	struct bpf_insn insns[2] = {
+		BPF_EMIT_CALL(id),
+		BPF_EXIT_INSN()
 	};
-	const size_t insn_cnt = ARRAY_SIZE(insns);
-	char buf[4096];
-	int ret;
+	char buf[4096] = {};
+	bool res;

-	if (opts)
-		return libbpf_err(-EINVAL);
+	probe_load(prog_type, insns, ARRAY_SIZE(insns), buf, sizeof(buf),
+		   ifindex);
+	res = !grep(buf, "invalid func ") && !grep(buf, "unknown func ");

-	/* we can't successfully load all prog types to check for BPF helper
-	 * support, so bail out with -EOPNOTSUPP error
-	 */
-	switch (prog_type) {
-	case BPF_PROG_TYPE_TRACING:
-	case BPF_PROG_TYPE_EXT:
-	case BPF_PROG_TYPE_LSM:
-	case BPF_PROG_TYPE_STRUCT_OPS:
-		return -EOPNOTSUPP;
-	default:
-		break;
+	if (ifindex) {
+		switch (get_vendor_id(ifindex)) {
+		case 0x19ee: /* Netronome specific */
+			res = res && !grep(buf, "not supported by FW") &&
+				!grep(buf, "unsupported function id");
+			break;
+		default:
+			break;
+		}
 	}

-	buf[0] = '\0';
-	ret = probe_prog_load(prog_type, insns, insn_cnt, buf, sizeof(buf));
-	if (ret < 0)
-		return libbpf_err(ret);
-
-	/* If BPF verifier doesn't recognize BPF helper ID (enum bpf_func_id)
-	 * at all, it will emit something like "invalid func unknown#181".
-	 * If BPF verifier recognizes BPF helper but it's not supported for
-	 * given BPF program type, it will emit "unknown func bpf_sys_bpf#166"
-	 * or "program of this type cannot use helper bpf_sys_bpf#166".
-	 * In both cases, provided combination of BPF program type and BPF
-	 * helper is not supported by the kernel.
-	 * In all other cases, probe_prog_load() above will either succeed (e.g.,
-	 * because BPF helper happens to accept no input arguments or it
-	 * accepts one input argument and initial PTR_TO_CTX is fine for
-	 * that), or we'll get some more specific BPF verifier error about
-	 * some unsatisfied conditions.
-	 */
-	if (ret == 0 && (strstr(buf, "invalid func ") || strstr(buf, "unknown func ") ||
-			 strstr(buf, "program of this type cannot use helper ")))
-		return 0;
-	return 1; /* assume supported */
+	return res;
+}
+
+/*
+ * Probe for availability of kernel commit (5.3):
+ *
+ * c04c0d2b968a ("bpf: increase complexity limit and maximum program size")
+ */
+bool bpf_probe_large_insn_limit(__u32 ifindex)
+{
+	struct bpf_insn insns[BPF_MAXINSNS + 1];
+	int i;
+
+	for (i = 0; i < BPF_MAXINSNS; i++)
+		insns[i] = BPF_MOV64_IMM(BPF_REG_0, 1);
+	insns[BPF_MAXINSNS] = BPF_EXIT_INSN();
+
+	errno = 0;
+	probe_load(BPF_PROG_TYPE_SCHED_CLS, insns, ARRAY_SIZE(insns), NULL, 0,
+		   ifindex);
+
+	return errno != E2BIG && errno != EINVAL;
 }
--- a/src/libbpf_version.h
+++ b/src/libbpf_version.h
@@ -3,7 +3,7 @@
 #ifndef __LIBBPF_VERSION_H
 #define __LIBBPF_VERSION_H

-#define LIBBPF_MAJOR_VERSION 1
-#define LIBBPF_MINOR_VERSION 5
+#define LIBBPF_MAJOR_VERSION 0
+#define LIBBPF_MINOR_VERSION 6

 #endif /* __LIBBPF_VERSION_H */
--- a/src/linker.c
+++ b/src/linker.c
@@ -210,7 +210,6 @@ void bpf_linker__free(struct bpf_linker *linker)
 	}
 	free(linker->secs);

-	free(linker->glob_syms);
 	free(linker);
 }

@@ -697,6 +696,11 @@ static int linker_load_obj_file(struct bpf_linker *linker, const char *filename,
 	return err;
 }

+static bool is_pow_of_2(size_t x)
+{
+	return x && (x & (x - 1)) == 0;
+}
+
 static int linker_sanity_check_elf(struct src_obj *obj)
 {
 	struct src_sec *sec;
@@ -719,28 +723,13 @@ static int linker_sanity_check_elf(struct src_obj *obj)
 			return -EINVAL;
 		}

-		if (is_dwarf_sec_name(sec->sec_name))
-			continue;
+		if (sec->shdr->sh_addralign && !is_pow_of_2(sec->shdr->sh_addralign))
+			return -EINVAL;
+		if (sec->shdr->sh_addralign != sec->data->d_align)
+			return -EINVAL;

-		if (sec->shdr->sh_addralign && !is_pow_of_2(sec->shdr->sh_addralign)) {
-			pr_warn("ELF section #%zu alignment %llu is non pow-of-2 alignment in %s\n",
-				sec->sec_idx, (long long unsigned)sec->shdr->sh_addralign,
-				obj->filename);
+		if (sec->shdr->sh_size != sec->data->d_size)
 			return -EINVAL;
-		}
-		if (sec->shdr->sh_addralign != sec->data->d_align) {
-			pr_warn("ELF section #%zu has inconsistent alignment addr=%llu != d=%llu in %s\n",
-				sec->sec_idx, (long long unsigned)sec->shdr->sh_addralign,
-				(long long unsigned)sec->data->d_align, obj->filename);
-			return -EINVAL;
-		}
-
-		if (sec->shdr->sh_size != sec->data->d_size) {
-			pr_warn("ELF section #%zu has inconsistent section size sh=%llu != d=%llu in %s\n",
-				sec->sec_idx, (long long unsigned)sec->shdr->sh_size,
-				(long long unsigned)sec->data->d_size, obj->filename);
-			return -EINVAL;
-		}

 		switch (sec->shdr->sh_type) {
 		case SHT_SYMTAB:
@@ -752,12 +741,8 @@ static int linker_sanity_check_elf(struct src_obj *obj)
 			break;
 		case SHT_PROGBITS:
 			if (sec->shdr->sh_flags & SHF_EXECINSTR) {
-				if (sec->shdr->sh_size % sizeof(struct bpf_insn) != 0) {
-					pr_warn("ELF section #%zu has unexpected size alignment %llu in %s\n",
-						sec->sec_idx, (long long unsigned)sec->shdr->sh_size,
-						obj->filename);
+				if (sec->shdr->sh_size % sizeof(struct bpf_insn) != 0)
 					return -EINVAL;
-				}
 			}
 			break;
 		case SHT_NOBITS:
@@ -957,33 +942,19 @@ static int check_btf_str_off(__u32 *str_off, void *ctx)
 static int linker_sanity_check_btf(struct src_obj *obj)
 {
 	struct btf_type *t;
-	int i, n, err;
+	int i, n, err = 0;

 	if (!obj->btf)
 		return 0;

 	n = btf__type_cnt(obj->btf);
 	for (i = 1; i < n; i++) {
-		struct btf_field_iter it;
-		__u32 *type_id, *str_off;
-
 		t = btf_type_by_id(obj->btf, i);

-		err = btf_field_iter_init(&it, t, BTF_FIELD_ITER_IDS);
+		err = err ?: btf_type_visit_type_ids(t, check_btf_type_id, obj->btf);
+		err = err ?: btf_type_visit_str_offs(t, check_btf_str_off, obj->btf);
 		if (err)
 			return err;
-		while ((type_id = btf_field_iter_next(&it))) {
-			if (*type_id >= n)
-				return -EINVAL;
-		}
-
-		err = btf_field_iter_init(&it, t, BTF_FIELD_ITER_STRS);
-		if (err)
-			return err;
-		while ((str_off = btf_field_iter_next(&it))) {
-			if (!btf__str_by_offset(obj->btf, *str_off))
-				return -EINVAL;
-		}
 	}

 	return 0;
@@ -1148,19 +1119,7 @@ static int extend_sec(struct bpf_linker *linker, struct dst_sec *dst, struct src

 	if (src->shdr->sh_type != SHT_NOBITS) {
 		tmp = realloc(dst->raw_data, dst_final_sz);
-		/* If dst_align_sz == 0, realloc() behaves in a special way:
-		 * 1. When dst->raw_data is NULL it returns:
-		 *    "either NULL or a pointer suitable to be passed to free()" [1].
-		 * 2. When dst->raw_data is not-NULL it frees dst->raw_data and returns NULL,
-		 *    thus invalidating any "pointer suitable to be passed to free()" obtained
-		 *    at step (1).
-		 *
-		 * The dst_align_sz > 0 check avoids error exit after (2), otherwise
-		 * dst->raw_data would be freed again in bpf_linker__free().
-		 *
-		 * [1] man 3 realloc
-		 */
-		if (!tmp && dst_align_sz > 0)
+		if (!tmp)
 			return -ENOMEM;
 		dst->raw_data = tmp;

@@ -1380,7 +1339,6 @@ recur:
 	case BTF_KIND_STRUCT:
 	case BTF_KIND_UNION:
 	case BTF_KIND_ENUM:
-	case BTF_KIND_ENUM64:
 	case BTF_KIND_FWD:
 	case BTF_KIND_FUNC:
 	case BTF_KIND_VAR:
@@ -1403,7 +1361,6 @@ recur:
 	case BTF_KIND_INT:
 	case BTF_KIND_FLOAT:
 	case BTF_KIND_ENUM:
-	case BTF_KIND_ENUM64:
 		/* ignore encoding for int and enum values for enum */
 		if (t1->size != t2->size) {
 			pr_warn("global '%s': incompatible %s '%s' size %u and %u\n",
@@ -2042,6 +1999,7 @@ add_sym:
 static int linker_append_elf_relos(struct bpf_linker *linker, struct src_obj *obj)
 {
 	struct src_sec *src_symtab = &obj->secs[obj->symtab_sec_idx];
+	struct dst_sec *dst_symtab = &linker->secs[linker->symtab_sec_idx];
 	int i, err;

 	for (i = 1; i < obj->sec_cnt; i++) {
@@ -2090,13 +2048,16 @@ static int linker_append_elf_relos(struct bpf_linker *linker, struct src_obj *ob
 		dst_rel = dst_sec->raw_data + src_sec->dst_off;
 		n = src_sec->shdr->sh_size / src_sec->shdr->sh_entsize;
 		for (j = 0; j < n; j++, src_rel++, dst_rel++) {
-			size_t src_sym_idx, dst_sym_idx, sym_type;
-			Elf64_Sym *src_sym;
+			size_t src_sym_idx = ELF64_R_SYM(src_rel->r_info);
+			size_t sym_type = ELF64_R_TYPE(src_rel->r_info);
+			Elf64_Sym *src_sym, *dst_sym;
+			size_t dst_sym_idx;

 			src_sym_idx = ELF64_R_SYM(src_rel->r_info);
 			src_sym = src_symtab->data->d_buf + sizeof(*src_sym) * src_sym_idx;

 			dst_sym_idx = obj->sym_map[src_sym_idx];
+			dst_sym = dst_symtab->raw_data + sizeof(*dst_sym) * dst_sym_idx;
 			dst_rel->r_offset += src_linked_sec->dst_off;
 			sym_type = ELF64_R_TYPE(src_rel->r_info);
 			dst_rel->r_info = ELF64_R_INFO(dst_sym_idx, sym_type);
@@ -2227,17 +2188,10 @@ static int linker_fixup_btf(struct src_obj *obj)
 		vi = btf_var_secinfos(t);
 		for (j = 0, m = btf_vlen(t); j < m; j++, vi++) {
 			const struct btf_type *vt = btf__type_by_id(obj->btf, vi->type);
-			const char *var_name;
-			int var_linkage;
+			const char *var_name = btf__str_by_offset(obj->btf, vt->name_off);
+			int var_linkage = btf_var(vt)->linkage;
 			Elf64_Sym *sym;

-			/* could be a variable or function */
-			if (!btf_is_var(vt))
-				continue;
-
-			var_name = btf__str_by_offset(obj->btf, vt->name_off);
-			var_linkage = btf_var(vt)->linkage;
-
 			/* no need to patch up static or extern vars */
 			if (var_linkage != BTF_VAR_GLOBAL_ALLOCATED)
 				continue;
@@ -2255,10 +2209,26 @@ static int linker_fixup_btf(struct src_obj *obj)
 	return 0;
 }

+static int remap_type_id(__u32 *type_id, void *ctx)
+{
+	int *id_map = ctx;
+	int new_id = id_map[*type_id];
+
+	/* Error out if the type wasn't remapped. Ignore VOID which stays VOID. */
+	if (new_id == 0 && *type_id != 0) {
+		pr_warn("failed to find new ID mapping for original BTF type ID %u\n", *type_id);
+		return -EINVAL;
+	}
+
+	*type_id = id_map[*type_id];
+
+	return 0;
+}
+
 static int linker_append_btf(struct bpf_linker *linker, struct src_obj *obj)
 {
 	const struct btf_type *t;
-	int i, j, n, start_id, id, err;
+	int i, j, n, start_id, id;
 	const char *name;

 	if (!obj->btf)
@@ -2329,25 +2299,9 @@ static int linker_append_btf(struct bpf_linker *linker, struct src_obj *obj)
 	n = btf__type_cnt(linker->btf);
 	for (i = start_id; i < n; i++) {
 		struct btf_type *dst_t = btf_type_by_id(linker->btf, i);
-		struct btf_field_iter it;
-		__u32 *type_id;

-		err = btf_field_iter_init(&it, dst_t, BTF_FIELD_ITER_IDS);
-		if (err)
-			return err;
-
-		while ((type_id = btf_field_iter_next(&it))) {
-			int new_id = obj->btf_type_map[*type_id];
-
-			/* Error out if the type wasn't remapped. Ignore VOID which stays VOID. */
-			if (new_id == 0 && *type_id != 0) {
-				pr_warn("failed to find new ID mapping for original BTF type ID %u\n",
-					*type_id);
-				return -EINVAL;
-			}
-
-			*type_id = obj->btf_type_map[*type_id];
-		}
+		if (btf_type_visit_type_ids(dst_t, remap_type_id, obj->btf_type_map))
+			return -EINVAL;
 	}

 	/* Rewrite VAR/FUNC underlying types (i.e., FUNC's FUNC_PROTO and VAR's
@@ -2696,7 +2650,6 @@ static int emit_elf_data_sec(struct bpf_linker *linker, const char *sec_name,

 static int finalize_btf(struct bpf_linker *linker)
 {
-	LIBBPF_OPTS(btf_dedup_opts, opts);
 	struct btf *btf = linker->btf;
 	const void *raw_data;
 	int i, j, id, err;
@@ -2733,8 +2686,7 @@ static int finalize_btf(struct bpf_linker *linker)
 		return err;
 	}

-	opts.btf_ext = linker->btf_ext;
-	err = btf__dedup(linker->btf, &opts);
+	err = btf__dedup(linker->btf, linker->btf_ext, NULL);
 	if (err) {
 		pr_warn("BTF dedup failed: %d\n", err);
 		return err;
@@ -2753,7 +2705,7 @@ static int finalize_btf(struct bpf_linker *linker)

 	/* Emit .BTF.ext section */
 	if (linker->btf_ext) {
-		raw_data = btf_ext__raw_data(linker->btf_ext, &raw_sz);
+		raw_data = btf_ext__get_raw_data(linker->btf_ext, &raw_sz);
 		if (!raw_data)
 			return -ENOMEM;

--- a/src/netlink.c
+++ b/src/netlink.c
@@ -9,7 +9,6 @@
 #include <linux/if_ether.h>
 #include <linux/pkt_cls.h>
 #include <linux/rtnetlink.h>
-#include <linux/netdev.h>
 #include <sys/socket.h>
 #include <errno.h>
 #include <time.h>
@@ -28,28 +27,13 @@ typedef int (*libbpf_dump_nlmsg_t)(void *cookie, void *msg, struct nlattr **tb);
 typedef int (*__dump_nlmsg_t)(struct nlmsghdr *nlmsg, libbpf_dump_nlmsg_t,
 			      void *cookie);

-struct xdp_link_info {
-	__u32 prog_id;
-	__u32 drv_prog_id;
-	__u32 hw_prog_id;
-	__u32 skb_prog_id;
-	__u8 attach_mode;
-};
-
 struct xdp_id_md {
 	int ifindex;
 	__u32 flags;
 	struct xdp_link_info info;
-	__u64 feature_flags;
 };

-struct xdp_features_md {
-	int ifindex;
-	__u32 xdp_zc_max_segs;
-	__u64 flags;
-};
-
-static int libbpf_netlink_open(__u32 *nl_pid, int proto)
+static int libbpf_netlink_open(__u32 *nl_pid)
 {
 	struct sockaddr_nl sa;
 	socklen_t addrlen;
@@ -59,7 +43,7 @@ static int libbpf_netlink_open(__u32 *nl_pid, int proto)
 	memset(&sa, 0, sizeof(sa));
 	sa.nl_family = AF_NETLINK;

-	sock = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, proto);
+	sock = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_ROUTE);
 	if (sock < 0)
 		return -errno;

@@ -103,75 +87,29 @@ enum {
 	NL_DONE,
 };

-static int netlink_recvmsg(int sock, struct msghdr *mhdr, int flags)
-{
-	int len;
-
-	do {
-		len = recvmsg(sock, mhdr, flags);
-	} while (len < 0 && (errno == EINTR || errno == EAGAIN));
-
-	if (len < 0)
-		return -errno;
-	return len;
-}
-
-static int alloc_iov(struct iovec *iov, int len)
-{
-	void *nbuf;
-
-	nbuf = realloc(iov->iov_base, len);
-	if (!nbuf)
-		return -ENOMEM;
-
-	iov->iov_base = nbuf;
-	iov->iov_len = len;
-	return 0;
-}
-
 static int libbpf_netlink_recv(int sock, __u32 nl_pid, int seq,
 			       __dump_nlmsg_t _fn, libbpf_dump_nlmsg_t fn,
 			       void *cookie)
 {
-	struct iovec iov = {};
-	struct msghdr mhdr = {
-		.msg_iov = &iov,
-		.msg_iovlen = 1,
-	};
 	bool multipart = true;
 	struct nlmsgerr *err;
 	struct nlmsghdr *nh;
+	char buf[4096];
 	int len, ret;

-	ret = alloc_iov(&iov, 4096);
-	if (ret)
-		goto done;
-
 	while (multipart) {
 start:
 		multipart = false;
-		len = netlink_recvmsg(sock, &mhdr, MSG_PEEK | MSG_TRUNC);
+		len = recv(sock, buf, sizeof(buf), 0);
 		if (len < 0) {
-			ret = len;
-			goto done;
-		}
-
-		if (len > iov.iov_len) {
-			ret = alloc_iov(&iov, len);
-			if (ret)
-				goto done;
-		}
-
-		len = netlink_recvmsg(sock, &mhdr, 0);
-		if (len < 0) {
-			ret = len;
+			ret = -errno;
 			goto done;
 		}

 		if (len == 0)
 			break;

-		for (nh = (struct nlmsghdr *)iov.iov_base; NLMSG_OK(nh, len);
+		for (nh = (struct nlmsghdr *)buf; NLMSG_OK(nh, len);
 		     nh = NLMSG_NEXT(nh, len)) {
 			if (nh->nlmsg_pid != nl_pid) {
 				ret = -LIBBPF_ERRNO__WRNGPID;
@@ -192,8 +130,7 @@ start:
 				libbpf_nla_dump_errormsg(nh);
 				goto done;
 			case NLMSG_DONE:
-				ret = 0;
-				goto done;
+				return 0;
 			default:
 				break;
 			}
@@ -205,29 +142,27 @@ start:
 				case NL_NEXT:
 					goto start;
 				case NL_DONE:
-					ret = 0;
-					goto done;
+					return 0;
 				default:
-					goto done;
+					return ret;
 				}
 			}
 		}
 	}
 	ret = 0;
 done:
-	free(iov.iov_base);
 	return ret;
 }

 static int libbpf_netlink_send_recv(struct libbpf_nla_req *req,
-				    int proto, __dump_nlmsg_t parse_msg,
+				    __dump_nlmsg_t parse_msg,
 				    libbpf_dump_nlmsg_t parse_attr,
 				    void *cookie)
 {
 	__u32 nl_pid = 0;
 	int sock, ret;

-	sock = libbpf_netlink_open(&nl_pid, proto);
+	sock = libbpf_netlink_open(&nl_pid);
 	if (sock < 0)
 		return sock;

@@ -246,43 +181,6 @@ out:
 	return ret;
 }

-static int parse_genl_family_id(struct nlmsghdr *nh, libbpf_dump_nlmsg_t fn,
-				void *cookie)
-{
-	struct genlmsghdr *gnl = NLMSG_DATA(nh);
-	struct nlattr *na = (struct nlattr *)((void *)gnl + GENL_HDRLEN);
-	struct nlattr *tb[CTRL_ATTR_FAMILY_ID + 1];
-	__u16 *id = cookie;
-
-	libbpf_nla_parse(tb, CTRL_ATTR_FAMILY_ID, na,
-			 NLMSG_PAYLOAD(nh, sizeof(*gnl)), NULL);
-	if (!tb[CTRL_ATTR_FAMILY_ID])
-		return NL_CONT;
-
-	*id = libbpf_nla_getattr_u16(tb[CTRL_ATTR_FAMILY_ID]);
-	return NL_DONE;
-}
-
-static int libbpf_netlink_resolve_genl_family_id(const char *name,
-						 __u16 len, __u16 *id)
-{
-	struct libbpf_nla_req req = {
-		.nh.nlmsg_len	= NLMSG_LENGTH(GENL_HDRLEN),
-		.nh.nlmsg_type	= GENL_ID_CTRL,
-		.nh.nlmsg_flags	= NLM_F_REQUEST,
-		.gnl.cmd	= CTRL_CMD_GETFAMILY,
-		.gnl.version	= 2,
-	};
-	int err;
-
-	err = nlattr_add(&req, CTRL_ATTR_FAMILY_NAME, name, len);
-	if (err < 0)
-		return err;
-
-	return libbpf_netlink_send_recv(&req, NETLINK_GENERIC,
-					parse_genl_family_id, NULL, id);
-}
-
 static int __bpf_set_link_xdp_fd_replace(int ifindex, int fd, int old_fd,
 					 __u32 flags)
 {
@@ -316,29 +214,32 @@ static int __bpf_set_link_xdp_fd_replace(int ifindex, int fd, int old_fd,
 	}
 	nlattr_end_nested(&req, nla);

-	return libbpf_netlink_send_recv(&req, NETLINK_ROUTE, NULL, NULL, NULL);
+	return libbpf_netlink_send_recv(&req, NULL, NULL, NULL);
 }

-int bpf_xdp_attach(int ifindex, int prog_fd, __u32 flags, const struct bpf_xdp_attach_opts *opts)
+int bpf_set_link_xdp_fd_opts(int ifindex, int fd, __u32 flags,
+			     const struct bpf_xdp_set_link_opts *opts)
 {
-	int old_prog_fd, err;
+	int old_fd = -1, ret;

-	if (!OPTS_VALID(opts, bpf_xdp_attach_opts))
+	if (!OPTS_VALID(opts, bpf_xdp_set_link_opts))
 		return libbpf_err(-EINVAL);

-	old_prog_fd = OPTS_GET(opts, old_prog_fd, 0);
-	if (old_prog_fd)
+	if (OPTS_HAS(opts, old_fd)) {
+		old_fd = OPTS_GET(opts, old_fd, -1);
 		flags |= XDP_FLAGS_REPLACE;
-	else
-		old_prog_fd = -1;
+	}

-	err = __bpf_set_link_xdp_fd_replace(ifindex, prog_fd, old_prog_fd, flags);
-	return libbpf_err(err);
+	ret = __bpf_set_link_xdp_fd_replace(ifindex, fd, old_fd, flags);
+	return libbpf_err(ret);
 }

-int bpf_xdp_detach(int ifindex, __u32 flags, const struct bpf_xdp_attach_opts *opts)
+int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags)
 {
-	return bpf_xdp_attach(ifindex, -1, flags, opts);
+	int ret;
+
+	ret = __bpf_set_link_xdp_fd_replace(ifindex, fd, 0, flags);
+	return libbpf_err(ret);
 }

 static int __dump_link_nlmsg(struct nlmsghdr *nlh,
@@ -402,132 +303,70 @@ static int get_xdp_info(void *cookie, void *msg, struct nlattr **tb)
 	return 0;
 }

-static int parse_xdp_features(struct nlmsghdr *nh, libbpf_dump_nlmsg_t fn,
-			      void *cookie)
-{
-	struct genlmsghdr *gnl = NLMSG_DATA(nh);
-	struct nlattr *na = (struct nlattr *)((void *)gnl + GENL_HDRLEN);
-	struct nlattr *tb[NETDEV_CMD_MAX + 1];
-	struct xdp_features_md *md = cookie;
-	__u32 ifindex;
-
-	libbpf_nla_parse(tb, NETDEV_CMD_MAX, na,
-			 NLMSG_PAYLOAD(nh, sizeof(*gnl)), NULL);
-
-	if (!tb[NETDEV_A_DEV_IFINDEX] || !tb[NETDEV_A_DEV_XDP_FEATURES])
-		return NL_CONT;
-
-	ifindex = libbpf_nla_getattr_u32(tb[NETDEV_A_DEV_IFINDEX]);
-	if (ifindex != md->ifindex)
-		return NL_CONT;
-
-	md->flags = libbpf_nla_getattr_u64(tb[NETDEV_A_DEV_XDP_FEATURES]);
-	if (tb[NETDEV_A_DEV_XDP_ZC_MAX_SEGS])
-		md->xdp_zc_max_segs =
-			libbpf_nla_getattr_u32(tb[NETDEV_A_DEV_XDP_ZC_MAX_SEGS]);
-	return NL_DONE;
-}
-
-int bpf_xdp_query(int ifindex, int xdp_flags, struct bpf_xdp_query_opts *opts)
+int bpf_get_link_xdp_info(int ifindex, struct xdp_link_info *info,
+			  size_t info_size, __u32 flags)
 {
+	struct xdp_id_md xdp_id = {};
+	__u32 mask;
+	int ret;
 	struct libbpf_nla_req req = {
 		.nh.nlmsg_len      = NLMSG_LENGTH(sizeof(struct ifinfomsg)),
 		.nh.nlmsg_type     = RTM_GETLINK,
 		.nh.nlmsg_flags    = NLM_F_DUMP | NLM_F_REQUEST,
 		.ifinfo.ifi_family = AF_PACKET,
 	};
-	struct xdp_id_md xdp_id = {};
-	struct xdp_features_md md = {
-		.ifindex = ifindex,
-	};
-	__u16 id;
-	int err;

-	if (!OPTS_VALID(opts, bpf_xdp_query_opts))
-		return libbpf_err(-EINVAL);
-
-	if (xdp_flags & ~XDP_FLAGS_MASK)
+	if (flags & ~XDP_FLAGS_MASK || !info_size)
 		return libbpf_err(-EINVAL);

 	/* Check whether the single {HW,DRV,SKB} mode is set */
-	xdp_flags &= XDP_FLAGS_SKB_MODE | XDP_FLAGS_DRV_MODE | XDP_FLAGS_HW_MODE;
-	if (xdp_flags & (xdp_flags - 1))
+	flags &= (XDP_FLAGS_SKB_MODE | XDP_FLAGS_DRV_MODE | XDP_FLAGS_HW_MODE);
+	mask = flags - 1;
+	if (flags && flags & mask)
 		return libbpf_err(-EINVAL);

 	xdp_id.ifindex = ifindex;
-	xdp_id.flags = xdp_flags;
+	xdp_id.flags = flags;

-	err = libbpf_netlink_send_recv(&req, NETLINK_ROUTE, __dump_link_nlmsg,
+	ret = libbpf_netlink_send_recv(&req, __dump_link_nlmsg,
 				       get_xdp_info, &xdp_id);
-	if (err)
-		return libbpf_err(err);
+	if (!ret) {
+		size_t sz = min(info_size, sizeof(xdp_id.info));

-	OPTS_SET(opts, prog_id, xdp_id.info.prog_id);
-	OPTS_SET(opts, drv_prog_id, xdp_id.info.drv_prog_id);
-	OPTS_SET(opts, hw_prog_id, xdp_id.info.hw_prog_id);
-	OPTS_SET(opts, skb_prog_id, xdp_id.info.skb_prog_id);
-	OPTS_SET(opts, attach_mode, xdp_id.info.attach_mode);
-
-	if (!OPTS_HAS(opts, feature_flags))
-		return 0;
-
-	err = libbpf_netlink_resolve_genl_family_id("netdev", sizeof("netdev"), &id);
-	if (err < 0) {
-		if (err == -ENOENT) {
-			opts->feature_flags = 0;
-			goto skip_feature_flags;
-		}
-		return libbpf_err(err);
+		memcpy(info, &xdp_id.info, sz);
+		memset((void *) info + sz, 0, info_size - sz);
 	}

-	memset(&req, 0, sizeof(req));
-	req.nh.nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN);
-	req.nh.nlmsg_flags = NLM_F_REQUEST;
-	req.nh.nlmsg_type = id;
-	req.gnl.cmd = NETDEV_CMD_DEV_GET;
-	req.gnl.version = 2;
-
-	err = nlattr_add(&req, NETDEV_A_DEV_IFINDEX, &ifindex, sizeof(ifindex));
-	if (err < 0)
-		return libbpf_err(err);
-
-	err = libbpf_netlink_send_recv(&req, NETLINK_GENERIC,
-				       parse_xdp_features, NULL, &md);
-	if (err)
-		return libbpf_err(err);
-
-	OPTS_SET(opts, feature_flags, md.flags);
-	OPTS_SET(opts, xdp_zc_max_segs, md.xdp_zc_max_segs);
-
-skip_feature_flags:
-	return 0;
+	return libbpf_err(ret);
 }

-int bpf_xdp_query_id(int ifindex, int flags, __u32 *prog_id)
+static __u32 get_xdp_id(struct xdp_link_info *info, __u32 flags)
 {
-	LIBBPF_OPTS(bpf_xdp_query_opts, opts);
-	int ret;
-
-	ret = bpf_xdp_query(ifindex, flags, &opts);
-	if (ret)
-		return libbpf_err(ret);
-
 	flags &= XDP_FLAGS_MODES;

-	if (opts.attach_mode != XDP_ATTACHED_MULTI && !flags)
-		*prog_id = opts.prog_id;
-	else if (flags & XDP_FLAGS_DRV_MODE)
-		*prog_id = opts.drv_prog_id;
-	else if (flags & XDP_FLAGS_HW_MODE)
-		*prog_id = opts.hw_prog_id;
-	else if (flags & XDP_FLAGS_SKB_MODE)
-		*prog_id = opts.skb_prog_id;
-	else
-		*prog_id = 0;
+	if (info->attach_mode != XDP_ATTACHED_MULTI && !flags)
+		return info->prog_id;
+	if (flags & XDP_FLAGS_DRV_MODE)
+		return info->drv_prog_id;
+	if (flags & XDP_FLAGS_HW_MODE)
+		return info->hw_prog_id;
+	if (flags & XDP_FLAGS_SKB_MODE)
+		return info->skb_prog_id;

 	return 0;
 }

+int bpf_get_link_xdp_id(int ifindex, __u32 *prog_id, __u32 flags)
+{
+	struct xdp_link_info info;
+	int ret;
+
+	ret = bpf_get_link_xdp_info(ifindex, &info, sizeof(info), flags);
+	if (!ret)
+		*prog_id = get_xdp_id(&info, flags);
+
+	return libbpf_err(ret);
+}

 typedef int (*qdisc_config_t)(struct libbpf_nla_req *req);

@@ -600,7 +439,7 @@ static int tc_qdisc_modify(struct bpf_tc_hook *hook, int cmd, int flags)
 	if (ret < 0)
 		return ret;

-	return libbpf_netlink_send_recv(&req, NETLINK_ROUTE, NULL, NULL, NULL);
+	return libbpf_netlink_send_recv(&req, NULL, NULL, NULL);
 }

 static int tc_qdisc_create_excl(struct bpf_tc_hook *hook)
@@ -694,13 +533,12 @@ static int get_tc_info(struct nlmsghdr *nh, libbpf_dump_nlmsg_t fn,

 static int tc_add_fd_and_name(struct libbpf_nla_req *req, int fd)
 {
-	struct bpf_prog_info info;
+	struct bpf_prog_info info = {};
 	__u32 info_len = sizeof(info);
 	char name[256];
 	int len, ret;

-	memset(&info, 0, info_len);
-	ret = bpf_prog_get_info_by_fd(fd, &info, &info_len);
+	ret = bpf_obj_get_info_by_fd(fd, &info, &info_len);
 	if (ret < 0)
 		return ret;

@@ -780,8 +618,7 @@ int bpf_tc_attach(const struct bpf_tc_hook *hook, struct bpf_tc_opts *opts)

 	info.opts = opts;

-	ret = libbpf_netlink_send_recv(&req, NETLINK_ROUTE, get_tc_info, NULL,
-				       &info);
+	ret = libbpf_netlink_send_recv(&req, get_tc_info, NULL, &info);
 	if (ret < 0)
 		return libbpf_err(ret);
 	if (!info.processed)
@@ -847,7 +684,7 @@ static int __bpf_tc_detach(const struct bpf_tc_hook *hook,
 			return ret;
 	}

-	return libbpf_netlink_send_recv(&req, NETLINK_ROUTE, NULL, NULL, NULL);
+	return libbpf_netlink_send_recv(&req, NULL, NULL, NULL);
 }

 int bpf_tc_detach(const struct bpf_tc_hook *hook,
@@ -912,8 +749,7 @@ int bpf_tc_query(const struct bpf_tc_hook *hook, struct bpf_tc_opts *opts)

 	info.opts = opts;

-	ret = libbpf_netlink_send_recv(&req, NETLINK_ROUTE, get_tc_info, NULL,
-				       &info);
+	ret = libbpf_netlink_send_recv(&req, get_tc_info, NULL, &info);
 	if (ret < 0)
 		return libbpf_err(ret);
 	if (!info.processed)
--- a/src/nlattr.c
+++ b/src/nlattr.c
@@ -32,7 +32,7 @@ static struct nlattr *nla_next(const struct nlattr *nla, int *remaining)

 static int nla_ok(const struct nlattr *nla, int remaining)
 {
-	return remaining >= (int)sizeof(*nla) &&
+	return remaining >= sizeof(*nla) &&
 	       nla->nla_len >= sizeof(*nla) &&
 	       nla->nla_len <= remaining;
 }
@@ -178,7 +178,7 @@ int libbpf_nla_dump_errormsg(struct nlmsghdr *nlh)
 		hlen += nlmsg_len(&err->msg);

 	attr = (struct nlattr *) ((void *) err + hlen);
-	alen = (void *)nlh + nlh->nlmsg_len - (void *)attr;
+	alen = nlh->nlmsg_len - hlen;

 	if (libbpf_nla_parse(tb, NLMSGERR_ATTR_MAX, attr, alen,
 			     extack_policy) != 0) {
--- a/src/nlattr.h
+++ b/src/nlattr.h
@@ -14,7 +14,6 @@
 #include <errno.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
-#include <linux/genetlink.h>

 /* avoid multiple definition of netlink features */
 #define __LINUX_NETLINK_H
@@ -59,7 +58,6 @@ struct libbpf_nla_req {
 	union {
 		struct ifinfomsg ifinfo;
 		struct tcmsg tc;
-		struct genlmsghdr gnl;
 	};
 	char buf[128];
 };
@@ -91,21 +89,11 @@ static inline uint8_t libbpf_nla_getattr_u8(const struct nlattr *nla)
 	return *(uint8_t *)libbpf_nla_data(nla);
 }

-static inline uint16_t libbpf_nla_getattr_u16(const struct nlattr *nla)
-{
-	return *(uint16_t *)libbpf_nla_data(nla);
-}
-
 static inline uint32_t libbpf_nla_getattr_u32(const struct nlattr *nla)
 {
 	return *(uint32_t *)libbpf_nla_data(nla);
 }

-static inline uint64_t libbpf_nla_getattr_u64(const struct nlattr *nla)
-{
-	return *(uint64_t *)libbpf_nla_data(nla);
-}
-
 static inline const char *libbpf_nla_getattr_str(const struct nlattr *nla)
 {
 	return (const char *)libbpf_nla_data(nla);
--- a/src/relo_core.c
+++ b/src/relo_core.c
--- a/src/relo_core.h
+++ b/src/relo_core.h
@@ -4,10 +4,81 @@
 #ifndef __RELO_CORE_H
 #define __RELO_CORE_H

-#include <linux/bpf.h>
+/* bpf_core_relo_kind encodes which aspect of captured field/type/enum value
+ * has to be adjusted by relocations.
+ */
+enum bpf_core_relo_kind {
+	BPF_FIELD_BYTE_OFFSET = 0,	/* field byte offset */
+	BPF_FIELD_BYTE_SIZE = 1,	/* field size in bytes */
+	BPF_FIELD_EXISTS = 2,		/* field existence in target kernel */
+	BPF_FIELD_SIGNED = 3,		/* field signedness (0 - unsigned, 1 - signed) */
+	BPF_FIELD_LSHIFT_U64 = 4,	/* bitfield-specific left bitshift */
+	BPF_FIELD_RSHIFT_U64 = 5,	/* bitfield-specific right bitshift */
+	BPF_TYPE_ID_LOCAL = 6,		/* type ID in local BPF object */
+	BPF_TYPE_ID_TARGET = 7,		/* type ID in target kernel */
+	BPF_TYPE_EXISTS = 8,		/* type existence in target kernel */
+	BPF_TYPE_SIZE = 9,		/* type size in bytes */
+	BPF_ENUMVAL_EXISTS = 10,	/* enum value existence in target kernel */
+	BPF_ENUMVAL_VALUE = 11,		/* enum value integer value */
+};
+
+/* The minimum bpf_core_relo checked by the loader
+ *
+ * CO-RE relocation captures the following data:
+ * - insn_off - instruction offset (in bytes) within a BPF program that needs
+ *   its insn->imm field to be relocated with actual field info;
+ * - type_id - BTF type ID of the "root" (containing) entity of a relocatable
+ *   type or field;
+ * - access_str_off - offset into corresponding .BTF string section. String
+ *   interpretation depends on specific relocation kind:
+ *     - for field-based relocations, string encodes an accessed field using
+ *     a sequence of field and array indices, separated by colon (:). It's
+ *     conceptually very close to LLVM's getelementptr ([0]) instruction's
+ *     arguments for identifying offset to a field.
+ *     - for type-based relocations, strings is expected to be just "0";
+ *     - for enum value-based relocations, string contains an index of enum
+ *     value within its enum type;
+ *
+ * Example to provide a better feel.
+ *
+ *   struct sample {
+ *       int a;
+ *       struct {
+ *           int b[10];
+ *       };
+ *   };
+ *
+ *   struct sample *s = ...;
+ *   int x = &s->a;     // encoded as "0:0" (a is field #0)
+ *   int y = &s->b[5];  // encoded as "0:1:0:5" (anon struct is field #1,
+ *                      // b is field #0 inside anon struct, accessing elem #5)
+ *   int z = &s[10]->b; // encoded as "10:1" (ptr is used as an array)
+ *
+ * type_id for all relocs in this example  will capture BTF type id of
+ * `struct sample`.
+ *
+ * Such relocation is emitted when using __builtin_preserve_access_index()
+ * Clang built-in, passing expression that captures field address, e.g.:
+ *
+ * bpf_probe_read(&dst, sizeof(dst),
+ *		  __builtin_preserve_access_index(&src->a.b.c));
+ *
+ * In this case Clang will emit field relocation recording necessary data to
+ * be able to find offset of embedded `a.b.c` field within `src` struct.
+ *
+ *   [0] https://llvm.org/docs/LangRef.html#getelementptr-instruction
+ */
+struct bpf_core_relo {
+	__u32   insn_off;
+	__u32   type_id;
+	__u32   access_str_off;
+	enum bpf_core_relo_kind kind;
+};

 struct bpf_core_cand {
 	const struct btf *btf;
+	const struct btf_type *t;
+	const char *name;
 	__u32 id;
 };

@@ -17,83 +88,13 @@ struct bpf_core_cand_list {
 	int len;
 };

-#define BPF_CORE_SPEC_MAX_LEN 64
-
-/* represents BPF CO-RE field or array element accessor */
-struct bpf_core_accessor {
-	__u32 type_id;		/* struct/union type or array element type */
-	__u32 idx;		/* field index or array index */
-	const char *name;	/* field name or NULL for array accessor */
-};
-
-struct bpf_core_spec {
-	const struct btf *btf;
-	/* high-level spec: named fields and array indices only */
-	struct bpf_core_accessor spec[BPF_CORE_SPEC_MAX_LEN];
-	/* original unresolved (no skip_mods_or_typedefs) root type ID */
-	__u32 root_type_id;
-	/* CO-RE relocation kind */
-	enum bpf_core_relo_kind relo_kind;
-	/* high-level spec length */
-	int len;
-	/* raw, low-level spec: 1-to-1 with accessor spec string */
-	int raw_spec[BPF_CORE_SPEC_MAX_LEN];
-	/* raw spec length */
-	int raw_len;
-	/* field bit offset represented by spec */
-	__u32 bit_offset;
-};
-
-struct bpf_core_relo_res {
-	/* expected value in the instruction, unless validate == false */
-	__u64 orig_val;
-	/* new value that needs to be patched up to */
-	__u64 new_val;
-	/* relocation unsuccessful, poison instruction, but don't fail load */
-	bool poison;
-	/* some relocations can't be validated against orig_val */
-	bool validate;
-	/* for field byte offset relocations or the forms:
-	 *     *(T *)(rX + <off>) = rY
-	 *     rX = *(T *)(rY + <off>),
-	 * we remember original and resolved field size to adjust direct
-	 * memory loads of pointers and integers; this is necessary for 32-bit
-	 * host kernel architectures, but also allows to automatically
-	 * relocate fields that were resized from, e.g., u32 to u64, etc.
-	 */
-	bool fail_memsz_adjust;
-	__u32 orig_sz;
-	__u32 orig_type_id;
-	__u32 new_sz;
-	__u32 new_type_id;
-};
-
-int __bpf_core_types_are_compat(const struct btf *local_btf, __u32 local_id,
-				const struct btf *targ_btf, __u32 targ_id, int level);
+int bpf_core_apply_relo_insn(const char *prog_name,
+			     struct bpf_insn *insn, int insn_idx,
+			     const struct bpf_core_relo *relo, int relo_idx,
+			     const struct btf *local_btf,
+			     struct bpf_core_cand_list *cands);
 int bpf_core_types_are_compat(const struct btf *local_btf, __u32 local_id,
 			      const struct btf *targ_btf, __u32 targ_id);
-int __bpf_core_types_match(const struct btf *local_btf, __u32 local_id, const struct btf *targ_btf,
-			   __u32 targ_id, bool behind_ptr, int level);
-int bpf_core_types_match(const struct btf *local_btf, __u32 local_id, const struct btf *targ_btf,
-			 __u32 targ_id);

 size_t bpf_core_essential_name_len(const char *name);
-
-int bpf_core_calc_relo_insn(const char *prog_name,
-			    const struct bpf_core_relo *relo, int relo_idx,
-			    const struct btf *local_btf,
-			    struct bpf_core_cand_list *cands,
-			    struct bpf_core_spec *specs_scratch,
-			    struct bpf_core_relo_res *targ_res);
-
-int bpf_core_patch_insn(const char *prog_name, struct bpf_insn *insn,
-			int insn_idx, const struct bpf_core_relo *relo,
-			int relo_idx, const struct bpf_core_relo_res *res);
-
-int bpf_core_parse_spec(const char *prog_name, const struct btf *btf,
-		        const struct bpf_core_relo *relo,
-		        struct bpf_core_spec *spec);
-
-int bpf_core_format_spec(char *buf, size_t buf_sz, const struct bpf_core_spec *spec);
-
 #endif
--- a/src/ringbuf.c
+++ b/src/ringbuf.c
@@ -16,7 +16,6 @@
 #include <asm/barrier.h>
 #include <sys/mman.h>
 #include <sys/epoll.h>
-#include <time.h>

 #include "libbpf.h"
 #include "libbpf_internal.h"
@@ -34,30 +33,13 @@ struct ring {

 struct ring_buffer {
 	struct epoll_event *events;
-	struct ring **rings;
+	struct ring *rings;
 	size_t page_size;
 	int epoll_fd;
 	int ring_cnt;
 };

-struct user_ring_buffer {
-	struct epoll_event event;
-	unsigned long *consumer_pos;
-	unsigned long *producer_pos;
-	void *data;
-	unsigned long mask;
-	size_t page_size;
-	int map_fd;
-	int epoll_fd;
-};
-
-/* 8-byte ring buffer header structure */
-struct ringbuf_hdr {
-	__u32 len;
-	__u32 pad;
-};
-
-static void ringbuf_free_ring(struct ring_buffer *rb, struct ring *r)
+static void ringbuf_unmap_ring(struct ring_buffer *rb, struct ring *r)
 {
 	if (r->consumer_pos) {
 		munmap(r->consumer_pos, rb->page_size);
@@ -67,8 +49,6 @@ static void ringbuf_free_ring(struct ring_buffer *rb, struct ring *r)
 		munmap(r->producer_pos, rb->page_size + 2 * (r->mask + 1));
 		r->producer_pos = NULL;
 	}
-
-	free(r);
 }

 /* Add extra RINGBUF maps to this ring buffer manager */
@@ -79,13 +59,12 @@ int ring_buffer__add(struct ring_buffer *rb, int map_fd,
 	__u32 len = sizeof(info);
 	struct epoll_event *e;
 	struct ring *r;
-	__u64 mmap_sz;
 	void *tmp;
 	int err;

 	memset(&info, 0, sizeof(info));

-	err = bpf_map_get_info_by_fd(map_fd, &info, &len);
+	err = bpf_obj_get_info_by_fd(map_fd, &info, &len);
 	if (err) {
 		err = -errno;
 		pr_warn("ringbuf: failed to get map info for fd=%d: %d\n",
@@ -109,10 +88,8 @@ int ring_buffer__add(struct ring_buffer *rb, int map_fd,
 		return libbpf_err(-ENOMEM);
 	rb->events = tmp;

-	r = calloc(1, sizeof(*r));
-	if (!r)
-		return libbpf_err(-ENOMEM);
-	rb->rings[rb->ring_cnt] = r;
+	r = &rb->rings[rb->ring_cnt];
+	memset(r, 0, sizeof(*r));

 	r->map_fd = map_fd;
 	r->sample_cb = sample_cb;
@@ -120,31 +97,28 @@ int ring_buffer__add(struct ring_buffer *rb, int map_fd,
 	r->mask = info.max_entries - 1;

 	/* Map writable consumer page */
-	tmp = mmap(NULL, rb->page_size, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, 0);
+	tmp = mmap(NULL, rb->page_size, PROT_READ | PROT_WRITE, MAP_SHARED,
+		   map_fd, 0);
 	if (tmp == MAP_FAILED) {
 		err = -errno;
 		pr_warn("ringbuf: failed to mmap consumer page for map fd=%d: %d\n",
 			map_fd, err);
-		goto err_out;
+		return libbpf_err(err);
 	}
 	r->consumer_pos = tmp;

 	/* Map read-only producer page and data pages. We map twice as big
 	 * data size to allow simple reading of samples that wrap around the
 	 * end of a ring buffer. See kernel implementation for details.
-	 */
-	mmap_sz = rb->page_size + 2 * (__u64)info.max_entries;
-	if (mmap_sz != (__u64)(size_t)mmap_sz) {
-		err = -E2BIG;
-		pr_warn("ringbuf: ring buffer size (%u) is too big\n", info.max_entries);
-		goto err_out;
-	}
-	tmp = mmap(NULL, (size_t)mmap_sz, PROT_READ, MAP_SHARED, map_fd, rb->page_size);
+	 * */
+	tmp = mmap(NULL, rb->page_size + 2 * info.max_entries, PROT_READ,
+		   MAP_SHARED, map_fd, rb->page_size);
 	if (tmp == MAP_FAILED) {
 		err = -errno;
+		ringbuf_unmap_ring(rb, r);
 		pr_warn("ringbuf: failed to mmap data pages for map fd=%d: %d\n",
 			map_fd, err);
-		goto err_out;
+		return libbpf_err(err);
 	}
 	r->producer_pos = tmp;
 	r->data = tmp + rb->page_size;
@@ -156,17 +130,14 @@ int ring_buffer__add(struct ring_buffer *rb, int map_fd,
 	e->data.fd = rb->ring_cnt;
 	if (epoll_ctl(rb->epoll_fd, EPOLL_CTL_ADD, map_fd, e) < 0) {
 		err = -errno;
+		ringbuf_unmap_ring(rb, r);
 		pr_warn("ringbuf: failed to epoll add map fd=%d: %d\n",
 			map_fd, err);
-		goto err_out;
+		return libbpf_err(err);
 	}

 	rb->ring_cnt++;
 	return 0;
-
-err_out:
-	ringbuf_free_ring(rb, r);
-	return libbpf_err(err);
 }

 void ring_buffer__free(struct ring_buffer *rb)
@@ -177,7 +148,7 @@ void ring_buffer__free(struct ring_buffer *rb)
 		return;

 	for (i = 0; i < rb->ring_cnt; ++i)
-		ringbuf_free_ring(rb, rb->rings[i]);
+		ringbuf_unmap_ring(rb, &rb->rings[i]);
 	if (rb->epoll_fd >= 0)
 		close(rb->epoll_fd);

@@ -231,7 +202,7 @@ static inline int roundup_len(__u32 len)
 	return (len + 7) / 8 * 8;
 }

-static int64_t ringbuf_process_ring(struct ring *r, size_t n)
+static int64_t ringbuf_process_ring(struct ring* r)
 {
 	int *len_ptr, len, err;
 	/* 64-bit to avoid overflow in case of extreme application behavior */
@@ -268,42 +239,12 @@ static int64_t ringbuf_process_ring(struct ring *r, size_t n)
 			}

 			smp_store_release(r->consumer_pos, cons_pos);
-
-			if (cnt >= n)
-				goto done;
 		}
 	} while (got_new_data);
 done:
 	return cnt;
 }

-/* Consume available ring buffer(s) data without event polling, up to n
- * records.
- *
- * Returns number of records consumed across all registered ring buffers (or
- * n, whichever is less), or negative number if any of the callbacks return
- * error.
- */
-int ring_buffer__consume_n(struct ring_buffer *rb, size_t n)
-{
-	int64_t err, res = 0;
-	int i;
-
-	for (i = 0; i < rb->ring_cnt; i++) {
-		struct ring *ring = rb->rings[i];
-
-		err = ringbuf_process_ring(ring, n);
-		if (err < 0)
-			return libbpf_err(err);
-		res += err;
-		n -= err;
-
-		if (n == 0)
-			break;
-	}
-	return res > INT_MAX ? INT_MAX : res;
-}
-
 /* Consume available ring buffer(s) data without event polling.
 * Returns number of records consumed across all registered ring buffers (or
 * INT_MAX, whichever is less), or negative number if any of the callbacks
@@ -315,17 +256,15 @@ int ring_buffer__consume(struct ring_buffer *rb)
 	int i;

 	for (i = 0; i < rb->ring_cnt; i++) {
-		struct ring *ring = rb->rings[i];
+		struct ring *ring = &rb->rings[i];

-		err = ringbuf_process_ring(ring, INT_MAX);
+		err = ringbuf_process_ring(ring);
 		if (err < 0)
 			return libbpf_err(err);
 		res += err;
-		if (res > INT_MAX) {
-			res = INT_MAX;
-			break;
-		}
 	}
+	if (res > INT_MAX)
+		return INT_MAX;
 	return res;
 }

@@ -344,15 +283,15 @@ int ring_buffer__poll(struct ring_buffer *rb, int timeout_ms)

 	for (i = 0; i < cnt; i++) {
 		__u32 ring_id = rb->events[i].data.fd;
-		struct ring *ring = rb->rings[ring_id];
+		struct ring *ring = &rb->rings[ring_id];

-		err = ringbuf_process_ring(ring, INT_MAX);
+		err = ringbuf_process_ring(ring);
 		if (err < 0)
 			return libbpf_err(err);
 		res += err;
 	}
 	if (res > INT_MAX)
-		res = INT_MAX;
+		return INT_MAX;
 	return res;
 }

@@ -361,323 +300,3 @@ int ring_buffer__epoll_fd(const struct ring_buffer *rb)
 {
 	return rb->epoll_fd;
 }
-
-struct ring *ring_buffer__ring(struct ring_buffer *rb, unsigned int idx)
-{
-	if (idx >= rb->ring_cnt)
-		return errno = ERANGE, NULL;
-
-	return rb->rings[idx];
-}
-
-unsigned long ring__consumer_pos(const struct ring *r)
-{
-	/* Synchronizes with smp_store_release() in ringbuf_process_ring(). */
-	return smp_load_acquire(r->consumer_pos);
-}
-
-unsigned long ring__producer_pos(const struct ring *r)
-{
-	/* Synchronizes with smp_store_release() in __bpf_ringbuf_reserve() in
-	 * the kernel.
-	 */
-	return smp_load_acquire(r->producer_pos);
-}
-
-size_t ring__avail_data_size(const struct ring *r)
-{
-	unsigned long cons_pos, prod_pos;
-
-	cons_pos = ring__consumer_pos(r);
-	prod_pos = ring__producer_pos(r);
-	return prod_pos - cons_pos;
-}
-
-size_t ring__size(const struct ring *r)
-{
-	return r->mask + 1;
-}
-
-int ring__map_fd(const struct ring *r)
-{
-	return r->map_fd;
-}
-
-int ring__consume_n(struct ring *r, size_t n)
-{
-	int64_t res;
-
-	res = ringbuf_process_ring(r, n);
-	if (res < 0)
-		return libbpf_err(res);
-
-	return res > INT_MAX ? INT_MAX : res;
-}
-
-int ring__consume(struct ring *r)
-{
-	return ring__consume_n(r, INT_MAX);
-}
-
-static void user_ringbuf_unmap_ring(struct user_ring_buffer *rb)
-{
-	if (rb->consumer_pos) {
-		munmap(rb->consumer_pos, rb->page_size);
-		rb->consumer_pos = NULL;
-	}
-	if (rb->producer_pos) {
-		munmap(rb->producer_pos, rb->page_size + 2 * (rb->mask + 1));
-		rb->producer_pos = NULL;
-	}
-}
-
-void user_ring_buffer__free(struct user_ring_buffer *rb)
-{
-	if (!rb)
-		return;
-
-	user_ringbuf_unmap_ring(rb);
-
-	if (rb->epoll_fd >= 0)
-		close(rb->epoll_fd);
-
-	free(rb);
-}
-
-static int user_ringbuf_map(struct user_ring_buffer *rb, int map_fd)
-{
-	struct bpf_map_info info;
-	__u32 len = sizeof(info);
-	__u64 mmap_sz;
-	void *tmp;
-	struct epoll_event *rb_epoll;
-	int err;
-
-	memset(&info, 0, sizeof(info));
-
-	err = bpf_map_get_info_by_fd(map_fd, &info, &len);
-	if (err) {
-		err = -errno;
-		pr_warn("user ringbuf: failed to get map info for fd=%d: %d\n", map_fd, err);
-		return err;
-	}
-
-	if (info.type != BPF_MAP_TYPE_USER_RINGBUF) {
-		pr_warn("user ringbuf: map fd=%d is not BPF_MAP_TYPE_USER_RINGBUF\n", map_fd);
-		return -EINVAL;
-	}
-
-	rb->map_fd = map_fd;
-	rb->mask = info.max_entries - 1;
-
-	/* Map read-only consumer page */
-	tmp = mmap(NULL, rb->page_size, PROT_READ, MAP_SHARED, map_fd, 0);
-	if (tmp == MAP_FAILED) {
-		err = -errno;
-		pr_warn("user ringbuf: failed to mmap consumer page for map fd=%d: %d\n",
-			map_fd, err);
-		return err;
-	}
-	rb->consumer_pos = tmp;
-
-	/* Map read-write the producer page and data pages. We map the data
-	 * region as twice the total size of the ring buffer to allow the
-	 * simple reading and writing of samples that wrap around the end of
-	 * the buffer.  See the kernel implementation for details.
-	 */
-	mmap_sz = rb->page_size + 2 * (__u64)info.max_entries;
-	if (mmap_sz != (__u64)(size_t)mmap_sz) {
-		pr_warn("user ringbuf: ring buf size (%u) is too big\n", info.max_entries);
-		return -E2BIG;
-	}
-	tmp = mmap(NULL, (size_t)mmap_sz, PROT_READ | PROT_WRITE, MAP_SHARED,
-		   map_fd, rb->page_size);
-	if (tmp == MAP_FAILED) {
-		err = -errno;
-		pr_warn("user ringbuf: failed to mmap data pages for map fd=%d: %d\n",
-			map_fd, err);
-		return err;
-	}
-
-	rb->producer_pos = tmp;
-	rb->data = tmp + rb->page_size;
-
-	rb_epoll = &rb->event;
-	rb_epoll->events = EPOLLOUT;
-	if (epoll_ctl(rb->epoll_fd, EPOLL_CTL_ADD, map_fd, rb_epoll) < 0) {
-		err = -errno;
-		pr_warn("user ringbuf: failed to epoll add map fd=%d: %d\n", map_fd, err);
-		return err;
-	}
-
-	return 0;
-}
-
-struct user_ring_buffer *
-user_ring_buffer__new(int map_fd, const struct user_ring_buffer_opts *opts)
-{
-	struct user_ring_buffer *rb;
-	int err;
-
-	if (!OPTS_VALID(opts, user_ring_buffer_opts))
-		return errno = EINVAL, NULL;
-
-	rb = calloc(1, sizeof(*rb));
-	if (!rb)
-		return errno = ENOMEM, NULL;
-
-	rb->page_size = getpagesize();
-
-	rb->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
-	if (rb->epoll_fd < 0) {
-		err = -errno;
-		pr_warn("user ringbuf: failed to create epoll instance: %d\n", err);
-		goto err_out;
-	}
-
-	err = user_ringbuf_map(rb, map_fd);
-	if (err)
-		goto err_out;
-
-	return rb;
-
-err_out:
-	user_ring_buffer__free(rb);
-	return errno = -err, NULL;
-}
-
-static void user_ringbuf_commit(struct user_ring_buffer *rb, void *sample, bool discard)
-{
-	__u32 new_len;
-	struct ringbuf_hdr *hdr;
-	uintptr_t hdr_offset;
-
-	hdr_offset = rb->mask + 1 + (sample - rb->data) - BPF_RINGBUF_HDR_SZ;
-	hdr = rb->data + (hdr_offset & rb->mask);
-
-	new_len = hdr->len & ~BPF_RINGBUF_BUSY_BIT;
-	if (discard)
-		new_len |= BPF_RINGBUF_DISCARD_BIT;
-
-	/* Synchronizes with smp_load_acquire() in __bpf_user_ringbuf_peek() in
-	 * the kernel.
-	 */
-	__atomic_exchange_n(&hdr->len, new_len, __ATOMIC_ACQ_REL);
-}
-
-void user_ring_buffer__discard(struct user_ring_buffer *rb, void *sample)
-{
-	user_ringbuf_commit(rb, sample, true);
-}
-
-void user_ring_buffer__submit(struct user_ring_buffer *rb, void *sample)
-{
-	user_ringbuf_commit(rb, sample, false);
-}
-
-void *user_ring_buffer__reserve(struct user_ring_buffer *rb, __u32 size)
-{
-	__u32 avail_size, total_size, max_size;
-	/* 64-bit to avoid overflow in case of extreme application behavior */
-	__u64 cons_pos, prod_pos;
-	struct ringbuf_hdr *hdr;
-
-	/* The top two bits are used as special flags */
-	if (size & (BPF_RINGBUF_BUSY_BIT | BPF_RINGBUF_DISCARD_BIT))
-		return errno = E2BIG, NULL;
-
-	/* Synchronizes with smp_store_release() in __bpf_user_ringbuf_peek() in
-	 * the kernel.
-	 */
-	cons_pos = smp_load_acquire(rb->consumer_pos);
-	/* Synchronizes with smp_store_release() in user_ringbuf_commit() */
-	prod_pos = smp_load_acquire(rb->producer_pos);
-
-	max_size = rb->mask + 1;
-	avail_size = max_size - (prod_pos - cons_pos);
-	/* Round up total size to a multiple of 8. */
-	total_size = (size + BPF_RINGBUF_HDR_SZ + 7) / 8 * 8;
-
-	if (total_size > max_size)
-		return errno = E2BIG, NULL;
-
-	if (avail_size < total_size)
-		return errno = ENOSPC, NULL;
-
-	hdr = rb->data + (prod_pos & rb->mask);
-	hdr->len = size | BPF_RINGBUF_BUSY_BIT;
-	hdr->pad = 0;
-
-	/* Synchronizes with smp_load_acquire() in __bpf_user_ringbuf_peek() in
-	 * the kernel.
-	 */
-	smp_store_release(rb->producer_pos, prod_pos + total_size);
-
-	return (void *)rb->data + ((prod_pos + BPF_RINGBUF_HDR_SZ) & rb->mask);
-}
-
-static __u64 ns_elapsed_timespec(const struct timespec *start, const struct timespec *end)
-{
-	__u64 start_ns, end_ns, ns_per_s = 1000000000;
-
-	start_ns = (__u64)start->tv_sec * ns_per_s + start->tv_nsec;
-	end_ns = (__u64)end->tv_sec * ns_per_s + end->tv_nsec;
-
-	return end_ns - start_ns;
-}
-
-void *user_ring_buffer__reserve_blocking(struct user_ring_buffer *rb, __u32 size, int timeout_ms)
-{
-	void *sample;
-	int err, ms_remaining = timeout_ms;
-	struct timespec start;
-
-	if (timeout_ms < 0 && timeout_ms != -1)
-		return errno = EINVAL, NULL;
-
-	if (timeout_ms != -1) {
-		err = clock_gettime(CLOCK_MONOTONIC, &start);
-		if (err)
-			return NULL;
-	}
-
-	do {
-		int cnt, ms_elapsed;
-		struct timespec curr;
-		__u64 ns_per_ms = 1000000;
-
-		sample = user_ring_buffer__reserve(rb, size);
-		if (sample)
-			return sample;
-		else if (errno != ENOSPC)
-			return NULL;
-
-		/* The kernel guarantees at least one event notification
-		 * delivery whenever at least one sample is drained from the
-		 * ring buffer in an invocation to bpf_ringbuf_drain(). Other
-		 * additional events may be delivered at any time, but only one
-		 * event is guaranteed per bpf_ringbuf_drain() invocation,
-		 * provided that a sample is drained, and the BPF program did
-		 * not pass BPF_RB_NO_WAKEUP to bpf_ringbuf_drain(). If
-		 * BPF_RB_FORCE_WAKEUP is passed to bpf_ringbuf_drain(), a
-		 * wakeup event will be delivered even if no samples are
-		 * drained.
-		 */
-		cnt = epoll_wait(rb->epoll_fd, &rb->event, 1, ms_remaining);
-		if (cnt < 0)
-			return NULL;
-
-		if (timeout_ms == -1)
-			continue;
-
-		err = clock_gettime(CLOCK_MONOTONIC, &curr);
-		if (err)
-			return NULL;
-
-		ms_elapsed = ns_elapsed_timespec(&start, &curr) / ns_per_ms;
-		ms_remaining = timeout_ms - ms_elapsed;
-	} while (ms_remaining > 0);
-
-	/* Try one more time to reserve a sample after the specified timeout has elapsed. */
-	return user_ring_buffer__reserve(rb, size);
-}
--- a/src/skel_internal.h
+++ b/src/skel_internal.h
@@ -3,29 +3,9 @@
 #ifndef __SKEL_INTERNAL_H
 #define __SKEL_INTERNAL_H

-#ifdef __KERNEL__
-#include <linux/fdtable.h>
-#include <linux/mm.h>
-#include <linux/mman.h>
-#include <linux/slab.h>
-#include <linux/bpf.h>
-#else
 #include <unistd.h>
 #include <sys/syscall.h>
 #include <sys/mman.h>
-#include <stdlib.h>
-#include "bpf.h"
-#endif
-
-#ifndef __NR_bpf
-# if defined(__mips__) && defined(_ABIO32)
-#  define __NR_bpf 4355
-# elif defined(__mips__) && defined(_ABIN32)
-#  define __NR_bpf 6319
-# elif defined(__mips__) && defined(_ABI64)
-#  define __NR_bpf 5315
-# endif
-#endif

 /* This file is a base header for auto-generated *.lskel.h files.
 * Its contents will change and may become part of auto-generation in the future.
@@ -35,23 +15,24 @@
 * requested during loader program generation.
 */
 struct bpf_map_desc {
-	/* output of the loader prog */
-	int map_fd;
-	/* input for the loader prog */
-	__u32 max_entries;
-	__aligned_u64 initial_value;
+	union {
+		/* input for the loader prog */
+		struct {
+			__aligned_u64 initial_value;
+			__u32 max_entries;
+		};
+		/* output of the loader prog */
+		struct {
+			int map_fd;
+		};
+	};
 };
 struct bpf_prog_desc {
 	int prog_fd;
 };

-enum {
-	BPF_SKEL_KERNEL = (1ULL << 0),
-};
-
 struct bpf_loader_ctx {
-	__u32 sz;
-	__u32 flags;
+	size_t sz;
 	__u32 log_level;
 	__u32 log_size;
 	__u64 log_buf;
@@ -66,144 +47,12 @@ struct bpf_load_and_run_opts {
 	const char *errstr;
 };

-long kern_sys_bpf(__u32 cmd, void *attr, __u32 attr_size);
-
 static inline int skel_sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr,
 			  unsigned int size)
 {
-#ifdef __KERNEL__
-	return kern_sys_bpf(cmd, attr, size);
-#else
 	return syscall(__NR_bpf, cmd, attr, size);
-#endif
 }

-#ifdef __KERNEL__
-static inline int close(int fd)
-{
-	return close_fd(fd);
-}
-
-static inline void *skel_alloc(size_t size)
-{
-	struct bpf_loader_ctx *ctx = kzalloc(size, GFP_KERNEL);
-
-	if (!ctx)
-		return NULL;
-	ctx->flags |= BPF_SKEL_KERNEL;
-	return ctx;
-}
-
-static inline void skel_free(const void *p)
-{
-	kfree(p);
-}
-
-/* skel->bss/rodata maps are populated the following way:
- *
- * For kernel use:
- * skel_prep_map_data() allocates kernel memory that kernel module can directly access.
- * Generated lskel stores the pointer in skel->rodata and in skel->maps.rodata.initial_value.
- * The loader program will perform probe_read_kernel() from maps.rodata.initial_value.
- * skel_finalize_map_data() sets skel->rodata to point to actual value in a bpf map and
- * does maps.rodata.initial_value = ~0ULL to signal skel_free_map_data() that kvfree
- * is not nessary.
- *
- * For user space:
- * skel_prep_map_data() mmaps anon memory into skel->rodata that can be accessed directly.
- * Generated lskel stores the pointer in skel->rodata and in skel->maps.rodata.initial_value.
- * The loader program will perform copy_from_user() from maps.rodata.initial_value.
- * skel_finalize_map_data() remaps bpf array map value from the kernel memory into
- * skel->rodata address.
- *
- * The "bpftool gen skeleton -L" command generates lskel.h that is suitable for
- * both kernel and user space. The generated loader program does
- * either bpf_probe_read_kernel() or bpf_copy_from_user() from initial_value
- * depending on bpf_loader_ctx->flags.
- */
-static inline void skel_free_map_data(void *p, __u64 addr, size_t sz)
-{
-	if (addr != ~0ULL)
-		kvfree(p);
-	/* When addr == ~0ULL the 'p' points to
-	 * ((struct bpf_array *)map)->value. See skel_finalize_map_data.
-	 */
-}
-
-static inline void *skel_prep_map_data(const void *val, size_t mmap_sz, size_t val_sz)
-{
-	void *addr;
-
-	addr = kvmalloc(val_sz, GFP_KERNEL);
-	if (!addr)
-		return NULL;
-	memcpy(addr, val, val_sz);
-	return addr;
-}
-
-static inline void *skel_finalize_map_data(__u64 *init_val, size_t mmap_sz, int flags, int fd)
-{
-	struct bpf_map *map;
-	void *addr = NULL;
-
-	kvfree((void *) (long) *init_val);
-	*init_val = ~0ULL;
-
-	/* At this point bpf_load_and_run() finished without error and
-	 * 'fd' is a valid bpf map FD. All sanity checks below should succeed.
-	 */
-	map = bpf_map_get(fd);
-	if (IS_ERR(map))
-		return NULL;
-	if (map->map_type != BPF_MAP_TYPE_ARRAY)
-		goto out;
-	addr = ((struct bpf_array *)map)->value;
-	/* the addr stays valid, since FD is not closed */
-out:
-	bpf_map_put(map);
-	return addr;
-}
-
-#else
-
-static inline void *skel_alloc(size_t size)
-{
-	return calloc(1, size);
-}
-
-static inline void skel_free(void *p)
-{
-	free(p);
-}
-
-static inline void skel_free_map_data(void *p, __u64 addr, size_t sz)
-{
-	munmap(p, sz);
-}
-
-static inline void *skel_prep_map_data(const void *val, size_t mmap_sz, size_t val_sz)
-{
-	void *addr;
-
-	addr = mmap(NULL, mmap_sz, PROT_READ | PROT_WRITE,
-		    MAP_SHARED | MAP_ANONYMOUS, -1, 0);
-	if (addr == (void *) -1)
-		return NULL;
-	memcpy(addr, val, val_sz);
-	return addr;
-}
-
-static inline void *skel_finalize_map_data(__u64 *init_val, size_t mmap_sz, int flags, int fd)
-{
-	void *addr;
-
-	addr = mmap((void *) (long) *init_val, mmap_sz, flags, MAP_SHARED | MAP_FIXED, fd, 0);
-	if (addr == (void *) -1)
-		return NULL;
-	return addr;
-}
-#endif
-
 static inline int skel_closenz(int fd)
 {
 	if (fd > 0)
@@ -211,123 +60,27 @@ static inline int skel_closenz(int fd)
 	return -EINVAL;
 }

-#ifndef offsetofend
-#define offsetofend(TYPE, MEMBER) \
-	(offsetof(TYPE, MEMBER)	+ sizeof((((TYPE *)0)->MEMBER)))
-#endif
-
-static inline int skel_map_create(enum bpf_map_type map_type,
-				  const char *map_name,
-				  __u32 key_size,
-				  __u32 value_size,
-				  __u32 max_entries)
-{
-	const size_t attr_sz = offsetofend(union bpf_attr, map_extra);
-	union bpf_attr attr;
-
-	memset(&attr, 0, attr_sz);
-
-	attr.map_type = map_type;
-	strncpy(attr.map_name, map_name, sizeof(attr.map_name));
-	attr.key_size = key_size;
-	attr.value_size = value_size;
-	attr.max_entries = max_entries;
-
-	return skel_sys_bpf(BPF_MAP_CREATE, &attr, attr_sz);
-}
-
-static inline int skel_map_update_elem(int fd, const void *key,
-				       const void *value, __u64 flags)
-{
-	const size_t attr_sz = offsetofend(union bpf_attr, flags);
-	union bpf_attr attr;
-
-	memset(&attr, 0, attr_sz);
-	attr.map_fd = fd;
-	attr.key = (long) key;
-	attr.value = (long) value;
-	attr.flags = flags;
-
-	return skel_sys_bpf(BPF_MAP_UPDATE_ELEM, &attr, attr_sz);
-}
-
-static inline int skel_map_delete_elem(int fd, const void *key)
-{
-	const size_t attr_sz = offsetofend(union bpf_attr, flags);
-	union bpf_attr attr;
-
-	memset(&attr, 0, attr_sz);
-	attr.map_fd = fd;
-	attr.key = (long)key;
-
-	return skel_sys_bpf(BPF_MAP_DELETE_ELEM, &attr, attr_sz);
-}
-
-static inline int skel_map_get_fd_by_id(__u32 id)
-{
-	const size_t attr_sz = offsetofend(union bpf_attr, flags);
-	union bpf_attr attr;
-
-	memset(&attr, 0, attr_sz);
-	attr.map_id = id;
-
-	return skel_sys_bpf(BPF_MAP_GET_FD_BY_ID, &attr, attr_sz);
-}
-
-static inline int skel_raw_tracepoint_open(const char *name, int prog_fd)
-{
-	const size_t attr_sz = offsetofend(union bpf_attr, raw_tracepoint.prog_fd);
-	union bpf_attr attr;
-
-	memset(&attr, 0, attr_sz);
-	attr.raw_tracepoint.name = (long) name;
-	attr.raw_tracepoint.prog_fd = prog_fd;
-
-	return skel_sys_bpf(BPF_RAW_TRACEPOINT_OPEN, &attr, attr_sz);
-}
-
-static inline int skel_link_create(int prog_fd, int target_fd,
-				   enum bpf_attach_type attach_type)
-{
-	const size_t attr_sz = offsetofend(union bpf_attr, link_create.iter_info_len);
-	union bpf_attr attr;
-
-	memset(&attr, 0, attr_sz);
-	attr.link_create.prog_fd = prog_fd;
-	attr.link_create.target_fd = target_fd;
-	attr.link_create.attach_type = attach_type;
-
-	return skel_sys_bpf(BPF_LINK_CREATE, &attr, attr_sz);
-}
-
-#ifdef __KERNEL__
-#define set_err
-#else
-#define set_err err = -errno
-#endif
-
 static inline int bpf_load_and_run(struct bpf_load_and_run_opts *opts)
 {
-	const size_t prog_load_attr_sz = offsetofend(union bpf_attr, fd_array);
-	const size_t test_run_attr_sz = offsetofend(union bpf_attr, test);
 	int map_fd = -1, prog_fd = -1, key = 0, err;
 	union bpf_attr attr;

-	err = map_fd = skel_map_create(BPF_MAP_TYPE_ARRAY, "__loader.map", 4, opts->data_sz, 1);
+	map_fd = bpf_create_map_name(BPF_MAP_TYPE_ARRAY, "__loader.map", 4,
+				     opts->data_sz, 1, 0);
 	if (map_fd < 0) {
 		opts->errstr = "failed to create loader map";
-		set_err;
+		err = -errno;
 		goto out;
 	}

-	err = skel_map_update_elem(map_fd, &key, opts->data, 0);
+	err = bpf_map_update_elem(map_fd, &key, opts->data, 0);
 	if (err < 0) {
 		opts->errstr = "failed to update loader map";
-		set_err;
+		err = -errno;
 		goto out;
 	}

-	memset(&attr, 0, prog_load_attr_sz);
+	memset(&attr, 0, sizeof(attr));
 	attr.prog_type = BPF_PROG_TYPE_SYSCALL;
 	attr.insns = (long) opts->insns;
 	attr.insn_cnt = opts->insns_sz / sizeof(struct bpf_insn);
@@ -338,27 +91,25 @@ static inline int bpf_load_and_run(struct bpf_load_and_run_opts *opts)
 	attr.log_size = opts->ctx->log_size;
 	attr.log_buf = opts->ctx->log_buf;
 	attr.prog_flags = BPF_F_SLEEPABLE;
-	err = prog_fd = skel_sys_bpf(BPF_PROG_LOAD, &attr, prog_load_attr_sz);
+	prog_fd = skel_sys_bpf(BPF_PROG_LOAD, &attr, sizeof(attr));
 	if (prog_fd < 0) {
 		opts->errstr = "failed to load loader prog";
-		set_err;
+		err = -errno;
 		goto out;
 	}

-	memset(&attr, 0, test_run_attr_sz);
+	memset(&attr, 0, sizeof(attr));
 	attr.test.prog_fd = prog_fd;
 	attr.test.ctx_in = (long) opts->ctx;
 	attr.test.ctx_size_in = opts->ctx->sz;
-	err = skel_sys_bpf(BPF_PROG_RUN, &attr, test_run_attr_sz);
+	err = skel_sys_bpf(BPF_PROG_RUN, &attr, sizeof(attr));
 	if (err < 0 || (int)attr.test.retval < 0) {
 		opts->errstr = "failed to execute loader prog";
 		if (err < 0) {
-			set_err;
+			err = -errno;
 		} else {
 			err = (int)attr.test.retval;
-#ifndef __KERNEL__
 			errno = -err;
-#endif
 		}
 		goto out;
 	}
--- a/Show More
+++ b/Show More