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 C499CC388F9 for ; Wed, 11 Nov 2020 15:04:10 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1B970207BB for ; Wed, 11 Nov 2020 15:04:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="uipkPj5W" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1B970207BB 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 3D2D46B006C; Wed, 11 Nov 2020 10:04:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 382B86B0074; Wed, 11 Nov 2020 10:04:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 24AB26B0075; Wed, 11 Nov 2020 10:04:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0073.hostedemail.com [216.40.44.73]) by kanga.kvack.org (Postfix) with ESMTP id EC09C6B006C for ; Wed, 11 Nov 2020 10:04:08 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 911801EFF for ; Wed, 11 Nov 2020 15:04:08 +0000 (UTC) X-FDA: 77472457776.30.roll89_4a14e3a272fe Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 5834D180B31DD for ; Wed, 11 Nov 2020 15:04:06 +0000 (UTC) X-HE-Tag: roll89_4a14e3a272fe X-Filterd-Recvd-Size: 7625 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by imf26.hostedemail.com (Postfix) with ESMTP for ; Wed, 11 Nov 2020 15:04:05 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id b16so1224941qtb.6 for ; Wed, 11 Nov 2020 07:04:05 -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=T/yXDCUDWYrYlUTbV+JUoEICw4sgibdbwn70JC0Gn9g=; b=uipkPj5W8JpRde1BZ8RAaTk9NNHw2+YlqXJ9JyUBQZaxzWzWJpraEeWTseMYn8FZXp FKIXsmIhMmyw/YkTLrJgima1BzZ45nn97MrH3SBkR1haPsTid1Nw/feF041VY1qzXoXm 3KQwJmppshISmVLG9BsZWDmtZPd5loGkwaZOX7bkXNAQZqkThZp4m7BXNpCVX9RBW3UY ryz1+Ra8ZyoYrNZxsJIexs1r+0TS5decAGbSe8KGMnnCQYWhKs2RiYP8GxFDlHjLeFHl EHSRRn/O6GdECsNaDztAisH/9kcU3X4w/Efuw8iD8XrxNp4vg2kDDfvMMv/CQGZ1f8n+ azyA== 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=T/yXDCUDWYrYlUTbV+JUoEICw4sgibdbwn70JC0Gn9g=; b=NUuANDiW2vcdG3EUsnvQl8x6uorPADHxvv+jEnX74+1FyjefrFMq9ZCgPoTeisyYB/ nlfVLYIWY3QRSHQEOpSDHspmGwATF5FNsXTNvCoMMe1uPCvfXVWWmtbHFU49U8cPhuRT xzvrXJeJ1XPUsVV+w9Jl2f7AmkHPYDirKAi9PkGApUAs1MwV7II8TDZVtmgS7Gn0A9wS J5rJ0G1oW/eN0uwufb6BTjaJcfsaycPcg1aAceB0AGJtaBXSh8rBz8eFjQ4DtCPY43rL aOuIl0MGY0TYKeQnUjKbMAIlLxmBnNM10RoPZmrbeMPLb0l68b6NJ0RSOFwxfCLZYStQ /kHw== X-Gm-Message-State: AOAM530DgHoxmurFQNiTe73RCkunuHUzqJVbSm1B4Z/dYq98CHz/wndV qK7+6dodEXoDjG/eSaZLxaLSYfzVgbM3iPTmxIOtmA== X-Google-Smtp-Source: ABdhPJxwRAJlkZXtCgjwOCfZ+vnUzrbvfBbQunngaC7AOJ1FHkYD1IJxWn+erS2dZuE2R6iUURWasBaDXnRAgK0eLjU= X-Received: by 2002:ac8:4884:: with SMTP id i4mr24115822qtq.300.1605107044904; Wed, 11 Nov 2020 07:04:04 -0800 (PST) MIME-Version: 1.0 References: <619cb0edad35d946c4796976c25bddb5b3eb0c56.1605046192.git.andreyknvl@google.com> In-Reply-To: <619cb0edad35d946c4796976c25bddb5b3eb0c56.1605046192.git.andreyknvl@google.com> From: Alexander Potapenko Date: Wed, 11 Nov 2020 16:03:52 +0100 Message-ID: Subject: Re: [PATCH v9 17/44] kasan, arm64: move initialization message 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: > > Software tag-based KASAN mode is fully initialized with kasan_init_tags()= , > while the generic mode only requires kasan_init(). Move the > initialization message for tag-based mode into kasan_init_tags(). > > Also fix pr_fmt() usage for KASAN code: generic.c doesn't need it as it > doesn't use any printing functions; tag-based mode should use "kasan:" > instead of KBUILD_MODNAME (which stands for file name). > > Signed-off-by: Andrey Konovalov > Reviewed-by: Catalin Marinas > --- > Change-Id: Iddca9764b30ff0fab1922f26ca9d4f39b6f22673 > --- > arch/arm64/include/asm/kasan.h | 9 +++------ > arch/arm64/mm/kasan_init.c | 13 +++++-------- > mm/kasan/generic.c | 2 -- > mm/kasan/sw_tags.c | 4 +++- > 4 files changed, 11 insertions(+), 17 deletions(-) > > diff --git a/arch/arm64/include/asm/kasan.h b/arch/arm64/include/asm/kasa= n.h > index f7ea70d02cab..0aaf9044cd6a 100644 > --- a/arch/arm64/include/asm/kasan.h > +++ b/arch/arm64/include/asm/kasan.h > @@ -12,14 +12,10 @@ > #define arch_kasan_reset_tag(addr) __tag_reset(addr) > #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) > > +void kasan_init(void); > + > /* > * KASAN_SHADOW_START: beginning of the kernel virtual addresses. > * KASAN_SHADOW_END: KASAN_SHADOW_START + 1/N of kernel virtual addresse= s, > @@ -43,6 +39,7 @@ 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 5172799f831f..e35ce04beed1 100644 > --- a/arch/arm64/mm/kasan_init.c > +++ b/arch/arm64/mm/kasan_init.c > @@ -278,17 +278,14 @@ 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(); > kasan_init_depth(); > +#if defined(CONFIG_KASAN_GENERIC) > + /* CONFIG_KASAN_SW_TAGS also requires kasan_init_tags(). */ > pr_info("KernelAddressSanitizer initialized\n"); > +#endif > } Cannot we have a single kasan_init() function that will call tool-specific initialization functions and print the message at the end? > + > +#endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ > diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c > index e1af3b6c53b8..adb254df1b1d 100644 > --- a/mm/kasan/generic.c > +++ b/mm/kasan/generic.c > @@ -9,8 +9,6 @@ > * Andrey Konovalov > */ > > -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > - > #include > #include > #include > diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c > index b2638c2cd58a..d25f8641b7cd 100644 > --- a/mm/kasan/sw_tags.c > +++ b/mm/kasan/sw_tags.c > @@ -6,7 +6,7 @@ > * Author: Andrey Konovalov > */ > > -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > +#define pr_fmt(fmt) "kasan: " fmt > > #include > #include > @@ -41,6 +41,8 @@ void kasan_init_tags(void) > > for_each_possible_cpu(cpu) > per_cpu(prng_state, cpu) =3D (u32)get_cycles(); > + > + pr_info("KernelAddressSanitizer initialized\n"); > } > > /* > -- > 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