From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752133AbbLaI6W (ORCPT ); Thu, 31 Dec 2015 03:58:22 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:33002 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750972AbbLaI6U (ORCPT ); Thu, 31 Dec 2015 03:58:20 -0500 From: zhongjiang To: , , Subject: [PATCH] arm64: fix add kasan bug Date: Thu, 31 Dec 2015 16:51:48 +0800 Message-ID: <1451551908-8642-1-git-send-email-zhongjiang@huawei.com> X-Mailer: git-send-email 1.7.12.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A0B0204.5684EE27.022B,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 42dbe371672e8a04f247e45034fe40e8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: zhong jiang In general, each process have 16kb stack space to use, but stack need extra space to store red_zone when kasan enable. the patch fix above question. Signed-off-by: zhong jiang --- arch/arm64/include/asm/thread_info.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index 90c7ff2..45b5a7e 100644 --- a/arch/arm64/include/asm/thread_info.h +++ b/arch/arm64/include/asm/thread_info.h @@ -23,13 +23,24 @@ #include +#ifdef CONFIG_KASAN +#define KASAN_STACK_ORDER 1 +#else +#define KASAN_STACK_ORDER 0 +#endif + #ifdef CONFIG_ARM64_4K_PAGES -#define THREAD_SIZE_ORDER 2 +#define THREAD_SIZE_ORDER (2 + KASAN_STACK_ORDER) #elif defined(CONFIG_ARM64_16K_PAGES) -#define THREAD_SIZE_ORDER 0 +#define THREAD_SIZE_ORDER (0 + KASAN_STACK_ORDER) #endif +#ifdef CONFIG_KASAN +#define THREAD_SIZE 32768 +#else #define THREAD_SIZE 16384 +#endif + #define THREAD_START_SP (THREAD_SIZE - 16) #ifndef __ASSEMBLY__ -- 2.0.0