From patchwork Thu Oct 29 19:25:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11867449 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 7C2B3C2D0A3 for ; Thu, 29 Oct 2020 19:50:32 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 EE37A207DE for ; Thu, 29 Oct 2020 19:50:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fSKcbeP0"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="dt5kW1Fu"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="JIIuHmSb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EE37A207DE Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+g5mvrb1eMXCVQG6qndN6X2fC1t09x3izvsW/jxiBZs=; b=fSKcbeP0h+fj8ibVcRdUiF6ln pxiuCOrbUHEfy6oCARw7gSvoq7Y6FcJp6KsuQ6MyEuyjrI83dbEF1NPg2PmghGvNxv+9KCu/R0p9L h/iAhu+ch6ngcprkW0JZxb0jrAX9SIfSU+bk9hGb91TNMl0BmBklSIGww11Go8k2WtkSA3K71LL7m ER920AKuMu4SZQ/JLBSHNbauyrM5NjzRZcK4/hnFrVIxbCzxaKcTHHAvI8nSPlgHPrCSHF4iYNjj/ Y5XtYpCeagUnpnxll6FfMMWEbtVMdmYSxCg+et3z/x2FjgoIIRWUzrIJ55+xlvUF0zw6dbbMGAZcG G/L/HnGKQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYDuY-0007Ws-Vi; Thu, 29 Oct 2020 19:48:39 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYDpG-00053d-Gf for linux-arm-kernel@merlin.infradead.org; Thu, 29 Oct 2020 19:43:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:Cc:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=oI/HbLx6/V9Mgdsl45doZaYB4b1VS6zKA72TKwwbKIw=; b=dt5kW1FuHCb5ItkL6n284icKNT p/EObB1mYWnQKv8jwXz3MK721/nowV6j6pvx7IZLlwoOr8XIU7rToHk1NHPlmgVgnE3JxVcLSCw3o XVzd2C8Q8B0d4bxmvUHYqG5UcC028mueifUybr70Y2OqznFgNLvCKloqA68yvQ8xzjQlYFOVFWR2U gLvWSSU9fcXU5Zbcb9I37eI4AbrcCTsZWqSRuShOrpu/7XZmxdegss9M8w9ofk1G0Q4c0p7r+hdUH sTZDVwp3K0xBG5paJqtpx7TGc3TK9wMszz630+WfHew4lBjijrgjQiCyfFsFctFhW5ZFtdBux+eDf zRsTTQkg==; Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYDZl-0006tf-4s for linux-arm-kernel@lists.infradead.org; Thu, 29 Oct 2020 19:27:13 +0000 Received: by mail-wr1-x44a.google.com with SMTP id b6so1662792wrn.17 for ; Thu, 29 Oct 2020 12:27:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=oI/HbLx6/V9Mgdsl45doZaYB4b1VS6zKA72TKwwbKIw=; b=JIIuHmSb8Zt7WBQJyCrMArWrki/niVacUm63sKgimEhHoU8mQn9GWxJ4w4UZx4RpFw pMeIaPMaJEETlG52pbiQ6lUGasxv2itQqiQG3zpIJ94gxCxSPiLqPYJ/C3wSqfjDbKqa nRco8sQxisfRkLS6JnwspHtU02zN4PpXRacD44+eHaxXhsQarva5RyR+KUb7zetqy11G xJn5MYWkN6rHJPCUSrPXs0xhzsYwyDmI5wWd0UwdBvU2TrOlLrSyxbnQaqrXAmVlT/Wr wuq6L9l/zTgfGB4qaVY2ejS8smNMdc7oFHTmHuwScWNj0xhNyRf9QJNDHg8lV4MxGael A2Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=oI/HbLx6/V9Mgdsl45doZaYB4b1VS6zKA72TKwwbKIw=; b=kbCrIGjPrcQKMCk8jDEjGF3FdjeyOCB+pF+2vHMkXV/m8HnjoKSOJeeHqVWpjopMkj R4FilrwUf+x1sxIeiSrAWuciEgpvPu+HSaRbNtHaFroKIkXVwSscJOrbTDz0u8dfIGji jm/wbctLozkLqxuwtkqpcl/4tRylcyqXP7fgy018FGrTgM0gpoAznsQkOVHvB6LzOjNo LDkXzl2adwvF24KThXlJXu7drEyioypu+mJdGqlcPic48YbalBHai83ZE6i27V6KVHMH z57L5YYO0TgJ53pQXTpCHsYAEbpzMKQibgH8NwwhACHNRY5p9QADc4lQuQGsjGBGzRW0 ZKjQ== X-Gm-Message-State: AOAM533yIih5VPT3PYECjHVzmMDzpoChAzplctEY3OTdpZlcsk4qF1vq QUV3p5Acr5frpW6VdsW2XB/HIcTJbXG/NBH5 X-Google-Smtp-Source: ABdhPJyIw7Vqk/FDzoTj75xIw3DeJogNIkP+Z0f/Iwx/QHEhHMDr7Xkdr8TNA06BxPdwwrvWITuCEmdq/ZFHYzDe X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:2dc4:: with SMTP id t187mr417857wmt.53.1603999625934; Thu, 29 Oct 2020 12:27:05 -0700 (PDT) Date: Thu, 29 Oct 2020 20:25:45 +0100 In-Reply-To: Message-Id: <0a56e9333c945e928c9a20c70451bcf818c4c60d.1603999489.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH v6 24/40] kasan, arm64: only use kasan_depth for software modes From: Andrey Konovalov To: Catalin Marinas , Will Deacon X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201029_192709_862140_E9675BC0 X-CRM114-Status: GOOD ( 14.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Marco Elver , Elena Petrova , Andrey Konovalov , Kevin Brodsky , Branislav Rankov , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , Evgenii Stepanov , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Dmitry Vyukov Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This is a preparatory commit for the upcoming addition of a new hardware tag-based (MTE-based) KASAN mode. Hardware tag-based KASAN won't use kasan_depth. Only define and use it when one of the software KASAN modes are enabled. No functional changes for software modes. Signed-off-by: Andrey Konovalov Signed-off-by: Vincenzo Frascino Reviewed-by: Catalin Marinas --- Change-Id: I6109ea96c8df41ef6d75ad71bf22c1c8fa234a9a --- arch/arm64/mm/kasan_init.c | 11 ++++++++--- include/linux/kasan.h | 18 +++++++++--------- include/linux/sched.h | 2 +- init/init_task.c | 2 +- mm/kasan/common.c | 2 ++ mm/kasan/report.c | 2 ++ 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index ffeb80d5aa8d..69c692b58f23 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -273,17 +273,22 @@ static void __init kasan_init_shadow(void) cpu_replace_ttbr1(lm_alias(swapper_pg_dir)); } +void __init kasan_init_depth(void) +{ + init_task.kasan_depth = 0; +} + #else /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS) */ static inline void __init kasan_init_shadow(void) { } +static inline void __init kasan_init_depth(void) { } + #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ void __init kasan_init(void) { kasan_init_shadow(); - - /* At this point kasan is fully initialized. Enable error messages */ - init_task.kasan_depth = 0; + kasan_init_depth(); pr_info("KernelAddressSanitizer initialized\n"); } diff --git a/include/linux/kasan.h b/include/linux/kasan.h index bfb21d5fd279..8d3d3c21340d 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -49,6 +49,12 @@ static inline void *kasan_mem_to_shadow(const void *addr) int kasan_add_zero_shadow(void *start, unsigned long size); void kasan_remove_zero_shadow(void *start, unsigned long size); +/* Enable reporting bugs after kasan_disable_current() */ +extern void kasan_enable_current(void); + +/* Disable reporting bugs for current task */ +extern void kasan_disable_current(void); + #else /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ static inline int kasan_add_zero_shadow(void *start, unsigned long size) @@ -59,16 +65,13 @@ static inline void kasan_remove_zero_shadow(void *start, unsigned long size) {} +static inline void kasan_enable_current(void) {} +static inline void kasan_disable_current(void) {} + #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ #ifdef CONFIG_KASAN -/* Enable reporting bugs after kasan_disable_current() */ -extern void kasan_enable_current(void); - -/* Disable reporting bugs for current task */ -extern void kasan_disable_current(void); - void kasan_unpoison_memory(const void *address, size_t size); void kasan_unpoison_task_stack(struct task_struct *task); @@ -119,9 +122,6 @@ 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_enable_current(void) {} -static inline void kasan_disable_current(void) {} - static inline void kasan_alloc_pages(struct page *page, unsigned int order) {} static inline void kasan_free_pages(struct page *page, unsigned int order) {} diff --git a/include/linux/sched.h b/include/linux/sched.h index 063cd120b459..81b09bd31186 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1197,7 +1197,7 @@ struct task_struct { u64 timer_slack_ns; u64 default_timer_slack_ns; -#ifdef CONFIG_KASAN +#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) unsigned int kasan_depth; #endif diff --git a/init/init_task.c b/init/init_task.c index a56f0abb63e9..39703b4ef1f1 100644 --- a/init/init_task.c +++ b/init/init_task.c @@ -176,7 +176,7 @@ struct task_struct init_task .numa_group = NULL, .numa_faults = NULL, #endif -#ifdef CONFIG_KASAN +#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) .kasan_depth = 1, #endif #ifdef CONFIG_KCSAN diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 543e6bf2168f..d0b3ff410b0c 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -46,6 +46,7 @@ void kasan_set_track(struct kasan_track *track, gfp_t flags) track->stack = kasan_save_stack(flags); } +#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) void kasan_enable_current(void) { current->kasan_depth++; @@ -55,6 +56,7 @@ void kasan_disable_current(void) { current->kasan_depth--; } +#endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ static void __kasan_unpoison_stack(struct task_struct *task, const void *sp) { diff --git a/mm/kasan/report.c b/mm/kasan/report.c index b18d193f7f58..af9138ea54ad 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -292,8 +292,10 @@ static void print_shadow_for_address(const void *addr) static bool report_enabled(void) { +#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) if (current->kasan_depth) return false; +#endif if (test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags)) return true; return !test_and_set_bit(KASAN_BIT_REPORTED, &kasan_flags);