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 18F084C8FE8 for ; Tue, 12 May 2026 12:07:34 +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=1778587657; cv=none; b=tRybCli1i5Xyn6POdbvATE5cHsApRQ+JEISGqMcRDkd0TnJ4IzzWdj3wmnbXK72DjTj3iF0U54n53zemL+vf6GYK6W2HafXdvzCES1K24dpGTY7XGSX/SpWsnWsaT+PJ2HUaSnbMyCSaP7DJzSoL0lWf8rFMMhgJ/I98iDiG7uI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778587657; c=relaxed/simple; bh=JZAsucx89h9zaaOH67WofWIC653MsxPaeyZ66UoP2L4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=JnI389qbSLu+750R1+nIr0gbD1lTlW3lUsrZ7nKxrWiv8++FTNvNX+fz05wN2V/847Z/RCcrvB2vrOc3Nljc/dBkiew314ctrCP+YJgMEw/nOxZaeA5FzHw4NgUC+F0kYLTN9XJ0BUno9bTiOWIXV1C1KMw9Tu+3ztD7Qy+k54w= 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=eDICJYrI; 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="eDICJYrI" 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=Dz 83lsq073grgSifOFWs9rUfMneboNx6kp9/4maQqrg=; b=eDICJYrI9Pf5YscXgG pMs/fAu2qUzCQY9lGKxrJ7nZlMaMV+mbT+tOibfydFyHJ5+Scvea+zszkfYGsSO+ +tJEjy5YNg+ZQ37k6e3wkGKtoPAD1bnhxcnDb98ncSuh20Xqrt97v3i5HskhCtl5 oNgBaEuPvoN0AsBHglKaMgznE= Received: from ubuntu24-z.. (unknown []) by gzsmtp2 (Coremail) with SMTP id PSgvCgCncianFwNqsj3nEA--.14956S2; Tue, 12 May 2026 20:06:00 +0800 (CST) From: ranxiaokai627@163.com To: hughd@google.com, baolin.wang@linux.alibaba.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, ran.xiaokai@zte.com.cn, ranxiaokai627@163.com Subject: [PATCH 1/2] mm: huge_memory: refactor thpsize_shmem_enabled_store() with sysfs_match_string() Date: Tue, 12 May 2026 12:05:55 +0000 Message-ID: <20260512120557.49995-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:PSgvCgCncianFwNqsj3nEA--.14956S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxJF4rCFWruFy3uw1xJrW7XFb_yoW7JF1kpF 4fC34fAry8JryDK3yxJF40yryrtrs3Ja1DtrykAas3Aan8JryYyFykt348Z34DAryfXr43 Kr18WasxGrWDtr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pR1E_ZUUUUU= X-CM-SenderInfo: xudq5x5drntxqwsxqiywtou0bp/xtbCxglLl2oDF6kEtgAA32 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 | 88 ++++++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 45 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 3b5dc21b323c..0cc7872cc576 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,32 @@ 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; - 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; + + spin_lock(&huge_shmem_orders_lock); + for (m = 0; m < ARRAY_SIZE(huge_shmem_orders_by_mode); m++) { + if (m == mode) + set_bit(order, huge_shmem_orders_by_mode[m]); + else + clear_bit(order, huge_shmem_orders_by_mode[m]); } + spin_unlock(&huge_shmem_orders_lock); - if (ret > 0) { - int err = start_stop_khugepaged(); + err = start_stop_khugepaged(); + if (err) + ret = err; - if (err) - ret = err; - } return ret; } -- 2.25.1