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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E23FC433FE for ; Wed, 23 Nov 2022 13:08:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A6B2C6B0071; Wed, 23 Nov 2022 08:08:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F4166B0073; Wed, 23 Nov 2022 08:08:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 86E1D6B0074; Wed, 23 Nov 2022 08:08:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 73A7F6B0071 for ; Wed, 23 Nov 2022 08:08:19 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 41458AB9A8 for ; Wed, 23 Nov 2022 13:08:19 +0000 (UTC) X-FDA: 80164735518.02.586DAE0 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf09.hostedemail.com (Postfix) with ESMTP id 4E7D4140013 for ; Wed, 23 Nov 2022 13:08:18 +0000 (UTC) Received: by mail-pl1-f171.google.com with SMTP id io19so16579849plb.8 for ; Wed, 23 Nov 2022 05:08:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=xWi6mZ6IeIfeEPlOxAtZAyKjM4+f66dl3p7cvZ+Vbjw=; b=PlqoSWMckN11XHTkaubhJVgJXMz2nLNOmPEXd2vV/zYDGJ2FDSA56j6J+nk9NuLjyt drDUniAkW+0jUuX9t9XuTxTfwX/jBkgWqiL1tjCX0G7csowTj8fvqGda/cNtQqZCk/jc X1SGjHaIEs7mnu3bBm/QEIExcdv+Z3QuJvclyJ5MuRw+gsto+ujGdgf6huig9O98HV99 U3DX1GOqPjuPN515mnoG/ukRHWdPDQQcG3Sk5yPaSIdrDInioNb5zIXYVypRoVJdNR2A k9G1ttM6O2l43q10jiQ7gNMk5g3Vf8YiK4XkTT9tnD2pk6foNyx43A+lZjl3s/nyooaF b+OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xWi6mZ6IeIfeEPlOxAtZAyKjM4+f66dl3p7cvZ+Vbjw=; b=Lu0hc1iSywZGCbPsrK1PqwEkqJJOpCDoXJ/YGtxhXfsf/i4092P+9lsTCmrorXr4/g 4ILFEANf7IYuJh/M9nnioaKm4s4Xjr3ZZlS6FTghOAH3g4ykuLd3D3VuqChgN6hAnWVI lMIBBEWbhbKQSQ7OmQx4n2xeWre6OMHJDx3H4e+bVrEL6XxJo0zWY6YV4xEir9B/jhWD /MUbzztQfjRDz2uiyg6vp0oZQ+4kYuDfPsQ93iRnyQ8FJnXsRd5D7KDGD0umLaVM2N1I R1DP9U4d2fMA/BXgjaUaDnuA/VPKjVQwrdRcqSM2Q62aLHS+5sjeDITohsVXZQP2Q3Lq 99Jw== X-Gm-Message-State: ANoB5pkGfG3MxKEeuuyzZqnOwibKvzFKZWD0q9lZjgknbgORRJIX5+3B 14+feWH5e8AyCGK7veii6dmvKnW69bl2eEP1oLk= X-Google-Smtp-Source: AA0mqf6MpV4so7yPLvjWQj5rT39uCbNMcyE8kgJItIUFlazg9K4P0R8ARpdSpcRWIZzmq14ZnNKHP2CWP0wiZGqKbAE= X-Received: by 2002:a17:90a:fc7:b0:218:aefe:60e3 with SMTP id 65-20020a17090a0fc700b00218aefe60e3mr15715903pjz.47.1669208896980; Wed, 23 Nov 2022 05:08:16 -0800 (PST) MIME-Version: 1.0 References: <20221123123159.2325763-1-feng.tang@intel.com> <20221123123159.2325763-2-feng.tang@intel.com> In-Reply-To: <20221123123159.2325763-2-feng.tang@intel.com> From: Andrey Konovalov Date: Wed, 23 Nov 2022 14:08:05 +0100 Message-ID: Subject: Re: [PATCH v2 -next 2/2] mm/kasan: simplify and refine kasan_cache code To: Feng Tang Cc: Andrew Morton , Vlastimil Babka , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Vincenzo Frascino , linux-mm@kvack.org, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1669208898; a=rsa-sha256; cv=none; b=siRFoHQOcxkkiN38ZMot62Fw6fmtvKeP7uYinDHrCqdiiDGE/VpfPaAnE3jOsCv7A6uFLi UyaJ+vzLPzmAdB6xk3FmJ4ryRMswuFy3ouZAdTejz5MWN7v8sr9pArRXkHX9GupO2Cc7el CdoCCpZWmofZSRsT4vrmPyedEiE2FEE= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=PlqoSWMc; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1669208898; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xWi6mZ6IeIfeEPlOxAtZAyKjM4+f66dl3p7cvZ+Vbjw=; b=c2Z7o5I1R+7KozYRnuqnSKUGLXSlzKnIhdKm0qVxS9Na/iQZ4zR0qpSGpD1I8ix9DzbQVE JACZsPU1c373I9vqTf2Ykl+RT30kiCnshseKhC13+tC+drNoQUOcTPLJROd0ZQZWezQe/Q 58sB33SsEedft6AXXUydj1Me5GI95Pc= X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 4E7D4140013 X-Rspam-User: Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=PlqoSWMc; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com X-Stat-Signature: co4kjph5hgifkyfmxy18gejxw5f8i694 X-HE-Tag: 1669208898-516274 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 Wed, Nov 23, 2022 at 1:35 PM Feng Tang wrote: > > struct 'kasan_cache' has a member 'is_kmalloc' indicating whether > its host kmem_cache is a kmalloc cache. With newly introduced > is_kmalloc_cache() helper, 'is_kmalloc' and its related function can > be replaced and removed. > > Also 'kasan_cache' is only needed by KASAN generic mode, and not by > SW/HW tag modes, so refine its protection macro accordingly, suggested > by Andrey Konoval. > > Signed-off-by: Feng Tang > --- > Changlog: > > Since v1 > * Use CONFIG_KASAN_GENERIC instead of CONFIG_KASAN for 'kasan_cache', > as suggested by Andrey Konovalov > > include/linux/kasan.h | 22 +++++----------------- > include/linux/slab_def.h | 2 +- > include/linux/slub_def.h | 2 +- > mm/kasan/common.c | 9 ++------- > mm/slab_common.c | 1 - > 5 files changed, 9 insertions(+), 27 deletions(-) > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index dff604912687..0ff382f79f80 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -96,15 +96,6 @@ static inline bool kasan_has_integrated_init(void) > } > > #ifdef CONFIG_KASAN > - > -struct kasan_cache { > -#ifdef CONFIG_KASAN_GENERIC > - int alloc_meta_offset; > - int free_meta_offset; > -#endif > - bool is_kmalloc; > -}; > - > void __kasan_unpoison_range(const void *addr, size_t size); > static __always_inline void kasan_unpoison_range(const void *addr, size_t size) > { > @@ -129,13 +120,6 @@ static __always_inline bool kasan_unpoison_pages(struct page *page, > return false; > } > > -void __kasan_cache_create_kmalloc(struct kmem_cache *cache); > -static __always_inline void kasan_cache_create_kmalloc(struct kmem_cache *cache) > -{ > - if (kasan_enabled()) > - __kasan_cache_create_kmalloc(cache); > -} > - > void __kasan_poison_slab(struct slab *slab); > static __always_inline void kasan_poison_slab(struct slab *slab) > { > @@ -252,7 +236,6 @@ static inline void kasan_poison_pages(struct page *page, unsigned int order, > bool init) {} > static inline bool kasan_unpoison_pages(struct page *page, unsigned int order, > bool init) { return false; } > -static inline void kasan_cache_create_kmalloc(struct kmem_cache *cache) {} > static inline void kasan_poison_slab(struct slab *slab) {} > static inline void kasan_unpoison_object_data(struct kmem_cache *cache, > void *object) {} > @@ -303,6 +286,11 @@ static inline void kasan_unpoison_task_stack(struct task_struct *task) {} > > #ifdef CONFIG_KASAN_GENERIC > > +struct kasan_cache { > + int alloc_meta_offset; > + int free_meta_offset; > +}; > + > size_t kasan_metadata_size(struct kmem_cache *cache, bool in_object); > slab_flags_t kasan_never_merge(void); > void kasan_cache_create(struct kmem_cache *cache, unsigned int *size, > diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h > index f0ffad6a3365..39f7f1f95de2 100644 > --- a/include/linux/slab_def.h > +++ b/include/linux/slab_def.h > @@ -72,7 +72,7 @@ struct kmem_cache { > int obj_offset; > #endif /* CONFIG_DEBUG_SLAB */ > > -#ifdef CONFIG_KASAN > +#ifdef CONFIG_KASAN_GENERIC > struct kasan_cache kasan_info; > #endif > > diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h > index f9c68a9dac04..4e7cdada4bbb 100644 > --- a/include/linux/slub_def.h > +++ b/include/linux/slub_def.h > @@ -132,7 +132,7 @@ struct kmem_cache { > unsigned int *random_seq; > #endif > > -#ifdef CONFIG_KASAN > +#ifdef CONFIG_KASAN_GENERIC > struct kasan_cache kasan_info; > #endif > > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index 1f30080a7a4c..6e265beefc27 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -122,11 +122,6 @@ void __kasan_poison_pages(struct page *page, unsigned int order, bool init) > KASAN_PAGE_FREE, init); > } > > -void __kasan_cache_create_kmalloc(struct kmem_cache *cache) > -{ > - cache->kasan_info.is_kmalloc = true; > -} > - > void __kasan_poison_slab(struct slab *slab) > { > struct page *page = slab_page(slab); > @@ -326,7 +321,7 @@ void * __must_check __kasan_slab_alloc(struct kmem_cache *cache, > kasan_unpoison(tagged_object, cache->object_size, init); > > /* Save alloc info (if possible) for non-kmalloc() allocations. */ > - if (kasan_stack_collection_enabled() && !cache->kasan_info.is_kmalloc) > + if (kasan_stack_collection_enabled() && !is_kmalloc_cache(cache)) > kasan_save_alloc_info(cache, tagged_object, flags); > > return tagged_object; > @@ -372,7 +367,7 @@ static inline void *____kasan_kmalloc(struct kmem_cache *cache, > * Save alloc info (if possible) for kmalloc() allocations. > * This also rewrites the alloc info when called from kasan_krealloc(). > */ > - if (kasan_stack_collection_enabled() && cache->kasan_info.is_kmalloc) > + if (kasan_stack_collection_enabled() && is_kmalloc_cache(cache)) > kasan_save_alloc_info(cache, (void *)object, flags); > > /* Keep the tag that was set by kasan_slab_alloc(). */ > diff --git a/mm/slab_common.c b/mm/slab_common.c > index 8276022f0da4..a5480d67f391 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -663,7 +663,6 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, > > create_boot_cache(s, name, size, flags | SLAB_KMALLOC, useroffset, > usersize); > - kasan_cache_create_kmalloc(s); > list_add(&s->list, &slab_caches); > s->refcount = 1; > return s; > -- > 2.34.1 > Reviewed-by: Andrey Konovalov Thanks!