Received-SPF: pass (google.com: domain of linux-kernel+bounces-89055-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Zi Yan <ziy@nvidia.com>
To: Aishwarya TCV <aishwarya.tcv@arm.com>
Cc: "\"Pankaj Raghav (Samsung)\"" <kernel@pankajraghav.com>,
 linux-mm@kvack.org, "\"Matthew Wilcox (Oracle)\"" <willy@infradead.org>,
 David Hildenbrand <david@redhat.com>, Yang Shi <shy828301@gmail.com>,
 Yu Zhao <yuzhao@google.com>,
 "\"Kirill A . Shutemov\"" <kirill.shutemov@linux.intel.com>,
 Ryan Roberts <ryan.roberts@arm.com>,
 =?utf-8?q?=22Michal_Koutn=C3=BD=22?= <mkoutny@suse.com>,
 Roman Gushchin <roman.gushchin@linux.dev>,
 "\"Zach O'Keefe\"" <zokeefe@google.com>, Hugh Dickins <hughd@google.com>,
 Luis Chamberlain <mcgrof@kernel.org>,
 Andrew Morton <akpm@linux-foundation.org>, linux-kernel@vger.kernel.org,
 cgroups@vger.kernel.org, linux-fsdevel@vger.kernel.org,
 linux-kselftest@vger.kernel.org, Mark Brown <broonie@kernel.org>
Subject: Re: [PATCH v5 8/8] mm: huge_memory: enable debugfs to split huge
 pages to any order.
Date: Fri, 01 Mar 2024 15:02:35 -0500
Message-ID: <7E498B77-6CC9-4FC6-B980-D79EEC548CD0@nvidia.com>
In-Reply-To: <A111EB95-0AF5-4715-82A4-70B8AD900A93@nvidia.com>
References: <20240226205534.1603748-1-zi.yan@sent.com>
 <20240226205534.1603748-9-zi.yan@sent.com>
 <082e48c8-71b7-4937-a5da-7a37b4be16ba@arm.com>
 <A111EB95-0AF5-4715-82A4-70B8AD900A93@nvidia.com>
Content-Type: multipart/signed;
 boundary="=_MailMate_E6B89F4F-A6CE-4D92-9F77-704DC444C51A_=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?XyhQIcWrKNYA0KVk4xm85dhujhxKL8z8CN+fSZ9CHw3fij4C1vWkPbBjgaqu?=
 =?us-ascii?Q?C5O9WM27+w2DuvVT79IuBo19MAlH+54NHpwIRuj3+Up4PWf7MPtESdHG5Abr?=
 =?us-ascii?Q?IeR40rnrz/Bqua7z3lPEtopY4GNJl1yaMps4easLa+hP9MpgzlNYuGXGGaeA?=
 =?us-ascii?Q?6nEDZjjPGOShMEXRAxC4NbKpeoasS0ppBW+3RnMFnm8SBaWQm1a1t3BQWQpc?=
 =?us-ascii?Q?2JgueAFD6fyYU3lbehkyZGFG7XBIQVZknOalKLOscDMKmVD6kctF6Bmgt0S2?=
 =?us-ascii?Q?TgomPXosXHTrmBzDOfnUxtKRCcKjMQuLSDYUV75diM+zxE/QyTH6fk5Fmbjw?=
 =?us-ascii?Q?SbYYpAhl+oCOfJ78WzEy16cyn8o+OyG8zoL8uQn/GvU1jdbU6urbiJ9FT6gG?=
 =?us-ascii?Q?s3lPrkfHL2tz/i3ddzPiC1mqleMAt65Amb9l0DeCfD8hvWN3NVEzZU84Zlj8?=
 =?us-ascii?Q?M8ky3ZFyg374x+jkNW4wfm5ZxqI+PyQ0XoZIqRfSJq1NPWpyfcVa7FyY97uv?=
 =?us-ascii?Q?XZ7aDJGRLNzNyzLtgraBHp/AV1s+4oxhFEFv5eiQpJefMOvsaqp6SEVjoujx?=
 =?us-ascii?Q?xMWolMdi4lnF0nZvxSIspmeExbAmOoBC3J/gGgCIj6bPMxCBkooWwkZ5Tboc?=
 =?us-ascii?Q?CGa0AJLXRnoKSvmtpNf7ugm4iOBZ+bg1vfxDeEFvb96yNbPcqD1pcmR1tT98?=
 =?us-ascii?Q?tCGCv3ZRtNYPIkWbDDnwj9f+3wxu9SpQhaL093XypOgYlHSSqFS8Vtnz5nfM?=
 =?us-ascii?Q?wH4anAB90TMvVhGpXBGTJViy3LKesAyQyiqBO7WjgdI4caMsZ1Z6jCUadMxD?=
 =?us-ascii?Q?7/uZB2lyBRazQlELTvP1TvDZ2c6p8G+ViIPG3Fj/UU5CGe/VaBBl0NPqHpVw?=
 =?us-ascii?Q?WswM7o0xK1uk6FeVMYB2TU70mJJ/ppQFf7mlj9SP8R/SDkIAJwI+00KFG7sJ?=
 =?us-ascii?Q?AjW3bWxmv37ZZUWK9hRBnmrsCCkBwcmwlTUOyQMbe9uv6pyWBECrT5FDdBoo?=
 =?us-ascii?Q?aTUXyQIY5OSaD8CUz3gNNtvr2A6bywtsCO6Q5pslhBalOHXAcQIX+uCHZrsn?=
 =?us-ascii?Q?0dBh0tGklSU8OoI+PbsZxXSce6OzHd5/a7QQ9Bu4IbDwGPqIXLzL/RYPnkRo?=
 =?us-ascii?Q?ioAcQw1eADEMc+NRyvCsS1fTOXGtOOtiGZ82FLinWz9jmxm+kAsbYOrKSCAC?=
 =?us-ascii?Q?PCzde16VeYRU1lmP/Cs60ASMTnlDtF8rKPdUDUWK1AoM9LxSkVl3USIMq7jI?=
 =?us-ascii?Q?TRRtaftkglZQoQKrkxS6CpPl8CdkVJrNkJHCcyz4Xt/SbnmKuQQUnRJNjqFB?=
 =?us-ascii?Q?tCtoDR443whDaL2m3tEbYR/1p+0MggpUgbit7oeGXMm/GleEkD6m9y70dsae?=
 =?us-ascii?Q?3GlhlOpjOvH9QNvTd74bgWU0eCnjUywWW+hSLs1TzWA8WS8ktlRdcvmgvhlE?=
 =?us-ascii?Q?GXzELni7m7R8WXWRmU0NEGoNsYaSQCThUn8sR/CrB3BgBL/YocW2+SyU4Eqf?=
 =?us-ascii?Q?ANc24FydrrSuMdaKSNLXKK6axtpDPGSxTynI2ZNqjUCXhZunkQmuKEyQpUR4?=
 =?us-ascii?Q?mGxGsjIkKeielM5PpRaR4GLF/4sNXd1928rNN5jj?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 75f5d93e-b240-4274-7124-08dc3a2a8b99
X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB5744.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2024 20:02:38.6785
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 5DG5qd0bLRwsVpCKRLZUfvwQva507nb8VP5CuBV2TL3FyMde1VZ4X4FsPfb3qWZ9
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9270

--=_MailMate_E6B89F4F-A6CE-4D92-9F77-704DC444C51A_=
Content-Type: multipart/mixed;
 boundary="=_MailMate_C1672DF9-8843-4915-92AE-5BBD0F2FC0F2_="


--=_MailMate_C1672DF9-8843-4915-92AE-5BBD0F2FC0F2_=
Content-Type: text/plain

On 1 Mar 2024, at 14:37, Zi Yan wrote:

> On 1 Mar 2024, at 4:51, Aishwarya TCV wrote:
>
>> On 26/02/2024 20:55, Zi Yan wrote:
>>> From: Zi Yan <ziy@nvidia.com>
>>>
>>> It is used to test split_huge_page_to_list_to_order for pagecache THPs.
>>> Also add test cases for split_huge_page_to_list_to_order via both
>>> debugfs.
>>>
>>> Signed-off-by: Zi Yan <ziy@nvidia.com>
>>> ---
>>>  mm/huge_memory.c                              |  34 ++++--
>>>  .../selftests/mm/split_huge_page_test.c       | 115 +++++++++++++++++-
>>>  2 files changed, 131 insertions(+), 18 deletions(-)
>>>
>>
>> Hi Zi,
>>
>> When booting the kernel against next-master(20240228)with Arm64 on
>> Marvell Thunder X2 (TX2), the kselftest-mm test 'split_huge_page_test'
>> is failing in our CI (with rootfs over NFS). I can send the full logs if
>> required.
>>
>> A bisect (full log below) identified this patch as introducing the
>> failure. Bisected it on the tag "next-20240228" at repo
>> "https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git".
>>
>> This works fine on  Linux version 6.8.0-rc6
>
> Hi Aishwarya,
>
> Can you try the attached patch and see if it fixes the failure? I changed
> the test to accept XFS dev as input, mount XFS on a temp folder under /tmp,
> and skip if no XFS is mounted.

Please try this updated one. It allows you to specify a XFS device path
in SPLIT_HUGE_PAGE_TEST_XFS_PATH env variable, which is passed to
split_huge_page_test in run_vmtests.sh. It at least allow CI/CD to run
the test without too much change.

--
Best Regards,
Yan, Zi

--=_MailMate_C1672DF9-8843-4915-92AE-5BBD0F2FC0F2_=
Content-Disposition: attachment; filename=selftest.patch
Content-ID: <A694A93E-BA63-4389-80AA-333F1C112AFB@nvidia.com>
Content-Type: text/plain; name=selftest.patch
Content-Transfer-Encoding: quoted-printable

diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/se=
lftests/mm/run_vmtests.sh
index fe140a9f4f9d..22e45207cf6b 100755
--- a/tools/testing/selftests/mm/run_vmtests.sh
+++ b/tools/testing/selftests/mm/run_vmtests.sh
@@ -412,7 +412,7 @@ CATEGORY=3D"thp" run_test ./khugepaged -s 2
 =

 CATEGORY=3D"thp" run_test ./transhuge-stress -d 20
 =

-CATEGORY=3D"thp" run_test ./split_huge_page_test
+CATEGORY=3D"thp" run_test ./split_huge_page_test ${SPLIT_HUGE_PAGE_TEST_=
XFS_PATH}
 =

 CATEGORY=3D"migration" run_test ./migration
 =

diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/te=
sting/selftests/mm/split_huge_page_test.c
index cf09fdc9ef22..047883473b84 100644
--- a/tools/testing/selftests/mm/split_huge_page_test.c
+++ b/tools/testing/selftests/mm/split_huge_page_test.c
@@ -26,7 +26,6 @@ uint64_t pmd_pagesize;
 =

 #define SPLIT_DEBUGFS "/sys/kernel/debug/split_huge_pages"
 #define SMAP_PATH "/proc/self/smaps"
-#define THP_FS_PATH "/mnt/thp_fs"
 #define INPUT_MAX 80
 =

 #define PID_FMT "%d,0x%lx,0x%lx,%d"
@@ -268,7 +267,45 @@ void split_file_backed_thp(void)
 	ksft_exit_fail_msg("Error occurred\n");
 }
 =

