Skip to contentSkip to conversation

selftests/mm: skip khugepaged file tests if mkfs.xfs is unavailable

PATCH Applied Jaeyeon Lee 4 participants 4 messages Sep 12 – Sep 16

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 selftests/mm: skip khugepaged file tests if mkfs.xfs is unavailable

The XFS setup for ./khugepaged all:file checks that the kernel supports XFS but not that mkfs.xfs is installed. When CONFIG_XFS_FS=y and xfsprogs is missing, mkfs.xfs and mount both fail, but SPLIT_HUGE_PAGE_TEST_XFS_PATH is assigned from mktemp -d and stays set. The test then runs against plain tmpfs and six subtests fail.

The script already has a skip path for this test, but it never runs because the path variable is always set. Assign SPLIT_HUGE_PAGE_TEST_XFS_PATH only once mkfs.xfs and mount have both succeeded, and remove the image and directory otherwise.

Assisted-by LLM

---
Changes in v2:
- Attempt mkfs.xfs and mount and fall back if either fails, rather than only checking whether mkfs.xfs exists (Zi Yan)
- Fix Assisted-by tag format

v1: https://lore.kernel.org/linux-mm/[email protected]/

 tools/testing/selftests/mm/run_vmtests.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
tools/testing/selftests/mm/run_vmtests.sh +8 -4
index d09f9f6a384e..b870d21c055a 100755
@@ -417,11 +417,15 @@ if [ -z "${SPLIT_HUGE_PAGE_TEST_XFS_PATH}" ]; then
     if test_selected "thp"; then
 	if grep xfs /proc/filesystems &>/dev/null; then
 	    XFS_IMG=$(mktemp /tmp/xfs_img_XXXXXX)
-	    SPLIT_HUGE_PAGE_TEST_XFS_PATH=$(mktemp -d /tmp/xfs_dir_XXXXXX)
+	    XFS_DIR=$(mktemp -d /tmp/xfs_dir_XXXXXX)
 	    truncate -s 314572800 ${XFS_IMG}
-	    mkfs.xfs -q ${XFS_IMG}
-	    mount -o loop ${XFS_IMG} ${SPLIT_HUGE_PAGE_TEST_XFS_PATH}
-	    MOUNTED_XFS=1
+	    if mkfs.xfs -q ${XFS_IMG} && mount -t xfs -o loop ${XFS_IMG} ${XFS_DIR}; then
+	        SPLIT_HUGE_PAGE_TEST_XFS_PATH=${XFS_DIR}
+	        MOUNTED_XFS=1
+	    else
+	        rmdir ${XFS_DIR}
+	        rm -f ${XFS_IMG}
+	    fi
 	fi
     fi
 fi
Signature · 1 line
2.43.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 20 lines · Jaeyeon Lee

The XFS setup for ./khugepaged all:file checks that the kernel supports XFS but not that mkfs.xfs is installed. When CONFIG_XFS_FS=y and xfsprogs is missing, mkfs.xfs and mount both fail, but SPLIT_HUGE_PAGE_TEST_XFS_PATH is assigned from mktemp -d and stays set. The test then runs against plain tmpfs and six subtests fail.

The script already has a skip path for this test, but it never runs because the path variable is always set. Assign SPLIT_HUGE_PAGE_TEST_XFS_PATH only once mkfs.xfs and mount have both succeeded, and remove the image and directory otherwise.

Assisted-by LLM

---
Changes in v2:
- Attempt mkfs.xfs and mount and fall back if either fails, rather than only checking whether mkfs.xfs exists (Zi Yan)
- Fix Assisted-by tag format

Quoted 5 lines

v1: https://lore.kernel.org/linux-mm/[email protected]/

 tools/testing/selftests/mm/run_vmtests.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

LGTM. Thanks.

Signature · 2 lines
Best Regards,
Yan, Zi
maintainer Acked-by on v2 1/1
#2 lore raw
In reply to Jaeyeon Lee
Quoted 11 lines · Jaeyeon Lee

The XFS setup for ./khugepaged all:file checks that the kernel supports XFS but not that mkfs.xfs is installed. When CONFIG_XFS_FS=y and xfsprogs is missing, mkfs.xfs and mount both fail, but SPLIT_HUGE_PAGE_TEST_XFS_PATH is assigned from mktemp -d and stays set. The test then runs against plain tmpfs and six subtests fail.

The script already has a skip path for this test, but it never runs because the path variable is always set. Assign SPLIT_HUGE_PAGE_TEST_XFS_PATH only once mkfs.xfs and mount have both succeeded, and remove the image and directory otherwise.

Quoted 4 lines
Assisted-by LLM

---

Signature · 3 lines
Cheers,

David
reviewer Reviewed-by on v2 1/1
#3 lore raw
In reply to Jaeyeon Lee
Quoted 6 lines · Jaeyeon Lee

The XFS setup for ./khugepaged all:file checks that the kernel supports XFS but not that mkfs.xfs is installed. When CONFIG_XFS_FS=y and xfsprogs is missing, mkfs.xfs and mount both fail, but SPLIT_HUGE_PAGE_TEST_XFS_PATH is assigned from mktemp -d and stays set. The test then runs against plain tmpfs and six subtests fail.

Quoted 8 lines

The script already has a skip path for this test, but it never runs because the path variable is always set. Assign SPLIT_HUGE_PAGE_TEST_XFS_PATH only once mkfs.xfs and mount have both succeeded, and remove the image and directory otherwise.

Assisted-by LLM

I guess you didn't propagate my tag as it changed a bit? Anyway LGTM so:

Quoted 36 lines

---
Changes in v2:
- Attempt mkfs.xfs and mount and fall back if either fails, rather than only checking whether mkfs.xfs exists (Zi Yan)
- Fix Assisted-by tag format

v1: https://lore.kernel.org/linux-mm/[email protected]/

 tools/testing/selftests/mm/run_vmtests.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
tools/testing/selftests/mm/run_vmtests.sh +8 -5
index d09f9f6a384e..b870d21c055a 100755
@@ -417,11 +417,15 @@ if [ -z "${SPLIT_HUGE_PAGE_TEST_XFS_PATH}" ]; then
     if test_selected "thp"; then
 	if grep xfs /proc/filesystems &>/dev/null; then
 	    XFS_IMG=$(mktemp /tmp/xfs_img_XXXXXX)
-	    SPLIT_HUGE_PAGE_TEST_XFS_PATH=$(mktemp -d /tmp/xfs_dir_XXXXXX)
+	    XFS_DIR=$(mktemp -d /tmp/xfs_dir_XXXXXX)
 	    truncate -s 314572800 ${XFS_IMG}
-	    mkfs.xfs -q ${XFS_IMG}
-	    mount -o loop ${XFS_IMG} ${SPLIT_HUGE_PAGE_TEST_XFS_PATH}
-	    MOUNTED_XFS=1
+	    if mkfs.xfs -q ${XFS_IMG} && mount -t xfs -o loop ${XFS_IMG} ${XFS_DIR}; then
+	        SPLIT_HUGE_PAGE_TEST_XFS_PATH=${XFS_DIR}
+	        MOUNTED_XFS=1
+	    else
+	        rmdir ${XFS_DIR}
+	        rm -f ${XFS_IMG}
+	    fi
 	fi
     fi
 fi
--
Quoted 2 lines

2.43.0

--
Cheers, Lorenzo