From patchwork Wed Nov 23 12:31:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Tang X-Patchwork-Id: 24948 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2760316wrr; Wed, 23 Nov 2022 04:38:10 -0800 (PST) X-Google-Smtp-Source: AA0mqf7+0V/JTmjrVopLmB3TEccsKIrOHnxVKJS5SaJYVq6ok5MQOEwomeDwksTfUgJQRae6hDwz X-Received: by 2002:aa7:d74c:0:b0:461:b952:8932 with SMTP id a12-20020aa7d74c000000b00461b9528932mr17008243eds.104.1669207090038; Wed, 23 Nov 2022 04:38:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669207090; cv=none; d=google.com; s=arc-20160816; b=R0Wjv0YqLB2wtmzkJyWgnKvpTE/5d+X7lvBgEeSC42dnqfJH3giCkxCqNHpaiYrvLY l0z3xUB46MWmrBdXqWe2Q0HYb5RgPFJKk4fGViQpbCAI1uhHTxGTB6fJQMYE2T4FGPa4 afouOv9yojcHoy/N12Gn+EcbCSSRsRMIxhAYOZyfPUa4/ELrlVlWldjSjjvEz0hRnoTV +hrk315JJhixNJmaTDy4rzYW5Ssx57do6ybP4EjRirpPifqcV1NygyfTPEaORTOB/uuS REAubOiavRJ2IV5w0aUd1sVyRbYMYXetRxXY9wxhRsTNv7kqrBVoym1StzgXOV6lqcoz 7+vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DKpDEUuzQP3JS6vSn7fniF3BoC56bwIDZKe8r0jOrQM=; b=wnnSBiMhEk3brUhPjgskM2AI84XJOoJft8RvWM+Mnyl+mdrMGToR5nScRbizhb9zxo FzsXWAtYsDvgErHJpdJvy6pyWsaHHAO3O0sCmW0IETSBuu+QuxipYxFf1jPYtS0Lu0HG xTDPA60BYNPgj7djkX+2FGBRWUeDVyb4daI7NZKvlLdZdkrfmpbWIpPX/fsgGLRpN+dn vm7id5qLgeLusbVWWZpKI+jbNg2GTsvCMoU8y547A3WpXcoLjoMs7/vtd+pRW5Rea3uH 9LFzi/0p+eapMgBZImukH2+pFSasqXq5VCu5bTO6mq8fLvjlXyEtaQPl07I9XdqWOUog qgrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=jqDNFf4d; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qw17-20020a1709066a1100b007ae6ba5f344si132976ejc.53.2022.11.23.04.37.46; Wed, 23 Nov 2022 04:38:10 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=jqDNFf4d; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237114AbiKWMfH (ORCPT + 99 others); Wed, 23 Nov 2022 07:35:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237017AbiKWMfF (ORCPT ); Wed, 23 Nov 2022 07:35:05 -0500 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D3B2DEBD for ; Wed, 23 Nov 2022 04:35:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669206904; x=1700742904; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/ZAAjGfYIjdVR+5X0uaKgifD9for1Ic1lKNhQ5iJ4HU=; b=jqDNFf4dwMJqhc6DZDnmxAcQEXdprc8Rk8G0g+lAeDB5NqXj/EVCn46z lY5sRaJGv569DBUBE3Dg2aVprfQ57rjhI5n9XNc/jumlzvM+X9TTlk01b pYbeQLmFxyToyWaUhn2mnWKf3/wt/jeERZwPwtGtsoF6thTxbafpVJwwl oIRlLqUo2xsC400Tk1iHUVgNlXPjg+dDSAa77Xf1bAa4VwephcgTIKEby BVvEc3ApscTn4dRKFLF3pPWUUp7DOzhQ/GxkPmovKQDRIYykO08nQRhoU rxXvs1z+wf8xf1fj385AocCjhgMJipe5KcLqd+STZns2LrnFGvNDWoak2 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10539"; a="340935429" X-IronPort-AV: E=Sophos;i="5.96,187,1665471600"; d="scan'208";a="340935429" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2022 04:35:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10539"; a="705349470" X-IronPort-AV: E=Sophos;i="5.96,187,1665471600"; d="scan'208";a="705349470" Received: from feng-clx.sh.intel.com ([10.238.200.228]) by fmsmga008.fm.intel.com with ESMTP; 23 Nov 2022 04:35:00 -0800 From: Feng Tang To: Andrew Morton , Vlastimil Babka , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Andrey Konovalov , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Vincenzo Frascino Cc: linux-mm@kvack.org, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, Feng Tang Subject: [PATCH v2 -next 2/2] mm/kasan: simplify and refine kasan_cache code Date: Wed, 23 Nov 2022 20:31:59 +0800 Message-Id: <20221123123159.2325763-2-feng.tang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221123123159.2325763-1-feng.tang@intel.com> References: <20221123123159.2325763-1-feng.tang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750290493559474684?= X-GMAIL-MSGID: =?utf-8?q?1750290493559474684?= 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 Reviewed-by: Andrey Konovalov --- 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;