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 B40ABC388F9 for ; Wed, 11 Nov 2020 14:59:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2DB7B207BB for ; Wed, 11 Nov 2020 14:59:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Ty273gzZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2DB7B207BB 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 537266B006C; Wed, 11 Nov 2020 09:59:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4E8B96B0074; Wed, 11 Nov 2020 09:59:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3FEA06B0075; Wed, 11 Nov 2020 09:59:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0007.hostedemail.com [216.40.44.7]) by kanga.kvack.org (Postfix) with ESMTP id 0A1766B006C for ; Wed, 11 Nov 2020 09:59:48 -0500 (EST) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id ABE138249980 for ; Wed, 11 Nov 2020 14:59:48 +0000 (UTC) X-FDA: 77472446856.25.men28_23150dc272fe Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id 635A21804E3A1 for ; Wed, 11 Nov 2020 14:59:48 +0000 (UTC) X-HE-Tag: men28_23150dc272fe X-Filterd-Recvd-Size: 9795 Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Wed, 11 Nov 2020 14:59:47 +0000 (UTC) Received: by mail-qk1-f194.google.com with SMTP id u4so1865929qkk.10 for ; Wed, 11 Nov 2020 06:59:47 -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=/fDcpIY0qGq2TOyxo24BIpfp3mzq21GpKr2EDtPYTac=; b=Ty273gzZBP5AOxstBsw1RhEtCdmjvUJfpOoPRJq/s43OIbRVjaGFiKolBDbmN776NY robjSmaetRwjV8fMVSijm05FCY5AU9myta6xfkHhebc9pN0+O+TKhGXyytCVNn0ccVqE QsvoNat6t7+FCjoABUzlCWErE9262ZzaQhX/YNZA5eYJuKkAfuu0nO4U6t8k1+XpbNEC tZPe3V61YUtGIDyHJWqh8yK2+D0z+jAQlHzI3bn/56FJTRNDSlOtp/CLBkem4LNxkoQU FUna472XPWJJsmujQ2nwxS4eNp7VtxmRbo7Z5FP7lU9d+oVq8xNF3XjbxNTrXiyfhbaV 8dvg== 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=/fDcpIY0qGq2TOyxo24BIpfp3mzq21GpKr2EDtPYTac=; b=IAeEE/C9yDBAnnFvXqHoxUm3QO0WKdiynlzURHJoM9uNEIHF67X7WLOm2HE4OO9tCQ 46TfzLgLVLEQTdeAXBKroKYCfcyE39l9HzUKcGh6KOt3hg6RWLTSoLcVs9E/mJb+2BPf aerSO3TnTsvDao/81UqbSdB2aO4modH0vkP3ptgxalwCL/ebMr7CzrztsW/v9gT020n0 6k3P1dT3bfdqVgAJR9fndgAMUNSQUUtgFN1LHK/yfrSussfUZNyVdiYg0o9cPRIahTAj nCWuZjJC14bcQdKhViPLRpA8UQT2zlQtcHJU92x8s5KPCW9wZK+Q8P29P2vGnphcF4l7 91jg== X-Gm-Message-State: AOAM532Lx7qS2oPjHwJ2MnzZ4tXZ+pqmj4y3V7vcZrHGa7L0j+UNWg6u gkHGwaiGblXhzK0uXO9/eoaoQ7GnsuqcT3QTEpA69w== X-Google-Smtp-Source: ABdhPJzbjy27RIkLLWvoPaUvOZWfgFRUJVg0/tpesY09y+nx6VSIwS50KV49LKHnYDskEH5yMx2VLlDTj12KJuOcwK8= X-Received: by 2002:a05:620a:f95:: with SMTP id b21mr16896205qkn.403.1605106786994; Wed, 11 Nov 2020 06:59:46 -0800 (PST) MIME-Version: 1.0 References: <91b3defa17748a61d1432929a80890043ca8dcda.1605046192.git.andreyknvl@google.com> In-Reply-To: <91b3defa17748a61d1432929a80890043ca8dcda.1605046192.git.andreyknvl@google.com> From: Alexander Potapenko Date: Wed, 11 Nov 2020 15:59:34 +0100 Message-ID: Subject: Re: [PATCH v9 16/44] kasan, arm64: only use kasan_depth 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 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 Reviewed-by: Alexander Potapenko > --- > 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..5172799f831f 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)); > } > > +static void __init kasan_init_depth(void) > +{ > + init_task.kasan_depth =3D 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 message= s */ > - init_task.kasan_depth =3D 0; > + kasan_init_depth(); > pr_info("KernelAddressSanitizer initialized\n"); > } > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index f6435b9f889c..979d598e1c30 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -51,6 +51,12 @@ static inline void *kasan_mem_to_shadow(const void *ad= dr) > 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) > @@ -61,16 +67,13 @@ static inline void kasan_remove_zero_shadow(void *sta= rt, > 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); > @@ -121,9 +124,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 ord= er) {} > static inline void kasan_free_pages(struct page *page, unsigned int orde= r) {} > > 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 =3D NULL, > .numa_faults =3D NULL, > #endif > -#ifdef CONFIG_KASAN > +#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) > .kasan_depth =3D 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 f= lags) > track->stack =3D 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 *add= r) > > 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); > -- > 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