Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751997AbbHZI3o (ORCPT ); Wed, 26 Aug 2015 04:29:44 -0400 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:36777 "EHLO e28smtp05.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756332AbbHZI06 (ORCPT ); Wed, 26 Aug 2015 04:26:58 -0400 X-Helo: d28dlp02.in.ibm.com X-MailFrom: aneesh.kumar@linux.vnet.ibm.com X-RcptTo: linux-kernel@vger.kernel.org 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> X-Mailer: git-send-email 2.5.0 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> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15082608-0017-0000-0000-000006E9738D Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2245 Lines: 80 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 -- 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/