From patchwork Wed Jan 4 06:06:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Tang X-Patchwork-Id: 38745 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4990010wrt; Tue, 3 Jan 2023 22:10:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXt5pM0BDhvs+MYhoMFWromA44015THyMhYC4JvP+QPag5511VVvi5/wHMasmiDJvpWZVnYW X-Received: by 2002:a05:6a20:9591:b0:b1:28a8:7c85 with SMTP id iu17-20020a056a20959100b000b128a87c85mr58640387pzb.13.1672812616516; Tue, 03 Jan 2023 22:10:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672812616; cv=none; d=google.com; s=arc-20160816; b=T7GW6UT53tdfTZFkoOn9znWmZVR/VvvPitn3UTnrlSn7JMwpF7MbZINhZcTwlrsi2I nx2IT8zOWmTaboerOvfoHhj75k/5ZzvqCelukBD9vw15rgkD24t52+fyUrjM6MdzYhdP GaMbZ97Zsta/vgh/xnOd242e/MLQkOWI6Sy+RLSznnv8krHDZbpFwRvbbUFmkJP+9AmH jxXDvlukQOGeVgWA+BnFdhOaxrBw3Wix2THBx4nUNh49aPbUb33tYiCSservcU/qt618 +6D7rxSk0xeEWZ2TBun8QO8P2vLH4kLDjswB9V1SD/qekhgdTtE6R4om09npnWbmM2zj OpNQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=1s5P6iET2OaU2whx6wnFdyFdaEhzKdZCflQd8AxmlTo=; b=jt40OU2RXwkYWxLrjukPBLi3gYowOYQofU1JJWG02kO+oXpGGCCaLdrOVIrXJLqjGq /8y3PQTTx6gOhDnMx2HggQmzMdFbEdwuoAnUF0dTcPOAM8dku75EGtiD/F+ohx9RecGD hya4Ipyxp0OJEfCqWlAzYfmm7UDMLl+sby/5u6AJM1wL0AdDEJ8JL7uM7W5XQGhSEfjN EOEhbmCz/uc8xZoFIfNlCSj6shxBHNdMFo4zdglYeZzGg/1YgVWfIitAOta4DnvbcXbZ 9RPaWZkXaVL0GVsptHa1XtdT6F+YwMlvXAuW9Suhndce17VOAWk0Li4VAJyrJiEx9y9Y KZDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Jfv+xXHo; 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 bc22-20020a656d96000000b004965dbd5c9esi14968033pgb.822.2023.01.03.22.10.04; Tue, 03 Jan 2023 22:10:16 -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=Jfv+xXHo; 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 S233219AbjADGIs (ORCPT + 99 others); Wed, 4 Jan 2023 01:08:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229655AbjADGIr (ORCPT ); Wed, 4 Jan 2023 01:08:47 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D00F12637 for ; Tue, 3 Jan 2023 22:08:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672812526; x=1704348526; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=akgWoI1DZBNrZUnXySes4BuMOxDs0QUyVGoUEHSDAAM=; b=Jfv+xXHorquctWz0QKHm2VsD8x0fLPOfdppi6t/0zn8sLke12wUFHQEM ATnYcLKP+E1Wca7n+mn3CVcWpI6e11fjViPakW7NmH/MzA1SesVvym72Y PukpabBTbXDM7xqc27M48SYVaKWSLGNsDnO3WAgpkSjDoG/qrimyg/HF+ vQ3TNc1dt2zCrirIeovKy956Zrvi0SR64j6iZtqgpArA9dkXQ1plM5B5F MnZBZFFvGmMkagmXEUFU25vSkBpWfcRKRgARzgRspnIeJdX/MyPwQNNfg dH4m5Drq+l6E8JoLzjmPqdRGRjIGOaJXLrNESRaC4FjccRb9xbZSSctrx A==; X-IronPort-AV: E=McAfee;i="6500,9779,10579"; a="323840107" X-IronPort-AV: E=Sophos;i="5.96,299,1665471600"; d="scan'208";a="323840107" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jan 2023 22:08:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10579"; a="779094063" X-IronPort-AV: E=Sophos;i="5.96,299,1665471600"; d="scan'208";a="779094063" Received: from feng-clx.sh.intel.com ([10.238.200.228]) by orsmga004.jf.intel.com with ESMTP; 03 Jan 2023 22:08:41 -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 v3 -mm 1/2] mm/slab: add is_kmalloc_cache() helper function Date: Wed, 4 Jan 2023 14:06:04 +0800 Message-Id: <20230104060605.930910-1-feng.tang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754071161908721395?= X-GMAIL-MSGID: =?utf-8?q?1754071161908721395?= commit 6edf2576a6cc ("mm/slub: enable debugging memory wasting of kmalloc") introduces 'SLAB_KMALLOC' bit specifying whether a kmem_cache is a kmalloc cache for slab/slub (slob doesn't have dedicated kmalloc caches). Add a helper inline function for other components like kasan to simplify code. Signed-off-by: Feng Tang Acked-by: Vlastimil Babka Acked-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Acked-by: David Rientjes --- changlog: since v2: * fix type in subject(Vlastimil Babka) * collect Acked-by tag since v1: * don't use macro for the helper (Andrew Morton) * place the inline function in mm/slab.h to solve data structure definition issue (Vlastimil Babka) mm/slab.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mm/slab.h b/mm/slab.h index 7cc432969945..63fb4c00d529 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -323,6 +323,14 @@ static inline slab_flags_t kmem_cache_flags(unsigned int object_size, } #endif +static inline bool is_kmalloc_cache(struct kmem_cache *s) +{ +#ifndef CONFIG_SLOB + return (s->flags & SLAB_KMALLOC); +#else + return false; +#endif +} /* Legal flag mask for kmem_cache_create(), for various configurations */ #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | \ From patchwork Wed Jan 4 06:06:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Tang X-Patchwork-Id: 38747 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4990339wrt; Tue, 3 Jan 2023 22:11:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXvdAhsy34rfyFMsCyS1fckL7q+dzY11RUhYSalcDkVttC+Ze8/x/SO1LCxKEIodzXE/x+nH X-Received: by 2002:a17:90a:8801:b0:225:df2a:c271 with SMTP id s1-20020a17090a880100b00225df2ac271mr35377985pjn.28.1672812679279; Tue, 03 Jan 2023 22:11:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672812679; cv=none; d=google.com; s=arc-20160816; b=zGe3J5GuLY3fwLAE26neSkwcq2Ku1zFBOKxdrK0IwuDRtXi3arnGAcLgUo5MmYeUre vcpAwGJr8IJeOuNB8qXUjKRsAZXv6nLTSlXjHXMPhK7kXkb+Uimgix332SQkxqh6J3n2 4mXVwrCTW51tWwbTKuL9NDXg55N8KSosEadCeRx9C90qxHTCimxcdN4sVaCqWb7Z/aNw 5msEpadS93VK/B2xf5YCEE+mJrYkCCaTTY+XoI2sHjj8BPbh68LvAoP2lMeKLV9ffMoA EbBk5qDC1gZU4wNb5Ri2VMPtBrT+7Y2p/RhH7lN7AxavFmQVGLFs8qiW5m5fa1RysFcH YUnw== 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=ICYbAgxo1gxvMoVCz28YjqvVpuUwn4trUmXKW6YLBhQ=; b=u15RZKnM88sWddQEOZ7/mVFXO6CZ6LxKc23mnDSBaotKwiafP8/4wuCv5rwHJ6ttI7 X9OpD7dPyddyHuVMxj6OX9sE0/M9MvR4v5GMJoi/165/vEu+K+xTX/1pPv+H0/w91u/u Ar1P5Hyom2kToTUKTreBkJDtwIm6B9qfO3NJlqM53UA6UEyKuivYpxIf0OzJbQ3waWak fEvLy6lqFqXzaow+FHnT1Xb5gvs/lJUaZnOZgJDUJU7WO4AI2+euatbxNLTgtP4ZsjjC YRNbA+2db3Bv11nTUncFxwrWVg9t4IesXXkE3RcTJ8AVzV/Dm4r59kgLo4TVUWoZu+ur YaMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SJfKpvYh; 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 pl8-20020a17090b268800b001fdcb564d73si26487062pjb.79.2023.01.03.22.11.07; Tue, 03 Jan 2023 22:11:19 -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=SJfKpvYh; 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 S233303AbjADGI7 (ORCPT + 99 others); Wed, 4 Jan 2023 01:08:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229655AbjADGIw (ORCPT ); Wed, 4 Jan 2023 01:08:52 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8093BFD20 for ; Tue, 3 Jan 2023 22:08:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672812530; x=1704348530; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yjPAo3gzL+gE/D3nqOFC9+brYvlet3IWm71HhQsK8Fo=; b=SJfKpvYh++XWiwE6vEsDuGnfzmsAxRLBcc2hOVX9UFUdqabbhhBR2gvo vTlT1IWrnmZEtk98eRD1Ny7U+kdW66rUZ3hbOMMc4KBjAxufOBxwTKHue aUHi64fawAFPsvWWCHJ50IIxgb25NxYvgoonD6hdzff1KhlpeYybP1lrL xer3enWWsOQ7IPseKznTcBqxu9o/AYNX5ZFvhIoz8gypuJRKLqP95DLN/ ZP0Os246rajTsENRmI3oCQVXa2pmaB4n34qUFL9Y/jj8/yuRxs1AdmCeR IufTR1TFqS0MG6Doznasg0bLZ/glL9/QI6lYkWexupl2GKCvABG1vu/mX Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10579"; a="323840140" X-IronPort-AV: E=Sophos;i="5.96,299,1665471600"; d="scan'208";a="323840140" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jan 2023 22:08:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10579"; a="779094081" X-IronPort-AV: E=Sophos;i="5.96,299,1665471600"; d="scan'208";a="779094081" Received: from feng-clx.sh.intel.com ([10.238.200.228]) by orsmga004.jf.intel.com with ESMTP; 03 Jan 2023 22:08:45 -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 v3 -mm 2/2] mm/kasan: simplify and refine kasan_cache code Date: Wed, 4 Jan 2023 14:06:05 +0800 Message-Id: <20230104060605.930910-2-feng.tang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230104060605.930910-1-feng.tang@intel.com> References: <20230104060605.930910-1-feng.tang@intel.com> MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754071228158673106?= X-GMAIL-MSGID: =?utf-8?q?1754071228158673106?= 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 Acked-by: Vlastimil Babka Acked-by: David Rientjes --- Changlog: Since v2: * Rebase latest -mm tree, fix a conflict with kasan changes * Collect Reviewed-by tag 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 5ebbaf672009..f7ef70661ce2 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) { @@ -255,7 +239,6 @@ static inline bool kasan_unpoison_pages(struct page *page, unsigned int order, { 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) {} @@ -306,6 +289,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 5834bad8ad78..a61e7d55d0d3 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 aa0ee1678d29..f6df03f934e5 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h @@ -136,7 +136,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 1d0008e1c420..6b8e9c848573 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 1cba98acc486..bf4e777cfe90 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -670,7 +670,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;