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=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL 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 58436C5517A for ; Wed, 11 Nov 2020 14:30:39 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5F3012068D for ; Wed, 11 Nov 2020 14:30:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="jvL+NTnB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F3012068D Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8BCEC6B0072; Wed, 11 Nov 2020 09:30:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 894D26B0075; Wed, 11 Nov 2020 09:30:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 782206B007B; Wed, 11 Nov 2020 09:30:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0019.hostedemail.com [216.40.44.19]) by kanga.kvack.org (Postfix) with ESMTP id 4AA936B0072 for ; Wed, 11 Nov 2020 09:30:37 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id E9B11181AC9CB for ; Wed, 11 Nov 2020 14:30:36 +0000 (UTC) X-FDA: 77472373272.05.shop47_331761c272fe Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id CB28518023ED3 for ; Wed, 11 Nov 2020 14:30:36 +0000 (UTC) X-HE-Tag: shop47_331761c272fe X-Filterd-Recvd-Size: 6855 Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by imf10.hostedemail.com (Postfix) with ESMTP for ; Wed, 11 Nov 2020 14:30:36 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id n132so1811833qke.1 for ; Wed, 11 Nov 2020 06:30:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=Z/BqGgtubdX37tmwe08Rq/1pXj9l2Bza+T3BZlmbJiM=; b=jvL+NTnBHSWLApmS7P+p19pqyWxpgB69jp9uis0hZF42uoT1XBnYFN9NaAsKlKEASe uLIq9e2d44ooNO/MNgOUL0JOwRBhmd7/PgJJIX16fc3mKZgm2FBx8nw7gei6jegiqeeR sdhTv70Bs/qQjzy6ZSoT3Q2yL8+mWAxuXtzBHmcIyoZOCJU3yBdYiNrNX8f4Pf4dhIZc aCJnxCPX4ug/8Oxl3oftLj5SqRHMigxoH48jO4FloEHaMA9GnPX4JzdAs05y788Nbn+e /cZOvwwfUw23tXlNFRpUgGAk5Gx5bpgailYjw2c08mjEAkLHFZlLDf5MYjeUQPm+EPuF Q7Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=Z/BqGgtubdX37tmwe08Rq/1pXj9l2Bza+T3BZlmbJiM=; b=fZhr4SeFUIOVxRz5y0UlGNk3aeQnnJN2JN48gx67T7R9KuPsfTykIQFjLCVym9Yy5+ rUx5W+EqfXUc/IxFzjETVtMErSQqUbM7/FAqcXj0g4b7nqiuUVkJAzWEvyxoa7RCFQKl UzAP/DSWG8/jgZPRHMTWVWkeO4hjdcCO5vkXQONMPEi+0mWq4Qc2zET1fRiStlUcg3zQ 6MvzULDRq+1c/URTt4fGIOwe0GxOCL77IutaUoAwR21wMMRxlCYbAaMnrWHaE72f6hbr XN0Lf9ZmfVvQtwYwjytEvqHHnkaBt0MLEYiSIIvURB/D2Ppi1LO/BjDIquKwU8+dL3MH fm4w== X-Gm-Message-State: AOAM532JhdHtC8eVhMjnTQ/F7bCVcNKFjMhQd7vvGGI+4y7AbCqAm51j KE1dohA3fVoViVX9VkZSENWSSI3EGbzaeyj3tYA7tQ== X-Google-Smtp-Source: ABdhPJyD3/xRKtJaSbF5ZNq+W+FQDm38hz+bmHdD0jgz0vEW7Rwi9biDt4z3OdyzDxWL4SWvUZu8Z7RK8lNOhpzQ7+4= X-Received: by 2002:a37:b545:: with SMTP id e66mr8296564qkf.392.1605105035446; Wed, 11 Nov 2020 06:30:35 -0800 (PST) MIME-Version: 1.0 References: <3aae3b3f931618b4418af7992bff1e258e4eb1ad.1605046192.git.andreyknvl@google.com> In-Reply-To: <3aae3b3f931618b4418af7992bff1e258e4eb1ad.1605046192.git.andreyknvl@google.com> From: Alexander Potapenko Date: Wed, 11 Nov 2020 15:30:23 +0100 Message-ID: Subject: Re: [PATCH v9 15/44] kasan, arm64: only init shadow for software modes To: Andrey Konovalov Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev , Linux ARM , Linux Memory Management List , LKML Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 Tue, Nov 10, 2020 at 11:11 PM Andrey Konovalov w= rote: > > 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 Reviewed-by: Alexander Potapenko > --- > 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/kasa= n.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 message= s */ > init_task.kasan_depth =3D 0; > -- > 2.29.2.222.g5d2a92d10f8-goog > --=20 Alexander Potapenko Software Engineer Google Germany GmbH Erika-Mann-Stra=C3=9Fe, 33 80636 M=C3=BCnchen Gesch=C3=A4ftsf=C3=BChrer: Paul Manicle, Halimah DeLaine Prado Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg