mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ihor Solodrai <ihor.solodrai@linux.dev>
To: Alexei Starovoitov <ast@kernel.org>,
	Andrii Nakryiko <andrii@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Eduard Zingerman <eddyz87@gmail.com>,
	Kumar Kartikeya Dwivedi <memxor@gmail.com>
Cc: Alan Maguire <alan.maguire@oracle.com>,
	Emil Tsalapatis <emil@etsalapatis.com>,
	Jiri Olsa <jolsa@kernel.org>, Song Liu <song@kernel.org>,
	Tejun Heo <tj@kernel.org>,
	Yonghong Song <yonghong.song@linux.dev>,
	bpf@vger.kernel.org, linux-kernel@vger.kernel.org,
	sched-ext@lists.linux.dev
Subject: [PATCH bpf-next v1 0/4] libbpf: Support kernel-side kfunc flavors
Date: Tue, 17 Nov 2026 12:21:49 -0700	[thread overview]
Message-ID: <20261117192153.3384031-1-ihor.solodrai@linux.dev> (raw)

An incompatible change to a kfunc's prototype, such as an added
parameter, breaks BPF programs built against the old one. libbpf
ignores the ___<flavor> suffix of a kfunc declared in a BPF program,
but makes an exact name look up on the kernel side, so the kernel
can't keep the old prototype available under the kfunc's name.

sched_ext ran into this. cded46d97159 ("sched_ext: Make
scx_bpf_dsq_insert*() return bool") kept the old prototype as
scx_bpf_dsq_insert___compat, expecting libbpf to bind old binaries to
it, and broke them. 2dbbdeda77a6 ("sched_ext: Fix scx_bpf_dsq_insert()
backward binary compatibility") reversed the naming. A ___v2 kfunc
declared as vmlinux.h spells it doesn't bind: 56bbc91219c0
("sched_ext: Fix scx_bpf_dsq_move_to_local___v2 compat detection")
fixed a compat macro that silently dropped enq_flags because of this.

With this series, if the kernel's bpf_foo kfunc is missing or its
prototype is incompatible with the declaration, libbpf binds the
bpf_foo___<flavor> that has a compatible prototype. So a changed kfunc
can keep its name, and the old prototype stays available as foo___v1.

resolve_btfids fails the build if two of bpf_foo and its flavors have
compatible prototypes, unless both have foo's exact prototype
(aliases), so the fallback finds at most one match.  This ensures at
kernel / module build time that no ambigous kfunc flavors exist.
Documentation/bpf/kfuncs.rst describes the rules.

Compatibility is determined by bpf_core_types_are_compat(), the check
libbpf already applies to kfuncs. Of the 70 same-name kfunc prototype
changes between v6.6 and bpf-next, it finds 8 incompatible (arity,
return kind, callback prototype). The other 62 (const, typedefs,
parameter names, integer widths, pointee struct names, annotation
suffixes) were made in place without breaking old callers.

The flavors feature is backwards compatible: declarations that resolve
today bind the same kernel function. The exact name lookup is
attempted first. Declarations rejected today for an incompatible
prototype, or left unresolved if __weak, may now bind to a flavor, for
example scx_bpf_dsq_insert___v2 as vmlinux.h declares it. Older libbpf
and light skeletons don't get the fallback.

---

Ihor Solodrai (4):
  libbpf: Fall back to kernel ___ flavors when resolving kfuncs
  selftests/bpf: Test kfunc flavor resolution
  resolve_btfids: Reject kfunc families that libbpf can't disambiguate
  docs/bpf: Describe how to change a kfunc's prototype

 Documentation/bpf/kfuncs.rst                  |  83 +++++++++++
 tools/bpf/resolve_btfids/btf_colors.c         |  11 ++
 tools/bpf/resolve_btfids/btf_colors.h         |   3 +
 tools/bpf/resolve_btfids/main.c               | 134 +++++++++++++++++
 tools/lib/bpf/btf.c                           |  26 ++++
 tools/lib/bpf/libbpf.c                        | 140 +++++++++++++++++-
 tools/lib/bpf/libbpf_internal.h               |   1 +
 .../selftests/bpf/prog_tests/verifier.c       |   3 +
 .../selftests/bpf/progs/kfunc_flavors.c       |  55 +++++++
 .../selftests/bpf/test_kmods/bpf_testmod.c    |  24 +++
 .../bpf/test_kmods/bpf_testmod_kfunc.h        |   4 +
 11 files changed, 482 insertions(+), 2 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/kfunc_flavors.c


base-commit: 32b66b94c86f009b49668de7340f2ed65aad2dc5
-- 
2.56.1


             reply	other threads:[~2026-11-17 19:22 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 19:21 Ihor Solodrai [this message]
2026-11-17 19:21 ` [PATCH bpf-next v1 1/4] libbpf: Fall back to kernel ___ flavors when resolving kfuncs Ihor Solodrai
2026-11-17 19:21 ` [PATCH bpf-next v1 2/4] selftests/bpf: Test kfunc flavor resolution Ihor Solodrai
2026-11-17 19:21 ` [PATCH bpf-next v1 3/4] resolve_btfids: Reject kfunc families that libbpf can't disambiguate Ihor Solodrai
2026-11-17 19:21 ` [PATCH bpf-next v1 4/4] docs/bpf: Describe how to change a kfunc's prototype Ihor Solodrai
2026-11-17 20:53 ` [PATCH bpf-next v1 0/4] libbpf: Support kernel-side kfunc flavors Tejun Heo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261117192153.3384031-1-ihor.solodrai@linux.dev \
    --to=ihor.solodrai@linux.dev \
    --cc=alan.maguire@oracle.com \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=eddyz87@gmail.com \
    --cc=emil@etsalapatis.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=memxor@gmail.com \
    --cc=sched-ext@lists.linux.dev \
    --cc=song@kernel.org \
    --cc=tj@kernel.org \
    --cc=yonghong.song@linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®