On Tue,  1 Sep 2026 21:46:02 +0800
Donglin Peng <[email protected]> wrote:

> From: pengdonglin <[email protected]>
> 
> The trace_btf.c file provides BTF helper functions used by the ftrace
> subsystem. Make the compilation of trace_btf.c solely depend on
> CONFIG_DEBUG_INFO_BTF, allowing features like funcgraph-retval to also
> utilize these helpers.
> 
> Additionally, the redundant dependency on CONFIG_PROBE_EVENTS_BTF_ARGS
> is removed, as CONFIG_DEBUG_INFO_BTF already depends on
> CONFIG_BPF_SYSCALL.

OK, nowadays BPF requires BTF. This looks good to me.

Acked-by: Masami Hiramatsu (Google) <[email protected]>

Thanks,

> 
> Cc: Steven Rostedt (Google) <[email protected]>
> Cc: Masami Hiramatsu <[email protected]>
> Cc: Xiaoqin Zhang <[email protected]>
> Signed-off-by: pengdonglin <[email protected]>
> ---
>  kernel/trace/Kconfig  | 2 +-
>  kernel/trace/Makefile | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
> index 0ab5916575a9..d8faeb659cfc 100644
> --- a/kernel/trace/Kconfig
> +++ b/kernel/trace/Kconfig
> @@ -770,7 +770,7 @@ config FPROBE_EVENTS
>  config PROBE_EVENTS_BTF_ARGS
>       depends on HAVE_FUNCTION_ARG_ACCESS_API
>       depends on FPROBE_EVENTS || KPROBE_EVENTS
> -     depends on DEBUG_INFO_BTF && BPF_SYSCALL
> +     depends on DEBUG_INFO_BTF
>       bool "Support BTF function arguments for probe events"
>       default y
>       help
> diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
> index f934ff586bd4..28b08f31e7e5 100644
> --- a/kernel/trace/Makefile
> +++ b/kernel/trace/Makefile
> @@ -119,7 +119,7 @@ obj-$(CONFIG_KGDB_KDB) += trace_kdb.o
>  endif
>  obj-$(CONFIG_DYNAMIC_EVENTS) += trace_dynevent.o
>  obj-$(CONFIG_PROBE_EVENTS) += trace_probe.o
> -obj-$(CONFIG_PROBE_EVENTS_BTF_ARGS) += trace_btf.o
> +obj-$(CONFIG_DEBUG_INFO_BTF) += trace_btf.o
>  obj-$(CONFIG_UPROBE_EVENTS) += trace_uprobe.o
>  obj-$(CONFIG_BOOTTIME_TRACING) += trace_boot.o
>  obj-$(CONFIG_FTRACE_RECORD_RECURSION) += trace_recursion_record.o
> -- 
> 2.34.1
> 


-- 
Masami Hiramatsu (Google) <[email protected]>

Reply via email to