Date: Tue, 2 Jun 2026 11:28:43 +0200
From: Paul Chaignon <paul.chaignon@gmail.com>
To: stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Sasha Levin <sashal@kernel.org>,
	Shung-Hsi Yu <shung-hsi.yu@suse.com>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Alexei Starovoitov <ast@kernel.org>,
	Eduard Zingerman <eddyz87@gmail.com>,
	Andrii Nakryiko <andrii@kernel.org>,
	Martin KaFai Lau <martin.lau@kernel.org>,
	Stanislav Fomichev <sdf@google.com>,
	Yonghong Song <yonghong.song@linux.dev>,
	Jiri Olsa <jolsa@kernel.org>
Subject: [PATCH 6.1.y 00/11] Fix BPF selftests
Message-ID: <cover.1780392092.git.paul.chaignon@gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

This patchset fixes the BPF selftests on 6.1. Its patches fall into
two categories:
- Reverts of backported selftests, usually because they test a change
  that didn't land in 6.1 (3 patches).
- Backports of selftest fixes and their dependencies (8 patches).

With this, the BPF selftests are passing on 6.1 (tested with both LLVM
16 and 18).

Andrii Nakryiko (3):
  selftests/bpf: add generic BPF program tester-loader
  selftests/bpf: Convert test_global_funcs test to test_loader framework
  selftests/bpf: enhance align selftest's expected log matching

Daniel Borkmann (1):
  selftests/bpf: Fix ARG_PTR_TO_LONG {half-,}uninitialized test

Jiri Olsa (1):
  selftests/bpf: Add read_build_id function

Martin KaFai Lau (1):
  selftests/bpf: S/iptables/iptables-legacy/ in the bpf_nf and
    xdp_synproxy test

Paul Chaignon (3):
  Revert "selftests/bpf: Workaround strict bpf_lsm return value check."
  Revert "selftests/bpf: Add tests for _opts variants of
    bpf_*_get_fd_by_id()"
  Revert "selftests/bpf: Add a cgroup prog bpf_get_ns_current_pid_tgid()
    test"

Stanislav Fomichev (1):
  selftests/bpf: Update bpf_clone_redirect expected return code

Yonghong Song (1):
  bpf: Fix a few selftest failures due to llvm18 change

 tools/testing/selftests/bpf/DENYLIST.s390x    |   1 -
 tools/testing/selftests/bpf/Makefile          |   2 +-
 .../testing/selftests/bpf/prog_tests/align.c  |  18 +-
 .../testing/selftests/bpf/prog_tests/bpf_nf.c |   6 +-
 .../selftests/bpf/prog_tests/empty_skb.c      |  12 +-
 .../bpf/prog_tests/libbpf_get_fd_by_id_opts.c |  87 -------
 .../bpf/prog_tests/ns_current_pid_tgid.c      |  73 ------
 .../bpf/prog_tests/test_global_funcs.c        | 131 +++-------
 .../selftests/bpf/prog_tests/xdp_synproxy.c   |   6 +-
 tools/testing/selftests/bpf/progs/bpf_misc.h  |   5 +
 .../selftests/bpf/progs/test_global_func1.c   |   6 +-
 .../selftests/bpf/progs/test_global_func10.c  |   1 +
 .../selftests/bpf/progs/test_global_func11.c  |   4 +-
 .../selftests/bpf/progs/test_global_func12.c  |   4 +-
 .../selftests/bpf/progs/test_global_func13.c  |   4 +-
 .../selftests/bpf/progs/test_global_func14.c  |   4 +-
 .../selftests/bpf/progs/test_global_func15.c  |   4 +-
 .../selftests/bpf/progs/test_global_func16.c  |   4 +-
 .../selftests/bpf/progs/test_global_func17.c  |   5 +-
 .../selftests/bpf/progs/test_global_func2.c   |  43 +++-
 .../selftests/bpf/progs/test_global_func3.c   |  10 +-
 .../selftests/bpf/progs/test_global_func4.c   |  55 ++++-
 .../selftests/bpf/progs/test_global_func5.c   |   4 +-
 .../selftests/bpf/progs/test_global_func6.c   |   4 +-
 .../selftests/bpf/progs/test_global_func7.c   |   4 +-
 .../selftests/bpf/progs/test_global_func8.c   |   4 +-
 .../selftests/bpf/progs/test_global_func9.c   |   4 +-
 .../bpf/progs/test_libbpf_get_fd_by_id_opts.c |  37 ---
 .../bpf/progs/test_ns_current_pid_tgid.c      |   7 -
 tools/testing/selftests/bpf/test_loader.c     | 233 ++++++++++++++++++
 tools/testing/selftests/bpf/test_progs.h      |  33 +++
 tools/testing/selftests/bpf/trace_helpers.c   |  82 ++++++
 tools/testing/selftests/bpf/trace_helpers.h   |   5 +
 .../testing/selftests/bpf/verifier/int_ptr.c  |   6 +-
 34 files changed, 561 insertions(+), 347 deletions(-)
 delete mode 100644 tools/testing/selftests/bpf/prog_tests/libbpf_get_fd_by_id_opts.c
 delete mode 100644 tools/testing/selftests/bpf/progs/test_libbpf_get_fd_by_id_opts.c
 create mode 100644 tools/testing/selftests/bpf/test_loader.c

-- 
2.43.0