[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-ab3765a050f7bea942f114d07278e1775e38199b@git.kernel.org>
Date: Wed, 26 Jun 2019 06:07:49 -0700
From: tip-bot for Zhenzhong Duan <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: hpa@...or.com, mingo@...nel.org, tglx@...utronix.de,
linux-kernel@...r.kernel.org, zhenzhong.duan@...cle.com
Subject: [tip:x86/pti] x86/speculation/mds: Eliminate leaks by
trace_hardirqs_on()
Commit-ID: ab3765a050f7bea942f114d07278e1775e38199b
Gitweb: https://git.kernel.org/tip/ab3765a050f7bea942f114d07278e1775e38199b
Author: Zhenzhong Duan <zhenzhong.duan@...cle.com>
AuthorDate: Sun, 23 Jun 2019 11:35:04 +0800
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Wed, 26 Jun 2019 15:01:50 +0200
x86/speculation/mds: Eliminate leaks by trace_hardirqs_on()
Move mds_idle_clear_cpu_buffers() after trace_hardirqs_on() to ensure
all store buffer entries are flushed.
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@...cle.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: bp@...en8.de
Cc: hpa@...or.com
Cc: jgross@...e.com
Cc: ndesaulniers@...gle.com
Cc: gregkh@...uxfoundation.org
Link: https://lkml.kernel.org/r/1561260904-29669-2-git-send-email-zhenzhong.duan@oracle.com
---
arch/x86/include/asm/mwait.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/mwait.h b/arch/x86/include/asm/mwait.h
index eb0f80ce8524..e28f8b723b5c 100644
--- a/arch/x86/include/asm/mwait.h
+++ b/arch/x86/include/asm/mwait.h
@@ -86,9 +86,9 @@ static inline void __mwaitx(unsigned long eax, unsigned long ebx,
static inline void __sti_mwait(unsigned long eax, unsigned long ecx)
{
- mds_idle_clear_cpu_buffers();
-
trace_hardirqs_on();
+
+ mds_idle_clear_cpu_buffers();
/* "mwait %eax, %ecx;" */
asm volatile("sti; .byte 0x0f, 0x01, 0xc9;"
:: "a" (eax), "c" (ecx));
Powered by blists - more mailing lists