From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (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 D6D2A2EA749 for ; Wed, 8 Apr 2026 15:47:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775663258; cv=none; b=ArFl6C6jeQJsJdxq7Ov6rBnllvL+GJsrpb0EFnWVHR0IxEdyHvbbFOc7g7e+EYv7qtjfdMsuvdOwbArTFAZ+QodZLPQzD6zRVRbfvqhGJ3IQ+CnhPh8J2T3ORcmtMeNZXiCwgdAzso7aWPH7iZhdHXeG2srRGwqmizdqHeIwF+Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775663258; c=relaxed/simple; bh=mTQwwZt5uj8cXUAizL9ChIQTeOvHj/NUcNxSipTdwOE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jvlxmsgQLE/H7KMZbu5PPrBJVHT5cCRB/MDBfsnISozAwmt1vxc31htvMpXfc7ryhUYf9vcPX+d+ShfOmmig5s4IUGh6E2uPuTK4daSxWvAewNvtd9LTkcHglsrGY22v7GiIX6q08CSsR2sseeQVAryjRfERAk9ld00g622S6jg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=drahk1PU; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="drahk1PU" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=LT/kDv7NmM6H9XF70WMUnfbRhC7vWN8v8AgsiqkvL94=; b=drahk1PUkWRinoPqEMUu/IGpID sespBLN33xkv3O6Jo4lmIb3svEtdh52lD2jPc7b0qva+SWObuIwmOPSmZNk9IKPMqJ4Sa1pCRWgjX qosQDrkepdDMvgAYye/KH+of2EIVWESUABROUReQFWpLz5K+H/LObbOQeNql6RS2v+Cj6ddAj5TLi zZ/sy4yB1R4M68fFS5SrZRdObpTnLHHCx8Owi9DBY8DPs2cwZd6Rt/dSbOfL7JxE4admIhTp3hKnp Z5MWFZ5Ax0fRtqTbbchR7hrpDsLy7PaSmpzG6X9+CTT2DGLiY0mEfnCV0Y0f2S1TfXLMsd26ezjWE 7vv09mhg==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.96) (envelope-from ) id 1wAV7v-008We3-02; Wed, 08 Apr 2026 15:47:35 +0000 From: Breno Leitao Date: Wed, 08 Apr 2026 08:47:01 -0700 Subject: [PATCH v2 2/2] mm: huge_memory: refactor defrag_show() to use defrag_flags[] Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260408-thp_defrag-v2-2-bc544c1bde4e@debian.org> References: <20260408-thp_defrag-v2-0-bc544c1bde4e@debian.org> In-Reply-To: <20260408-thp_defrag-v2-0-bc544c1bde4e@debian.org> To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.16-dev-453a6 X-Developer-Signature: v=1; a=openpgp-sha256; l=2413; i=leitao@debian.org; h=from:subject:message-id; bh=mTQwwZt5uj8cXUAizL9ChIQTeOvHj/NUcNxSipTdwOE=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBp1niIJkVjI5JeQhzpSXj5cT6B2M8rkQkPYw/h8 B1diSfbV5KJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCadZ4iAAKCRA1o5Of/Hh3 bfBVD/9GZrthmy+SIFfHPYogBzJSYvug1zP4vuKbzqQl/Q4yLcfr6lsLsWBVn9EnAcdF8K3hiO6 4qua0ajk1RjssYSxMNSoBvbgT30y1bFciqPEqXOb/zFOHPevTxoBe2NuVOfQVcjMmp8n8I3qJE0 5PuJrHyY7tD2V7wI3nQO0zU5TOzmaFWXrXQJHrh7LqlvUWxvD4TnOdE2v1T9cSArRf0mFBopR23 7m6Cq53UJulAOtNsSH8tjNyEkBR+/z4RrLyY5tZxdxtOHQ0dCF+OTpXU6LwJMGGq1x+Osl9FHrz 9PLz2oOvMvjWWjPcvIP8wH1XHXwFjUZXu7StH5wLgGKAr1fDPYzHMIiasVSm2/Q03wmI0ZksH7/ kOGchHKltrb3rEZn4jB/FNYn5QrKaNL+aQn8cqRCt3mgYXOZaD3JGz9zedTjmdrl6USkgFZmTXr WPsgssF1UKp9Lx1tYEyNgI+omLMkCa95GFJWjsjwZNQcmypJYf03dUEr6rfjc6/l8JL+CJx95Dj O2ChzMieK5qo/w8Oic1TuoSt26rauwBhlXFx6KHqTlRpYEOK0h8StUzazfMYUR7USEnHpl7Yf93 SBvEusTF9/tbH3aUbdpJZ8JEnfFFq80OUX8ZBaFnyn2ARNGlMRbmB1kICX+UGqu4D5KGaQlpQye tOuSyoN97RpVNgw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Replace the hardcoded if/else chain of test_bit() calls and string literals in defrag_show() with a loop over defrag_flags[] and defrag_mode_strings[] arrays introduced in the previous commit. This makes defrag_show() consistent with defrag_store() and eliminates the duplicated mode name strings. Acked-by: David Hildenbrand (Arm) Tested-by: Lance Yang Reviewed-by: Lance Yang Reviewed-by: Barry Song Signed-off-by: Breno Leitao --- mm/huge_memory.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 76f2d32428c7f..6993c6d8709dc 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -455,24 +455,30 @@ static const enum transparent_hugepage_flag defrag_flags[] = { static ssize_t defrag_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { - const char *output; + int active = DEFRAG_NEVER; + int len = 0; + int i; - if (test_bit(TRANSPARENT_HUGEPAGE_DEFRAG_DIRECT_FLAG, - &transparent_hugepage_flags)) - output = "[always] defer defer+madvise madvise never"; - else if (test_bit(TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_FLAG, - &transparent_hugepage_flags)) - output = "always [defer] defer+madvise madvise never"; - else if (test_bit(TRANSPARENT_HUGEPAGE_DEFRAG_KSWAPD_OR_MADV_FLAG, - &transparent_hugepage_flags)) - output = "always defer [defer+madvise] madvise never"; - else if (test_bit(TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG, - &transparent_hugepage_flags)) - output = "always defer defer+madvise [madvise] never"; - else - output = "always defer defer+madvise madvise [never]"; + for (i = 0; i < ARRAY_SIZE(defrag_flags); i++) { + if (test_bit(defrag_flags[i], &transparent_hugepage_flags)) { + active = i; + break; + } + } - return sysfs_emit(buf, "%s\n", output); + for (i = 0; i < ARRAY_SIZE(defrag_mode_strings); i++) { + if (i == active) + len += sysfs_emit_at(buf, len, "[%s] ", + defrag_mode_strings[i]); + else + len += sysfs_emit_at(buf, len, "%s ", + defrag_mode_strings[i]); + } + + /* Replace trailing space with newline */ + buf[len - 1] = '\n'; + + return len; } static ssize_t defrag_store(struct kobject *kobj, -- 2.52.0