From patchwork Thu Oct 22 13:18:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851335 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AC7CF61C for ; Thu, 22 Oct 2020 13:19:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5A44624178 for ; Thu, 22 Oct 2020 13:19:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="A/DzVj6N" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A44624178 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 4E49A6B0083; Thu, 22 Oct 2020 09:19:44 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 46D866B0085; Thu, 22 Oct 2020 09:19:44 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 35B996B0087; Thu, 22 Oct 2020 09:19:44 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0114.hostedemail.com [216.40.44.114]) by kanga.kvack.org (Postfix) with ESMTP id 046686B0083 for ; Thu, 22 Oct 2020 09:19:43 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 99B5F80353DB for ; Thu, 22 Oct 2020 13:19:43 +0000 (UTC) X-FDA: 77399618646.30.foot02_1a15ab527251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 4ED21180B3C8B for ; Thu, 22 Oct 2020 13:19:43 +0000 (UTC) X-Spam-Summary: 1,0,0,afb7e17d3f27844d,d41d8cd98f00b204,37yarxwokceqgtjxk4qt1rmuumrk.iusrot03-ssq1giq.uxm@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1542:1593:1594:1711:1730:1747:1777:1792:1981:2194:2199:2393:2525:2559:2563:2682:2685:2859:2902:2904:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3353:3865:3866:3872:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4117:4250:4321:4425:4605:5007:6119:6120:6261:6653:6742:7514:7901:8957:9025:9592:9969:10004:10400:11026:11473:11658:11914:12043:12048:12296:12297:12438:12555:12679:12895:12986:13095:14181:14394:14659:14721:21080:21212:21365:21433:21444:21451:21627:21660:21939:30012:30054,0,RBL:209.85.222.202:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yfp4goc4e5rh4y3zuspmj8a9ydpopexap993bxrqnktpbnk6734dxjfcrp76k.7ik3fw1h4gb35p1bbihx9y4fn3jic4531znpsq7oadf5q5sep 4c511yak X-HE-Tag: foot02_1a15ab527251 X-Filterd-Recvd-Size: 6156 Received: from mail-qk1-f202.google.com (mail-qk1-f202.google.com [209.85.222.202]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:42 +0000 (UTC) Received: by mail-qk1-f202.google.com with SMTP id j20so462008qkl.7 for ; Thu, 22 Oct 2020 06:19:42 -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=S3zpKFgl6lOQ4xschlXI9IBqFZJcfplQNQgfAvCSd9c=; b=A/DzVj6NJxiFJ1FGJ6LmU2ByOvdQoNTbI0xyZCf/l69mGnF7H5keOh0cFSh6PSKDDW UHgRUgb4ay+Bz2HtzVeITURs24/VAJzkUUMrbBSiRqCemaRmiituhtSDAnGPjpzUAV7G Ei3KV9+HsVFPHC28hTUw4gJGHTaodYigbcSOTvK2AWvQufR2FcbEhGoUMuKdYfzt1MPd 8nIHmu9UMA1TypVVK3IeFONWs9DUwaoRRERr7So3y4edr6JN5LQblz7M5V0PmuvctKPC UoVTtgZE67tor/jqK0uHNZ6etDCPZk14fm7juz+4hjSvuI0gvPWbT+aULiOTmcNYUsdV KJng== 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=S3zpKFgl6lOQ4xschlXI9IBqFZJcfplQNQgfAvCSd9c=; b=Ky2INwqF6fi8yXSmkcbEnNGSIH69mxrWnVyguawQRroUMfVI+r2Ke/8Nc8atD3r+4P upG8FQ61Agl+1oagSTHtz68hEmRGoSNvSvIdhKg20wW4xk7+EbPZfrmPG1hkOA2ms2fY azznz1R5ByWeon3bI42JiNkwSMkGZrIy+UbgcotGosqZR1Kb5bMmSiwP1zfqjo1mt8Mg /hBfw293ZNBWzXSZhTqnGjWbJcp2PPdMdMvpmF5L0Bty93dGiq5iw63ZShz9fUWqSNTJ AoIp2YuOHP9m2KhOrP8KgM0vgBKQ5rZ5TMzO6RcewdSKsMvcapZccZWoiVVATiIsb0vc F/gg== X-Gm-Message-State: AOAM5309BfoDtBf3tAJi14FG3vIDh/KaysQrHTOPuFX0qy9Qr0kmmFF/ eejGg+/GRUsAS/wenVXDZxoG0TwjoUNQXq1N X-Google-Smtp-Source: ABdhPJye0iIWFtk9uCN4G57gAraBO0b8dguucuYN00Tzqt7FUHcOAlZwClbYPWiparjNpI11i9pTLLg1NFTsf+gO X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:52c6:: with SMTP id p6mr2361291qvs.38.1603372781851; Thu, 22 Oct 2020 06:19:41 -0700 (PDT) Date: Thu, 22 Oct 2020 15:18:59 +0200 In-Reply-To: Message-Id: <1d87f0d5a282d9e8d14d408ac6d63462129f524c.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 07/21] kasan, arm64: move initialization message From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Tag-based KASAN modes are fully initialized with kasan_init_tags(), while the generic mode only requireds kasan_init(). Move the initialization message for tag-based modes into kasan_init_tags(). Also fix pr_fmt() usage for KASAN code: generic mode doesn't need it, tag-based modes should use "kasan:" instead of KBUILD_MODNAME. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Idfd1e50625ffdf42dfc3dbf7455b11bd200a0a49 --- arch/arm64/mm/kasan_init.c | 3 +++ mm/kasan/generic.c | 2 -- mm/kasan/hw_tags.c | 4 ++++ mm/kasan/sw_tags.c | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index b6b9d55bb72e..8f17fa834b62 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -290,5 +290,8 @@ void __init kasan_init(void) { kasan_init_shadow(); kasan_init_depth(); +#if defined(CONFIG_KASAN_GENERIC) + /* CONFIG_KASAN_SW/HW_TAGS also requires kasan_init_tags(). */ pr_info("KernelAddressSanitizer initialized\n"); +#endif } diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index de6b3f03a023..d259e4c3aefd 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/hw_tags.c b/mm/kasan/hw_tags.c index 0128062320d5..b372421258c8 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -6,6 +6,8 @@ * Author: Andrey Konovalov */ +#define pr_fmt(fmt) "kasan: " fmt + #include #include #include @@ -18,6 +20,8 @@ void __init kasan_init_tags(void) { init_tags(KASAN_TAG_MAX); + + pr_info("KernelAddressSanitizer initialized\n"); } void *kasan_reset_tag(const void *addr) diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c index bf1422282bb5..099af6dc8f7e 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 __init kasan_init_tags(void) for_each_possible_cpu(cpu) per_cpu(prng_state, cpu) = (u32)get_cycles(); + + pr_info("KernelAddressSanitizer initialized\n"); } /*