xfs: use KM_NOFS for allocations during attribute list operations
PATCH 1/1 xfs: use KM_NOFS for allocations during attribute list operations
From: Dave Chinner <[email protected]>
When listing attributes, we are doiing memory allocations under the inode ilock using only KM_SLEEP. This allows memory allocation to recurse back into the filesystem and do writeback, which may the ilock we already hold on the current inode. THis will deadlock. Hence use KM_NOFS for such allocations outside of transaction context to ensure that reclaim recursion does not occur.
--- fs/xfs/xfs_attr_leaf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
fs/xfs/xfs_attr_leaf.c +2 -2
@@ -637,7 +637,7 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)* It didn't all fit, so we have to sort everything on hashval. */ sbsize = sf->hdr.count *sizeof (*sbuf); - sbp = sbuf =kmem_alloc (sbsize,KM_SLEEP ); + sbp = sbuf =kmem_alloc (sbsize,KM_SLEEP |KM_NOFS );/* * Scan the attribute list for the rest of the entries, storing
@@ -2386,7 +2386,7 @@ xfs_attr_leaf_list_int(xfs_dabuf_t *bp, xfs_attr_list_context_t *context) args.dp = context->dp; args.whichfork =XFS_ATTR_FORK ; args.valuelen = valuelen; - args.value =kmem_alloc (valuelen,KM_SLEEP ); + args.value =kmem_alloc (valuelen,KM_SLEEP |KM_NOFS ); args.rmtblkno =be32_to_cpu (name_rmt->valueblk); args.rmtblkcnt =XFS_B_TO_FSB (args.dp->i_mount, valuelen); retval =xfs_attr_rmtval_get (&args);
Signature · 6 lines
1.7.2.3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 11 lines · Dave Chinner
From: Dave Chinner <[email protected]>
When listing attributes, we are doiing memory allocations under the inode ilock using only
KM_SLEEP. This allows memory allocation to recurse back into the filesystem and do writeback, which may the ilock we already hold on the current inode. THis will deadlock. Hence useKM_NOFSfor such allocations outside of transaction context to ensure that reclaim recursion does not occur.Reported-by Nick Piggin <[email protected]>Signed-off-by Dave Chinner <[email protected]>
Looks good,
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs