From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E8C63859DF for ; Wed, 13 May 2026 09:46:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.2 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778665569; cv=none; b=beK0WzbHhhxdIsT1v5FvjK5C+Cw3UmARwCmflnhmmJhIWSKtmua4QmBZrTp1FhjzNNf9BmJ5W4iuZlkhgCJ4z8N8Grn2z5+qluVxE95RU0zxcV6ZW3CJXdoLMGK2BbrLDLIdQ7hWYCCor2FGJyoCJxZd4pwyS2zXoQwapPZHIrc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778665569; c=relaxed/simple; bh=sD1Ak2oOeKWKwf4dZPu4rws5FD/4zDkEbOJRM8EjqOU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=k1M4EWaGBkdYaz9glxtEs+q657Ca+mJusicbJEBm6KKEHrFhdIY7l7kmNgmkqUhihQEJTYU4o/g4GrYYp7i6AGaq4umKIsOSIJYF7fA+iL8YjMDk3M90ptdHWjk3rv99eD2EH0VbrC0yv8i5T2os+N7S/lhAhqNQCsMKOolqtmE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=LZSnsbi8; arc=none smtp.client-ip=220.197.31.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="LZSnsbi8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=ca RtC8vLr/yalP2Wx9m78i8TJ8NZ21hIDKNxEZYYRL0=; b=LZSnsbi8/pxI6fUhoK GAO5PjAqZV4Z8h/g1AGn/3Tuens8TGjxfhbPiUECFiCzP+hkhzb01rgKDA8WS24I XS3A5dOlr7RiMlm/TINSgjYRzeX5Xr+sc8xRk/FE3Ok3wFBDB0m25aJ93/13Ebhd pFkP8iX/cqiAjMrs+PC2GR6lU= Received: from ubuntu24-z.. (unknown []) by gzsmtp4 (Coremail) with SMTP id PygvCgBXXvImSARqv3FNDg--.31S2; Wed, 13 May 2026 17:45:13 +0800 (CST) From: ranxiaokai627@163.com To: hughd@google.com, baolin.wang@linux.alibaba.com, akpm@linux-foundation.org Cc: leitao@debian.org, ljs@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, ran.xiaokai@zte.com.cn, ranxiaokai627@163.com Subject: [PATCH v2 1/2] mm: huge_memory: refactor thpsize_shmem_enabled_store() with sysfs_match_string() Date: Wed, 13 May 2026 09:45:07 +0000 Message-ID: <20260513094508.50888-1-ranxiaokai627@163.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:PygvCgBXXvImSARqv3FNDg--.31S2 X-Coremail-Antispam: 1Uf129KBjvJXoW3JryUWrWrZr13Ar4rurWkCrg_yoW7Xw13pF 4fC34fAry8XryDK3yxJF40yryrtrs3Ja1DtrykAas3Aan8JryYyFykt348Z34DAryfXr43 Kr18WasxG3yDtr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pRHmh5UUUUU= X-CM-SenderInfo: xudq5x5drntxqwsxqiywtou0bp/xtbCxQq3BGoESCoakwAA35 From: Ran Xiaokai Inspired by commit 82d9ff648c6c ("mm: huge_memory: refactor anon_enabled_store() with set_anon_enabled_mode()"), refactor thpsize_shmem_enabled_store() using sysfs_match_string(). This eliminates the duplicated spin_lock/unlock(), set/clear_bit(), calls across all branches, reducing code duplication. Tested with selftests ./run_kselftest.sh -t mm:ksft_thp.sh, all test cases passed. Signed-off-by: Ran Xiaokai --- mm/shmem.c | 94 +++++++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 43 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 3b5dc21b323c..60cb10854f11 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -5526,6 +5526,29 @@ static ssize_t shmem_enabled_store(struct kobject *kobj, struct kobj_attribute shmem_enabled_attr = __ATTR_RW(shmem_enabled); static DEFINE_SPINLOCK(huge_shmem_orders_lock); +enum huge_shmem_enabled_mode { + HUGE_SHMEM_ENABLED_ALWAYS = 0, + HUGE_SHMEM_ENABLED_INHERIT, + HUGE_SHMEM_ENABLED_WITHIN_SIZE, + HUGE_SHMEM_ENABLED_ADVISE, + HUGE_SHMEM_ENABLED_NEVER, +}; + +static const char * const huge_shmem_enabled_mode_strings[] = { + [HUGE_SHMEM_ENABLED_ALWAYS] = "always", + [HUGE_SHMEM_ENABLED_INHERIT] = "inherit", + [HUGE_SHMEM_ENABLED_WITHIN_SIZE] = "within_size", + [HUGE_SHMEM_ENABLED_ADVISE] = "advise", + [HUGE_SHMEM_ENABLED_NEVER] = "never", +}; + +static unsigned long * const huge_shmem_orders_by_mode[] = { + [HUGE_SHMEM_ENABLED_ALWAYS] = &huge_shmem_orders_always, + [HUGE_SHMEM_ENABLED_INHERIT] = &huge_shmem_orders_inherit, + [HUGE_SHMEM_ENABLED_WITHIN_SIZE] = &huge_shmem_orders_within_size, + [HUGE_SHMEM_ENABLED_ADVISE] = &huge_shmem_orders_madvise, +}; + static ssize_t thpsize_shmem_enabled_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { @@ -5551,57 +5574,42 @@ static ssize_t thpsize_shmem_enabled_store(struct kobject *kobj, const char *buf, size_t count) { int order = to_thpsize(kobj)->order; + int mode, m; ssize_t ret = count; + int err; + bool changed = false; - if (sysfs_streq(buf, "always")) { - spin_lock(&huge_shmem_orders_lock); - clear_bit(order, &huge_shmem_orders_inherit); - clear_bit(order, &huge_shmem_orders_madvise); - clear_bit(order, &huge_shmem_orders_within_size); - set_bit(order, &huge_shmem_orders_always); - spin_unlock(&huge_shmem_orders_lock); - } else if (sysfs_streq(buf, "inherit")) { - /* Do not override huge allocation policy with non-PMD sized mTHP */ - if (shmem_huge == SHMEM_HUGE_FORCE && !is_pmd_order(order)) - return -EINVAL; + mode = sysfs_match_string(huge_shmem_enabled_mode_strings, buf); + if (mode < 0) + return -EINVAL; - spin_lock(&huge_shmem_orders_lock); - clear_bit(order, &huge_shmem_orders_always); - clear_bit(order, &huge_shmem_orders_madvise); - clear_bit(order, &huge_shmem_orders_within_size); - set_bit(order, &huge_shmem_orders_inherit); - spin_unlock(&huge_shmem_orders_lock); - } else if (sysfs_streq(buf, "within_size")) { - spin_lock(&huge_shmem_orders_lock); - clear_bit(order, &huge_shmem_orders_always); - clear_bit(order, &huge_shmem_orders_inherit); - clear_bit(order, &huge_shmem_orders_madvise); - set_bit(order, &huge_shmem_orders_within_size); - spin_unlock(&huge_shmem_orders_lock); - } else if (sysfs_streq(buf, "advise")) { - spin_lock(&huge_shmem_orders_lock); - clear_bit(order, &huge_shmem_orders_always); - clear_bit(order, &huge_shmem_orders_inherit); - clear_bit(order, &huge_shmem_orders_within_size); - set_bit(order, &huge_shmem_orders_madvise); - spin_unlock(&huge_shmem_orders_lock); - } else if (sysfs_streq(buf, "never")) { - spin_lock(&huge_shmem_orders_lock); - clear_bit(order, &huge_shmem_orders_always); - clear_bit(order, &huge_shmem_orders_inherit); - clear_bit(order, &huge_shmem_orders_within_size); - clear_bit(order, &huge_shmem_orders_madvise); - spin_unlock(&huge_shmem_orders_lock); - } else { - ret = -EINVAL; - } + /* Do not override huge allocation policy with non-PMD sized mTHP */ + if (mode == HUGE_SHMEM_ENABLED_INHERIT && + shmem_huge == SHMEM_HUGE_FORCE && !is_pmd_order(order)) + return -EINVAL; - if (ret > 0) { - int err = start_stop_khugepaged(); + spin_lock(&huge_shmem_orders_lock); + for (m = 0; m < ARRAY_SIZE(huge_shmem_orders_by_mode); m++) { + if (m == mode) + changed |= !__test_and_set_bit(order, huge_shmem_orders_by_mode[m]); + else + changed |= __test_and_clear_bit(order, huge_shmem_orders_by_mode[m]); + } + spin_unlock(&huge_shmem_orders_lock); + if (changed) { + err = start_stop_khugepaged(); if (err) ret = err; + } else { + /* + * Recalculate watermarks even when the mode hasn't changed + * to preserve the legacy behavior, as this is always called + * inside start_stop_khugepaged(). + */ + set_recommended_min_free_kbytes(); } + return ret; } -- 2.25.1