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=-20.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_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 F0C15C63697 for ; Fri, 13 Nov 2020 22:17:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C062E22259 for ; Fri, 13 Nov 2020 22:17:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="i4IRzr7+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726412AbgKMWRF (ORCPT ); Fri, 13 Nov 2020 17:17:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726276AbgKMWRB (ORCPT ); Fri, 13 Nov 2020 17:17:01 -0500 Received: from mail-wr1-x449.google.com (mail-wr1-x449.google.com [IPv6:2a00:1450:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B624C0617A6 for ; Fri, 13 Nov 2020 14:16:57 -0800 (PST) Received: by mail-wr1-x449.google.com with SMTP id 91so4476857wrk.17 for ; Fri, 13 Nov 2020 14:16:56 -0800 (PST) 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=AllKQJimzn7hLgi4RPYa1jCIh9marG6fXAU7bboN0mo=; b=i4IRzr7+/eoQ+lnOGtTQBdgWb0fu4qQkB84Tq9FFV9rbuaL+X/H6CRSgpdHesjdSVb Pz9YHO9ZH9NU1SRYhQkZfRsdqoXyHbKk8tQihGE6SOyzKDQGPHfHATaMl9qStufrRUXw vhIYdeeoG0sJwGl9GbDxi64sp1bCNfn9Q+XUcCZV8srHJ4ThQ4brshPp/aoL+iz0nT40 lvWuDWVE317WTnn4s/i/xxHldZIGVC1mtM3sGVscptrrHQI9Jl3dnhnv5Gofe7t+vo// SKp7T0eyyilA7jlo09AsI8TXoNBFcXtA5J5w9jV4PdDb8sXJHO4H9/fQH6BVEWRCIKuh UB5A== 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=AllKQJimzn7hLgi4RPYa1jCIh9marG6fXAU7bboN0mo=; b=BggYcqlFj7tKCiYjV/pSCm3IzndcvzIn9WysOgxJCxYS+TuzHxbM+Wazd/ZCB/sJ7G 8dSclLoMJT5mPDHAA+v5qP9IcdBSM8F9YDiRbQKVtyHB9zRomK/af3F8e9yOnsqcFwKi jUfXTO/9rV/ZQmrrNkxDJA9Wi1T6E+juOFAwDOoUfO1lWnGJqzyLD+l8HTMVtHWvZudY rFznhhsR449oUF2KaLSY2Yvz0LQSU136xFILhm3Ou/1JHBu1H8OV3/KJTGWHKQbq/Cio VnHLzeaHm+1LtUghztVCL17NdxXqpdFjzJzvo5H7MNDyie0l+c3x2HR53dXpHtW378QT GevA== X-Gm-Message-State: AOAM530VkowmjNIhEmk4FG57s1pREBWQYb9Aw20ntBsqbEI+xWGVwK6Y TUMN/ohg8C9dgyDebXwv7OSIc3fxk1zWkZWL X-Google-Smtp-Source: ABdhPJzRByF66A4BSINBX5iVs8nBcZqNdrZ7mZgwx23OUF+TjKT+gN+fxNUfxlwF0dexd6eOGTxMCgHz5JLrJA8G Sender: "andreyknvl via sendgmr" X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a5d:6a0b:: with SMTP id m11mr5863665wru.190.1605305815704; Fri, 13 Nov 2020 14:16:55 -0800 (PST) Date: Fri, 13 Nov 2020 23:15:45 +0100 In-Reply-To: Message-Id: <6182fdbdc372e9e4888cc7b73c47f85d21d1827f.1605305705.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog Subject: [PATCH mm v10 17/42] kasan, arm64: rename kasan_init_tags and mark as __init From: Andrey Konovalov To: Andrew Morton Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rename kasan_init_tags() to kasan_init_sw_tags() as the upcoming hardware tag-based KASAN mode will have its own initialization routine. Also similarly to kasan_init() mark kasan_init_tags() as __init. Signed-off-by: Andrey Konovalov Reviewed-by: Catalin Marinas Reviewed-by: Alexander Potapenko --- Change-Id: I99aa2f7115d38a34ed85b329dadab6c7d6952416 --- arch/arm64/kernel/setup.c | 2 +- arch/arm64/mm/kasan_init.c | 2 +- include/linux/kasan.h | 4 ++-- mm/kasan/sw_tags.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index c28a9ec76b11..75e511211eb4 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -358,7 +358,7 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p) smp_build_mpidr_hash(); /* Init percpu seeds for random tags after cpus are set up. */ - kasan_init_tags(); + kasan_init_sw_tags(); #ifdef CONFIG_ARM64_SW_TTBR0_PAN /* diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index e35ce04beed1..d8e66c78440e 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -283,7 +283,7 @@ 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(). */ + /* CONFIG_KASAN_SW_TAGS also requires kasan_init_sw_tags(). */ pr_info("KernelAddressSanitizer initialized\n"); #endif } diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 58567a672c5c..8b8babab852c 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -191,7 +191,7 @@ static inline void kasan_record_aux_stack(void *ptr) {} #ifdef CONFIG_KASAN_SW_TAGS -void kasan_init_tags(void); +void __init kasan_init_sw_tags(void); void *kasan_reset_tag(const void *addr); @@ -200,7 +200,7 @@ bool kasan_report(unsigned long addr, size_t size, #else /* CONFIG_KASAN_SW_TAGS */ -static inline void kasan_init_tags(void) { } +static inline void kasan_init_sw_tags(void) { } static inline void *kasan_reset_tag(const void *addr) { diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c index 9445cf4ccdc8..7317d5229b2b 100644 --- a/mm/kasan/sw_tags.c +++ b/mm/kasan/sw_tags.c @@ -35,7 +35,7 @@ static DEFINE_PER_CPU(u32, prng_state); -void kasan_init_tags(void) +void __init kasan_init_sw_tags(void) { int cpu; -- 2.29.2.299.gdc1121823c-goog