Merge tag 'kgdb-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux

[linux.git] / fs / xfs / kmem.c

diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c
index 7cd315ad937e0435d44f3d928682a58c3d199ab9..da031b93e1828dc83084ab29ef108eb203c42089 100644 (file)
--- a/fs/xfs/kmem.c
+++ b/fs/xfs/kmem.c
@@ -3,10 +3,10 @@
  * Copyright (c) 2000-2005 Silicon Graphics, Inc.
  * All Rights Reserved.
  */
-#include <linux/sched/mm.h>
+#include "xfs.h"
 #include <linux/backing-dev.h>
-#include "kmem.h"
 #include "xfs_message.h"
+#include "xfs_trace.h"
 
 void *
 kmem_alloc(size_t size, xfs_km_flags_t flags)
@@ -15,6 +15,8 @@ kmem_alloc(size_t size, xfs_km_flags_t flags)
        gfp_t   lflags = kmem_flags_convert(flags);
        void    *ptr;
 
+       trace_kmem_alloc(size, flags, _RET_IP_);
+
        do {
                ptr = kmalloc(size, lflags);
                if (ptr || (flags & KM_MAYFAIL))
@@ -28,28 +30,24 @@ kmem_alloc(size_t size, xfs_km_flags_t flags)
        } while (1);
 }
 
-void *
-kmem_alloc_large(size_t size, xfs_km_flags_t flags)
+
+/*
+ * __vmalloc() will allocate data pages and auxillary structures (e.g.
+ * pagetables) with GFP_KERNEL, yet we may be under GFP_NOFS context here. Hence
+ * we need to tell memory reclaim that we are in such a context via
+ * PF_MEMALLOC_NOFS to prevent memory reclaim re-entering the filesystem here
+ * and potentially deadlocking.
+ */
+static void *
+__kmem_vmalloc(size_t size, xfs_km_flags_t flags)
 {
        unsigned nofs_flag = 0;
        void    *ptr;
-       gfp_t   lflags;
-
-       ptr = kmem_alloc(size, flags | KM_MAYFAIL);
-       if (ptr)
-               return ptr;
+       gfp_t   lflags = kmem_flags_convert(flags);
 
-       /*
-        * __vmalloc() will allocate data pages and auxillary structures (e.g.
-        * pagetables) with GFP_KERNEL, yet we may be under GFP_NOFS context
-        * here. Hence we need to tell memory reclaim that we are in such a
-        * context via PF_MEMALLOC_NOFS to prevent memory reclaim re-entering
-        * the filesystem here and potentially deadlocking.
-        */
        if (flags & KM_NOFS)
                nofs_flag = memalloc_nofs_save();
 
-       lflags = kmem_flags_convert(flags);
        ptr = __vmalloc(size, lflags, PAGE_KERNEL);
 
        if (flags & KM_NOFS)
@@ -58,6 +56,44 @@ kmem_alloc_large(size_t size, xfs_km_flags_t flags)
        return ptr;
 }
 
+/*
+ * Same as kmem_alloc_large, except we guarantee the buffer returned is aligned
+ * to the @align_mask. We only guarantee alignment up to page size, we'll clamp
+ * alignment at page size if it is larger. vmalloc always returns a PAGE_SIZE
+ * aligned region.
+ */
+void *
+kmem_alloc_io(size_t size, int align_mask, xfs_km_flags_t flags)
+{
+       void    *ptr;
+
+       trace_kmem_alloc_io(size, flags, _RET_IP_);
+
+       if (WARN_ON_ONCE(align_mask >= PAGE_SIZE))
+               align_mask = PAGE_SIZE - 1;
+
+       ptr = kmem_alloc(size, flags | KM_MAYFAIL);
+       if (ptr) {
+               if (!((uintptr_t)ptr & align_mask))
+                       return ptr;
+               kfree(ptr);
+       }
+       return __kmem_vmalloc(size, flags);
+}
+
+void *
+kmem_alloc_large(size_t size, xfs_km_flags_t flags)
+{
+       void    *ptr;
+
+       trace_kmem_alloc_large(size, flags, _RET_IP_);
+
+       ptr = kmem_alloc(size, flags | KM_MAYFAIL);
+       if (ptr)
+               return ptr;
+       return __kmem_vmalloc(size, flags);
+}
+
 void *
 kmem_realloc(const void *old, size_t newsize, xfs_km_flags_t flags)
 {
@@ -65,6 +101,8 @@ kmem_realloc(const void *old, size_t newsize, xfs_km_flags_t flags)
        gfp_t   lflags = kmem_flags_convert(flags);
        void    *ptr;
 
+       trace_kmem_realloc(newsize, flags, _RET_IP_);
+
        do {
                ptr = krealloc(old, newsize, lflags);
                if (ptr || (flags & KM_MAYFAIL))
@@ -85,6 +123,7 @@ kmem_zone_alloc(kmem_zone_t *zone, xfs_km_flags_t flags)
        gfp_t   lflags = kmem_flags_convert(flags);
        void    *ptr;
 
+       trace_kmem_zone_alloc(kmem_cache_size(zone), flags, _RET_IP_);
        do {
                ptr = kmem_cache_alloc(zone, lflags);
                if (ptr || (flags & KM_MAYFAIL))