Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932296AbbB0AH7 (ORCPT ); Thu, 26 Feb 2015 19:07:59 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:40431 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753983AbbB0AH5 (ORCPT ); Thu, 26 Feb 2015 19:07:57 -0500 From: Andy Lutomirski To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: Borislav Petkov , Oleg Nesterov , Denys Vlasenko , Andy Lutomirski , Konrad Rzeszutek Wilk , Boris Ostrovsky , Rusty Russell Subject: [RFC 2/3] x86: Switch all C consumers of kernel_stack to this_cpu_sp0 Date: Thu, 26 Feb 2015 16:07:50 -0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1714 Lines: 46 This will make modifying the semantics of kernel_stack easier. Cc: Konrad Rzeszutek Wilk Cc: Boris Ostrovsky Cc: Rusty Russell Signed-off-by: Andy Lutomirski --- arch/x86/include/asm/thread_info.h | 3 +-- arch/x86/kernel/traps.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index e82e95abc92b..92549053d86d 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h @@ -163,8 +163,7 @@ DECLARE_PER_CPU(unsigned long, kernel_stack); static inline struct thread_info *current_thread_info(void) { struct thread_info *ti; - ti = (void *)(this_cpu_read_stable(kernel_stack) + - KERNEL_STACK_OFFSET - THREAD_SIZE); + ti = (void *)(this_cpu_sp0() - THREAD_SIZE); return ti; } diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index c74f2f5652da..d287ea779728 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -174,7 +174,7 @@ void ist_begin_non_atomic(struct pt_regs *regs) * will catch asm bugs and any attempt to use ist_preempt_enable * from double_fault. */ - BUG_ON(((current_stack_pointer() ^ this_cpu_read_stable(kernel_stack)) + BUG_ON(((current_stack_pointer() ^ (this_cpu_sp0() - 1)) & ~(THREAD_SIZE - 1)) != 0); preempt_count_sub(HARDIRQ_OFFSET); -- 2.1.0 -- 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/