]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
vdev_disk: fix alignment check when buffer has non-zero starting offset
authorRob Norris <rob.norris@klarasystems.com>
Wed, 10 Apr 2024 03:14:13 +0000 (13:14 +1000)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 11 Apr 2024 21:43:27 +0000 (14:43 -0700)
commit1bf649cb0a1cc6e48dce848611ba327eb283000e
treed0f03cc09ea043c10910d8e7bdd84be7cc5b4b5a
parentbc27c494049e5282f90b103ee45d0fe12310aac4
vdev_disk: fix alignment check when buffer has non-zero starting offset

If a linear buffer spans multiple pages, and the first page has a
non-zero starting offset, the checker would not include the offset, and
so would think there was an alignment gap at the end of the first page,
rather than at the start.

That is, for a 16K buffer spread across five pages with an initial 512B
offset:

    [.XXXXXXX][XXXXXXXX][XXXXXXXX][XXXXXXXX][XXXXXXX.]

It would be interpreted as:

    [XXXXXXX.][XXXXXXXX]...

And be rejected as misaligned.

Since it's already a linear ABD, the "linearising" copy would just reuse
the buffer as-is, and the second check would failing, tripping the
VERIFY in vdev_disk_io_rw().

This commit fixes all this by including the offset in the check for
end-of-page alignment.

Sponsored-by: Klara, Inc.
Sponsored-by: Wasabi Technology, Inc.
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
Closes #16076
module/os/linux/zfs/vdev_disk.c
tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c