Commit 49850bd0 authored by Usama Arif's avatar Usama Arif Committed by Andrew Morton
Browse files

selftest/mm: extract sz2ord function into vm_util.h 

The function already has 2 uses and will have a 3rd one in prctl
selftests.  The pagesize argument is added into the function, as it's not
a global variable anymore.  No functional change intended with this patch.

Link: https://lkml.kernel.org/r/20250815135549.130506-6-usamaarif642@gmail.com


Suggested-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarUsama Arif <usamaarif642@gmail.com>
Reviewed-by: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: default avatarZi Yan <ziy@nvidia.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Barry Song <baohua@kernel.org>
Cc: Dev Jain <dev.jain@arm.com>
Cc: Jann Horn <jannh@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Mariano Pache <npache@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Rik van Riel <riel@surriel.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: SeongJae Park <sj@kernel.org>
Cc: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Yafang <laoar.shao@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 7de85491

tools/testing/selftests/mm/cow.c

+4 −4
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static int detect_thp_sizes(size_t sizes[], int max) 
	if (!pmdsize)

		return 0;



	orders = 1UL << sz2ord(pmdsize);

	orders = 1UL << sz2ord(pmdsize, pagesize);

	orders |= thp_supported_orders();



	for (i = 0; orders && count < max; i++) {
@@ -1211,8 +1211,8 @@ static void run_anon_test_case(struct test_case const *test_case) 
		size_t size = thpsizes[i];

		struct thp_settings settings = *thp_current_settings();



		settings.hugepages[sz2ord(pmdsize)].enabled = THP_NEVER;

		settings.hugepages[sz2ord(size)].enabled = THP_ALWAYS;

		settings.hugepages[sz2ord(pmdsize, pagesize)].enabled = THP_NEVER;

		settings.hugepages[sz2ord(size, pagesize)].enabled = THP_ALWAYS;

		thp_push_settings(&settings);



		if (size == pmdsize) {
@@ -1863,7 +1863,7 @@ int main(int argc, char **argv) 
	if (pmdsize) {

		/* Only if THP is supported. */

		thp_read_settings(&default_settings);

		default_settings.hugepages[sz2ord(pmdsize)].enabled = THP_INHERIT;

		default_settings.hugepages[sz2ord(pmdsize, pagesize)].enabled = THP_INHERIT;

		thp_save_settings();

		thp_push_settings(&default_settings);

tools/testing/selftests/mm/split_huge_page_test.c

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ int main(int argc, char **argv) 
		ksft_exit_fail_msg("Reading PMD pagesize failed\n");



	nr_pages = pmd_pagesize / pagesize;

	max_order = sz2ord(pmd_pagesize);

	max_order =  sz2ord(pmd_pagesize, pagesize);

	tests = 2 + (max_order - 1) + (2 * max_order) + (max_order - 1) * 4 + 2;

	ksft_set_plan(tests);

tools/testing/selftests/mm/uffd-wp-mremap.c

+2 −2
Original line number Diff line number Diff line
@@ -82,9 +82,9 @@ static void *alloc_one_folio(size_t size, bool private, bool hugetlb) 
		struct thp_settings settings = *thp_current_settings();



		if (private)

			settings.hugepages[sz2ord(size)].enabled = THP_ALWAYS;

			settings.hugepages[sz2ord(size, pagesize)].enabled = THP_ALWAYS;

		else

			settings.shmem_hugepages[sz2ord(size)].enabled = SHMEM_ALWAYS;

			settings.shmem_hugepages[sz2ord(size, pagesize)].enabled = SHMEM_ALWAYS;



		thp_push_settings(&settings);

tools/testing/selftests/mm/vm_util.h

+2 −2
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ static inline void log_test_result(int result) 
	ksft_test_result_report(result, "%s\n", test_name);

}



static inline int sz2ord(size_t size)

static inline int sz2ord(size_t size, size_t pagesize)

{

	return __builtin_ctzll(size / getpagesize());

	return __builtin_ctzll(size / pagesize);

}



void *sys_mremap(void *old_address, unsigned long old_size,