Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

block: require LBA dma_alignment when using PI

The block layer PI generation / verification code expects the bio_vecs
to have at least LBA size (or more correctly integrity internal)
granularity. With the direct I/O alignment relaxation in 2022, user
space can now feed bios with less alignment than that, leading to
scribbling outside the PI buffers. Apparently this wasn't noticed so far
because none of the tests generate such buffers, but since 851c4c96db00
("xfs: implement XFS_IOC_DIOINFO in terms of vfs_getattr"), xfstests
generic/013 by default generates such I/O now that the relaxed alignment
is advertised by the XFS_IOC_DIOINFO ioctl.

Fix this by increasing the required alignment when using PI, although
handling arbitrary alignment in the long run would be even nicer.

Fixes: bf8d08532bc1 ("iomap: add support for dma aligned direct-io")
Fixes: b1a000d3b8ec ("block: relax direct io memory alignment")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Hellwig and committed by
Jens Axboe
4c8cf6bd 81ccca31

+10
+10
block/blk-settings.c
··· 184 184 if (!bi->interval_exp) 185 185 bi->interval_exp = ilog2(lim->logical_block_size); 186 186 187 + /* 188 + * The PI generation / validation helpers do not expect intervals to 189 + * straddle multiple bio_vecs. Enforce alignment so that those are 190 + * never generated, and that each buffer is aligned as expected. 191 + */ 192 + if (bi->csum_type) { 193 + lim->dma_alignment = max(lim->dma_alignment, 194 + (1U << bi->interval_exp) - 1); 195 + } 196 + 187 197 return 0; 188 198 } 189 199