linux-kernel - [tip:x86/urgent] x86/cpu/vmware: Do not trace vmware_sched

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-15035388439f892017d38b05214d3cda6578af64@git.kernel.org>
Date:   Fri, 9 Nov 2018 12:48:51 -0800
From:   "tip-bot for Steven Rostedt (VMware)" <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     mingo@...nel.org, bp@...e.de, tglx@...utronix.de, x86@...nel.org,
        akataria@...are.com, hpa@...or.com, gy741.kim@...il.com,
        linux-kernel@...r.kernel.org, rostedt@...dmis.org
Subject: [tip:x86/urgent] x86/cpu/vmware: Do not trace vmware_sched_clock()

Commit-ID:  15035388439f892017d38b05214d3cda6578af64
Gitweb:     https://git.kernel.org/tip/15035388439f892017d38b05214d3cda6578af64
Author:     Steven Rostedt (VMware) <rostedt@...dmis.org>
AuthorDate: Fri, 9 Nov 2018 15:22:07 -0500
Committer:  Borislav Petkov <bp@...e.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@...il.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@...dmis.org>
Signed-off-by: Borislav Petkov <bp@...e.de>
CC: Alok Kataria <akataria@...are.com>
CC: GwanYeong Kim <gy741.kim@...il.com>
CC: "H. Peter Anvin" <hpa@...or.com>
CC: Ingo Molnar <mingo@...nel.org>
Cc: stable@...r.kernel.org
CC: Thomas Gleixner <tglx@...utronix.de>
CC: virtualization@...ts.linux-foundation.org
CC: x86-ml <x86@...nel.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;