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=-11.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 B7DE8C8B4EC for ; Mon, 16 Nov 2020 12:42:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2023820897 for ; Mon, 16 Nov 2020 12:42:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2023820897 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 381136B0036; Mon, 16 Nov 2020 07:42:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 331866B005D; Mon, 16 Nov 2020 07:42:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2481C6B0068; Mon, 16 Nov 2020 07:42:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0045.hostedemail.com [216.40.44.45]) by kanga.kvack.org (Postfix) with ESMTP id E9B966B0036 for ; Mon, 16 Nov 2020 07:42:18 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 77B178249980 for ; Mon, 16 Nov 2020 12:42:18 +0000 (UTC) X-FDA: 77490244356.29.kite59_430c54d27329 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id 5C7C5180868DE for ; Mon, 16 Nov 2020 12:42:18 +0000 (UTC) X-HE-Tag: kite59_430c54d27329 X-Filterd-Recvd-Size: 7505 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf12.hostedemail.com (Postfix) with ESMTP for ; Mon, 16 Nov 2020 12:42:17 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id DC39B101E; Mon, 16 Nov 2020 04:42:16 -0800 (PST) Received: from [10.37.12.42] (unknown [10.37.12.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 003023F70D; Mon, 16 Nov 2020 04:42:12 -0800 (PST) Subject: Re: [PATCH RFC v2 04/21] kasan: unpoison stack only with CONFIG_KASAN_STACK To: Dmitry Vyukov , Catalin Marinas Cc: Marco Elver , Andrey Konovalov , Will Deacon , Alexander Potapenko , Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev , Linux ARM , Linux-MM , LKML References: From: Vincenzo Frascino Message-ID: <9d4156e6-ec4f-a742-a44e-f38bf7fa9ba9@arm.com> Date: Mon, 16 Nov 2020 12:45:19 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 11/16/20 12:19 PM, Dmitry Vyukov wrote: > On Mon, Nov 16, 2020 at 1:16 PM Catalin Marinas wrote: >> >> On Mon, Nov 16, 2020 at 12:50:00PM +0100, Marco Elver wrote: >>> On Mon, 16 Nov 2020 at 11:59, Dmitry Vyukov wrote: >>>> On Thu, Oct 29, 2020 at 8:57 PM 'Andrey Konovalov' via kasan-dev >>>> wrote: >>>>> On Tue, Oct 27, 2020 at 1:44 PM Dmitry Vyukov wrote: >>>>>> >>>>>> On Thu, Oct 22, 2020 at 3:19 PM Andrey Konovalov wrote: >>>>>>> >>>>>>> There's a config option CONFIG_KASAN_STACK that has to be enabled for >>>>>>> KASAN to use stack instrumentation and perform validity checks for >>>>>>> stack variables. >>>>>>> >>>>>>> There's no need to unpoison stack when CONFIG_KASAN_STACK is not enabled. >>>>>>> Only call kasan_unpoison_task_stack[_below]() when CONFIG_KASAN_STACK is >>>>>>> enabled. >>>>>>> >>>>>>> Signed-off-by: Andrey Konovalov >>>>>>> Link: https://linux-review.googlesource.com/id/If8a891e9fe01ea543e00b576852685afec0887e3 >>>>>>> --- >>>>>>> arch/arm64/kernel/sleep.S | 2 +- >>>>>>> arch/x86/kernel/acpi/wakeup_64.S | 2 +- >>>>>>> include/linux/kasan.h | 10 ++++++---- >>>>>>> mm/kasan/common.c | 2 ++ >>>>>>> 4 files changed, 10 insertions(+), 6 deletions(-) >>>>>>> >>>>>>> diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S >>>>>>> index ba40d57757d6..bdadfa56b40e 100644 >>>>>>> --- a/arch/arm64/kernel/sleep.S >>>>>>> +++ b/arch/arm64/kernel/sleep.S >>>>>>> @@ -133,7 +133,7 @@ SYM_FUNC_START(_cpu_resume) >>>>>>> */ >>>>>>> bl cpu_do_resume >>>>>>> >>>>>>> -#ifdef CONFIG_KASAN >>>>>>> +#if defined(CONFIG_KASAN) && 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 c8daa92f38dc..5d3a0b8fd379 100644 >>>>>>> --- a/arch/x86/kernel/acpi/wakeup_64.S >>>>>>> +++ b/arch/x86/kernel/acpi/wakeup_64.S >>>>>>> @@ -112,7 +112,7 @@ SYM_FUNC_START(do_suspend_lowlevel) >>>>>>> movq pt_regs_r14(%rax), %r14 >>>>>>> movq pt_regs_r15(%rax), %r15 >>>>>>> >>>>>>> -#ifdef CONFIG_KASAN >>>>>>> +#if defined(CONFIG_KASAN) && 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 3f3f541e5d5f..7be9fb9146ac 100644 >>>>>>> --- a/include/linux/kasan.h >>>>>>> +++ b/include/linux/kasan.h >>>>>>> @@ -68,8 +68,6 @@ static inline void kasan_disable_current(void) {} >>>>>>> >>>>>>> void kasan_unpoison_memory(const void *address, size_t size); >>>>>>> >>>>>>> -void kasan_unpoison_task_stack(struct task_struct *task); >>>>>>> - >>>>>>> void kasan_alloc_pages(struct page *page, unsigned int order); >>>>>>> void kasan_free_pages(struct page *page, unsigned int order); >>>>>>> >>>>>>> @@ -114,8 +112,6 @@ void kasan_restore_multi_shot(bool enabled); >>>>>>> >>>>>>> static inline void kasan_unpoison_memory(const void *address, size_t size) {} >>>>>>> >>>>>>> -static inline void kasan_unpoison_task_stack(struct task_struct *task) {} >>>>>>> - >>>>>>> static inline void kasan_alloc_pages(struct page *page, unsigned int order) {} >>>>>>> static inline void kasan_free_pages(struct page *page, unsigned int order) {} >>>>>>> >>>>>>> @@ -167,6 +163,12 @@ static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } >>>>>>> >>>>>>> #endif /* CONFIG_KASAN */ >>>>>>> >>>>>>> +#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK >>>>>> >>>>>> && defined(CONFIG_KASAN_STACK) for consistency >>>>> >>>>> CONFIG_KASAN_STACK is different from other KASAN configs. It's always >>>>> defined, and its value is what controls whether stack instrumentation >>>>> is enabled. >>>> >>>> Not sure why we did this instead of the following, but okay. >>>> >>>> config KASAN_STACK >>>> - int >>>> - default 1 if KASAN_STACK_ENABLE || CC_IS_GCC >>>> - default 0 >>>> + bool >>>> + default y if KASAN_STACK_ENABLE || CC_IS_GCC >>>> + default n >>> >>> I wondered the same, but then looking at scripts/Makefile.kasan I >>> think it's because we directly pass it to the compiler: >>> ... >>> $(call cc-param,asan-stack=$(CONFIG_KASAN_STACK)) \ >>> ... >> >> Try this instead: >> >> $(call cc-param,asan-stack=$(if $(CONFIG_KASAN_STACK),1,0)) \ > > > We could have just 1 config instead of 2 as well. > For gcc we could do no prompt and default value y, and for clang -- > prompt and default value n. I think it should do what we need. > I agree with Catalin's proposal since it should simplify things. Nit: 'default n' is the default hence I do not think it should be required explicitly. -- Regards, Vincenzo