mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-03-22 07:27:12 +08:00
mm/mm_init: replace simple_strtoul with kstrtobool in set_hashdist
Use bool for 'hashdist' and replace simple_strtoul() with kstrtobool() for parsing the 'hashdist=' boot parameter. Unlike simple_strtoul(), which returns an unsigned long, kstrtobool() converts the string directly to bool and avoids implicit casting. Check the return value of kstrtobool() and reject invalid values. This adds error handling while preserving behavior for existing values, and removes use of the deprecated simple_strtoul() helper. The current code silently sets 'hashdist = 0' if parsing fails, instead of leaving the default value (HASHDIST_DEFAULT) unchanged. Additionally, kstrtobool() accepts common boolean strings such as "on" and "off". Link: https://lkml.kernel.org/r/20251217110214.50807-1-thorsten.blum@linux.dev Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev> Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
committed by
Andrew Morton
parent
a98ec863fd
commit
84355caa27
@@ -598,9 +598,9 @@ extern void *alloc_large_system_hash(const char *tablename,
|
||||
*/
|
||||
#ifdef CONFIG_NUMA
|
||||
#define HASHDIST_DEFAULT IS_ENABLED(CONFIG_64BIT)
|
||||
extern int hashdist; /* Distribute hashes across NUMA nodes? */
|
||||
extern bool hashdist; /* Distribute hashes across NUMA nodes? */
|
||||
#else
|
||||
#define hashdist (0)
|
||||
#define hashdist (false)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MEMTEST
|
||||
|
||||
@@ -646,21 +646,18 @@ int __meminit early_pfn_to_nid(unsigned long pfn)
|
||||
return nid;
|
||||
}
|
||||
|
||||
int hashdist = HASHDIST_DEFAULT;
|
||||
bool hashdist = HASHDIST_DEFAULT;
|
||||
|
||||
static int __init set_hashdist(char *str)
|
||||
{
|
||||
if (!str)
|
||||
return 0;
|
||||
hashdist = simple_strtoul(str, &str, 0);
|
||||
return 1;
|
||||
return kstrtobool(str, &hashdist) == 0;
|
||||
}
|
||||
__setup("hashdist=", set_hashdist);
|
||||
|
||||
static inline void fixup_hashdist(void)
|
||||
{
|
||||
if (num_node_state(N_MEMORY) == 1)
|
||||
hashdist = 0;
|
||||
hashdist = false;
|
||||
}
|
||||
#else
|
||||
static inline void fixup_hashdist(void) {}
|
||||
|
||||
Reference in New Issue
Block a user