Message-ID: <20251114221358.71656-1-alexei.starovoitov@gmail.com>
Date: Fri, 14 Nov 2025 14:13:58 -0800
From: Alexei Starovoitov <alexei.starovoitov@...il.com>
To: torvalds@...ux-foundation.org
Cc: bpf@...r.kernel.org,
	daniel@...earbox.net,
	andrii@...nel.org,
	martin.lau@...nel.org,
	netdev@...r.kernel.org,
	rostedt@...dmis.org
Subject: [GIT PULL] BPF fixes for 6.18-rc6

Hi Linus,

The following changes since commit 6146a0f1dfae5d37442a9ddcba012add260bceb0:

  Linux 6.18-rc4 (2025-11-02 11:28:02 -0800)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git tags/bpf-fixes

for you to fetch changes up to 6c762611fed7365790000925f3d14f20037d0061:

  selftests/bpf: Test widen_imprecise_scalars() with different stack depth (2025-11-14 09:26:28 -0800)

----------------------------------------------------------------
- Fix interaction between livepatch and BPF fexit programs (Song Liu)
  With Steven and Masami acks.

- Fix stack ORC unwind from BPF kprobe_multi (Jiri Olsa)
  With Steven and Masami acks.

- Fix out of bounds access in widen_imprecise_scalars() in the verifier
  (Eduard Zingerman)

- Fix conflicts between MPTCP and BPF sockmap (Jiayuan Chen)

- Fix net_sched storage collision with BPF data_meta/data_end (Eric Dumazet)

- Add _impl suffix to BPF kfuncs with implicit args to avoid
  breaking them in bpf-next when KF_IMPLICIT_ARGS is added (Mykyta Yatsenko)

Signed-off-by: Alexei Starovoitov <ast@...nel.org>
----------------------------------------------------------------
Alexei Starovoitov (3):
      Merge branch 'fix-ftrace-for-livepatch-bpf-fexit-programs'
      Merge branch 'bpf-add-_impl-suffix-for-kfuncs-with-implicit-args'
      Merge branch 'x86-fgraph-bpf-fix-orc-stack-unwind-from-return-probe'

Eduard Zingerman (2):
      bpf: account for current allocated stack depth in widen_imprecise_scalars()
      selftests/bpf: Test widen_imprecise_scalars() with different stack depth

Eric Dumazet (1):
      bpf: Add bpf_prog_run_data_pointers()

Jiayuan Chen (3):
      mptcp: Disallow MPTCP subflows from sockmap
      mptcp: Fix proto fallback detection with BPF
      selftests/bpf: Add mptcp test with sockmap

Jiri Olsa (4):
      Revert "perf/x86: Always store regs->ip in perf_callchain_kernel()"
      x86/fgraph,bpf: Fix stack ORC unwind from kprobe_multi return probe
      selftests/bpf: Add stacktrace ips test for kprobe_multi/kretprobe_multi
      selftests/bpf: Add stacktrace ips test for raw_tp

Martin KaFai Lau (1):
      Merge branch 'mptcp-fix-conflicts-between-mptcp-and-sockmap'

Mykyta Yatsenko (2):
      bpf:add _impl suffix for bpf_task_work_schedule* kfuncs
      bpf: add _impl suffix for bpf_stream_vprintk() kfunc

Song Liu (3):
      ftrace: Fix BPF fexit with livepatch
      ftrace: bpf: Fix IPMODIFY + DIRECT in modify_ftrace_direct()
      selftests/bpf: Add tests for livepatch + bpf trampoline

 arch/x86/events/core.c                             |  10 +-
 arch/x86/include/asm/ftrace.h                      |   5 +
 arch/x86/kernel/ftrace_64.S                        |   8 +-
 include/linux/filter.h                             |  20 +++
 include/linux/ftrace.h                             |  10 +-
 kernel/bpf/helpers.c                               |  26 ++--
 kernel/bpf/stream.c                                |   3 +-
 kernel/bpf/trampoline.c                            |   5 -
 kernel/bpf/verifier.c                              |  18 +--
 kernel/trace/ftrace.c                              |  60 ++++++---
 net/mptcp/protocol.c                               |   6 +-
 net/mptcp/subflow.c                                |   8 ++
 net/sched/act_bpf.c                                |   6 +-
 net/sched/cls_bpf.c                                |   6 +-
 tools/bpf/bpftool/Documentation/bpftool-prog.rst   |   2 +-
 tools/lib/bpf/bpf_helpers.h                        |  28 ++--
 tools/testing/selftests/bpf/config                 |   3 +
 .../bpf/prog_tests/livepatch_trampoline.c          | 107 +++++++++++++++
 tools/testing/selftests/bpf/prog_tests/mptcp.c     | 140 +++++++++++++++++++
 .../selftests/bpf/prog_tests/stacktrace_ips.c      | 150 +++++++++++++++++++++
 tools/testing/selftests/bpf/progs/iters_looping.c  |  53 ++++++++
 .../selftests/bpf/progs/livepatch_trampoline.c     |  30 +++++
 tools/testing/selftests/bpf/progs/mptcp_sockmap.c  |  43 ++++++
 tools/testing/selftests/bpf/progs/stacktrace_ips.c |  49 +++++++
 tools/testing/selftests/bpf/progs/stream_fail.c    |   6 +-
 tools/testing/selftests/bpf/progs/task_work.c      |   6 +-
 tools/testing/selftests/bpf/progs/task_work_fail.c |   8 +-
 .../testing/selftests/bpf/progs/task_work_stress.c |   4 +-
 .../testing/selftests/bpf/test_kmods/bpf_testmod.c |  26 ++++
 29 files changed, 762 insertions(+), 84 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/livepatch_trampoline.c
 create mode 100644 tools/testing/selftests/bpf/prog_tests/stacktrace_ips.c
 create mode 100644 tools/testing/selftests/bpf/progs/livepatch_trampoline.c
 create mode 100644 tools/testing/selftests/bpf/progs/mptcp_sockmap.c
 create mode 100644 tools/testing/selftests/bpf/progs/stacktrace_ips.c

Powered by blists - more mailing lists