Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 21 Nov 2022 22:13:27 +0800
From:   Feng Tang <feng.tang@intel.com>
To:     Andrew Morton <akpm@linux-foundation.org>,
        Vlastimil Babka <vbabka@suse.cz>,
        Christoph Lameter <cl@linux.com>,
        Pekka Enberg <penberg@kernel.org>,
        David Rientjes <rientjes@google.com>,
        Joonsoo Kim <iamjoonsoo.kim@lge.com>,
        Roman Gushchin <roman.gushchin@linux.dev>,
        Hyeonggon Yoo <42.hyeyoo@gmail.com>,
        Andrey Konovalov <andreyknvl@gmail.com>,
        Dmitry Vyukov <dvyukov@google.com>,
        Andrey Ryabinin <ryabinin.a.a@gmail.com>,
        Alexander Potapenko <glider@google.com>,
        Vincenzo Frascino <vincenzo.frascino@arm.com>
CC:     "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "kasan-dev@googlegroups.com" <kasan-dev@googlegroups.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH -next 2/2] mm/kasan: simplify is_kmalloc check
Message-ID: <Y3uHhxWeKGyRrkYT@feng-clx>
References: <20221121135024.1655240-1-feng.tang@intel.com>
 <20221121135024.1655240-2-feng.tang@intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20221121135024.1655240-2-feng.tang@intel.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uMUM31xchWUbGMi/QN5xM5kkJ0Nzx4gmZ0b9B7WHFEbTbcTXCzla8HtCrLxd?=
 =?us-ascii?Q?7WOSW15Ikdg48M+1mwOylBXuT9fItWgZiDcHY6g7Z4P/r0L2Z9uwRvrQjMMG?=
 =?us-ascii?Q?4UpOE1LjioTmEOnM7hQRMTcPe82u233sPLVzpNtKoHNmzmpYrns3XzMRYCZd?=
 =?us-ascii?Q?QFxuaZCGE3mj93KNnOV8VtCyermvW0qVhKTo6wOKPM9wJrfudH+Xcy/Pilq0?=
 =?us-ascii?Q?fSSgHEPIyNdOUttzNuKDespbJrM6KZ/U/mQYBEMP+3knIDISSjs0rBfveTlo?=
 =?us-ascii?Q?Bme+qQMno7tT0xlkZgYbwSdiO2dWd5Je9ECdP1chv+9lMWZUBOu+sGnPhMTx?=
 =?us-ascii?Q?1FUQ+CWPvCrIQqktGk/QstzxMp11JrU3KX8BEJi6vSvOkoK+kWbEcLIadS02?=
 =?us-ascii?Q?CsXKPiR9y7ae8uCNUpMPXLDfjhEOsHZS+6dNjosEhE0ZV7538y8N/vB34hTt?=
 =?us-ascii?Q?0Otyo0+Sk+GNOy/FYDkYCrBIiFZigJ0CQL4g96EXkbW5I/dcrPKesesy91x1?=
 =?us-ascii?Q?S6CLTML9hFwEW5ATUKopl9R+gO3kc8Z4ctworRtqX/Wxik+ga3HUGhiKSGkt?=
 =?us-ascii?Q?g93ZPSGngk9+799EIZaqlgLtHQfcZNrrHhYahaGK5k1GLHTSE6ykJLCHtNN9?=
 =?us-ascii?Q?eLcGdSbbjlJLvUCcMA5kQHveIn1zvgDlkM0sccXgj4tR4xLgKhPBkA22L6NW?=
 =?us-ascii?Q?Dmismg/ntsjVvfbgyXhyzm2o957XuZ7fbGzIOBUhMw3SgrOP7zI6odrTdEB/?=
 =?us-ascii?Q?EE0vsCKDSNIaoDtm5ihV049Ms2HLRqn6/cPcv4JayWssJS4aNCS9YcBvEK+w?=
 =?us-ascii?Q?Yo2QXZDoFEuO/RuzBxGHCrba/IVUfqf/9fmn18BXXJoN8cZXi7D75QZDxosj?=
 =?us-ascii?Q?48wISn61xJLWMzyqiyM0wVPqcQDiql6nO662vTalMCDPzTv6ONDXOMP/S6ye?=
 =?us-ascii?Q?I6GW9VWtmA3QesGCfPMS+G3H0B1V72EYYOhJ9yzjsxq3syD083aBp7TU28sR?=
 =?us-ascii?Q?kyhR+dMR5LwOcWY22BfFCL6AObTXsVGnCLFC9tjH/lg2sfIS0PUkFgHsiq7k?=
 =?us-ascii?Q?wkg7i3lGZpsO+TrRitaJPGqfGP/divgo4M9Jqm/23ZHBGqXJjLW/CPZunIPC?=
 =?us-ascii?Q?G5gXfO9+rat0pgf3MjfCfAZYyMn+L2Y4ranSo/dq1FJPeSsf7mjjkOPyJkpA?=
 =?us-ascii?Q?vO6n3GmAPhdQ7/nlQHbEj83TSq9GRBI4fKT7R9zSKhW/tjc72CyKBLCg2Jri?=
 =?us-ascii?Q?3cwVOLUfeT3LbKekh6D26fN5E1wT0u5JadHgZKp2DkmsIt62grIwlJSGyy5q?=
 =?us-ascii?Q?OzLaGZzmckHSfUj9W+tflY5uH84lL6OEyU92pvQ2HPMG7BVmQ5676LfvIs2d?=
 =?us-ascii?Q?hOLU40l/VFJwpHyv8DYn/ApzvebmxpYeY2uHYIADomRQaKh+gRT9tSYcN//T?=
 =?us-ascii?Q?2MqOokihlDThLgmT1Sqnmq8RrcPUmLMTGDFBNZaQCQ1prFGz+afpfyc3Y2kC?=
 =?us-ascii?Q?J2t0KeDEJGMniOGEForq5mHIcRO/pNjq9SXFudjxwxj6/Mo7Z5LIkemn2md5?=
 =?us-ascii?Q?sX6zDx832Z4XMEG1uD7AzHLCwXV5KUnoSN3Ab15o?=
