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=-17.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_IN_DEF_DKIM_WL 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 1C49AC4363A for ; Wed, 28 Oct 2020 11:29:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6BCB5246C3 for ; Wed, 28 Oct 2020 11:29:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="hMNvDItC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6BCB5246C3 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 A80676B006E; Wed, 28 Oct 2020 07:29:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A57996B0070; Wed, 28 Oct 2020 07:29:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 96DB26B0071; Wed, 28 Oct 2020 07:29:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0216.hostedemail.com [216.40.44.216]) by kanga.kvack.org (Postfix) with ESMTP id 68C896B006E for ; Wed, 28 Oct 2020 07:29:15 -0400 (EDT) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 07F89181AC9B6 for ; Wed, 28 Oct 2020 11:29:15 +0000 (UTC) X-FDA: 77421113070.05.view37_460e75e27284 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id E0D2A1801492F for ; Wed, 28 Oct 2020 11:29:14 +0000 (UTC) X-HE-Tag: view37_460e75e27284 X-Filterd-Recvd-Size: 7624 Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by imf50.hostedemail.com (Postfix) with ESMTP for ; Wed, 28 Oct 2020 11:29:14 +0000 (UTC) Received: by mail-qk1-f196.google.com with SMTP id x20so4124015qkn.1 for ; Wed, 28 Oct 2020 04:29:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=OCUxgFfsZm5hmmiU0cs7ogr7Bp2NfxesKIPOcc2vAD8=; b=hMNvDItCFow179z1oxcHvXX45C4OvX0NHNzQYXw3NOLZRdKOHb7/k8PJHkRXA1QFJl pk4gDtrKVkv+68G5uSD3zOid4BSZRsEsQi5HePycxB6Udp4BL/tC3yDZhkgvdxnz3UD2 BwtSfod1QwR5YHWuaScvBUFj66f8gr4LjNSq5BH3m+fTh4bYBvrERiJBrvNWldI7X6kB Jt4Rj64I7XLd3+I0cjjD0cDdy+Q6Maa8sovvdg7tKV6G2GnT8J/cO/WmtP97mpVxmd5G 97dp2HRrG3vu3e+B1uea5tM11zQcDL7TffkUpNymvHZ/0SnvvyzkUpL6pza1VunZwUee 8qoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=OCUxgFfsZm5hmmiU0cs7ogr7Bp2NfxesKIPOcc2vAD8=; b=ISisIGetvjLqMWMium/pqy9UiDRPqPP4Py7PQt8ilCoi/F62PqD0g8xKjzfz+7xIiI tEPrLHsioOoXe8tIWDrJZ5JxFXB/C1XKbxagQyVIagnAuOHXMV0UPLEx/3Z8yRxRqO1a UgMcqGsu8fRwA2/bKMnhR14emLSE4dSep12Zdyc/isA2tka37wnj4QoNg317g7oWu7Ps g/OIg+cOaD7i16lqJBSM65BlXUgLsSdfxiAdUl6vgJ/I8DLiaozD/9SVpihG1i7wVScr uz9sqJoAsNDs7UENUqBC+Pa7Qq+uBbHp34JqKonTpQeHilE3UIMfZzdm/iK5zz7P/qC6 wJPA== X-Gm-Message-State: AOAM533koWS8JhqNT+pADrg6C+VU6IxZ6u8uOVKTLwVSe3O/7fHwyBBF jce/iIcCQxjzJZYRgbMYIBs/fjagnK8zYaCqFlzQxw== X-Google-Smtp-Source: ABdhPJwkWF7ICS/T3u9QAuLg00nKns5VS6z2SJ/Sxr55S1s/LWN6PMgsgimncWAvlLi6nA80amMcWtDJanh/ewW5rgQ= X-Received: by 2002:a37:a00c:: with SMTP id j12mr931915qke.231.1603884553300; Wed, 28 Oct 2020 04:29:13 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Dmitry Vyukov Date: Wed, 28 Oct 2020 12:29:02 +0100 Message-ID: Subject: Re: [PATCH RFC v2 11/21] kasan: inline kasan_poison_memory and check_invalid_free To: Andrey Konovalov Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev , Linux ARM , Linux-MM , LKML 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: On Thu, Oct 22, 2020 at 3:19 PM 'Andrey Konovalov' via kasan-dev wrote: > > 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 Reviewed-by: Dmitry Vyukov > --- > 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 > > -- > You received this message because you are subscribed to the Google Groups "kasan-dev" group. > To unsubscribe from this group and stop receiving emails from it, send an email to kasan-dev+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/a3cd7d83cc1f9ca06ef6d8c84e70f122212bf8ef.1603372719.git.andreyknvl%40google.com.