Skip to contentSkip to conversation

xfs: update XFS_IOC_DIOINFO memory alignment value

PATCH In review Dave Chinner 3 participants 7 messages Jul 11, 2024 XFS filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs: update XFS_IOC_DIOINFO memory alignment value

From: Dave Chinner <[email protected]>

As of v6.0, the DIO memory buffer alignment is no longer aligned to the logical sector size of the underlying block device. There is now a specific DMA alignment parameter that memory buffers should be aligned to. statx(STATX_DIOALIGN) gets this right, but XFS_IOC_DIOINFO does not - it still uses the older fixed alignment defined by the block device logical sector size.

This was found because the s390 DASD driver increased DMA alignment to PAGE_SIZE in commit bc792884b76f ("s390/dasd: Establish DMA alignment") and DIO aligned to logical sector sizes have started failing on kernels with that commit. Fixing the "userspace fails because device alignment constraints increased" issue is not XFS's problem, but we really should be reporting the correct device memory alignment in XFS_IOC_DIOINFO.

---
 fs/xfs/xfs_ioctl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
fs/xfs/xfs_ioctl.c +2 -1
index f0117188f302..71eba4849e03 100644
@@ -1368,7 +1368,8 @@ xfs_file_ioctl(
 		struct xfs_buftarg	*target = xfs_inode_buftarg(ip);
 		struct dioattr		da;
 
-		da.d_mem =  da.d_miniosz = target->bt_logical_sectorsize;
+		da.d_mem = bdev_dma_alignment(target->bt_bdev);
+		da.d_miniosz = target->bt_logical_sectorsize;
 		da.d_maxiosz = INT_MAX & ~(da.d_miniosz - 1);
 
 		if (copy_to_user(arg, &da, sizeof(da)))
Signature · 1 line
2.45.1
#1 lore raw
Quoted 27 lines · Dave Chinner

From: Dave Chinner <[email protected]>

As of v6.0, the DIO memory buffer alignment is no longer aligned to the logical sector size of the underlying block device. There is now a specific DMA alignment parameter that memory buffers should be aligned to. statx(STATX_DIOALIGN) gets this right, but XFS_IOC_DIOINFO does not - it still uses the older fixed alignment defined by the block device logical sector size.

This was found because the s390 DASD driver increased DMA alignment to PAGE_SIZE in commit bc792884b76f ("s390/dasd: Establish DMA alignment") and DIO aligned to logical sector sizes have started failing on kernels with that commit. Fixing the "userspace fails because device alignment constraints increased" issue is not XFS's problem, but we really should be reporting the correct device memory alignment in XFS_IOC_DIOINFO.

---
 fs/xfs/xfs_ioctl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
fs/xfs/xfs_ioctl.c +0 -0
index f0117188f302..71eba4849e03 100644

fs/xfs/xfs_ioctl.c xfs_file_ioctl( · line 1371

Quoted 5 lines
fs/xfs/xfs_ioctl.c +1 -1
@@ -1368,7 +1368,8 @@ xfs_file_ioctl(
 		struct xfs_buftarg	*target = xfs_inode_buftarg(ip);
 		struct dioattr		da;
 
-		da.d_mem =  da.d_miniosz = target->bt_logical_sectorsize;
+		da.d_mem = bdev_dma_alignment(target->bt_bdev);

bdev_dma_alignment returns a mask, so I think you want to add one here?

Though at this point, perhaps DIOINFO should query the STATX_DIOALIGN information so xfs doesn't have to maintain this anymore?

(Or just make a helper that statx and DIOINFO can both call?)

--D

Quoted 8 lines
fs/xfs/xfs_ioctl.c +1 -0
+		da.d_miniosz = target->bt_logical_sectorsize;
 		da.d_maxiosz = INT_MAX & ~(da.d_miniosz - 1);
 
 		if (copy_to_user(arg, &da, sizeof(da)))
Signature · 1 line
2.45.1
#2 lore raw
Quoted 4 lines · Darrick J. Wong

fs/xfs/xfs_ioctl.c xfs_file_ioctl( · line 1371

Quoted 2 lines
fs/xfs/xfs_ioctl.c +1 -1
-		da.d_mem =  da.d_miniosz = target->bt_logical_sectorsize;
+		da.d_mem = bdev_dma_alignment(target->bt_bdev);

bdev_dma_alignment returns a mask, so I think you want to add one here?

Yes.

Quoted 4 lines

Though at this point, perhaps DIOINFO should query the STATX_DIOALIGN information so xfs doesn't have to maintain this anymore?

(Or just make a helper that statx and DIOINFO can both call?)

Lift DIOINFO to the VFS and back it using the statx data?

#3 lore raw
Quoted 6 lines · Christoph Hellwig
Quoted 4 lines · Darrick J. Wong

fs/xfs/xfs_ioctl.c xfs_file_ioctl( · line 1371

Quoted 2 lines
fs/xfs/xfs_ioctl.c +1 -1
-		da.d_mem =  da.d_miniosz = target->bt_logical_sectorsize;
+		da.d_mem = bdev_dma_alignment(target->bt_bdev);

bdev_dma_alignment returns a mask, so I think you want to add one here?

Quoted 8 lines

Yes.

Quoted 4 lines

Though at this point, perhaps DIOINFO should query the STATX_DIOALIGN information so xfs doesn't have to maintain this anymore?

(Or just make a helper that statx and DIOINFO can both call?)

Lift DIOINFO to the VFS and back it using the statx data?

<shrug> Is there anything that DIOINFO provides that statx doesn't? AFAICT XFS is the only fs that implements DIOINFO, so why expand that?

--D

#4 lore raw
Quoted 2 lines · Darrick J. Wong

<shrug> Is there anything that DIOINFO provides that statx doesn't? AFAICT XFS is the only fs that implements DIOINFO, so why expand that?

Because it'll just make all the existing software using it do the right thing everywhere?

#5 lore raw
Quoted 6 lines · Christoph Hellwig
Quoted 2 lines · Darrick J. Wong

<shrug> Is there anything that DIOINFO provides that statx doesn't? AFAICT XFS is the only fs that implements DIOINFO, so why expand that?

Because it'll just make all the existing software using it do the right thing everywhere?

I'm just fixing a bug. If you want to make DIOINFO a VFS ioctl, I'll review the patches but it's way outside the scope of fixing a minor oversight in a recent feature addition...

-Dave.

Signature · 2 lines
Dave Chinner
[email protected]
#6 lore raw
In reply to Darrick J. Wong
Quoted 31 lines · Darrick J. Wong
Quoted 30 lines · Dave Chinner

From: Dave Chinner <[email protected]>

As of v6.0, the DIO memory buffer alignment is no longer aligned to the logical sector size of the underlying block device. There is now a specific DMA alignment parameter that memory buffers should be aligned to. statx(STATX_DIOALIGN) gets this right, but XFS_IOC_DIOINFO does not - it still uses the older fixed alignment defined by the block device logical sector size.

This was found because the s390 DASD driver increased DMA alignment to PAGE_SIZE in commit bc792884b76f ("s390/dasd: Establish DMA alignment") and DIO aligned to logical sector sizes have started failing on kernels with that commit. Fixing the "userspace fails because device alignment constraints increased" issue is not XFS's problem, but we really should be reporting the correct device memory alignment in XFS_IOC_DIOINFO.

---
 fs/xfs/xfs_ioctl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
fs/xfs/xfs_ioctl.c +0 -0
index f0117188f302..71eba4849e03 100644
@@ -1368,7 +1368,8 @@ xfs_file_ioctl(
 		struct xfs_buftarg	*target = xfs_inode_buftarg(ip);
 		struct dioattr		da;
 
Quoted 4 lines

fs/xfs/xfs_ioctl.c xfs_file_ioctl( · line 1371

Quoted 2 lines
fs/xfs/xfs_ioctl.c +1 -1
-		da.d_mem =  da.d_miniosz = target->bt_logical_sectorsize;
+		da.d_mem = bdev_dma_alignment(target->bt_bdev);

bdev_dma_alignment returns a mask, so I think you want to add one here?

Ah, yes, good eyes, I forgot to refresh the patch. I'll send an updated version to the list.

Quoted 2 lines

Though at this point, perhaps DIOINFO should query the STATX_DIOALIGN information so xfs doesn't have to maintain this anymore?

We open code the STATX_DIOALIGN stuff in xfs_vn_getattr() ourselves
- there's no point using statx to query information we supply statx with in the first place.

Quoted 1 line

(Or just make a helper that statx and DIOINFO can both call?)

If we grow more internal users, then maybe?

-Dave.

Signature · 2 lines
Dave Chinner
[email protected]