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=-12.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 9DF16C388F7 for ; Thu, 22 Oct 2020 13:23:47 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0029424178 for ; Thu, 22 Oct 2020 13:23:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qImv7L8i"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="FpiS6ya9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0029424178 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ykwvHnGD+OzarEACOTvIsc9nLG1Iwzbkb5zJyhITu6c=; b=qImv7L8iOpler9wdsYt0QB7nY z1w+ydqqellYmyXNc71U4/94WX+DyZ3/coM/CS6rvFs4sg/JO4spJVj7ME96UKRUurkhLJOj+88xy zyCIbHc9DU1t0f9RRXeSJxIHPZtQOjSCYnvoFyN2GP/nKdhs0Hx9O3aUaR2f0NEcwOJcJtoNLgAld /xZBNCL+klcNhbAT+tvKPmMt8aIIGqoq4N/i18kM/Zvc2+168eqjTNYaewWOlmgYatq61lkpCZ17X NMCpmtHjZwifqiZeVbSKU0DTbiQTy7UaG7HrHY6QEhFUrH9S57rEPehN3NC5aqReZNOyTt3PQUp6r H1UvHIAiw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVaXW-0004Vo-Oi; Thu, 22 Oct 2020 13:21:58 +0000 Received: from mail-qk1-x749.google.com ([2607:f8b0:4864:20::749]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVaVS-0003kE-LF for linux-arm-kernel@lists.infradead.org; Thu, 22 Oct 2020 13:19:57 +0000 Received: by mail-qk1-x749.google.com with SMTP id q26so873278qki.5 for ; Thu, 22 Oct 2020 06:19:47 -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=2LAxUi3Z+b/LyEBabYwH/SVI831szHE0G1gzyusivfA=; b=FpiS6ya9dima3cGFv2ElWjEzGn/AjgIOjjA4nCJucaeUIGickhtOh9Bys9UiRtSADE fjopvPyI20DFOwopcIT5lUJlbZcMF4DbGfWV51sjg9G4uSGmBjo9k71EyAqpVLZlocmc RZuzjb+QS/uWksRQdms/OIEEQtSHAP1YCrtaxsPDUhddEQl/Tm449I9yrgBZ6gyhzmEx Z+YYNrCbQs0F1iFLDro2B5zKIPve2PJYP+8EChCsz8ppySMSulg21A7GMsmWXlwY9ZJl Gw/zTKPaB0G881vyNGTjYBcUivggDHvOEkXXyh1Y3bNv+t+M6vkHWtge1bYsrivUKKLZ UHhQ== 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=2LAxUi3Z+b/LyEBabYwH/SVI831szHE0G1gzyusivfA=; b=kns6X4Wqmlq25zPlSaqos+GrwvrPd2dCX3CMcbMB57xnq1YKSmeuqIAMJLw0k/t2ac lOqnwqdfEs/NYmiDrpaebeuilxG+G1qJtP8NQDGNVALrXupfGUAeOmpxAxHdxXlMP9nP FAaNBL7CeBAabaYJzac6f+uxw1WjjXD7o8+cL/SqvN6a+zTWDKBok/DQNC2CBTWq5L3f PPa9NejrHHb712r0ZFFAQ577klbEEjDhxrrf+v+8k7DeqOLbLeNXCeSuxmUTdXdgff4x moffJGgFEupIYnFKT39GdmEIs/WB9eBa/CWFntDE0J5ek7/hdzaFxIs/puWof6+Syd84 7+KQ== X-Gm-Message-State: AOAM533cvftAiXgkEUy6IrSy3TA+BHcrOe6PDpcrxpWl5T8t6znj2Xhw XRakxbGnOQHIHIFCwM24qVf2hV6WejR3TWE/ X-Google-Smtp-Source: ABdhPJxIP3IGzvps/ztZVCxylxxW3pDrg7OAYIS67bKz5QYods1FZnmEDxL5RuFvtWUriGc+3ulAxeTDdpoAifDt X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:45ed:: with SMTP id q13mr2255535qvu.55.1603372786206; Thu, 22 Oct 2020 06:19:46 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:01 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 09/21] kasan: inline kasan_reset_tag for tag-based modes From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201022_091950_880977_0706EF15 X-CRM114-Status: GOOD ( 12.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Branislav Rankov , Elena Petrova , linux-mm@kvack.org, Andrey Konovalov , Kevin Brodsky , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, Kostya Serebryany , linux-arm-kernel@lists.infradead.org, Serban Constantinescu , Andrey Ryabinin , Andrew Morton , Peter Collingbourne , Evgenii Stepanov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Using kasan_reset_tag() currently results in a function call. As it's called quite often from the allocator code this leads to a noticeable slowdown. Move it to include/linux/kasan.h and turn it into a static inline function. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/I4d2061acfe91d480a75df00b07c22d8494ef14b5 --- include/linux/kasan.h | 5 ++++- mm/kasan/hw_tags.c | 5 ----- mm/kasan/kasan.h | 6 ++---- mm/kasan/sw_tags.c | 5 ----- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 93d9834b7122..6377d7d3a951 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -187,7 +187,10 @@ static inline void kasan_record_aux_stack(void *ptr) {} void __init kasan_init_tags(void); -void *kasan_reset_tag(const void *addr); +static inline void *kasan_reset_tag(const void *addr) +{ + return (void *)arch_kasan_reset_tag(addr); +} bool kasan_report(unsigned long addr, size_t size, bool is_write, unsigned long ip); diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index b372421258c8..c3a0e83b5e7a 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -24,11 +24,6 @@ void __init kasan_init_tags(void) pr_info("KernelAddressSanitizer initialized\n"); } -void *kasan_reset_tag(const void *addr) -{ - return reset_tag(addr); -} - void kasan_poison_memory(const void *address, size_t size, u8 value) { set_mem_tag_range(reset_tag(address), diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 456b264e5124..0ccbb3c4c519 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -246,15 +246,13 @@ static inline const void *arch_kasan_set_tag(const void *addr, u8 tag) return addr; } #endif -#ifndef arch_kasan_reset_tag -#define arch_kasan_reset_tag(addr) ((void *)(addr)) -#endif #ifndef arch_kasan_get_tag #define arch_kasan_get_tag(addr) 0 #endif +/* kasan_reset_tag() defined in include/linux/kasan.h. */ +#define reset_tag(addr) ((void *)kasan_reset_tag(addr)) #define set_tag(addr, tag) ((void *)arch_kasan_set_tag((addr), (tag))) -#define reset_tag(addr) ((void *)arch_kasan_reset_tag(addr)) #define get_tag(addr) arch_kasan_get_tag(addr) #ifndef arch_init_tags diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c index 099af6dc8f7e..4db41f274702 100644 --- a/mm/kasan/sw_tags.c +++ b/mm/kasan/sw_tags.c @@ -67,11 +67,6 @@ u8 random_tag(void) return (u8)(state % (KASAN_TAG_MAX + 1)); } -void *kasan_reset_tag(const void *addr) -{ - return reset_tag(addr); -} - bool check_memory_region(unsigned long addr, size_t size, bool write, unsigned long ret_ip) { -- 2.29.0.rc1.297.gfa9743e501-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel