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.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 E3C65C388F7 for ; Thu, 22 Oct 2020 13:19:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5D4CA221FE for ; Thu, 22 Oct 2020 13:19:57 +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="g6JwnRNL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5D4CA221FE 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 3D0776B0095; Thu, 22 Oct 2020 09:19:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 386926B0096; Thu, 22 Oct 2020 09:19:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 18AFA6B0098; Thu, 22 Oct 2020 09:19:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0144.hostedemail.com [216.40.44.144]) by kanga.kvack.org (Postfix) with ESMTP id D7B1E6B0095 for ; Thu, 22 Oct 2020 09:19:52 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 7CE088A218BF for ; Thu, 22 Oct 2020 13:19:52 +0000 (UTC) X-FDA: 77399619024.11.tent40_4d10ed527251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 5C6ED180F8B81 for ; Thu, 22 Oct 2020 13:19:52 +0000 (UTC) X-HE-Tag: tent40_4d10ed527251 X-Filterd-Recvd-Size: 6803 Received: from mail-ej1-f74.google.com (mail-ej1-f74.google.com [209.85.218.74]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:51 +0000 (UTC) Received: by mail-ej1-f74.google.com with SMTP id x12so638268eju.22 for ; Thu, 22 Oct 2020 06:19:51 -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=ZDpLws4WWjszeBZt7nTlIzp0p338D/8ILsPCgH/ymC0=; b=g6JwnRNLjkaRFkpFVHgLjZOQIQP4rh4rnIwcyms2N78ZDOmBQSYZP56ZAmgxHWUXcm IUxQSQ2WjpTQOfUa8ywDBIZo1cjnWs8RIdmAIYR9BmY3f8dJANNQmkqPsknBrdP0mTKd 7pCLzIjmPAiHrKFfW7/HdqypIdOXRxYiU0A/P2X0gH4z/L+QRN+nb/l+nlJ8Ry9HIATi yOztfvRbuWiGoiuYr/982JFzJxS8rVLWNALBOnthgIh/rCbjPQo4UQOn0uk+zjVYB9Qu tUcKGvDXUfdIG3nRrZ6DpILb3BTK4YSl1/12TJvrVWROGFqZHPvDO3fClAxHO5QiQ5ok hAYQ== 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=ZDpLws4WWjszeBZt7nTlIzp0p338D/8ILsPCgH/ymC0=; b=ObE+ztnoy+7kQPKO6IWSomz53nBHy6ZWntEeeQtz611Y5M9jFSDt5TM5StR28EZHfM STXXBAopZIT8KvCcBZqOuQ5vG7dk7WN8vG5k5KVFd5h8LLLzj1kTlp33VXMm4vAVKzCF r6S/C8xpTSi2XRXBpKZhZA4DIg3tJd4aJ8E7BFeM9rBy1O24T4R4vRcRB4ADOQ0YeX0g iQLplWwShiXESLpBtO1ciFV3CBp/UaslYRLvv8hj4RJPSAnKDKoYN6bDJpk2lbbTqBG4 YBz7FAVuwkdR/kHUszftHTZdlGNzkjPckxQNCJcf3Mb13Uadi4k85FZL4G0FCRUVUbvH 2/UA== X-Gm-Message-State: AOAM5338Mbc/vJwdobgea7vGK8Jsc+2oOZNoG2YctqrVoymnPwvqiO1i qncPs53QWRFxyh2ORt3lxaO77G9vP4nJ2h2y X-Google-Smtp-Source: ABdhPJxu3Fj1qguz52Emo3v2IYFJxBR6Ao7egY4U/BdH3m+sfImkhBYYfIlca1OIixc7Du21Hd+WcdpgheaEGhNu X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a50:fb06:: with SMTP id d6mr2197662edq.312.1603372790776; Thu, 22 Oct 2020 06:19:50 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:03 +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 11/21] kasan: inline kasan_poison_memory and check_invalid_free 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 Content-Type: text/plain; charset="UTF-8" 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_poison_memory() or check_invalid_free() currently results in function calls. Move their definitions to mm/kasan/kasan.h and turn them into static inline functions for hardware tag-based mode to avoid uneeded function calls. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Ia9d8191024a12d1374675b3d27197f10193f50bb --- mm/kasan/hw_tags.c | 15 --------------- mm/kasan/kasan.h | 28 ++++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index 4c24bfcfeff9..f03161f3da19 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -24,27 +24,12 @@ void __init kasan_init_tags(void) pr_info("KernelAddressSanitizer initialized\n"); } -void kasan_poison_memory(const void *address, size_t size, u8 value) -{ - set_mem_tag_range(reset_tag(address), - round_up(size, KASAN_GRANULE_SIZE), value); -} - void kasan_unpoison_memory(const void *address, size_t size) { set_mem_tag_range(reset_tag(address), round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); } -bool check_invalid_free(void *addr) -{ - u8 ptr_tag = get_tag(addr); - u8 mem_tag = get_mem_tag(addr); - - return (mem_tag == KASAN_TAG_INVALID) || - (ptr_tag != KASAN_TAG_KERNEL && ptr_tag != mem_tag); -} - void kasan_set_free_info(struct kmem_cache *cache, void *object, u8 tag) { diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 94ba15c2f860..8d84ae6f58f1 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -153,8 +153,6 @@ struct kasan_alloc_meta *kasan_get_alloc_meta(struct kmem_cache *cache, struct kasan_free_meta *kasan_get_free_meta(struct kmem_cache *cache, const void *object); -void kasan_poison_memory(const void *address, size_t size, u8 value); - #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) static inline const void *kasan_shadow_to_mem(const void *shadow_addr) @@ -194,8 +192,6 @@ void print_tags(u8 addr_tag, const void *addr); static inline void print_tags(u8 addr_tag, const void *addr) { } #endif -bool check_invalid_free(void *addr); - void *find_first_bad_addr(void *addr, size_t size); const char *get_bug_type(struct kasan_access_info *info); void metadata_fetch_row(char *buffer, void *row); @@ -276,6 +272,30 @@ static inline u8 random_tag(void) } #endif +#ifdef CONFIG_KASAN_HW_TAGS + +static inline void kasan_poison_memory(const void *address, size_t size, u8 value) +{ + set_mem_tag_range(reset_tag(address), + round_up(size, KASAN_GRANULE_SIZE), value); +} + +static inline bool check_invalid_free(void *addr) +{ + u8 ptr_tag = get_tag(addr); + u8 mem_tag = get_mem_tag(addr); + + return (mem_tag == KASAN_TAG_INVALID) || + (ptr_tag != KASAN_TAG_KERNEL && ptr_tag != mem_tag); +} + +#else /* CONFIG_KASAN_HW_TAGS */ + +void kasan_poison_memory(const void *address, size_t size, u8 value); +bool check_invalid_free(void *addr); + +#endif /* CONFIG_KASAN_HW_TAGS */ + /* * Exported functions for interfaces called from assembly or from generated * code. Declarations here to avoid warning about missing declarations. -- 2.29.0.rc1.297.gfa9743e501-goog