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 14C96C388F9 for ; Wed, 11 Nov 2020 17:50:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8517720678 for ; Wed, 11 Nov 2020 17:50:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="fAVKGBzK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8517720678 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 F35A26B0068; Wed, 11 Nov 2020 12:50:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F0F036B006C; Wed, 11 Nov 2020 12:50:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD5B06B006E; Wed, 11 Nov 2020 12:50:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0196.hostedemail.com [216.40.44.196]) by kanga.kvack.org (Postfix) with ESMTP id AF23D6B0068 for ; Wed, 11 Nov 2020 12:50:46 -0500 (EST) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 5E8701EE6 for ; Wed, 11 Nov 2020 17:50:46 +0000 (UTC) X-FDA: 77472877692.18.voice76_4816e6c272ff Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id 45E13100ED3D5 for ; Wed, 11 Nov 2020 17:50:46 +0000 (UTC) X-HE-Tag: voice76_4816e6c272ff X-Filterd-Recvd-Size: 7649 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by imf19.hostedemail.com (Postfix) with ESMTP for ; Wed, 11 Nov 2020 17:50:45 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id w24so3151254wmi.0 for ; Wed, 11 Nov 2020 09:50:45 -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=pMy5H5o1v+WngKr1b+qy1lo8XFp3TrTTXnTQCqUhuZg=; b=fAVKGBzKjAe4FzmDhdDDIdaDB5BezRl0ARbzRYYJnSFvDZui2+PV9PzMunIgpyBtFV 1e1pdPHRVceAMBXgozczlGqUNQhPkCQqlFHjTAd3nPNZ6ycbPnymnqNOKlEW+SdgZEbZ Ca7t42UZkCex/Ik+BLFF0tKwXxS0hdm+OvHaTu3VQurOOSra1XAOInP9k8Lxu517uOJi yiyjOxWAeLsKn1mXFIW6KhPvCXcw3qC2VhYFr+mwvUtdnjXV4r3i2oMaWcAiAu3C8HYL SBxTEcfnRjP5ln+tXuaFcbzMSN9dBNP0fcH1BaeZfGHH3CyfJyJc8T0FvBTxlpvCxJiC c9Pw== 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=pMy5H5o1v+WngKr1b+qy1lo8XFp3TrTTXnTQCqUhuZg=; b=gXImgUVf5V1zOPxVNLnEdud+Pu4APYKb25uz7o3bPnzt5sFKNDTAFt2TdztWx4pJki oPom+KQgXvac5EmFu3+KxfE8opRHXUgfkZ86RkFMbYHvB9axGkRSP86i5ptGGSHtoe2w MfXrihNs4TrywS085MTU7crP1D0ghf7+OkNPiTmIP6AhPbt1HpkckoOU2I+a7eopqNMZ taAGzFRftSDEYLTGBMxBEbmNZNNL64qSMhTBaGV29J4aP+XJUsfY+rm7CGQjrdOa+s1e BFiAk95aICdyapSYxjax5uGrK+H3ZhwohThosZS0Un2krfUpBeZwRRC6R4LhD6vTBWtH Qm5Q== X-Gm-Message-State: AOAM533RiqWUBOrYiLTyeLwmb6MNcJp+jh30lQE/jD97WkpY6DpWD3yB ZZHhdvIIkExVh6oU8KsIxowfdQ== X-Google-Smtp-Source: ABdhPJwZ1ZTomPkEm6NnFS5XcoFOE7jbre2KnwrSxfqY1ikuV8ZC4b2EjuVGNlFN60bBV2WWFhhU0g== X-Received: by 2002:a1c:7e87:: with SMTP id z129mr5390876wmc.176.1605117044596; Wed, 11 Nov 2020 09:50:44 -0800 (PST) Received: from elver.google.com ([2a00:79e0:15:13:f693:9fff:fef4:2449]) by smtp.gmail.com with ESMTPSA id v8sm3346969wmg.28.2020.11.11.09.50.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 09:50:43 -0800 (PST) Date: Wed, 11 Nov 2020 18:50:38 +0100 From: Marco Elver To: Andrey Konovalov Cc: Dmitry Vyukov , Alexander Potapenko , Catalin Marinas , Will Deacon , Vincenzo Frascino , Evgenii Stepanov , Andrey Ryabinin , 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 Subject: Re: [PATCH v2 09/20] kasan: inline kasan_poison_memory and check_invalid_free Message-ID: <20201111175038.GL517454@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 Tue, Nov 10, 2020 at 11:20PM +0100, '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 > unneeded function calls. > > Signed-off-by: Andrey Konovalov > Reviewed-by: Dmitry Vyukov > 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(-) Reviewed-by: Marco Elver > diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c > index 1476ac07666e..0303e49904b4 100644 > --- a/mm/kasan/hw_tags.c > +++ b/mm/kasan/hw_tags.c > @@ -30,27 +30,12 @@ void kasan_init_hw_tags(void) > pr_info("KernelAddressSanitizer initialized\n"); > } > > -void kasan_poison_memory(const void *address, size_t size, u8 value) > -{ > - hw_set_mem_tag_range(kasan_reset_tag(address), > - round_up(size, KASAN_GRANULE_SIZE), value); > -} > - > void kasan_unpoison_memory(const void *address, size_t size) > { > 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 7498839a15d3..ab7314418604 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); > @@ -279,6 +275,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) > +{ > + hw_set_mem_tag_range(kasan_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 = 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 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.2.222.g5d2a92d10f8-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/e14ac53d7c43b4381ad94665c63a154dffc04b6b.1605046662.git.andreyknvl%40google.com.