-void create_pagecache_thp_and_fd(const char *testfile, size_t fd_size, i=
nt *fd, char **addr)
+bool prepare_thp_fs(const char *xfs_dev_loc, char *thp_fs_template,
+		const char **thp_fs_loc)
+{
+	bool mounted =3D false;
+
+	*thp_fs_loc =3D mkdtemp(thp_fs_template);
+
+	if (!*thp_fs_loc)
+		ksft_exit_fail_msg("cannot create temp folder\n");
+
+	if (xfs_dev_loc) {
+		int status =3D mount(xfs_dev_loc, *thp_fs_loc, "xfs", 0, NULL);
+
+		if (status)
+			ksft_exit_fail_msg("Unable to mount xfs for testing\n");
+		mounted =3D true;
+	}
+	return mounted;
+}
+
+void cleanup_thp_fs(const char *thp_fs_loc, bool mounted)
+{
+	int status;
+
+	if (mounted) {
+		status =3D umount(thp_fs_loc);
+		if (status)
+			ksft_exit_fail_msg("Unable to umount %s\n",
+					   thp_fs_loc);
+	}
+
+	status =3D rmdir(thp_fs_loc);
+	if (status)
+		ksft_exit_fail_msg("cannot remove tmp dir: %s\n",
+				   strerror(errno));
+}
+
+int create_pagecache_thp_and_fd(const char *testfile, size_t fd_size, in=
t *fd,
+		char **addr)
 {
 	size_t i;
 	int dummy;
@@ -277,7 +314,7 @@ void create_pagecache_thp_and_fd(const char *testfile=
, size_t fd_size, int *fd,
 =

 	*fd =3D open(testfile, O_CREAT | O_RDWR, 0664);
 	if (*fd =3D=3D -1)
-		ksft_exit_fail_msg("Failed to create a file at "THP_FS_PATH);
+		ksft_exit_fail_msg("Failed to create a file at %s\n", testfile);
 =

 	for (i =3D 0; i < fd_size; i++) {
 		unsigned char byte =3D (unsigned char)i;
@@ -299,7 +336,7 @@ void create_pagecache_thp_and_fd(const char *testfile=
, size_t fd_size, int *fd,
 =

 	*fd =3D open(testfile, O_RDWR);
 	if (*fd =3D=3D -1) {
-		ksft_perror("Failed to open a file at "THP_FS_PATH);
+		ksft_perror("Failed to open testfile\n");
 		goto err_out_unlink;
 	}
 =

@@ -314,26 +351,37 @@ void create_pagecache_thp_and_fd(const char *testfi=
le, size_t fd_size, int *fd,
 		dummy +=3D *(*addr + i);
 =

 	if (!check_huge_file(*addr, fd_size / pmd_pagesize, pmd_pagesize)) {
-		ksft_print_msg("No large pagecache folio generated, please mount a fil=
esystem supporting large folio at "THP_FS_PATH"\n");
-		goto err_out_close;
+		ksft_print_msg("No large pagecache folio generated, please provide a f=
ilesystem supporting large folio\n");
+		unlink(testfile);
+		ksft_test_result_skip("Pagecache folio split skipped\n");
+		return -2;
 	}
-	return;
+	return 0;
 err_out_close:
 	close(*fd);
 err_out_unlink:
 	unlink(testfile);
 	ksft_exit_fail_msg("Failed to create large pagecache folios\n");
+	return -1;
 }
 =

-void split_thp_in_pagecache_to_order(size_t fd_size, int order)
+void split_thp_in_pagecache_to_order(size_t fd_size, int order, const ch=
ar *fs_loc)
 {
 	int fd;
 	char *addr;
 	size_t i;
-	const char testfile[] =3D THP_FS_PATH "/test";
+	char testfile[INPUT_MAX];
 	int err =3D 0;
 =

-	create_pagecache_thp_and_fd(testfile, fd_size, &fd, &addr);
+	err =3D snprintf(testfile, INPUT_MAX, "%s/test", fs_loc);
+
+	if (err < 0)
+		ksft_exit_fail_msg("cannot generate right test file name\n");
+
+	err =3D create_pagecache_thp_and_fd(testfile, fd_size, &fd, &addr);
+	if (err)
+		return;
+	err =3D 0;
 =

 	write_debugfs(PID_FMT, getpid(), (uint64_t)addr, (uint64_t)addr + fd_si=
ze, order);
 =

@@ -351,6 +399,7 @@ void split_thp_in_pagecache_to_order(size_t fd_size, =
int order)
 	}
 =

 out:
+	munmap(addr, fd_size);
 	close(fd);
 	unlink(testfile);
 	if (err)
@@ -360,8 +409,11 @@ void split_thp_in_pagecache_to_order(size_t fd_size,=
 int order)
 =

 int main(int argc, char **argv)
 {
-	int i;
+	int i, mounted;
 	size_t fd_size;
+	char *optional_xfs_dev_loc =3D NULL;
+	char fs_loc_template[] =3D "/tmp/thp_fs_XXXXXX";
+	const char *fs_loc;
 =

 	ksft_print_header();
 =

@@ -370,6 +422,9 @@ int main(int argc, char **argv)
 		ksft_finished();
 	}
 =

+	if (argc > 1)
+		optional_xfs_dev_loc =3D argv[1];
+
 	ksft_set_plan(3+9);
 =

 	pagesize =3D getpagesize();
@@ -384,8 +439,11 @@ int main(int argc, char **argv)
 	split_pte_mapped_thp();
 	split_file_backed_thp();
 =

+	mounted =3D prepare_thp_fs(optional_xfs_dev_loc, fs_loc_template,
+				 &fs_loc);
 	for (i =3D 8; i >=3D 0; i--)
-		split_thp_in_pagecache_to_order(fd_size, i);
+		split_thp_in_pagecache_to_order(fd_size, i, fs_loc);
+	cleanup_thp_fs(fs_loc, mounted);
 =

 	ksft_finished();
 =


--=_MailMate_C1672DF9-8843-4915-92AE-5BBD0F2FC0F2_=--

--=_MailMate_E6B89F4F-A6CE-4D92-9F77-704DC444C51A_=
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename=signature.asc
Content-Type: application/pgp-signature; name=signature.asc

-----BEGIN PGP SIGNATURE-----

iQJDBAEBCgAtFiEE6rR4j8RuQ2XmaZol4n+egRQHKFQFAmXiNFsPHHppeUBudmlk
aWEuY29tAAoJEOJ/noEUByhUkb0P/RF0K1l4H7AKxP+74NW0vu0pct6Hb3dHxh6L
L0M/tgxx2hR6hOzqaW/FmHITpqVtmq4Uyvxt3Swx3pNO9gGXDX2nUmBxpWDbnElC
Bq+8Wh8Q4YEmTDKG6uFiAkfDrVcYlEfTQXg3ipGSO0ZRYe10ySg7BjAHwSNn3OWy
CIa3of4UEPU90RK+AIzDAIPIp13ahprZdL6dSCIhh5JpryA/vDi8TtJjz5o9CzpC
zqjFC5Fh9FfxL/cbfxfpylH7G9B5U8a2g+qa7vCkVe3fC2WTgGnW1RDHGrk59WLE
ncOWv+N+jHIiqYc7JCVtHxeIZ6TOiJSYtPZZMulLwvS4tW0/ikp/BhfyrIDRDaPs
WY9emlz9D4mSTbX4NFL+wmqeYLmnZH/aCzYUadOWsr9Q6J3oMVYqokpi4HWdWD3S
4GOMJI95oNBE4Qmxcq51WFpsLI0UKptsw6zm5kx/215YK7vOQZMZEqeabHUMT7WJ
H4s94oPhSKk0zwBI7LwWQLzeQDZRU/7LG014tu2NU7JKpE4kcferQRyProiVG9BW
BCEQNxvDcczf6GDO+VH8gvTvQXGOH61vgaMUDEQLArHRbJHzqXk5PN0Y1doZv6z+
I+OGEq3Rs7ryp7v4Vl7lC8Bi8jgg+vR/I/A8//KHtcV1GKA2ZAsLn4yZDY+NKMnf
vIRd6itE
=dzGr
-----END PGP SIGNATURE-----

--=_MailMate_E6B89F4F-A6CE-4D92-9F77-704DC444C51A_=--