Merge branch 'xfs-misc-fixes-for-4.4-1' into for-next

9 files changed, 41 insertions, 13 deletions

diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c
index a7a3a63bb360..686ba6fb20dd 100644
--- a/fs/xfs/kmem.c
+++ b/fs/xfs/kmem.c
@@ -55,8 +55,9 @@ kmem_alloc(size_t size, xfs_km_flags_t flags)
                         return ptr;
                 if (!(++retries % 100))
                         xfs_err(NULL,
-                "possible memory allocation deadlock in %s (mode:0x%x)",
-                                        __func__, lflags);
+        "%s(%u) possible memory allocation deadlock size %u in %s (mode:0x%x)",
+                                current->comm, current->pid,
+                                (unsigned int)size, __func__, lflags);
                 congestion_wait(BLK_RW_ASYNC, HZ/50);
         } while (1);
 }
@@ -120,8 +121,9 @@ kmem_zone_alloc(kmem_zone_t *zone, xfs_km_flags_t flags)
                         return ptr;
                 if (!(++retries % 100))
                         xfs_err(NULL,
-                "possible memory allocation deadlock in %s (mode:0x%x)",
-                                        __func__, lflags);
+                "%s(%u) possible memory allocation deadlock in %s (mode:0x%x)",
+                                current->comm, current->pid,
+                                __func__, lflags);
                 congestion_wait(BLK_RW_ASYNC, HZ/50);
         } while (1);
 }
diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c
index f38f9bd81557..5ab95ffa4ae9 100644
--- a/fs/xfs/libxfs/xfs_attr_remote.c
+++ b/fs/xfs/libxfs/xfs_attr_remote.c
@@ -107,7 +107,7 @@ xfs_attr3_rmt_verify(
         if (be32_to_cpu(rmt->rm_bytes) > fsbsize - sizeof(*rmt))
                 return false;
         if (be32_to_cpu(rmt->rm_offset) +
-                                be32_to_cpu(rmt->rm_bytes) > XATTR_SIZE_MAX)
+                                be32_to_cpu(rmt->rm_bytes) > XFS_XATTR_SIZE_MAX)
                 return false;
         if (rmt->rm_owner == 0)
                 return false;
diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c
index 235d026c7f9c..af1bbee5586e 100644
--- a/fs/xfs/libxfs/xfs_btree.c
+++ b/fs/xfs/libxfs/xfs_btree.c
@@ -223,7 +223,7 @@ xfs_btree_check_ptr(
  * long-form btree header.
  *
  * Prior to calculting the CRC, pull the LSN out of the buffer log item and put
- * it into the buffer so recovery knows what the last modifcation was that made
+ * it into the buffer so recovery knows what the last modification was that made
  * it to disk.
  */
 void
@@ -261,7 +261,7 @@ xfs_btree_lblock_verify_crc(
  * short-form btree header.
  *
  * Prior to calculting the CRC, pull the LSN out of the buffer log item and put
- * it into the buffer so recovery knows what the last modifcation was that made
+ * it into the buffer so recovery knows what the last modification was that made
  * it to disk.
  */
 void
diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index 9590a069e556..8568de163004 100644
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -60,6 +60,14 @@ struct xfs_ifork;
 #define XFS_SB_VERSION_MOREBITSBIT      0x8000
 
 /*
+ * The size of a single extended attribute on disk is limited by
+ * the size of index values within the attribute entries themselves.
+ * These are be16 fields, so we can only support attribute data
+ * sizes up to 2^16 bytes in length.
+ */
+#define XFS_XATTR_SIZE_MAX (1 << 16)
+
+/*
  * Supported feature bit list is just all bits in the versionnum field because
  * we've used them all up and understand them all. Except, of course, for the
  * shared superblock bit, which nobody knows what it does and so is unsupported.
@@ -1483,7 +1491,7 @@ struct xfs_acl {
  */
 #define XFS_ACL_MAX_ENTRIES(mp) \
         (xfs_sb_version_hascrc(&mp->m_sb) \
-                ?  (XATTR_SIZE_MAX - sizeof(struct xfs_acl)) / \
+                ?  (XFS_XATTR_SIZE_MAX - sizeof(struct xfs_acl)) / \
                                                 sizeof(struct xfs_acl_entry) \
                 : 25)
 
diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h
index 89689c6a43e2..b2b73a998d42 100644
--- a/fs/xfs/libxfs/xfs_fs.h
+++ b/fs/xfs/libxfs/xfs_fs.h
@@ -490,6 +490,16 @@ typedef struct xfs_swapext
 #define XFS_FSOP_GOING_FLAGS_NOLOGFLUSH         0x2     /* don't flush log nor data */
 
 /*
+ * ioctl limits
+ */
+#ifdef XATTR_LIST_MAX
+#  define XFS_XATTR_LIST_MAX XATTR_LIST_MAX
+#else
+#  define XFS_XATTR_LIST_MAX 65536
+#endif
+
+
+/*
  * ioctl commands that are used by Linux filesystems
  */
 #define XFS_IOC_GETXFLAGS       FS_IOC_GETFLAGS
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 90815c22b22d..3243cdf97f33 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -354,7 +354,8 @@ retry:
                          */
                         if (!(++retries % 100))
                                 xfs_err(NULL,
-                "possible memory allocation deadlock in %s (mode:0x%x)",
+                "%s(%u) possible memory allocation deadlock in %s (mode:0x%x)",
+                                        current->comm, current->pid,
                                         __func__, gfp_mask);
 
                         XFS_STATS_INC(bp->b_target->bt_mount, xb_page_retries);
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index b67a130134fb..c88ddcadd656 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -411,7 +411,7 @@ xfs_attrlist_by_handle(
         if (copy_from_user(&al_hreq, arg, sizeof(xfs_fsop_attrlist_handlereq_t)))
                 return -EFAULT;
         if (al_hreq.buflen < sizeof(struct attrlist) ||
-            al_hreq.buflen > XATTR_LIST_MAX)
+            al_hreq.buflen > XFS_XATTR_LIST_MAX)
                 return -EINVAL;
 
         /*
@@ -455,7 +455,7 @@ xfs_attrmulti_attr_get(
         unsigned char           *kbuf;
         int                     error = -EFAULT;
 
-        if (*len > XATTR_SIZE_MAX)
+        if (*len > XFS_XATTR_SIZE_MAX)
                 return -EINVAL;
         kbuf = kmem_zalloc_large(*len, KM_SLEEP);
         if (!kbuf)
@@ -485,7 +485,7 @@ xfs_attrmulti_attr_set(
 
         if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
                 return -EPERM;
-        if (len > XATTR_SIZE_MAX)
+        if (len > XFS_XATTR_SIZE_MAX)
                 return -EINVAL;
 
         kbuf = memdup_user(ubuf, len);
diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
index b88bdc85dd3d..1a05d8ae327d 100644
--- a/fs/xfs/xfs_ioctl32.c
+++ b/fs/xfs/xfs_ioctl32.c
@@ -356,7 +356,7 @@ xfs_compat_attrlist_by_handle(
                            sizeof(compat_xfs_fsop_attrlist_handlereq_t)))
                 return -EFAULT;
         if (al_hreq.buflen < sizeof(struct attrlist) ||
-            al_hreq.buflen > XATTR_LIST_MAX)
+            al_hreq.buflen > XFS_XATTR_LIST_MAX)
                 return -EINVAL;
 
         /*
diff --git a/fs/xfs/xfs_message.c b/fs/xfs/xfs_message.c
index d8b67547ab34..11792d888e4e 100644
--- a/fs/xfs/xfs_message.c
+++ b/fs/xfs/xfs_message.c
@@ -17,6 +17,7 @@
 
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_error.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"
@@ -43,6 +44,7 @@ void func(const struct xfs_mount *mp, const char *fmt, ...)	\
 {                                                               \
         struct va_format        vaf;                            \
         va_list                 args;                           \
+        int                     level;                          \
                                                                 \
         va_start(args, fmt);                                    \
                                                                 \
@@ -51,6 +53,11 @@ void func(const struct xfs_mount *mp, const char *fmt, ...)	\
                                                                 \
         __xfs_printk(kern_level, mp, &vaf);                     \
         va_end(args);                                           \
+                                                                \
+        if (!kstrtoint(kern_level, 0, &level) &&                \
+            level <= LOGLEVEL_ERR &&                            \
+            xfs_error_level >= XFS_ERRLEVEL_HIGH)               \
+                xfs_stack_trace();                              \
 }                                                               \
 
 define_xfs_printk_level(xfs_emerg, KERN_EMERG);