From: "tip-bot for Steven Rostedt (VMware)" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, bp@suse.de, tglx@linutronix.de, x86@kernel.org,
akataria@vmware.com, hpa@zytor.com, gy741.kim@gmail.com,
linux-kernel@vger.kernel.org, rostedt@goodmis.org
Subject: [tip:x86/urgent] x86/cpu/vmware: Do not trace vmware_sched_clock()
Date: Fri, 9 Nov 2018 12:48:51 -0800 [thread overview]
Message-ID: <tip-15035388439f892017d38b05214d3cda6578af64@git.kernel.org> (raw)
In-Reply-To: <20181109152207.4d3e7d70@gandalf.local.home>
Commit-ID: 15035388439f892017d38b05214d3cda6578af64
Gitweb: https://git.kernel.org/tip/15035388439f892017d38b05214d3cda6578af64
Author: Steven Rostedt (VMware) <rostedt@goodmis.org>
AuthorDate: Fri, 9 Nov 2018 15:22:07 -0500
Committer: Borislav Petkov <bp@suse.de>
CommitDate: Fri, 9 Nov 2018 21:39:14 +0100
x86/cpu/vmware: Do not trace vmware_sched_clock()
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")
Reported-by: GwanYeong Kim <gy741.kim@gmail.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
CC: Alok Kataria <akataria@vmware.com>
CC: GwanYeong Kim <gy741.kim@gmail.com>
CC: "H. Peter Anvin" <hpa@zytor.com>
CC: Ingo Molnar <mingo@kernel.org>
Cc: stable@vger.kernel.org
CC: Thomas Gleixner <tglx@linutronix.de>
CC: virtualization@lists.linux-foundation.org
CC: x86-ml <x86@kernel.org>
Link: http://lkml.kernel.org/r/20181109152207.4d3e7d70@gandalf.local.home
---
arch/x86/kernel/cpu/vmware.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
prev parent reply other threads:[~2018-11-09 20:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-09 20:22 [PATCH] x86/vmware: Do not trace vmware_sched_clock() Steven Rostedt
2018-11-09 20:48 ` tip-bot for Steven Rostedt (VMware) [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-15035388439f892017d38b05214d3cda6578af64@git.kernel.org \
--to=tipbot@zytor.com \
--cc=akataria@vmware.com \
--cc=bp@suse.de \
--cc=gy741.kim@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox