Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

mm/khugepaged: define KHUGEPAGED_MAX_PTES_LIMIT as HPAGE_PMD_NR - 1

The value (HPAGE_PMD_NR - 1) is used often in the khugepaged code to
signify the limit of the max_ptes_* values. Add a define for this to
increase code readability and reuse.

Link: https://lkml.kernel.org/r/20260325114022.444081-4-npache@redhat.com
Signed-off-by: Nico Pache <npache@redhat.com>
Acked-by: Pedro Falcato <pfalcato@suse.de>
Acked-by: David Hildenbrand (Arm) <david@kernel.org>
Suggested-by: Lorenzo Stoakes (Oracle) <ljs@kernel.org>
Reviewed-by: Lorenzo Stoakes (Oracle) <ljs@kernel.org>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Reviewed-by: Zi Yan <ziy@nvidia.com>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Barry Song <baohua@kernel.org>
Cc: Brendan Jackman <jackmanb@google.com>
Cc: Byungchul Park <byungchul@sk.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Dev Jain <dev.jain@arm.com>
Cc: Gregory Price <gourry@gourry.net>
Cc: "Huang, Ying" <ying.huang@linux.alibaba.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jann Horn <jannh@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Joshua Hahn <joshua.hahnjy@gmail.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Lance Yang <lance.yang@linux.dev>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Nanyong Sun <sunnanyong@huawei.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Rafael Aquini <raquini@redhat.com>
Cc: Rakie Kim <rakie.kim@sk.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Shivank Garg <shivankg@amd.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Takashi Iwai (SUSE) <tiwai@suse.de>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Usama Arif <usamaarif642@gmail.com>
Cc: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yang Shi <yang@os.amperecomputing.com>
Cc: Zach O'Keefe <zokeefe@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Nico Pache and committed by
Andrew Morton
36da8a88 b90c453d

+5 -4
+5 -4
mm/khugepaged.c
··· 89 89 * 90 90 * Note that these are only respected if collapse was initiated by khugepaged. 91 91 */ 92 + #define KHUGEPAGED_MAX_PTES_LIMIT (HPAGE_PMD_NR - 1) 92 93 unsigned int khugepaged_max_ptes_none __read_mostly; 93 94 static unsigned int khugepaged_max_ptes_swap __read_mostly; 94 95 static unsigned int khugepaged_max_ptes_shared __read_mostly; ··· 260 259 unsigned long max_ptes_none; 261 260 262 261 err = kstrtoul(buf, 10, &max_ptes_none); 263 - if (err || max_ptes_none > HPAGE_PMD_NR - 1) 262 + if (err || max_ptes_none > KHUGEPAGED_MAX_PTES_LIMIT) 264 263 return -EINVAL; 265 264 266 265 khugepaged_max_ptes_none = max_ptes_none; ··· 285 284 unsigned long max_ptes_swap; 286 285 287 286 err = kstrtoul(buf, 10, &max_ptes_swap); 288 - if (err || max_ptes_swap > HPAGE_PMD_NR - 1) 287 + if (err || max_ptes_swap > KHUGEPAGED_MAX_PTES_LIMIT) 289 288 return -EINVAL; 290 289 291 290 khugepaged_max_ptes_swap = max_ptes_swap; ··· 311 310 unsigned long max_ptes_shared; 312 311 313 312 err = kstrtoul(buf, 10, &max_ptes_shared); 314 - if (err || max_ptes_shared > HPAGE_PMD_NR - 1) 313 + if (err || max_ptes_shared > KHUGEPAGED_MAX_PTES_LIMIT) 315 314 return -EINVAL; 316 315 317 316 khugepaged_max_ptes_shared = max_ptes_shared; ··· 383 382 return -ENOMEM; 384 383 385 384 khugepaged_pages_to_scan = HPAGE_PMD_NR * 8; 386 - khugepaged_max_ptes_none = HPAGE_PMD_NR - 1; 385 + khugepaged_max_ptes_none = KHUGEPAGED_MAX_PTES_LIMIT; 387 386 khugepaged_max_ptes_swap = HPAGE_PMD_NR / 8; 388 387 khugepaged_max_ptes_shared = HPAGE_PMD_NR / 2; 389 388