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=-18.9 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_SANE_1,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 51A04C4742C for ; Mon, 16 Nov 2020 15:11:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D9046204FD for ; Mon, 16 Nov 2020 15:11:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="fqv5T6oy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D9046204FD 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 F25F06B0074; Mon, 16 Nov 2020 10:11:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id ED7696B0075; Mon, 16 Nov 2020 10:11:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D9E326B0078; Mon, 16 Nov 2020 10:11:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0163.hostedemail.com [216.40.44.163]) by kanga.kvack.org (Postfix) with ESMTP id A9C6F6B0074 for ; Mon, 16 Nov 2020 10:11:35 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 3FD528249980 for ; Mon, 16 Nov 2020 15:11:35 +0000 (UTC) X-FDA: 77490620550.05.quill44_1e1004c27329 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id 1FBCB18018760 for ; Mon, 16 Nov 2020 15:11:35 +0000 (UTC) X-HE-Tag: quill44_1e1004c27329 X-Filterd-Recvd-Size: 8510 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Mon, 16 Nov 2020 15:11:34 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id l1so19041737wrb.9 for ; Mon, 16 Nov 2020 07:11:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=ph474WBwjZPtIC8WXwer+eWtTufIJgCo5S0VZjhhIPE=; b=fqv5T6oyUPs3UyvG6i30zxMwtpOg6tczmHuVWpNWm+hQXxuNi/kdQEczNFJpFKC77q F37j43S/vqJ9S7adkg3K85WLETVanVbPSbghDnruXZOVhD/0Js3wagMTAB+hgfGQm0HP xzphqBY72oN1yPlFCW4T1Je4vU8BHtiTbvg5TSFbX4uOk/uYTbTM9oG4XKvpQMMV5rsj 4XUkYvW1/4BqGp2xGZLNhqt5nIDJCOyXJhLm8K+b7k6o78gbzZPMawtbXuT/ivFD9kpm w666BOPjJkvsKI4azNQGTbx7XN+In0C+v4KyG6rbP7L77FuugdxOqQdz9vSIPJ6yySGC unCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=ph474WBwjZPtIC8WXwer+eWtTufIJgCo5S0VZjhhIPE=; b=LyjakiwccFWPGhMvLr2MTu54LtPWcXmTl9mx2lJ3f1Ad2LHFA35pHlwfKjpNkXlkYL iAAccQXBpVnBnbnRgv8z2CFUOURvCDLqygMWC0huCQyobAHFiIvk1CtSvnJjRuqTvM14 VgNr0wzvme6IPvpMPRMoogGI6nD85fX2lSYc15kVdjY/UdlgIdAcEwEytrE+5Bqyh6++ xtVIMnrSbOAtklXTASi7G0wEJFXinjyWqjGMg2kgKg4pnL02YfZWU4+3BqgMSXXCM/BH tzUKqI0EOwO98m7PA4SY64HjsIfur3O52jnKUNYnzAdcPfWu3hcLxUicVIbpN2BqshVf 1XTw== X-Gm-Message-State: AOAM5317vOYHEXs+nL9I9Yq+a9hYuwL7gpLaFFBs9X1GcDiEopEI2cMq ApLk0MKaVDN/zVnNuRdQ0SQ7UA== X-Google-Smtp-Source: ABdhPJxbM4Aw3fKMYZetkprvW9hOh0Nan1KDunBg0W5NB8sKz+IevgtW6psdw0QSl4UedN+YASGUpg== X-Received: by 2002:adf:8521:: with SMTP id 30mr20230790wrh.265.1605539492993; Mon, 16 Nov 2020 07:11:32 -0800 (PST) Received: from elver.google.com ([2a00:79e0:15:13:f693:9fff:fef4:2449]) by smtp.gmail.com with ESMTPSA id t136sm17495991wmt.18.2020.11.16.07.11.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 07:11:32 -0800 (PST) Date: Mon, 16 Nov 2020 16:11:26 +0100 From: Marco Elver To: Andrey Konovalov Cc: Andrew Morton , Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , 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 Subject: Re: [PATCH mm v3 10/19] kasan: inline (un)poison_range and check_invalid_free Message-ID: <20201116151126.GB1357314@elver.google.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.14.6 (2020-07-11) 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 Fri, Nov 13, 2020 at 11:20PM +0100, Andrey Konovalov wrote: > Using (un)poison_range() 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 > unneeded function calls. > > Signed-off-by: Andrey Konovalov > Link: https://linux-review.googlesource.com/id/Ia9d8191024a12d1374675b3d27197f10193f50bb Reviewed-by: Marco Elver > --- > mm/kasan/hw_tags.c | 30 ------------------------------ > mm/kasan/kasan.h | 45 ++++++++++++++++++++++++++++++++++++++++----- > 2 files changed, 40 insertions(+), 35 deletions(-) > > diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c > index 3cdd87d189f6..863fed4edd3f 100644 > --- a/mm/kasan/hw_tags.c > +++ b/mm/kasan/hw_tags.c > @@ -10,7 +10,6 @@ > > #include > #include > -#include > #include > #include > #include > @@ -31,35 +30,6 @@ void __init kasan_init_hw_tags(void) > pr_info("KernelAddressSanitizer initialized\n"); > } > > -void poison_range(const void *address, size_t size, u8 value) > -{ > - /* Skip KFENCE memory if called explicitly outside of sl*b. */ > - if (is_kfence_address(address)) > - return; > - > - hw_set_mem_tag_range(kasan_reset_tag(address), > - round_up(size, KASAN_GRANULE_SIZE), value); > -} > - > -void unpoison_range(const void *address, size_t size) > -{ > - /* Skip KFENCE memory if called explicitly outside of sl*b. */ > - if (is_kfence_address(address)) > - return; > - > - hw_set_mem_tag_range(kasan_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 = hw_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 7876a2547b7d..8aa83b7ad79e 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -3,6 +3,7 @@ > #define __MM_KASAN_KASAN_H > > #include > +#include > #include > > #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) > @@ -154,9 +155,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 poison_range(const void *address, size_t size, u8 value); > -void unpoison_range(const void *address, size_t size); > - > #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) > > static inline const void *kasan_shadow_to_mem(const void *shadow_addr) > @@ -196,8 +194,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); > @@ -278,6 +274,45 @@ static inline u8 random_tag(void) { return hw_get_random_tag(); } > static inline u8 random_tag(void) { return 0; } > #endif > > +#ifdef CONFIG_KASAN_HW_TAGS > + > +static inline void poison_range(const void *address, size_t size, u8 value) > +{ > + /* Skip KFENCE memory if called explicitly outside of sl*b. */ > + if (is_kfence_address(address)) > + return; > + > + hw_set_mem_tag_range(kasan_reset_tag(address), > + round_up(size, KASAN_GRANULE_SIZE), value); > +} > + > +static inline void unpoison_range(const void *address, size_t size) > +{ > + /* Skip KFENCE memory if called explicitly outside of sl*b. */ > + if (is_kfence_address(address)) > + return; > + > + hw_set_mem_tag_range(kasan_reset_tag(address), > + round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); > +} > + > +static inline bool check_invalid_free(void *addr) > +{ > + u8 ptr_tag = get_tag(addr); > + u8 mem_tag = hw_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 poison_range(const void *address, size_t size, u8 value); > +void unpoison_range(const void *address, size_t size); > +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.2.299.gdc1121823c-goog >