xfs: fallback to vmalloc for large buffers in xfs_attrmulti_attr_get
authorDave Chinner <dchinner@redhat.com>
Wed, 7 Mar 2012 04:50:21 +0000 (04:50 +0000)
committerBen Myers <bpm@sgi.com>
Thu, 15 Mar 2012 19:14:33 +0000 (14:14 -0500)
xfsdump uses for a large buffer for extended attributes, which has a
kmalloc'd shadow buffer in the kernel. This can fail after the
system has been running for some time as it is a high order
allocation. Add a fallback to vmalloc so that it doesn't require
contiguous memory and so won't randomly fail while xfsdump is
running.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
fs/xfs/xfs_ioctl.c

index 76f3ca5cfc361f962fa40a72243a525f191a618f..f588320dc4b9070a6d2c65244a9a7ed9ac1cc462 100644 (file)
@@ -450,9 +450,12 @@ xfs_attrmulti_attr_get(
 
        if (*len > XATTR_SIZE_MAX)
                return EINVAL;
-       kbuf = kmalloc(*len, GFP_KERNEL);
-       if (!kbuf)
-               return ENOMEM;
+       kbuf = kmem_zalloc(*len, KM_SLEEP | KM_MAYFAIL);
+       if (!kbuf) {
+               kbuf = kmem_zalloc_large(*len);
+               if (!kbuf)
+                       return ENOMEM;
+       }
 
        error = xfs_attr_get(XFS_I(inode), name, kbuf, (int *)len, flags);
        if (error)
@@ -462,7 +465,10 @@ xfs_attrmulti_attr_get(
                error = EFAULT;
 
  out_kfree:
-       kfree(kbuf);
+       if (is_vmalloc_addr(kbuf))
+               kmem_free_large(kbuf);
+       else
+               kmem_free(kbuf);
        return error;
 }