X-MS-Exchange-CrossTenant-Network-Message-Id: bff33406-c341-4add-eed0-08dacbcb0147
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6304.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2022 14:16:38.8043
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: m1pwfVVD3YvbJGmilBdfiENd61UHVAJPjOBxPTNCoB4/USCzTDHDLrx1hjXpTVRGjSO46NEqtLJXjR0mmESaGg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB6172
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Nov 21, 2022 at 09:50:24PM +0800, Tang, Feng wrote:
> Use new is_kmalloc_cache() to simplify the code of checking whether
> a kmem_cache is a kmalloc cache.
> 
> Signed-off-by: Feng Tang <feng.tang@intel.com>
> ---
>  include/linux/kasan.h | 9 ---------
>  mm/kasan/common.c     | 9 ++-------
>  mm/slab_common.c      | 1 -
>  3 files changed, 2 insertions(+), 17 deletions(-)
> 
> diff --git a/include/linux/kasan.h b/include/linux/kasan.h
> index dff604912687..fc46f5d6f404 100644
> --- a/include/linux/kasan.h
> +++ b/include/linux/kasan.h
> @@ -102,7 +102,6 @@ struct kasan_cache {
>  	int alloc_meta_offset;
>  	int free_meta_offset;
>  #endif
> -	bool is_kmalloc;
>  };
>  
>  void __kasan_unpoison_range(const void *addr, size_t size);
> @@ -129,13 +128,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 +244,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) {}
> diff --git a/mm/kasan/common.c b/mm/kasan/common.c
> index 1f30080a7a4c..f7e0e5067e7a 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))

Sorry, it should be: 

 -	if (kasan_stack_collection_enabled() && !cache->kasan_info.is_kmalloc)
 +	if (kasan_stack_collection_enabled() && !is_kmalloc_cache(cache))

Thanks,
Feng

>  		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
>