Steven Rostedt
2018-Nov-09 20:22 UTC
[PATCH] x86/vmware: Do not trace vmware_sched_clock()
From: Steven Rostedt (VMware) <rostedt at goodmis.org> When running function tracing on a Linux guest running on VMware Workstation, the guest would crash. This is due to tracing of the sched_clock internal call of the VMware vmware_sched_clock(), which causes an infinite recursion within the tracing code (clock calls must not be traced). Make vmware_sched_clock() not traced by ftrace. Cc: stable at vger.kernel.org Fixes: 80e9a4f21fd7c ("x86/vmware: Add paravirt sched clock") Reported-by: GwanYeong Kim <gy741.kim at gmail.com> Signed-off-by: Steven Rostedt (VMware) <rostedt at goodmis.org> --- diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index d9ab49bed8af..0eda91f8eeac 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -77,7 +77,7 @@ static __init int setup_vmw_sched_clock(char *s) } early_param("no-vmw-sched-clock", setup_vmw_sched_clock); -static unsigned long long vmware_sched_clock(void) +static unsigned long long notrace vmware_sched_clock(void) { unsigned long long ns;
Possibly Parallel Threads
- Patch "x86/cpu/vmware: Do not trace vmware_sched_clock()" has been added to the 4.14-stable tree
- Patch "x86/cpu/vmware: Do not trace vmware_sched_clock()" has been added to the 4.18-stable tree
- Patch "x86/cpu/vmware: Do not trace vmware_sched_clock()" has been added to the 4.19-stable tree
- [PATCH 4.19 118/205] x86/cpu/vmware: Do not trace vmware_sched_clock()
- [PATCH 4.18 095/171] x86/cpu/vmware: Do not trace vmware_sched_clock()