* [PATCH] bpf, btf: switch CONFIG_CFI_CLANG to CONFIG_CFI
@ 2026-03-12 18:38 Carlos Llamas
2026-03-12 18:50 ` Sami Tolvanen
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Carlos Llamas @ 2026-03-12 18:38 UTC (permalink / raw)
To: Martin KaFai Lau, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Eduard Zingerman, Song Liu, Yonghong Song,
John Fastabend, KP Singh, Stanislav Fomichev, Hao Luo, Jiri Olsa,
Sami Tolvanen
Cc: kernel-team, linux-kernel, Kees Cook, Carlos Llamas,
open list:BPF [BTF]
This was renamed in commit 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG
to CONFIG_CFI") as it is now a compiler-agnostic option. Using the wrong
name results in the code getting compiled out. Meaning the CFI failures
for btf_dtor_kfunc_t would still trigger.
Fixes: 99fde4d06261 ("bpf, btf: Enforce destructor kfunc type with CFI")
Signed-off-by: Carlos Llamas <cmllamas@google.com>
---
kernel/bpf/btf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 4872d2a6c42d..84665f76a3c6 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -9003,7 +9003,7 @@ static int btf_check_dtor_kfuncs(struct btf *btf, const struct btf_id_dtor_kfunc
if (!t || !btf_type_is_ptr(t))
return -EINVAL;
- if (IS_ENABLED(CONFIG_CFI_CLANG)) {
+ if (IS_ENABLED(CONFIG_CFI)) {
/* Ensure the destructor kfunc type matches btf_dtor_kfunc_t */
t = btf_type_by_id(btf, t->type);
if (!btf_type_is_void(t))
--
2.53.0.880.g73c4285caa-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] bpf, btf: switch CONFIG_CFI_CLANG to CONFIG_CFI
2026-03-12 18:38 [PATCH] bpf, btf: switch CONFIG_CFI_CLANG to CONFIG_CFI Carlos Llamas
@ 2026-03-12 18:50 ` Sami Tolvanen
2026-03-12 20:03 ` Yonghong Song
2026-03-24 15:50 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Sami Tolvanen @ 2026-03-12 18:50 UTC (permalink / raw)
To: Carlos Llamas
Cc: Martin KaFai Lau, Alexei Starovoitov, Daniel Borkmann,
Andrii Nakryiko, Eduard Zingerman, Song Liu, Yonghong Song,
John Fastabend, KP Singh, Stanislav Fomichev, Hao Luo, Jiri Olsa,
kernel-team, linux-kernel, Kees Cook, open list:BPF [BTF]
Hi Carlos,
On Thu, Mar 12, 2026 at 11:38 AM Carlos Llamas <cmllamas@google.com> wrote:
>
> This was renamed in commit 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG
> to CONFIG_CFI") as it is now a compiler-agnostic option. Using the wrong
> name results in the code getting compiled out. Meaning the CFI failures
> for btf_dtor_kfunc_t would still trigger.
>
> Fixes: 99fde4d06261 ("bpf, btf: Enforce destructor kfunc type with CFI")
> Signed-off-by: Carlos Llamas <cmllamas@google.com>
> ---
> kernel/bpf/btf.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
> index 4872d2a6c42d..84665f76a3c6 100644
> --- a/kernel/bpf/btf.c
> +++ b/kernel/bpf/btf.c
> @@ -9003,7 +9003,7 @@ static int btf_check_dtor_kfuncs(struct btf *btf, const struct btf_id_dtor_kfunc
> if (!t || !btf_type_is_ptr(t))
> return -EINVAL;
>
> - if (IS_ENABLED(CONFIG_CFI_CLANG)) {
> + if (IS_ENABLED(CONFIG_CFI)) {
> /* Ensure the destructor kfunc type matches btf_dtor_kfunc_t */
> t = btf_type_by_id(btf, t->type);
> if (!btf_type_is_void(t))
Thanks for the fix!
Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
Sami
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] bpf, btf: switch CONFIG_CFI_CLANG to CONFIG_CFI
2026-03-12 18:38 [PATCH] bpf, btf: switch CONFIG_CFI_CLANG to CONFIG_CFI Carlos Llamas
2026-03-12 18:50 ` Sami Tolvanen
@ 2026-03-12 20:03 ` Yonghong Song
2026-03-24 15:50 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Yonghong Song @ 2026-03-12 20:03 UTC (permalink / raw)
To: Carlos Llamas, Martin KaFai Lau, Alexei Starovoitov,
Daniel Borkmann, Andrii Nakryiko, Eduard Zingerman, Song Liu,
John Fastabend, KP Singh, Stanislav Fomichev, Hao Luo, Jiri Olsa,
Sami Tolvanen
Cc: kernel-team, linux-kernel, Kees Cook, open list:BPF [BTF]
On 3/12/26 11:38 AM, Carlos Llamas wrote:
> This was renamed in commit 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG
> to CONFIG_CFI") as it is now a compiler-agnostic option. Using the wrong
> name results in the code getting compiled out. Meaning the CFI failures
> for btf_dtor_kfunc_t would still trigger.
>
> Fixes: 99fde4d06261 ("bpf, btf: Enforce destructor kfunc type with CFI")
> Signed-off-by: Carlos Llamas <cmllamas@google.com>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] bpf, btf: switch CONFIG_CFI_CLANG to CONFIG_CFI
2026-03-12 18:38 [PATCH] bpf, btf: switch CONFIG_CFI_CLANG to CONFIG_CFI Carlos Llamas
2026-03-12 18:50 ` Sami Tolvanen
2026-03-12 20:03 ` Yonghong Song
@ 2026-03-24 15:50 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2026-03-24 15:50 UTC (permalink / raw)
To: Carlos Llamas
Cc: martin.lau, ast, daniel, andrii, eddyz87, song, yonghong.song,
john.fastabend, kpsingh, sdf, haoluo, jolsa, samitolvanen,
kernel-team, linux-kernel, kees, bpf
Hello:
This patch was applied to bpf/bpf-next.git (master)
by Alexei Starovoitov <ast@kernel.org>:
On Thu, 12 Mar 2026 18:38:17 +0000 you wrote:
> This was renamed in commit 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG
> to CONFIG_CFI") as it is now a compiler-agnostic option. Using the wrong
> name results in the code getting compiled out. Meaning the CFI failures
> for btf_dtor_kfunc_t would still trigger.
>
> Fixes: 99fde4d06261 ("bpf, btf: Enforce destructor kfunc type with CFI")
> Signed-off-by: Carlos Llamas <cmllamas@google.com>
>
> [...]
Here is the summary with links:
- bpf, btf: switch CONFIG_CFI_CLANG to CONFIG_CFI
https://git.kernel.org/bpf/bpf-next/c/9b0cf064ea0a
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-03-24 15:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-12 18:38 [PATCH] bpf, btf: switch CONFIG_CFI_CLANG to CONFIG_CFI Carlos Llamas
2026-03-12 18:50 ` Sami Tolvanen
2026-03-12 20:03 ` Yonghong Song
2026-03-24 15:50 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.