From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.169 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794400927; b=ec1aWkOpKcMrweYe4QLEu2etC2WL266FoQueMrMEmwHI75bKUp2at8dVB1QoXfqy9M2k s3yfZv1CTvHW+y3MuY6U1FdylASpPbfiSVFpQpIXh+Kvm5m/GHFhiT4MFnp6jRq5mf+BN 8/4XqEC4PxJ3tPQqsNAZwySIRFUsIy4Klea24isZb5ZUdBO6SyBrJDHEYQaU/2d1QLLNV kQhNO21jEJCSs4UnF7xkCFNsOGnzcINlQf2mq4NxnCJeVJo1uKJRyyCjvfoH2xhe99/3c LrUADsyhJWX44LGyZAsq/Yi6uODdvzZsAqG2He0zc8rgow9ybbovRM85t1sEUzS0b1Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794400927; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:Date:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:X-B4-Tracking:X-Change-ID:To:Cc:X-Mailer; bh=OQ16sdEJf1gdJkohVqyloM5KBnz2C1+nxajXYYSElQA=; b=wBU3fap05+0UptxDqi89ELHbroXzORMtB57s5ZFGkKDGyragV7OqrWPPOgCAJZ0p90Se LBRqDycyHdSCeXSYZcaK/OMcRui0qXsIDDpI8S/HRGNVsDYzC9NofHiqMOXsCb1uneIFU Osn0z06eR6IQp94Q/Pa1oKF2memTFXm65RZ4C0oznhlYWch4Ty4lTi2+FpN6e0V36jQLG BwuhyJxjyZ8TqfbVCFZBvEjIkwz4BNUxrV/gcv509AHjT+woy/J2zTMR9yultP/7csNEp vfy9bRNfsB9SXKwwC9mFnphPwz6BgGFx5O/UChBHzfGkodX95t5AUG2OL8c1odU28iQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=0Pou1PQP; arc=none smtp.remote-ip=74.125.82.169 Received: from mail-dy1-f169.google.com (mail-dy1-f169.google.com [74.125.82.169]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C30A8606A32A for ; Wed, 11 Nov 2026 12:42:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C30A8606A32A Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=0Pou1PQP Received: by mail-dy1-f169.google.com with SMTP id 5a478bee46e88-376a4059061so58743eec.1 for ; Wed, 11 Nov 2026 04:42:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794400926; x=1795005726; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=OQ16sdEJf1gdJkohVqyloM5KBnz2C1+nxajXYYSElQA=; b=0Pou1PQPAuvbVRhRj9+hhQ5LLYq2V5/nMuKx/UUTnGe6vVRdZBQ2wGseEP21of/KFn sJMYUNBub5q7J0KLDM5gpc1xQr7ppK5Y2bfQ4x8RF2WXVzAXErxUQk15lKkh5RIS5/zo I1EWB5zWqPe4LF2NV0i0t+uOnP46AcBgB0GZFloQViZ5RVIIYIgPKymoYOVgAgA5++JF teVuAbHRYpk5ZBwsyKP+FqUapvJbBC7nurVSgwxcM8jaIJwpU1W18t2iINsQOEh9i9o2 ZHdroZI9LkfOtvZn562cwN/2UHOLRODFi1ZxOOZ1/xU/SaoVwl5PSyA52RsShLlFjEaH twXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794400926; x=1795005726; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=OQ16sdEJf1gdJkohVqyloM5KBnz2C1+nxajXYYSElQA=; b=ZZk+h8eUMba/60A9EcR9NPkTECRjSin5aX2MukJPT+4GBJDBxNIa9Xvju5AeHSRUFR 1QkOeVRHDOf4Ss9x9XOk3flvOq8+0ve9MmjXeeWUJhGLQgpprd0jrVmj49iT0k1hStc1 1xgEQZCzEjQobzg8TKU5nH6xzcKCVhwoGha0lpN01Bz7OM7CfpFH41hfw5kEjpW6VbWz irKYNnvLTT1QcfD6uApxDvhPylnvjjx4ExAnsbaX4OWHt5ETKaqAAieJpKSUtIoZIqSF bI7YLDFvmSH/HKscu4ufpbVAxrcSgcrsfYPyb8kAFhGoOWLhHOqJNu9XUHiTAlR28obi DhDA== X-Forwarded-Encrypted: i=1; AL+hErHPjXnI+Ul0YHcEayQNP2sdalb0OX36Ua/Tn2kN//zpYfOUvOilIWpArILU/IqO76hppXOqxqnAdPdHE+w=@vger.kernel.org X-Gm-Message-State: APuU4Z9/Hbgt/1cWiG/xCzCEX12NnKhLFrO4QtSxIKPIhVPdbtTenTxP J6n1r50YSq7dC0+gmJ7Xhs6om7NB1zejOlYPHS1TEjq8rY+qV9qJYNSB X-Gm-Gg: AYBFou2qlMbKIQp9AL8URveWRNg9XoVztw8ID9aawbL137KveEJB64Xmp4hhEXSMoX/ vNBpbPYyJmqH4or50lxtY0wBGF9EsUTTc22AwfTx6u9vvav/+swkkls267rQhMtQIphP9npR4JI 4e855gnvtyKtXgEHyc7KULe7TvQuCb+HkRiKQX0BT5HKyxYxHyXYfQQSXnmhh175VjNJwY/8Id0 2cjCW+mBxiSg9HFmuDtf292m+m0ncdvoxP0Xx9LUvnHWsKL4qjE7qjv51cX8hLwKg+sAuD2csp1 vUOkozGdV8X9i3PqgUXVv1EBq36jX3EP6iAPPf+R8a1A2OTttqTGmX9so8nFS+yBsYnRqlTu7nR lGVtQqiZzKwNiZMNZhRVNS2vbmL057WFIoOZ4JQukjjYnfDBU6TCaAymyTPydHB+sD+XK5+X0KW bjlUMCnWYaNMmAIKE7EJKv9oMeYCDqLmv6vnMz7v4GFquuC7dApGWojiYiCo0W3At+FnNX1u6bT 1HwOjvSARe9R0x27/FBO3yhaEwg60nFRic8h/vOi+ooG2xuM8dTrjWky7OG+4a1cD+MPJkSGiM2 XYbVpPBarMLrUe5DUx+CCiAU1B2d1KTKc9Tl/9EOzy4soPlHfAyibpa+XcDnovA+1x0= X-Received: by 2002:a05:7022:3a86:b0:143:5c2a:e45f with SMTP id a92af1059eb24-1b3c01600d4mr3616454c88.0.1794400925446; Wed, 11 Nov 2026 04:42:05 -0800 (PST) Received: from o6.lan ([2602:fce1:44f:115e::]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1b3b5b4efc2sm13462032c88.15.2026.11.11.04.41.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2026 04:42:04 -0800 (PST) From: Xueyuan Chen Date: Wed, 11 Nov 2026 20:41:26 +0800 Subject: [PATCH v3] mm/zsmalloc: remove CONFIG_ZSMALLOC_STAT X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20261111-zsmalloc_stat-v3-1-2d85ed51570e@gmail.com> X-B4-Tracking: v=1; b=H4sIAHVi9GoC/3WO2wrCMBBEf6Xk2dUmxlZ98j9EZJNs20jbSFKLF /rvNhWhCD7OMOcwLxbIWwpsn7yYp94G69oxrBcJ0xW2JYE1Y2YiFRnnaQbP0GBdO30OHXZAY2u k0VzkGRuZq6fC3iff8fTJ4aYupLsoiQuFgUB5bHUVKyUhNquvFox3V4juOK5s6Jx/TO96HqX/j vQcOKhNLguZc4mmOJQN2nqpXcPikV7M6d0vLSAFjUSSZ1uJCuf0MAxvI0pZ6ycBAAA= X-Change-ID: 20261106-zsmalloc_stat-e261d4dc1276 To: Minchan Kim , Sergey Senozhatsky , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Jonathan Corbet , Shuah Khan , Randy Dunlap , Alex Shi , Yanteng Si , Dongliang Mu , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Helen Koike , Vignesh Raman , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, dri-devel@lists.freedesktop.org, Nhat Pham , Xueyuan Chen X-Mailer: b4 0.16.0 CONFIG_ZSMALLOC_STAT only controls the debugfs interface. The class counters are updated regardless of this option. Remove the CONFIG_ZSMALLOC_STAT guards and rely on the debugfs API stubs when CONFIG_DEBUG_FS=n. Skip statistics setup silently when debugfs is unavailable. Remove the Kconfig entry and replace the existing CONFIG_ZSMALLOC_STAT settings with CONFIG_DEBUG_FS=y. Update the English and Chinese documentation to match, and clarify the pool name in the debugfs path. Suggested-by: Nhat Pham Reviewed-by: Nhat Pham Signed-off-by: Xueyuan Chen --- Drop CONFIG_ZSMALLOC_STAT instead of making the counters conditional. The option only controls the debugfs interface, while the class counters are updated unconditionally. Removing it simplifies the code. Following Nhat's suggestion, remove CONFIG_ZSMALLOC_STAT and rely on the existing debugfs API stubs when CONFIG_DEBUG_FS=n. --- Changes in v3: - Squash the three patches into one (Nhat, Sergey). - Add Nhat's Reviewed-by. - Update the documentation wording. - Link to v2: https://patch.msgid.link/20261109-zsmalloc_stat-v2-0-caee41684aba@gmail.com Changes in v2: - Drop CONFIG_ZSMALLOC_STAT instead of making the counters conditional. - Update configuration files and documentation. - Link to v1: https://patch.msgid.link/20261106-zsmalloc_stat-v1-1-b574f4714adf@gmail.com --- Documentation/mm/zsmalloc.rst | 4 +-- Documentation/translations/zh_CN/mm/zsmalloc.rst | 2 +- arch/s390/configs/debug_defconfig | 2 +- arch/s390/configs/defconfig | 2 +- drivers/gpu/drm/ci/arm.config | 2 +- drivers/gpu/drm/ci/arm64.config | 2 +- drivers/gpu/drm/ci/x86_64.config | 2 +- mm/Kconfig | 9 ------- mm/zsmalloc.c | 33 ++---------------------- 9 files changed, 10 insertions(+), 48 deletions(-) diff --git a/Documentation/mm/zsmalloc.rst b/Documentation/mm/zsmalloc.rst index d2bbecd78e14..4c0786378dc3 100644 --- a/Documentation/mm/zsmalloc.rst +++ b/Documentation/mm/zsmalloc.rst @@ -33,8 +33,8 @@ proper handle-based APIs. stat ==== -With CONFIG_ZSMALLOC_STAT, we could see zsmalloc internal information via -``/sys/kernel/debug/zsmalloc/``. Here is a sample of stat output:: +With CONFIG_DEBUG_FS, we could see zsmalloc internal information via +``/sys/kernel/debug/zsmalloc/``. Here is a sample of stat output:: # cat /sys/kernel/debug/zsmalloc/zram0/classes diff --git a/Documentation/translations/zh_CN/mm/zsmalloc.rst b/Documentation/translations/zh_CN/mm/zsmalloc.rst index 4c8c9b1006a9..b555a07ac871 100644 --- a/Documentation/translations/zh_CN/mm/zsmalloc.rst +++ b/Documentation/translations/zh_CN/mm/zsmalloc.rst @@ -32,7 +32,7 @@ zs_unmap_object()解除映射。 stat ==== -通过CONFIG_ZSMALLOC_STAT，我们可以通过 ``/sys/kernel/debug/zsmalloc/`` +启用CONFIG_DEBUG_FS，我们可以通过 ``/sys/kernel/debug/zsmalloc/`` 看到zsmalloc内部信息。下面是一个统计输出的例子。:: # cat /sys/kernel/debug/zsmalloc/zram0/classes diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig index d44674b63715..83193ef8efb9 100644 --- a/arch/s390/configs/debug_defconfig +++ b/arch/s390/configs/debug_defconfig @@ -100,7 +100,7 @@ CONFIG_UNIXWARE_DISKLABEL=y CONFIG_IOSCHED_BFQ=y CONFIG_BINFMT_MISC=m CONFIG_ZSWAP=y -CONFIG_ZSMALLOC_STAT=y +CONFIG_DEBUG_FS=y CONFIG_SLAB_BUCKETS=y CONFIG_SLUB_STATS=y # CONFIG_COMPAT_BRK is not set diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig index e00e252d4694..694a309377d5 100644 --- a/arch/s390/configs/defconfig +++ b/arch/s390/configs/defconfig @@ -94,7 +94,7 @@ CONFIG_UNIXWARE_DISKLABEL=y CONFIG_IOSCHED_BFQ=y CONFIG_BINFMT_MISC=m CONFIG_ZSWAP=y -CONFIG_ZSMALLOC_STAT=y +CONFIG_DEBUG_FS=y CONFIG_SLAB_BUCKETS=y # CONFIG_COMPAT_BRK is not set CONFIG_MEMORY_HOTPLUG=y diff --git a/drivers/gpu/drm/ci/arm.config b/drivers/gpu/drm/ci/arm.config index d7c51670da2f..fc0a8a4bfb18 100644 --- a/drivers/gpu/drm/ci/arm.config +++ b/drivers/gpu/drm/ci/arm.config @@ -5,7 +5,7 @@ CONFIG_CRYPTO_ZSTD=y CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_ZRAM_WRITEBACK=y CONFIG_ZRAM=y -CONFIG_ZSMALLOC_STAT=y +CONFIG_DEBUG_FS=y # abootimg with a 'dummy' rootfs fails with root=/dev/nfs CONFIG_BLK_DEV_INITRD=n diff --git a/drivers/gpu/drm/ci/arm64.config b/drivers/gpu/drm/ci/arm64.config index c46125c1f80f..10b01b55a66d 100644 --- a/drivers/gpu/drm/ci/arm64.config +++ b/drivers/gpu/drm/ci/arm64.config @@ -5,7 +5,7 @@ CONFIG_CRYPTO_ZSTD=y CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_ZRAM_WRITEBACK=y CONFIG_ZRAM=y -CONFIG_ZSMALLOC_STAT=y +CONFIG_DEBUG_FS=y # abootimg with a 'dummy' rootfs fails with root=/dev/nfs CONFIG_BLK_DEV_INITRD=n diff --git a/drivers/gpu/drm/ci/x86_64.config b/drivers/gpu/drm/ci/x86_64.config index 7ac98a78691e..8225b806dad8 100644 --- a/drivers/gpu/drm/ci/x86_64.config +++ b/drivers/gpu/drm/ci/x86_64.config @@ -5,7 +5,7 @@ CONFIG_CRYPTO_ZSTD=y CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_ZRAM_WRITEBACK=y CONFIG_ZRAM=y -CONFIG_ZSMALLOC_STAT=y +CONFIG_DEBUG_FS=y CONFIG_PWM=y CONFIG_PM_DEVFREQ=y diff --git a/mm/Kconfig b/mm/Kconfig index afff1b25b543..4a77cda7f1d7 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -130,15 +130,6 @@ menu "Zsmalloc allocator options" comment "Zsmalloc is a common backend allocator for zswap & zram" -config ZSMALLOC_STAT - bool "Export zsmalloc statistics" - select DEBUG_FS - help - This option enables code in the zsmalloc to collect various - statistics about what's happening in zsmalloc and exports that - information to userspace via debugfs. - If unsure, say N. - config ZSMALLOC_CHAIN_SIZE int "Maximum number of physical pages per-zspage" default 8 diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 7ef80e0da626..104ccf3aa170 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -222,9 +222,7 @@ struct zs_size_stat { unsigned long objs[NR_CLASS_STAT_TYPES]; }; -#ifdef CONFIG_ZSMALLOC_STAT static struct dentry *zs_stat_root; -#endif static size_t huge_class_size; @@ -279,9 +277,7 @@ struct zs_pool { /* Compact classes */ struct shrinker *shrinker; -#ifdef CONFIG_ZSMALLOC_STAT struct dentry *stat_dentry; -#endif #ifdef CONFIG_COMPACTION struct work_struct free_work; #endif @@ -565,14 +561,10 @@ static inline unsigned long class_stat_read(struct size_class *class, int type) return class->stats.objs[type]; } -#ifdef CONFIG_ZSMALLOC_STAT - static void __init zs_stat_init(void) { - if (!debugfs_initialized()) { - pr_warn("debugfs not available, stat dir not created\n"); + if (!debugfs_initialized()) return; - } zs_stat_root = debugfs_create_dir("zsmalloc", NULL); } @@ -650,10 +642,8 @@ DEFINE_SHOW_ATTRIBUTE(zs_stats_size); static void zs_pool_stat_create(struct zs_pool *pool, const char *name) { - if (!zs_stat_root) { - pr_warn("no root stat dir, not creating <%s> stat dir\n", name); + if (IS_ERR_OR_NULL(zs_stat_root)) return; - } pool->stat_dentry = debugfs_create_dir(name, zs_stat_root); @@ -666,25 +656,6 @@ static void zs_pool_stat_destroy(struct zs_pool *pool) debugfs_remove_recursive(pool->stat_dentry); } -#else /* CONFIG_ZSMALLOC_STAT */ -static void __init zs_stat_init(void) -{ -} - -static void __exit zs_stat_exit(void) -{ -} - -static inline void zs_pool_stat_create(struct zs_pool *pool, const char *name) -{ -} - -static inline void zs_pool_stat_destroy(struct zs_pool *pool) -{ -} -#endif - - /* * For each size class, zspages are divided into different groups * depending on their usage ratio. This function returns fullness --- base-commit: fa4ad798f6f681031775266044ba1b0cf3c670bd -- Best regards, Xueyuan