common/rc: teach _require_scratch_swapfile() that swap does not work with DAX
PATCH 1/1 common/rc: teach _require_scratch_swapfile() that swap does not work with DAX
The statement, "ext* and xfs have supported all variants of swap files since their introduction, so swapon should not fail," is not quite completely true. In particular, swapon does not work if the DAX is active on a swapfile, and that would be true if the file system is mounted with -o dax.
So if swapon fails, check to see if the swapfile has the STATX_ATTR_DAX attribute set, and if so, issue a _notrun instead of a _fail.
--- common/rc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
common/rc +10 -1
@@ -2495,8 +2495,17 @@ _require_scratch_swapfile() case "$FSTYP" in ext2|ext3|ext4|xfs) if ! swapon "$SCRATCH_MNT/swap" >/dev/null 2>&1; then + local attributes=$($XFS_IO_PROG -c 'statx -r' \ + "$SCRATCH_MNT/swap" 2>/dev/null | \ + awk '/stat.attributes / { print $3 }') _scratch_unmount - _fail "swapon failed for $FSTYP" + if test -n "$attributes" -a \ + $((attributes & 0x00200000)) -eq $((0x00200000)) ; + then + _notrun "DAX swapfiles are not supported" + else + _fail "swapon failed for $FSTYP" + fi fi ;; *)
Signature · 1 line
2.31.0
Quoted 9 lines · Theodore Ts'o
The statement, "ext* and xfs have supported all variants of swap files since their introduction, so swapon should not fail," is not quite completely true. In particular, swapon does not work if the DAX is active on a swapfile, and that would be true if the file system is mounted with -o dax.
So if swapon fails, check to see if the swapfile has the
STATX_ATTR_DAXattribute set, and if so, issue a_notruninstead of a_fail.
Isn't the fact that swapon doesn't work on DAX files a back? The swap I/O path couldn't care less if the file is marked as DAX or not.