xfs: Initialize xfs_alloc_arg->total correctly when allocating minlen extents
PATCH 1/2 xfs: Initialize xfs_alloc_arg->total correctly when allocating minlen extents
xfs/538 can cause the following call trace to be printed when executing on a multi-block directory configuration,
WARNING: CPU: 1 PID: 2578 at fs/xfs/libxfs/xfs_bmap.c:717 xfs_bmap_extents_to_btree+0x520/0x5d0 Call Trace: ? xfs_buf_rele+0x4f/0x450 xfs_bmap_add_extent_hole_real+0x747/0x960 xfs_bmapi_allocate+0x39a/0x440 xfs_bmapi_write+0x507/0x9e0 xfs_da_grow_inode_int+0x1cd/0x330 ? up+0x12/0x60 xfs_dir2_grow_inode+0x62/0x110 ? xfs_trans_log_inode+0x234/0x2d0 xfs_dir2_sf_to_block+0x103/0x940 ? xfs_dir2_sf_check+0x8c/0x210 ? xfs_da_compname+0x19/0x30 ? xfs_dir2_sf_lookup+0xd0/0x3d0 xfs_dir2_sf_addname+0x10d/0x910 xfs_dir_createname+0x1ad/0x210 xfs_create+0x404/0x620 xfs_generic_create+0x24c/0x320 path_openat+0xda6/0x1030 do_filp_open+0x88/0x130 ? kmem_cache_alloc+0x50/0x210 ? __cond_resched+0x16/0x40 ? kmem_cache_alloc+0x50/0x210 do_sys_openat2+0x97/0x150 __x64_sys_creat+0x49/0x70 do_syscall_64+0x33/0x40 entry_SYSCALL_64_after_hwframe+0x44/0xae
This occurs because xfs_bmap_exact_minlen_extent_alloc() initializes xfs_alloc_arg->total to xfs_bmalloca->minlen. In the context of xfs_bmap_exact_minlen_extent_alloc(), xfs_bmalloca->minlen has a value of 1 and hence the space allocator could choose an AG which has less than xfs_bmalloca->total number of free blocks available. As the transaction proceeds, one of the future space allocation requests could fail due to non-availability of free blocks in the AG that was originally chosen.
This commit fixes the bug by assigning xfs_alloc_arg->total to the value of xfs_bmalloca->total.
--- fs/xfs/libxfs/xfs_bmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/xfs/libxfs/xfs_bmap.c +2 -1
@@ -3586,7 +3586,8 @@ xfs_bmap_exact_minlen_extent_alloc( args.fsbno = ap->blkno; args.oinfo =XFS_RMAP_OINFO_SKIP_UPDATE ; args.type =XFS_ALLOCTYPE_FIRST_AG ; - args.total = args.minlen = args.maxlen = ap->minlen; + args.minlen = args.maxlen = ap->minlen; + args.total = ap->total; args.alignment =1 ; args.minalignslop =0 ;
Signature · 1 line
2.29.2
PATCH 2/2 xfs: Fix dax inode extent calculation when direct write is performed on an unwritten extent
With dax enabled filesystems, a direct write operation into an existing unwritten extent results in xfs_iomap_write_direct() zero-ing and converting the extent into a normal extent before the actual data is copied from the userspace buffer.
The inode extent count can increase by 2 if the extent range being written to maps to the middle of the existing unwritten extent range. Hence this commit uses XFS_IEXT_WRITE_UNWRITTEN_CNT as the extent count delta when such a write operation is being performed.
--- fs/xfs/xfs_iomap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/xfs/xfs_iomap.c +3 -2
@@ -198,6 +198,7 @@ xfs_iomap_write_direct(bool force = false;int error;int bmapi_flags =XFS_BMAPI_PREALLOC ; +int nr_exts =XFS_IEXT_ADD_NOSPLIT_CNT ;ASSERT (count_fsb >0 );
@@ -232,6 +233,7 @@ xfs_iomap_write_direct( bmapi_flags =XFS_BMAPI_CONVERT |XFS_BMAPI_ZERO ;if (imap->br_state ==XFS_EXT_UNWRITTEN ) { force = true; + nr_exts =XFS_IEXT_WRITE_UNWRITTEN_CNT ; dblocks =XFS_DIOSTRAT_SPACE_RES (mp,0 ) <<1 ; } }
@@ -241,8 +243,7 @@ xfs_iomap_write_direct(if (error)return error; - error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , -XFS_IEXT_ADD_NOSPLIT_CNT ); + error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , nr_exts);if (error) goto out_trans_cancel;
Signature · 1 line
2.29.2
Re: [PATCH 2/2] xfs: Fix dax inode extent calculation when direct write is performed on an unwritten extent
Quoted 5 lines · Chandan Babu R
With dax enabled filesystems, a direct write operation into an existing unwritten extent results in
xfs_iomap_write_direct()zero-ing and converting the extent into a normal extent before the actual data is copied from the userspace buffer.
Quoted 8 lines
The inode extent count can increase by 2 if the extent range being written to maps to the middle of the existing unwritten extent range. Hence this commit uses
XFS_IEXT_WRITE_UNWRITTEN_CNTas the extent count delta when such a write operation is being performed.Fixes 727e1acd297c ("xfs: Check for extent overflow when trivally adding a new extent")Reported-by Darrick J. Wong <[email protected]>Signed-off-by Chandan Babu R <[email protected]>
Pretty much what I was expecting,
--D
Quoted 37 lines
--- fs/xfs/xfs_iomap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)fs/xfs/xfs_iomap.c +3
-2@@ -198,6 +198,7 @@ xfs_iomap_write_direct(bool force = false;int error;int bmapi_flags =XFS_BMAPI_PREALLOC ; +int nr_exts =XFS_IEXT_ADD_NOSPLIT_CNT ;ASSERT (count_fsb >0 );@@ -232,6 +233,7 @@ xfs_iomap_write_direct( bmapi_flags =XFS_BMAPI_CONVERT |XFS_BMAPI_ZERO ;if (imap->br_state ==XFS_EXT_UNWRITTEN ) { force = true; + nr_exts =XFS_IEXT_WRITE_UNWRITTEN_CNT ; dblocks =XFS_DIOSTRAT_SPACE_RES (mp,0 ) <<1 ; } }@@ -241,8 +243,7 @@ xfs_iomap_write_direct(if (error)return error; - error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , -XFS_IEXT_ADD_NOSPLIT_CNT ); + error =xfs_iext_count_may_overflow (ip,XFS_DATA_FORK , nr_exts);if (error) goto out_trans_cancel;Signature · 1 line
2.29.2
Quoted 39 lines · Chandan Babu R
xfs/538 can cause the following call trace to be printed when executing on a multi-block directory configuration,
WARNING: CPU: 1 PID: 2578 at fs/xfs/libxfs/xfs_bmap.c:717 xfs_bmap_extents_to_btree+0x520/0x5d0 Call Trace: ? xfs_buf_rele+0x4f/0x450 xfs_bmap_add_extent_hole_real+0x747/0x960 xfs_bmapi_allocate+0x39a/0x440 xfs_bmapi_write+0x507/0x9e0 xfs_da_grow_inode_int+0x1cd/0x330 ? up+0x12/0x60 xfs_dir2_grow_inode+0x62/0x110 ? xfs_trans_log_inode+0x234/0x2d0 xfs_dir2_sf_to_block+0x103/0x940 ? xfs_dir2_sf_check+0x8c/0x210 ? xfs_da_compname+0x19/0x30 ? xfs_dir2_sf_lookup+0xd0/0x3d0 xfs_dir2_sf_addname+0x10d/0x910 xfs_dir_createname+0x1ad/0x210 xfs_create+0x404/0x620 xfs_generic_create+0x24c/0x320 path_openat+0xda6/0x1030 do_filp_open+0x88/0x130 ? kmem_cache_alloc+0x50/0x210 ? __cond_resched+0x16/0x40 ? kmem_cache_alloc+0x50/0x210 do_sys_openat2+0x97/0x150 __x64_sys_creat+0x49/0x70 do_syscall_64+0x33/0x40 entry_SYSCALL_64_after_hwframe+0x44/0xaeThis occurs because
xfs_bmap_exact_minlen_extent_alloc()initializesxfs_alloc_arg->totaltoxfs_bmalloca->minlen. In the context ofxfs_bmap_exact_minlen_extent_alloc(),xfs_bmalloca->minlenhas a value of 1 and hence the space allocator could choose an AG which has less thanxfs_bmalloca->totalnumber of free blocks available. As the transaction proceeds, one of the future space allocation requests could fail due to non-availability of free blocks in the AG that was originally chosen.
Quoted 5 lines
This commit fixes the bug by assigning
xfs_alloc_arg->totalto the value ofxfs_bmalloca->total.Fixes 301519674699 ("xfs: Introduce error injection to allocate only minlen size extents for files")Signed-off-by Chandan Babu R <[email protected]>
Sounds resonable to me, I guess I'll give it a try...
--D
Quoted 21 lines
--- fs/xfs/libxfs/xfs_bmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/xfs/libxfs/xfs_bmap.c +2
-1@@ -3586,7 +3586,8 @@ xfs_bmap_exact_minlen_extent_alloc( args.fsbno = ap->blkno; args.oinfo =XFS_RMAP_OINFO_SKIP_UPDATE ; args.type =XFS_ALLOCTYPE_FIRST_AG ; - args.total = args.minlen = args.maxlen = ap->minlen; + args.minlen = args.maxlen = ap->minlen; + args.total = ap->total; args.alignment =1 ; args.minalignslop =0 ;Signature · 1 line
2.29.2
Looks good,
Re: [PATCH 2/2] xfs: Fix dax inode extent calculation when direct write is performed on an unwritten extent
In reply to Chandan Babu RQuoted 9 lines · Chandan Babu R
With dax enabled filesystems, a direct write operation into an existing unwritten extent results in
xfs_iomap_write_direct()zero-ing and converting the extent into a normal extent before the actual data is copied from the userspace buffer.The inode extent count can increase by 2 if the extent range being written to maps to the middle of the existing unwritten extent range. Hence this commit uses
XFS_IEXT_WRITE_UNWRITTEN_CNTas the extent count delta when such a write operation is being performed.
Looks good,