From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48E5FC433DB for ; Wed, 3 Mar 2021 16:09:48 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CA26864EE4 for ; Wed, 3 Mar 2021 16:09:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA26864EE4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Date:CC:To:From: Subject:Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=7FVdymXyVFsv0pxswPjjFBYcX7yccEaOeZE6QLfg0hc=; b=MzzTzEPRYQ4KVt3WiR68ISe85 fjoFh1QeFM5WrC50X1ZpY0fvV83Wp9EWkY9+Rb12M/KcTlXx+zNa8aYHzyWNVxCDvLuT51F6wgKuK 9zWPhuOhitZuAyCvlRDieXE4fj8HCpA/GAJ6zAskjnbLchFlLtZAxn7MCoeP0pAjc/ESO8gbUe74e NyqCHpsA2EA2Xrl26hot3DwHvi31R37Tc0Cs9EtxayKDzrh8KP54pfOc8Lw4r5Mr2b8ik1YbW5TDl M58HAIMThx29ZuyrJdUQswx9hCNZ2uhB9B8jxp9HPBvzlLbmJJ0ZPjFrK9r5c3LAf+SyAGrFAE+p4 O00gLy0og==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHU1m-005X16-Se; Wed, 03 Mar 2021 16:07:11 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHSoT-005Dbk-U3; Wed, 03 Mar 2021 14:49:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID:Sender :Reply-To:Content-ID:Content-Description; bh=AWzLvF5Mphj2LxOTWlI1vkLJVO/ce4uOqjBNnFlwD1A=; b=FiPd90PMMajOHj2MqlbpyXNXc4 /Og4mLDp7PcUwUQ1+TFSfB7ViOVdb1ExmXaNpT0uXXShPUVdnALz+jY88K5SncPgQHtGAzSGudl+J 7GnRocAzKZkXub23LuxDdUdeUxMnZV1rx+/wdFZTbinnOjyQm8qhw1H2nyi/TrhJuObdTa3oLXhg8 ovr6q4w2HWw8NPc/RS2kLfrOPrA0yp+dEzLM0BRzJEQaGv6NGb23N1p+c/XvumakV8bLzlCnPKbEJ 2P9P/zB6Sw9/kgEfq9Qzn1OdMbJbQB0Dp494QMAe9We9uqaLgoCkx6HnxRRdgW4sPXwNciqPif/Lj 1CwUS0OQ==; Received: from mailgw02.mediatek.com ([216.200.240.185]) by casper.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHPzZ-002Pnt-HI; Wed, 03 Mar 2021 11:48:39 +0000 X-UUID: 1040ff172b8b42e88dc01e7eb0b05f52-20210303 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=AWzLvF5Mphj2LxOTWlI1vkLJVO/ce4uOqjBNnFlwD1A=; b=BbGfO3XYJn8WQGjuNe7KPQh7xrD6hCNEn2Kz9s75glO/Agr//PqawyeRZSod0+0LWZKYj1DQfdXiqJiqcSGThA1hVzH5TLCQWv2LqKFegL3/03jCmn7PtCs5XN+o1mI3oaUuam+SsabC4VoFb5nXg3/LvNR625OjtAAk6r5dKdk=; X-UUID: 1040ff172b8b42e88dc01e7eb0b05f52-20210303 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 2098396463; Wed, 03 Mar 2021 03:48:22 -0800 Received: from MTKMBS01N1.mediatek.inc (172.21.101.68) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 3 Mar 2021 03:48:21 -0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 3 Mar 2021 19:48:19 +0800 Received: from [172.21.84.99] (172.21.84.99) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 3 Mar 2021 19:48:19 +0800 Message-ID: <1614772099.26785.3.camel@mtksdccf07> Subject: Re: [PATCH v4] kasan: remove redundant config option From: Walter Wu To: Andrew Morton CC: Alexander Potapenko , Dmitry Vyukov , Nathan Chancellor , "Arnd Bergmann" , Andrey Konovalov , , , , , wsd_upstream , , Andrey Ryabinin Date: Wed, 3 Mar 2021 19:48:19 +0800 In-Reply-To: <20210226012531.29231-1-walter-zh.wu@mediatek.com> References: <20210226012531.29231-1-walter-zh.wu@mediatek.com> X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210303_114839_171129_C8904E81 X-CRM114-Status: GOOD ( 27.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, 2021-02-26 at 09:25 +0800, Walter Wu wrote: > CONFIG_KASAN_STACK and CONFIG_KASAN_STACK_ENABLE both enable KASAN stack > instrumentation, but we should only need one config, so that we remove > CONFIG_KASAN_STACK_ENABLE and make CONFIG_KASAN_STACK workable. see [1]. > > When enable KASAN stack instrumentation, then for gcc we could do no > prompt and default value y, and for clang prompt and default value n. > > [1]: https://bugzilla.kernel.org/show_bug.cgi?id=210221 > > Signed-off-by: Walter Wu > Suggested-by: Dmitry Vyukov > Reviewed-by: Nathan Chancellor > Acked-by: Arnd Bergmann > Reviewed-by: Andrey Konovalov > Cc: Andrey Ryabinin > Cc: Dmitry Vyukov > Cc: Alexander Potapenko > Cc: Andrew Morton > --- > > v4: After this patch sent, someone had modification about KASAN_STACK, > so I need to rebase codebase. Thank Andrey for your pointing. > Hi Andrew, Could you pick this v4 patch up into mm? Thanks. Walter > --- > arch/arm64/kernel/sleep.S | 2 +- > arch/x86/kernel/acpi/wakeup_64.S | 2 +- > include/linux/kasan.h | 2 +- > lib/Kconfig.kasan | 8 ++------ > mm/kasan/common.c | 2 +- > mm/kasan/kasan.h | 2 +- > mm/kasan/report_generic.c | 2 +- > scripts/Makefile.kasan | 10 ++++++++-- > security/Kconfig.hardening | 4 ++-- > 9 files changed, 18 insertions(+), 16 deletions(-) > > diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S > index 5bfd9b87f85d..4ea9392f86e0 100644 > --- a/arch/arm64/kernel/sleep.S > +++ b/arch/arm64/kernel/sleep.S > @@ -134,7 +134,7 @@ SYM_FUNC_START(_cpu_resume) > */ > bl cpu_do_resume > > -#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK > +#if defined(CONFIG_KASAN) && defined(CONFIG_KASAN_STACK) > mov x0, sp > bl kasan_unpoison_task_stack_below > #endif > diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S > index 56b6865afb2a..d5d8a352eafa 100644 > --- a/arch/x86/kernel/acpi/wakeup_64.S > +++ b/arch/x86/kernel/acpi/wakeup_64.S > @@ -115,7 +115,7 @@ SYM_FUNC_START(do_suspend_lowlevel) > movq pt_regs_r14(%rax), %r14 > movq pt_regs_r15(%rax), %r15 > > -#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK > +#if defined(CONFIG_KASAN) && defined(CONFIG_KASAN_STACK) > /* > * The suspend path may have poisoned some areas deeper in the stack, > * which we now need to unpoison. > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index b91732bd05d7..14f72ec96492 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -330,7 +330,7 @@ static inline bool kasan_check_byte(const void *address) > > #endif /* CONFIG_KASAN */ > > -#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK > +#if defined(CONFIG_KASAN) && defined(CONFIG_KASAN_STACK) > void kasan_unpoison_task_stack(struct task_struct *task); > #else > static inline void kasan_unpoison_task_stack(struct task_struct *task) {} > diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan > index 624ae1df7984..cffc2ebbf185 100644 > --- a/lib/Kconfig.kasan > +++ b/lib/Kconfig.kasan > @@ -138,9 +138,10 @@ config KASAN_INLINE > > endchoice > > -config KASAN_STACK_ENABLE > +config KASAN_STACK > bool "Enable stack instrumentation (unsafe)" if CC_IS_CLANG && !COMPILE_TEST > depends on KASAN_GENERIC || KASAN_SW_TAGS > + default y if CC_IS_GCC > help > The LLVM stack address sanitizer has a know problem that > causes excessive stack usage in a lot of functions, see > @@ -154,11 +155,6 @@ config KASAN_STACK_ENABLE > CONFIG_COMPILE_TEST. On gcc it is assumed to always be safe > to use and enabled by default. > > -config KASAN_STACK > - int > - default 1 if KASAN_STACK_ENABLE || CC_IS_GCC > - default 0 > - > config KASAN_SW_TAGS_IDENTIFY > bool "Enable memory corruption identification" > depends on KASAN_SW_TAGS > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index b5e08d4cefec..7b53291dafa1 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -63,7 +63,7 @@ void __kasan_unpoison_range(const void *address, size_t size) > kasan_unpoison(address, size); > } > > -#if CONFIG_KASAN_STACK > +#ifdef CONFIG_KASAN_STACK > /* Unpoison the entire stack for a task. */ > void kasan_unpoison_task_stack(struct task_struct *task) > { > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 8c55634d6edd..3436c6bf7c0c 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -231,7 +231,7 @@ void *kasan_find_first_bad_addr(void *addr, size_t size); > const char *kasan_get_bug_type(struct kasan_access_info *info); > void kasan_metadata_fetch_row(char *buffer, void *row); > > -#if defined(CONFIG_KASAN_GENERIC) && CONFIG_KASAN_STACK > +#if defined(CONFIG_KASAN_GENERIC) && defined(CONFIG_KASAN_STACK) > void kasan_print_address_stack_frame(const void *addr); > #else > static inline void kasan_print_address_stack_frame(const void *addr) { } > diff --git a/mm/kasan/report_generic.c b/mm/kasan/report_generic.c > index 41f374585144..de732bc341c5 100644 > --- a/mm/kasan/report_generic.c > +++ b/mm/kasan/report_generic.c > @@ -128,7 +128,7 @@ void kasan_metadata_fetch_row(char *buffer, void *row) > memcpy(buffer, kasan_mem_to_shadow(row), META_BYTES_PER_ROW); > } > > -#if CONFIG_KASAN_STACK > +#ifdef CONFIG_KASAN_STACK > static bool __must_check tokenize_frame_descr(const char **frame_descr, > char *token, size_t max_tok_len, > unsigned long *value) > diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan > index 1e000cc2e7b4..abf231d209b1 100644 > --- a/scripts/Makefile.kasan > +++ b/scripts/Makefile.kasan > @@ -2,6 +2,12 @@ > CFLAGS_KASAN_NOSANITIZE := -fno-builtin > KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) > > +ifdef CONFIG_KASAN_STACK > + stack_enable := 1 > +else > + stack_enable := 0 > +endif > + > ifdef CONFIG_KASAN_GENERIC > > ifdef CONFIG_KASAN_INLINE > @@ -27,7 +33,7 @@ else > CFLAGS_KASAN := $(CFLAGS_KASAN_SHADOW) \ > $(call cc-param,asan-globals=1) \ > $(call cc-param,asan-instrumentation-with-call-threshold=$(call_threshold)) \ > - $(call cc-param,asan-stack=$(CONFIG_KASAN_STACK)) \ > + $(call cc-param,asan-stack=$(stack_enable)) \ > $(call cc-param,asan-instrument-allocas=1) > endif > > @@ -42,7 +48,7 @@ else > endif > > CFLAGS_KASAN := -fsanitize=kernel-hwaddress \ > - -mllvm -hwasan-instrument-stack=$(CONFIG_KASAN_STACK) \ > + -mllvm -hwasan-instrument-stack=$(stack_enable) \ > -mllvm -hwasan-use-short-granules=0 \ > $(instrumentation_flags) > > diff --git a/security/Kconfig.hardening b/security/Kconfig.hardening > index 269967c4fc1b..a56c36470cb1 100644 > --- a/security/Kconfig.hardening > +++ b/security/Kconfig.hardening > @@ -64,7 +64,7 @@ choice > config GCC_PLUGIN_STRUCTLEAK_BYREF > bool "zero-init structs passed by reference (strong)" > depends on GCC_PLUGINS > - depends on !(KASAN && KASAN_STACK=1) > + depends on !(KASAN && KASAN_STACK) > select GCC_PLUGIN_STRUCTLEAK > help > Zero-initialize any structures on the stack that may > @@ -82,7 +82,7 @@ choice > config GCC_PLUGIN_STRUCTLEAK_BYREF_ALL > bool "zero-init anything passed by reference (very strong)" > depends on GCC_PLUGINS > - depends on !(KASAN && KASAN_STACK=1) > + depends on !(KASAN && KASAN_STACK) > select GCC_PLUGIN_STRUCTLEAK > help > Zero-initialize any stack variables that may be passed _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel