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=-11.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 76076C63699 for ; Mon, 16 Nov 2020 15:29:48 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D4F3620E65 for ; Mon, 16 Nov 2020 15:29:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Dh4eihEF"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="u/ixGDcp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D4F3620E65 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=h7DLkbagQshYZjbh+lwWk/D9gxFB4qRbhuqb5zJhRqo=; b=Dh4eihEFUqwQ/sEpwka7XMk1o dkwTIjlYwb5cc5QbTSuhRbbZdLASsuhSuAXQme438hX9P/s55yLfASeMvk2/2uLAo2g2EDvhDJH3s Q6U7q323r1s7OWqe1maah9HC/+zyQbl17DUZPMybrdtdjrTr5phUmN8cjsHdrTJ6NvvT1ktOF3CC4 RFxZyfpQ3pQA20mdv67cUFE9pIqaRsk+afQ0bDLikCP1d6IofC/jcW5cfd8NNcgkTv99avocjeUqG d2hOR0oPSNCPlReSE5UoL1nQB7N5S7XwTGIdO+XAGjbVjEXb/oqgRSIfE5Xah7F/X6htCpN0udTyg pmpBZhksQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kegOy-0000cg-Jx; Mon, 16 Nov 2020 15:26:44 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1keg5A-0000XS-0M for linux-arm-kernel@lists.infradead.org; Mon, 16 Nov 2020 15:06:18 +0000 Received: by mail-wm1-x343.google.com with SMTP id a3so23895976wmb.5 for ; Mon, 16 Nov 2020 07:06:15 -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=s4udoHyh9j5IqUv+HxIL+80tVyb07J8vLMt6/kF0Ir4=; b=u/ixGDcp+NZMNnm/O+DlS0jMRpHKY4q7Pd3EsbpVtdjjSSMtr3FS77mwphnR9q29+f IzDll4a7WFJwUvgxNnlOemkmmCfjvnpJWDAcn4xX4szOhaUhQMXvejtD84fG1m+T0S4v b8HPPvL9a1PvNMQ6/0ghOPVPX0OyZ7ilaHtmEpUPa9h2ValL8VYceeFwdc9bdV3OFBEG WzFqlq8Ko2/WmyM7pIukgIvcBNtHZpDq/ZxL4eTnAbfhsfEtNUci1T56jtUsbvSqUlCe CKaIjSxxLNJ7+xzLTHKO2xL4PkFWph4oBjcItMXaWmdz3s7PXMzJlXSlZBSthnD7uued Z5kQ== 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=s4udoHyh9j5IqUv+HxIL+80tVyb07J8vLMt6/kF0Ir4=; b=GTH8NqIi/v6V5KW3NCmc7d+WnCEpAJHqwhhbpiOWAPUyPaFqBFWp6rlIXssUeMFaWK IYRANsnXZeST1/EoBRHZsQsEXd6BtKTqyrhCyjs4Et8QF/zU23la+mOctJwHMJ6/aGRS G6f7+V3KHwcUsB0i6Od++xpmfgp8jnLpTx1cmEjDzLIVxk51MFmCche7KJxdPYDKBErQ iAhHtnAGaAG40nzgXCOAiMmNjQ0OqCfCG6rT4SxlSUwu+c1Mq+4eXNZEW/v73eU5xG6D EhSRvJKZTyuuq/tuwggiEh+NWkLiLToS4VDcBQuJfnmoytnLSKcUehzGQsL05fU4zwy+ hOKg== X-Gm-Message-State: AOAM5308QvQekmmbYBd0ry8ORNV6RDdXj9wADIVeMRYSMf8Ljwc8L3MQ bM+TYZyVbJwdQgZkufwHFoEexw== X-Google-Smtp-Source: ABdhPJw8tF4y6iZkiPHaYIRvmwH3SgAzlk4656vVGflsdOGVS/S4cEjS2rC+eWSoaGqa5NFbMWb9/Q== X-Received: by 2002:a1c:9c53:: with SMTP id f80mr15486878wme.19.1605539174436; Mon, 16 Nov 2020 07:06:14 -0800 (PST) Received: from elver.google.com ([2a00:79e0:15:13:f693:9fff:fef4:2449]) by smtp.gmail.com with ESMTPSA id d128sm4597301wmc.7.2020.11.16.07.06.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 07:06:13 -0800 (PST) Date: Mon, 16 Nov 2020 16:06:07 +0100 From: Marco Elver To: Andrey Konovalov Subject: Re: [PATCH mm v3 09/19] kasan: open-code kasan_unpoison_slab Message-ID: <20201116150607.GA1357314@elver.google.com> References: <4d64025c647190a8b7101d0b1da3deb922535a0d.1605305978.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4d64025c647190a8b7101d0b1da3deb922535a0d.1605305978.git.andreyknvl@google.com> User-Agent: Mutt/1.14.6 (2020-07-11) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_100616_127441_FF082FF0 X-CRM114-Status: GOOD ( 21.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Branislav Rankov , Catalin Marinas , Kevin Brodsky , Will Deacon , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, Alexander Potapenko , Evgenii Stepanov , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Dmitry Vyukov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Nov 13, 2020 at 11:19PM +0100, Andrey Konovalov wrote: > There's the external annotation kasan_unpoison_slab() that is currently > defined as static inline and uses kasan_unpoison_range(). Open-code this > function in mempool.c. Otherwise with an upcoming change this function > will result in an unnecessary function call. > > Signed-off-by: Andrey Konovalov > Link: https://linux-review.googlesource.com/id/Ia7c8b659f79209935cbaab3913bf7f082cc43a0e Reviewed-by: Marco Elver Thank you! I also think this change made the code more readable, as kasan_unpoison_slab() made me think it's unpoisoning the *whole* slab, which is clearly not the case. > --- > include/linux/kasan.h | 6 ------ > mm/mempool.c | 2 +- > 2 files changed, 1 insertion(+), 7 deletions(-) > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index 1594177f86bb..872bf145ddde 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -106,11 +106,6 @@ struct kasan_cache { > int free_meta_offset; > }; > > -size_t __ksize(const void *); > -static inline void kasan_unpoison_slab(const void *ptr) > -{ > - kasan_unpoison_range(ptr, __ksize(ptr)); > -} > size_t kasan_metadata_size(struct kmem_cache *cache); > > bool kasan_save_enable_multi_shot(void); > @@ -166,7 +161,6 @@ static inline bool kasan_slab_free(struct kmem_cache *s, void *object, > return false; > } > > -static inline void kasan_unpoison_slab(const void *ptr) { } > static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } > > #endif /* CONFIG_KASAN */ > diff --git a/mm/mempool.c b/mm/mempool.c > index f473cdddaff0..583a9865b181 100644 > --- a/mm/mempool.c > +++ b/mm/mempool.c > @@ -112,7 +112,7 @@ static __always_inline void kasan_poison_element(mempool_t *pool, void *element) > static void kasan_unpoison_element(mempool_t *pool, void *element) > { > if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc) > - kasan_unpoison_slab(element); > + kasan_unpoison_range(element, __ksize(element)); > else if (pool->alloc == mempool_alloc_pages) > kasan_alloc_pages(element, (unsigned long)pool->pool_data); > } > -- > 2.29.2.299.gdc1121823c-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel