From patchwork Thu Oct 29 19:25:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11867381 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 C2909C55178 for ; Thu, 29 Oct 2020 19:34:40 +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 28DD221548 for ; Thu, 29 Oct 2020 19:34:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tdNBReID"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="O74FrK2B" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 28DD221548 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=vcpagapbsoTQt06ywyafMRkkuocH3R5e2oJTmyug0fI=; b=tdNBReIDe9nMNxxxPB48GD1Tg BxzsmbTqcNfcoxsOyVJvRKV8Y1TFXhWaZIY00+sJlUh82cW7yHz894PQDgsAmXQ4S6XyGBHCb2cM3 RYsTDo2fC0W9lC/8ZBXXm1Qs9azxaYnBPSAN9Pj2DUoAROQfqKyMixxX/VxBZeWbLfO3ktU1VvXeZ oZnb/GuIAotqCRRaunwF8NmGWYLhyAtSBNEgsYEPtR0bUwph5DSGHJhD/zHXc5rjdSC4SMp3meegO 35gyCVKMhMwX0HNyYcxSVUIpFgyVpS/1i6h82aXb/gagw8aJ7GPp3oz3iqldvRDK6Djpr9H/9WT4c 9ySDguctw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYDfh-0000zo-0p; Thu, 29 Oct 2020 19:33:17 +0000 Received: from mail-qv1-xf4a.google.com ([2607:f8b0:4864:20::f4a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYDZi-0006uW-Uq for linux-arm-kernel@lists.infradead.org; Thu, 29 Oct 2020 19:27:37 +0000 Received: by mail-qv1-xf4a.google.com with SMTP id a1so2145187qvt.9 for ; Thu, 29 Oct 2020 12:27:04 -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=d4Yc7AItymQNyKGF4tg/i8f/qZM6X5xLr7PA4bM2pG0=; b=O74FrK2BtsojO1gJTmVRrwanlx0ZtzanXUIPqK4QGOpVx6/+lQKyw7gMi1OzhDYnro XYeA3XQnRGJgaNNE+upEw+xp44U+7tuGC0PGArM9cRE0A40T44n/fiXKuQAFWNU6S9c0 StWAdLPmPOEc6ZvyAR1cJqqPauGz/dSzjmkqwSVPEEfLIWtd8430JxPis2FT82VQfX2p iH41smid3IF5U8wWdT1rA70VFMNmFKG4sl0OqnFq8FROAB5qdpIE14D6aIbY2t5sfxkw jFdAsdRBbekvMZso5Zyr3Sw4yve/QTI7ZL7eapzqmTvZ1U+HRRmIHAQfnHcd4ok+WITT uX2Q== 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=d4Yc7AItymQNyKGF4tg/i8f/qZM6X5xLr7PA4bM2pG0=; b=T40wkDcXz4NNJR8BL8+k2PdXvOwGOX9HBBT3ex7FENSKBwamZaGgNxoNeIpUQpcmAV QAemhzwa/Qt07ZK1wNUgHEwjhPvodqGwDrDn+0q3NvrGFqEFZM86EpDLRsN2QsdQtuVL 80flTchcC8mxqIUDbLANBgH6hJk/zWUKAia1N/xRxgFk1d2epoSO1grT0KWeatP1WjQr fYkoMl2Dz2vo6FM8/QR9qwozXSj8GZVFbS5ZdF7yt5nwpcudWp9ONtV/YORwo3veGn7+ 5Ifk6s1Cn2is5rsgqb9a9xTifMH00ZasI9/mJvgYsCXy2J79owxKUQoVgyp/oUhTfptL T/4A== X-Gm-Message-State: AOAM530L8PRJXWJLxbyyvYZ3frG81hlzOMK7FkHRy07fC037ooGSZJyX HRuYMLp2K9kaGlV8rgtbDUWn7kyHkM/3MQWo X-Google-Smtp-Source: ABdhPJwouyk2oG+IHwlZ4Ot8vpYM8kJR7LNn7VyLuIlfQ8xA1mAjCJlXlEzV/5jhlJDTzuW3U5TBr5OSY7dRdhp8 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:edb1:: with SMTP id h17mr5423193qvr.7.1603999623483; Thu, 29 Oct 2020 12:27:03 -0700 (PDT) Date: Thu, 29 Oct 2020 20:25:44 +0100 In-Reply-To: Message-Id: <1b97c0eeb401f9657e66b05c6c43621edff3bb68.1603999489.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH v6 23/40] kasan, arm64: only init shadow 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_152707_128880_F6DF96C6 X-CRM114-Status: GOOD ( 16.35 ) 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 be using shadow memory. Only initialize 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: I055e0651369b14d3e54cdaa8c48e6329b2e8952d --- arch/arm64/include/asm/kasan.h | 8 ++++++-- arch/arm64/mm/kasan_init.c | 15 ++++++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/kasan.h b/arch/arm64/include/asm/kasan.h index b0dc4abc3589..f7ea70d02cab 100644 --- a/arch/arm64/include/asm/kasan.h +++ b/arch/arm64/include/asm/kasan.h @@ -13,6 +13,12 @@ #define arch_kasan_get_tag(addr) __tag_get(addr) #ifdef CONFIG_KASAN +void kasan_init(void); +#else +static inline void kasan_init(void) { } +#endif + +#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) /* * KASAN_SHADOW_START: beginning of the kernel virtual addresses. @@ -33,12 +39,10 @@ #define _KASAN_SHADOW_START(va) (KASAN_SHADOW_END - (1UL << ((va) - KASAN_SHADOW_SCALE_SHIFT))) #define KASAN_SHADOW_START _KASAN_SHADOW_START(vabits_actual) -void kasan_init(void); void kasan_copy_shadow(pgd_t *pgdir); asmlinkage void kasan_early_init(void); #else -static inline void kasan_init(void) { } static inline void kasan_copy_shadow(pgd_t *pgdir) { } #endif diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index b24e43d20667..ffeb80d5aa8d 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -21,6 +21,8 @@ #include #include +#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) + static pgd_t tmp_pg_dir[PTRS_PER_PGD] __initdata __aligned(PGD_SIZE); /* @@ -208,7 +210,7 @@ static void __init clear_pgds(unsigned long start, set_pgd(pgd_offset_k(start), __pgd(0)); } -void __init kasan_init(void) +static void __init kasan_init_shadow(void) { u64 kimg_shadow_start, kimg_shadow_end; u64 mod_shadow_start, mod_shadow_end; @@ -269,6 +271,17 @@ void __init kasan_init(void) memset(kasan_early_shadow_page, KASAN_SHADOW_INIT, PAGE_SIZE); cpu_replace_ttbr1(lm_alias(swapper_pg_dir)); +} + +#else /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS) */ + +static inline void __init kasan_init_shadow(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;