Unverified Commit d254d093 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4538 fix kprobe reenter bug 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Chuang <liuchuang40@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/H3OSBRA6NZYNLNIVGNFI6ST4YG66WWBL/ 
Liu Chuang (1):
  arm64/openeuler_defconfig: add not set config to fix compiling error

Masami Hiramatsu (1):
  tracing/kprobes: Do the notrace functions check without kprobes on
    ftrace


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/I9093Z 
 
Link:https://gitee.com/openeuler/kernel/pulls/4538

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 3a28772f b16e88e5

arch/arm64/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -6618,6 +6618,7 @@ CONFIG_BRANCH_PROFILE_NONE=y 
CONFIG_STACK_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_KPROBE_EVENTS=y

# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set

CONFIG_UPROBE_EVENTS=y

CONFIG_BPF_EVENTS=y

CONFIG_PROBE_EVENTS=y

kernel/trace/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ config KPROBE_EVENTS 
config KPROBE_EVENTS_ON_NOTRACE

	bool "Do NOT protect notrace function from kprobe events"

	depends on KPROBE_EVENTS

	depends on KPROBES_ON_FTRACE

	depends on DYNAMIC_FTRACE

	default n

	help

	  This is only for the developers who want to debug ftrace itself

kernel/trace/trace_kprobe.c

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ disable_trace_kprobe(struct trace_kprobe *tk, struct trace_event_file *file) 
	return ret;

}



#if defined(CONFIG_KPROBES_ON_FTRACE) && \

#if defined(CONFIG_DYNAMIC_FTRACE) && \

	!defined(CONFIG_KPROBE_EVENTS_ON_NOTRACE)

static bool __within_notrace_func(unsigned long addr)

{