From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e28smtp09.in.ibm.com (e28smtp09.in.ibm.com [122.248.162.9]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 5A1261A077B for ; Wed, 26 Aug 2015 18:26:51 +1000 (AEST) Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 26 Aug 2015 13:56:47 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 33C7B1258061 for ; Wed, 26 Aug 2015 13:56:06 +0530 (IST) Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay03.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t7Q8Qf7J56623280 for ; Wed, 26 Aug 2015 13:56:42 +0530 Received: from d28av05.in.ibm.com (localhost [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t7Q8QdaR025208 for ; Wed, 26 Aug 2015 13:56:41 +0530 From: "Aneesh Kumar K.V" To: benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au, ryabinin.a.a@gmail.com Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, "Aneesh Kumar K.V" Subject: [PATCH V2 05/10] kasan: Enable arch to hook into kasan callbacks. Date: Wed, 26 Aug 2015 13:56:13 +0530 Message-Id: <1440577578-15813-6-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1440577578-15813-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1440577578-15813-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , We add enable/disable callbacks in this patch which architecture can implemement. We will use this in the later patches for architecture like ppc64, that cannot have early zero page kasan shadow region for the entire virtual address space. Such architectures also cannot use inline kasan support. Signed-off-by: Aneesh Kumar K.V --- mm/kasan/kasan.c | 9 +++++++++ mm/kasan/kasan.h | 15 +++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c index 7b28e9cdf1c7..e4d33afd0eaf 100644 --- a/mm/kasan/kasan.c +++ b/mm/kasan/kasan.c @@ -43,6 +43,9 @@ static void kasan_poison_shadow(const void *address, size_t size, u8 value) { void *shadow_start, *shadow_end; + if (!kasan_enabled()) + return; + shadow_start = kasan_mem_to_shadow(address); shadow_end = kasan_mem_to_shadow(address + size); @@ -51,6 +54,9 @@ static void kasan_poison_shadow(const void *address, size_t size, u8 value) void kasan_unpoison_shadow(const void *address, size_t size) { + if (!kasan_enabled()) + return; + kasan_poison_shadow(address, size, 0); if (size & KASAN_SHADOW_MASK) { @@ -238,6 +244,9 @@ static __always_inline void check_memory_region(unsigned long addr, { struct kasan_access_info info; + if (!kasan_enabled()) + return; + if (unlikely(size == 0)) return; diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index a6b46cc94907..deb547d5a916 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -68,6 +68,21 @@ static inline bool kasan_report_enabled(void) return !current->kasan_depth; } +#ifndef kasan_enabled +/* + * Some archs may want to disable kasan callbacks. + */ +static inline bool kasan_enabled(void) +{ + return true; +} +#define kasan_enabled kasan_enabled +#else +#ifdef CONFIG_KASAN_INLINE +#error "Kasan inline support cannot work with KASAN arch hooks" +#endif +#endif + void kasan_report(unsigned long addr, size_t size, bool is_write, unsigned long ip); -- 2.5.0