Skip to contentSkip to conversation

Patch "x86/cpu/vmware: Do not trace vmware_sched_clock()" has been added to the 4.19-stable tree

PATCH [email protected] 1 participant 1 message Nov 19, 2018

Subsystems (3)
lore
Share & tools
lore

[email protected]

author Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

x86/cpu/vmware: Do not trace vmware_sched_clock()

to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
x86-cpu-vmware-do-not-trace-vmware_sched_clock.patch
and it can be found in the queue-4.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From 15035388439f892017d38b05214d3cda6578af64 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (VMware)" <[email protected]>
Date: Fri, 9 Nov 2018 15:22:07 -0500
Subject: x86/cpu/vmware: Do not trace vmware_sched_clock()

From: Steven Rostedt (VMware) <[email protected]>

commit 15035388439f892017d38b05214d3cda6578af64 upstream.

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.

Fixes 80e9a4f21fd7c ("x86/vmware: Add paravirt sched clock")
CC Alok Kataria <[email protected]>
CC GwanYeong Kim <[email protected]>
CC "H. Peter Anvin" <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC x86-ml <[email protected]>
---
 arch/x86/kernel/cpu/vmware.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/vmware.c +1 -1
@@ -77,7 +77,7 @@ static __init int setup_vmw_sched_clock(
 }
 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;
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.19/tracing-kprobes-check-the-probe-on-unloaded-module-correctly.patch queue-4.19/x86-cpu-vmware-do-not-trace-vmware_sched_clock.patch