From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 06B8C296BCB for ; Wed, 1 Apr 2026 21:01:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775077278; cv=none; b=t9JzNPTQtF7LKy2aVa/WsybAr/M/3rI31XbpwkwF0UAueVZulns7BVq5fv86u35GHY1sbAzASsZGrI0LhPM/j/YwFaDyGxUechVlr7JZThU4K+HvvpL39ofiRyDniZsTcM6bIq1aY8N6VVOwvPR917pS4orLu1xNFYmzDkzXOQM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775077278; c=relaxed/simple; bh=fe8j9NqDnogTcuMj7dXOBX4qAet6RJ7+JZTVHlEB6+I=; h=Date:To:From:Subject:Message-Id; b=DMuvDzI4JUvk2rOt2hVzvmulr0KzWFWkdD5Be1oOBzuyjvwVDR3mZEw2NMchyL7EjCRNRimEetzUJ/74pQ4tlGrRo65Xo9r5i3u/v48UKlsYvdMz9QdY9MxBtpZk1lCfbFH4reprCCt1+u2o1cG2JtpFLhEKgZXGaQtC9WB1bF0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=0TFEWccE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="0TFEWccE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C3FDC4CEF7; Wed, 1 Apr 2026 21:01:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1775077277; bh=fe8j9NqDnogTcuMj7dXOBX4qAet6RJ7+JZTVHlEB6+I=; h=Date:To:From:Subject:From; b=0TFEWccE9+mUIUmmiaJ8/OAuLML7e43jUBYUTaUe+El8AGtjTFBBzK+qja4yRg+uv QOEa3LruZaTxAlF+gvg1kyJ2f1b4fDmQ/UKnkN0BuPeA7dwf9wDqffzaM/go5qYXiT Fr6MSQuWswRb9rsPjH/yA+9JLMUvqdiIFh4tYd98= Date: Wed, 01 Apr 2026 14:01:17 -0700 To: mm-commits@vger.kernel.org,rppt@kernel.org,david@kernel.org,liwang@redhat.com,akpm@linux-foundation.org From: Andrew Morton Subject: [to-be-updated] selftests-mm-skip-hugetlb_dio-tests-when-dio-alignment-is-incompatible.patch removed from -mm tree Message-Id: <20260401210117.8C3FDC4CEF7@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: selftests/mm: skip hugetlb_dio tests when DIO alignment is incompatible has been removed from the -mm tree. Its filename was selftests-mm-skip-hugetlb_dio-tests-when-dio-alignment-is-incompatible.patch This patch was dropped because an updated version will be issued ------------------------------------------------------ From: Li Wang Subject: selftests/mm: skip hugetlb_dio tests when DIO alignment is incompatible Date: Mon, 30 Mar 2026 20:53:07 +0800 hugetlb_dio test uses sub-page offsets (pagesize / 2) to verify that hugepages used as DIO user buffers are correctly unpinned at completion. However, on filesystems with a logical block size larger than half the page size (e.g., 4K-sector block devices), these unaligned DIO writes are rejected with -EINVAL, causing the test to fail unexpectedly. Add get_dio_alignment() to query the filesystem's required DIO alignment via statx(STATX_DIOALIGN) and skip individual test cases whose file offset or write size is not a multiple of that alignment. Aligned cases continue to run so the core coverage is preserved. While here, open the temporary file once in main() and share the fd across all test cases instead of reopening it in each invocation. === Reproduce Steps === # dd if=/dev/zero of=/tmp/test.img bs=1M count=512 # losetup --sector-size 4096 /dev/loop0 /tmp/test.img # mkfs.xfs /dev/loop0 # mkdir -p /mnt/dio_test # mount /dev/loop0 /mnt/dio_test // Modify test to open /mnt/dio_test and rebuild it: - fd = open("/tmp", O_TMPFILE | O_RDWR | O_DIRECT, 0664); + fd = open("/mnt/dio_test", O_TMPFILE | O_RDWR | O_DIRECT, 0664); # getconf PAGESIZE 4096 # echo 100 >/proc/sys/vm/nr_hugepages # ./hugetlb_dio TAP version 13 1..4 # No. Free pages before allocation : 100 # No. Free pages after munmap : 100 ok 1 free huge pages from 0-12288 Bail out! Error writing to file : Invalid argument (22) # Planned tests != run tests (4 != 1) # Totals: pass:1 fail:0 xfail:0 xpass:0 skip:0 error:0 [akpm@linux-foundation.org: coding-style cleanups] Link: https://lkml.kernel.org/r/20260330125307.98581-1-liwang@redhat.com Signed-off-by: Li Wang Suggested-by: Mike Rapoport Suggested-by: David Hildenbrand Acked-by: David Hildenbrand (Arm) Signed-off-by: Andrew Morton --- tools/testing/selftests/mm/hugetlb_dio.c | 97 ++++++++++++++++----- 1 file changed, 75 insertions(+), 22 deletions(-) --- a/tools/testing/selftests/mm/hugetlb_dio.c~selftests-mm-skip-hugetlb_dio-tests-when-dio-alignment-is-incompatible +++ a/tools/testing/selftests/mm/hugetlb_dio.c @@ -17,12 +17,57 @@ #include #include #include +#include #include "vm_util.h" #include "kselftest.h" -void run_dio_using_hugetlb(unsigned int start_off, unsigned int end_off) +#ifndef STATX_DIOALIGN +#define STATX_DIOALIGN 0x00002000U +#endif + +static int get_dio_alignment(int fd) +{ + struct statx stx; + int ret; + + ret = syscall(__NR_statx, fd, "", AT_EMPTY_PATH, STATX_DIOALIGN, &stx); + if (ret < 0) + return -1; + + /* + * If STATX_DIOALIGN is unsupported, assume no alignment + * constraint and let the test proceed. + */ + if (!(stx.stx_mask & STATX_DIOALIGN) || !stx.stx_dio_offset_align) + return 1; + + return stx.stx_dio_offset_align; +} + +static bool check_dio_alignment(unsigned int start_off, + unsigned int end_off, unsigned int align) +{ + unsigned int writesize = end_off - start_off; + + /* + * The kernel's DIO path checks that file offset, length, and + * buffer address are all multiples of dio_offset_align. When + * this test case's parameters don't satisfy that, the write + * would fail with -EINVAL before exercising the hugetlb unpin + * path, so skip. + */ + if (start_off % align != 0 || writesize % align != 0) { + ksft_test_result_skip("DIO align=%u incompatible with offset %u writesize %u\n", + align, start_off, writesize); + return false; + } + + return true; +} + +static void run_dio_using_hugetlb(int fd, unsigned int start_off, + unsigned int end_off) { - int fd; char *buffer = NULL; char *orig_buffer = NULL; size_t h_pagesize = 0; @@ -39,10 +84,9 @@ void run_dio_using_hugetlb(unsigned int if (!h_pagesize) ksft_exit_fail_msg("Unable to determine huge page size\n"); - /* Open the file to DIO */ - fd = open("/tmp", O_TMPFILE | O_RDWR | O_DIRECT, 0664); - if (fd < 0) - ksft_exit_fail_perror("Error opening file\n"); + /* Reset file position since fd is shared across tests */ + if (lseek(fd, 0, SEEK_SET) < 0) + ksft_exit_fail_perror("lseek failed\n"); /* Get the free huge pages before allocation */ free_hpage_b = get_free_hugepages(); @@ -71,7 +115,6 @@ void run_dio_using_hugetlb(unsigned int /* unmap the huge page */ munmap(orig_buffer, h_pagesize); - close(fd); /* Get the free huge pages after unmap*/ free_hpage_a = get_free_hugepages(); @@ -87,39 +130,49 @@ void run_dio_using_hugetlb(unsigned int "free huge pages from %u-%u\n", start_off, end_off); } +static void run_test(int fd, unsigned int start_off, + unsigned int end_off, unsigned int align) +{ + if (!check_dio_alignment(start_off, end_off, align)) + return; + + run_dio_using_hugetlb(fd, start_off, end_off); +} + int main(void) { - size_t pagesize = 0; - int fd; + int fd, align; + const size_t pagesize = psize(); ksft_print_header(); - /* Open the file to DIO */ - fd = open("/tmp", O_TMPFILE | O_RDWR | O_DIRECT, 0664); - if (fd < 0) - ksft_exit_skip("Unable to allocate file: %s\n", strerror(errno)); - close(fd); - /* Check if huge pages are free */ if (!get_free_hugepages()) ksft_exit_skip("No free hugepage, exiting\n"); - ksft_set_plan(4); + fd = open("/tmp", O_TMPFILE | O_RDWR | O_DIRECT, 0664); + if (fd < 0) + ksft_exit_skip("Unable to allocate file: %s\n", strerror(errno)); - /* Get base page size */ - pagesize = psize(); + align = get_dio_alignment(fd); + if (align < 0) + ksft_exit_skip("Unable to obtain DIO alignment: %s\n", + strerror(errno)); + ksft_set_plan(4); /* start and end is aligned to pagesize */ - run_dio_using_hugetlb(0, (pagesize * 3)); + run_test(fd, 0, (pagesize * 3), align); /* start is aligned but end is not aligned */ - run_dio_using_hugetlb(0, (pagesize * 3) - (pagesize / 2)); + run_test(fd, 0, (pagesize * 3) - (pagesize / 2), align); /* start is unaligned and end is aligned */ - run_dio_using_hugetlb(pagesize / 2, (pagesize * 3)); + run_test(fd, pagesize / 2, (pagesize * 3), align); /* both start and end are unaligned */ - run_dio_using_hugetlb(pagesize / 2, (pagesize * 3) + (pagesize / 2)); + run_test(fd, pagesize / 2, (pagesize * 3) + (pagesize / 2), align); + + close(fd); ksft_finished(); } _ Patches currently in -mm which might be from liwang@redhat.com are