Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759464AbYHNOGU (ORCPT ); Thu, 14 Aug 2008 10:06:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751213AbYHNOGL (ORCPT ); Thu, 14 Aug 2008 10:06:11 -0400 Received: from outbound-sin.frontbridge.com ([207.46.51.80]:17983 "EHLO SG2EHSOBE004.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751466AbYHNOGK convert rfc822-to-8bit (ORCPT ); Thu, 14 Aug 2008 10:06:10 -0400 X-BigFish: VPS-5(zz936fQzz10d3izzz32i6bh43j62h) X-Spam-TCS-SCL: 1:0 X-WSS-ID: 0K5LGHT-02-JQC-01 From: Mark Langsdorf To: Arjan van de Ven Subject: Re: [PATCH](retry 4) invalidate caches before going into suspend Date: Thu, 14 Aug 2008 09:11:26 -0500 User-Agent: KMail/1.9.9 CC: "Ingo Molnar" , "Linus Torvalds" , linux-kernel@vger.kernel.org, "H. Peter Anvin" , "Thomas Gleixner" References: <200808131141.18003.mark.langsdorf@amd.com> <20080813143206.07550498@infradead.org> <200808140845.05160.mark.langsdorf@amd.com> In-Reply-To: <200808140845.05160.mark.langsdorf@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8BIT Content-Disposition: inline Message-ID: <200808140911.26617.mark.langsdorf@amd.com> X-OriginalArrivalTime: 14 Aug 2008 14:05:59.0422 (UTC) FILETIME=[E0CB61E0:01C8FE16] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3260 Lines: 97 When a CPU core is shut down, all of its caches need to be flushed to prevent stale data from causing errors if the core is resumed. Current Linux suspend code performs an assignment after the flush, which can add dirty data back to the cache. ?On some AMD platforms, additional speculative reads have caused crashes on resume because of this dirty data. Relocate the cache flush to be the very last thing done before halting. ?Tie into an assembly line so the compile will not reorder it. ?Add some documentation explaining what is going on and why we're doing this. Signed-off-by: Mark Langsdorf Acked-by: Mark Borden Acked-by: Michael Hohmuth diff -r 1e74a821dd00 arch/x86/kernel/process_32.c --- a/arch/x86/kernel/process_32.c Tue Aug 12 12:04:12 2008 -0500 +++ b/arch/x86/kernel/process_32.c Thu Aug 14 03:35:14 2008 -0500 @@ -95,7 +95,6 @@ static inline void play_dead(void) { /* This must be done before dead CPU ack */ cpu_exit_clear(); - wbinvd(); mb(); /* Ack it */ __get_cpu_var(cpu_state) = CPU_DEAD; @@ -104,8 +103,8 @@ static inline void play_dead(void) * With physical CPU hotplug, we should halt the cpu */ local_irq_disable(); - while (1) - halt(); + /* mask all interrupts, flush any and all caches, and halt */ + wbinvd_halt(); } #else static inline void play_dead(void) diff -r 1e74a821dd00 arch/x86/kernel/process_64.c --- a/arch/x86/kernel/process_64.c Tue Aug 12 12:04:12 2008 -0500 +++ b/arch/x86/kernel/process_64.c Thu Aug 14 03:36:13 2008 -0500 @@ -93,14 +93,13 @@ static inline void play_dead(void) static inline void play_dead(void) { idle_task_exit(); - wbinvd(); mb(); /* Ack it */ __get_cpu_var(cpu_state) = CPU_DEAD; local_irq_disable(); - while (1) - halt(); + /* mask all interrupts, flush any and all caches, and halt */ + wbinvd_halt(); } #else static inline void play_dead(void) diff -r 1e74a821dd00 include/asm-x86/processor.h --- a/include/asm-x86/processor.h Tue Aug 12 12:04:12 2008 -0500 +++ b/include/asm-x86/processor.h Thu Aug 14 03:47:01 2008 -0500 @@ -728,6 +728,29 @@ extern unsigned long idle_halt; extern unsigned long idle_halt; extern unsigned long idle_nomwait; +/* + * on systems with caches, caches must be flashed as the absolute + * last instruction before going into a suspended halt. Otherwise, + * dirty data can linger in the cache and become stale on resume, + * leading to strange errors. + * + * perform a variety of operations to guarantee that the compiler + * will not reorder instructions. wbinvd itself is serializing + * so the processor will not reorder. + * + * Systems without cache can just go into halt. + */ +static inline void wbinvd_halt(void) +{ + mb(); + /* check for clflush to determine if wbinvd is legal */ + if (cpu_has_clflush) + asm volatile("cli; wbinvd; 1: hlt; jmp 1b" : : : "memory"); + else + while (1) + halt(); +} + extern void enable_sep_cpu(void); extern int sysenter_setup(void); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/