3 files changed, 12 insertions, 3 deletions

diff --git a/fs/inode.c b/fs/inode.c
index df6542ec3b88..2bf21e2c90fc 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -362,7 +362,7 @@ EXPORT_SYMBOL(inc_nlink);
 
 static void __address_space_init_once(struct address_space *mapping)
 {
-        xa_init_flags(&mapping->i_pages, XA_FLAGS_LOCK_IRQ);
+        xa_init_flags(&mapping->i_pages, XA_FLAGS_LOCK_IRQ | XA_FLAGS_ACCOUNT);
         init_rwsem(&mapping->i_mmap_rwsem);
         INIT_LIST_HEAD(&mapping->private_list);
         spin_lock_init(&mapping->private_lock);
diff --git a/include/linux/xarray.h b/include/linux/xarray.h
index 0e01e6129145..5921599b6dc4 100644
--- a/include/linux/xarray.h
+++ b/include/linux/xarray.h
@@ -265,6 +265,7 @@ enum xa_lock_type {
 #define XA_FLAGS_TRACK_FREE     ((__force gfp_t)4U)
 #define XA_FLAGS_ZERO_BUSY      ((__force gfp_t)8U)
 #define XA_FLAGS_ALLOC_WRAPPED  ((__force gfp_t)16U)
+#define XA_FLAGS_ACCOUNT        ((__force gfp_t)32U)
 #define XA_FLAGS_MARK(mark)     ((__force gfp_t)((1U << __GFP_BITS_SHIFT) << \
                                                 (__force unsigned)(mark)))
 
diff --git a/lib/xarray.c b/lib/xarray.c
index 6be3acbb861f..446b956c9188 100644
--- a/lib/xarray.c
+++ b/lib/xarray.c
@@ -298,6 +298,8 @@ bool xas_nomem(struct xa_state *xas, gfp_t gfp)
                 xas_destroy(xas);
                 return false;
         }
+        if (xas->xa->xa_flags & XA_FLAGS_ACCOUNT)
+                gfp |= __GFP_ACCOUNT;
         xas->xa_alloc = kmem_cache_alloc(radix_tree_node_cachep, gfp);
         if (!xas->xa_alloc)
                 return false;
@@ -325,6 +327,8 @@ static bool __xas_nomem(struct xa_state *xas, gfp_t gfp)
                 xas_destroy(xas);
                 return false;
         }
+        if (xas->xa->xa_flags & XA_FLAGS_ACCOUNT)
+                gfp |= __GFP_ACCOUNT;
         if (gfpflags_allow_blocking(gfp)) {
                 xas_unlock_type(xas, lock_type);
                 xas->xa_alloc = kmem_cache_alloc(radix_tree_node_cachep, gfp);
@@ -358,8 +362,12 @@ static void *xas_alloc(struct xa_state *xas, unsigned int shift)
         if (node) {
                 xas->xa_alloc = NULL;
         } else {
-                node = kmem_cache_alloc(radix_tree_node_cachep,
-                                        GFP_NOWAIT | __GFP_NOWARN);
+                gfp_t gfp = GFP_NOWAIT | __GFP_NOWARN;
+
+                if (xas->xa->xa_flags & XA_FLAGS_ACCOUNT)
+                        gfp |= __GFP_ACCOUNT;
+
+                node = kmem_cache_alloc(radix_tree_node_cachep, gfp);
                 if (!node) {
                         xas_set_err(xas, -ENOMEM);
                         return NULL;