Commit-ID: ab3765a050f7bea942f114d07278e1775e38199b Gitweb: https://git.kernel.org/tip/ab3765a050f7bea942f114d07278e1775e38199b Author: Zhenzhong Duan <zhenzhong.d...@oracle.com> AuthorDate: Sun, 23 Jun 2019 11:35:04 +0800 Committer: Thomas Gleixner <t...@linutronix.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.d...@oracle.com> Signed-off-by: Thomas Gleixner <t...@linutronix.de> Cc: b...@alien8.de Cc: h...@zytor.com Cc: jgr...@suse.com Cc: ndesaulni...@google.com Cc: gre...@linuxfoundation.org Link: https://lkml.kernel.org/r/1561260904-29669-2-git-send-email-zhenzhong.d...@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));
