From patchwork Thu Oct 22 13:19:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851341 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 F32F461C for ; Thu, 22 Oct 2020 13:19:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 94400222E9 for ; Thu, 22 Oct 2020 13:19:53 +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="FpiS6ya9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94400222E9 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 691CE6B0089; Thu, 22 Oct 2020 09:19:48 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5F8476B008A; Thu, 22 Oct 2020 09:19:48 -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 4709D6B0092; Thu, 22 Oct 2020 09:19:48 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0129.hostedemail.com [216.40.44.129]) by kanga.kvack.org (Postfix) with ESMTP id 0EF7D6B0089 for ; Thu, 22 Oct 2020 09:19:48 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 9C029180AD801 for ; Thu, 22 Oct 2020 13:19:47 +0000 (UTC) X-FDA: 77399618814.02.line00_320bf1827251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id 79F1C10263C46 for ; Thu, 22 Oct 2020 13:19:47 +0000 (UTC) X-Spam-Summary: 1,0,0,e3852044d933eb1a,d41d8cd98f00b204,38oarxwokceklyo2p9vy6wrzzrwp.nzxwty58-xxv6lnv.z2r@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:2380:2393:2525:2559:2563:2682:2685:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3353:3865:3867:3868:3870:3872:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4117:4321:4425:4605:5007:6120:6261:6653:6742:7901:8603:8660:8957:9025:9592:9969:10004:10400:11026:11473:11658:11914:12043:12048:12297:12438:12555:12679:12895:12986:13148:13230:14096:14097:14181:14394:14659:14721:21067:21080:21365:21444:21451:21611:21627:21939:21990:30003:30012:30045:30054,0,RBL:209.85.222.202:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yriwikk9guggcs7yy964jokhpz4ycx7atxyyn8djwdfm1ywnrz1o453pz678k.jrhpr6nbf1xnnzbh7akiu9prdrojoyew1u6 dcyt78ex X-HE-Tag: line00_320bf1827251 X-Filterd-Recvd-Size: 6300 Received: from mail-qk1-f202.google.com (mail-qk1-f202.google.com [209.85.222.202]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:46 +0000 (UTC) Received: by mail-qk1-f202.google.com with SMTP id i2so1022346qkk.0 for ; Thu, 22 Oct 2020 06:19:46 -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=dgFUMAJi2QxCM6fdCdZ0zCKJnB/uVIFzAR0AfNw7GlSljxcp25FoBtofYMjT6l8bUp 23qhPBhnhRH55DgvuVs9g/EWgSfnepIExQnUPDCrk2qy3Svryo3vW0HDW/YHrfBBPB1P puqy/BINZMT5zKCeRBtB3+x/wZx8y/LANCo4tQhZjg2ZIOM9u6xtkUNYtBTUnUCYqBrp 0jpZYH/R7+6AZhbvgUMmdbIVpQCF8yh23WPKFe4s9II6c5QrWyzBfdXoBLZ3D+AjdMbG jvjLH6ezhwlUTTKHZyd14lh/Vj/KHW4MB4q0aVI5nwzD/GWl1tg50J+YLUv4UjdVR7sR wmIA== X-Gm-Message-State: AOAM531FBoCgz9IoSw84FJFvm2uOPanel9DQOHIOaGwExBvVWEUoodTL d3hpfNBNlgeeOc/V8NkfUXYavgjPoMPiOFv7 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 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: 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) {