growfs: workaround sfdisk + LUKS incompatibility on 512e disks

overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-growfs.sh

@@ -101,14 +101,28 @@ while true; do
         part)
             eval $(udevadm info --query property --export "${current_blkdev}" | grep ^DM_ || :)
             if [ -n "${DM_MPATH:-}" ]; then
+                PKNAME=/dev/mapper/${DM_MPATH}
+                partnum=${DM_PART}
                 # Since growpart does not understand device mapper, we have to use sfdisk.
-                echo ", +" | sfdisk --no-reread --no-tell-kernel --force -N "${DM_PART}" "/dev/mapper/${DM_MPATH}"
+                echo ", +" | sfdisk --no-reread --no-tell-kernel --force -N "${partnum}" "${PKNAME}"
                 udevadm settle || : # Wait for udev-triggered kpartx to update mappings
             else
                 partnum=$(cat "/sys/dev/block/${MAJMIN}/partition")
                 # XXX: ideally this'd be idempotent and we wouldn't `|| :`
                 growpart "${PKNAME}" "${partnum}" || :
             fi
+            # If this is a 512e disk, then ensure the partition end is 4K
+            # aligned to be compatible with LUKS. If it's a 4Kn disk, `size`
+            # necessarily must be 4K aligned (note the sysfs value is always
+            # reported in 512b sizes). We should be able to drop this once
+            # https://github.com/util-linux/util-linux/issues/2140 is fixed.
+            size=$(cat "/sys/dev/block/${MAJMIN}/size")
+            phy_sec=$(blockdev --getpbsz "${PKNAME}")
+            if [ "$((size % 8))" != 0 ] && [ "${phy_sec:-}" = 4096 ]; then
+                size=$(((size >> 3) << 3))  # round down to nearest 4K boundary
+                echo ", ${size}" | sfdisk --no-reread --force -N "${partnum}" "${PKNAME}"
+                partx --update --nr "${partnum}" "${PKNAME}"
+            fi
             ;;
         crypt)
             # XXX: yuck... we need to expose this sanely in clevis

overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/module-setup.sh

@@ -42,6 +42,7 @@ install() {
     inst_multiple  \
         basename   \
         blkid      \
+        blockdev   \
         cat        \
         dirname    \
         findmnt    \

tests/kola/root-reprovision/luks/512e/config.ign

@@ -0,0 +1 @@
+../config.ign

tests/kola/root-reprovision/luks/512e/data

@@ -0,0 +1 @@
+../data

tests/kola/root-reprovision/luks/512e/test.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+## kola:
+##   # This test reprovisions the rootfs.
+##   tags: "reprovision"
+##   # This uses additionalDisks, which is QEMU only
+##   platforms: qemu
+##   # Root reprovisioning requires at least 4GiB of memory.
+##   minMemory: 4096
+##   # A TPM backend device is not available on s390x to suport TPM.
+##   architectures: "! s390x"
+##   # This test includes a lot of disk I/O and needs a higher
+##   # timeout value than the default.
+##   timeoutMin: 15
+##   description: Verify that LUKS on a 512e disks works.
+##   primaryDisk: ":512e"
+
+set -xeuo pipefail
+
+# shellcheck disable=SC1091
+. "$KOLA_EXT_DATA/commonlib.sh"
+
+# sanity-check that it's a 512e disk
+phy_sec=$(blockdev --getpbsz /dev/disk/by-id/virtio-primary-disk)
+log_sec=$(blockdev --getss /dev/disk/by-id/virtio-primary-disk)
+if [ "${phy_sec}" != 4096 ] || [ "${log_sec}" != 512 ]; then
+    fatal "root device isn't 512e"
+fi
+
+# sanity-check that LUKS chose a 4096 sector size
+luks_sec=$(blockdev --getss /dev/mapper/myluksdev)
+if [ "${luks_sec}" != 4096 ]; then
+    fatal "root LUKS device isn't 4k"
+fi
+
+# run the rest of the tests
+. $KOLA_EXT_DATA/luks-test.sh