mm: treewide: remove GFP_TEMPORARY allocation flag

GFP_TEMPORARY was introduced by commit e12ba74d8ff3 ("Group short-lived
and reclaimable kernel allocations") along with __GFP_RECLAIMABLE.  It's
primary motivation was to allow users to tell that an allocation is
short lived and so the allocator can try to place such allocations close
together and prevent long term fragmentation.  As much as this sounds
like a reasonable semantic it becomes much less clear when to use the
highlevel GFP_TEMPORARY allocation flag.  How long is temporary? Can the
context holding that memory sleep? Can it take locks? It seems there is
no good answer for those questions.

The current implementation of GFP_TEMPORARY is basically GFP_KERNEL |
__GFP_RECLAIMABLE which in itself is tricky because basically none of
the existing caller provide a way to reclaim the allocated memory.  So
this is rather misleading and hard to evaluate for any benefits.

I have checked some random users and none of them has added the flag
with a specific justification.  I suspect most of them just copied from
other existing users and others just thought it might be a good idea to
use without any measuring.  This suggests that GFP_TEMPORARY just
motivates for cargo cult usage without any reasoning.

I believe that our gfp flags are quite complex already and especially
those with highlevel semantic should be clearly defined to prevent from
confusion and abuse.  Therefore I propose dropping GFP_TEMPORARY and
replace all existing users to simply use GFP_KERNEL.  Please note that
SLAB users with shrinkers will still get __GFP_RECLAIMABLE heuristic and
so they will be placed properly for memory fragmentation prevention.

I can see reasons we might want some gfp flag to reflect shorterm
allocations but I propose starting from a clear semantic definition and
only then add users with proper justification.

This was been brought up before LSF this year by Matthew [1] and it
turned out that GFP_TEMPORARY really doesn't have a clear semantic.  It
seems to be a heuristic without any measured advantage for most (if not
all) its current users.  The follow up discussion has revealed that
opinions on what might be temporary allocation differ a lot between
developers.  So rather than trying to tweak existing users into a
semantic which they haven't expected I propose to simply remove the flag
and start from scratch if we really need a semantic for short term
allocations.

[1] http://lkml.kernel.org/r/20170118054945.GD18349@bombadil.infradead.org

[akpm@linux-foundation.org: fix typo]
[akpm@linux-foundation.org: coding-style fixes]
[sfr@canb.auug.org.au: drm/i915: fix up]
  Link: http://lkml.kernel.org/r/20170816144703.378d4f4d@canb.auug.org.au
Link: http://lkml.kernel.org/r/20170728091904.14627-1-mhocko@kernel.org
Signed-off-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Mel Gorman <mgorman@suse.de>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Neil Brown <neilb@suse.de>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

36 files changed, 57 insertions, 61 deletions

diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index c4ffb441716c..877cec8f5ea2 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -510,7 +510,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                 goto done;
         }
 
-        str = (char *)__get_free_page(GFP_TEMPORARY);
+        str = (char *)__get_free_page(GFP_KERNEL);
         if (!str)
                 goto done;
 
diff --git a/arch/arc/kernel/troubleshoot.c b/arch/arc/kernel/troubleshoot.c
index 7e94476f3994..7d8c1d6c2f60 100644
--- a/arch/arc/kernel/troubleshoot.c
+++ b/arch/arc/kernel/troubleshoot.c
@@ -178,7 +178,7 @@ void show_regs(struct pt_regs *regs)
         struct callee_regs *cregs;
         char *buf;
 
-        buf = (char *)__get_free_page(GFP_TEMPORARY);
+        buf = (char *)__get_free_page(GFP_KERNEL);
         if (!buf)
                 return;
 
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index b8a4987f58cf..1643e9e53655 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -914,7 +914,7 @@ int rtas_online_cpus_mask(cpumask_var_t cpus)
         if (ret) {
                 cpumask_var_t tmp_mask;
 
-                if (!alloc_cpumask_var(&tmp_mask, GFP_TEMPORARY))
+                if (!alloc_cpumask_var(&tmp_mask, GFP_KERNEL))
                         return ret;
 
                 /* Use tmp_mask to preserve cpus mask from first failure */
@@ -962,7 +962,7 @@ int rtas_ibm_suspend_me(u64 handle)
                 return -EIO;
         }
 
-        if (!alloc_cpumask_var(&offline_mask, GFP_TEMPORARY))
+        if (!alloc_cpumask_var(&offline_mask, GFP_KERNEL))
                 return -ENOMEM;
 
         atomic_set(&data.working, 0);
diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c
index e76aefae2aa2..89726f07d249 100644
--- a/arch/powerpc/platforms/pseries/suspend.c
+++ b/arch/powerpc/platforms/pseries/suspend.c
@@ -151,7 +151,7 @@ static ssize_t store_hibernate(struct device *dev,
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        if (!alloc_cpumask_var(&offline_mask, GFP_TEMPORARY))
+        if (!alloc_cpumask_var(&offline_mask, GFP_KERNEL))
                 return -ENOMEM;
 
         stream_id = simple_strtoul(buf, NULL, 16);
diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c
index db6aeec50b82..2e5e089dd912 100644
--- a/drivers/gpu/drm/drm_blend.c
+++ b/drivers/gpu/drm/drm_blend.c
@@ -319,7 +319,7 @@ static int drm_atomic_helper_crtc_normalize_zpos(struct drm_crtc *crtc,
         DRM_DEBUG_ATOMIC("[CRTC:%d:%s] calculating normalized zpos values\n",
                          crtc->base.id, crtc->name);
 
-        states = kmalloc_array(total_planes, sizeof(*states), GFP_TEMPORARY);
+        states = kmalloc_array(total_planes, sizeof(*states), GFP_KERNEL);
         if (!states)
                 return -ENOMEM;
 
diff --git a/drivers/gpu/drm/drm_dp_dual_mode_helper.c b/drivers/gpu/drm/drm_dp_dual_mode_helper.c
index 80e62f669321..0ef9011a1856 100644
--- a/drivers/gpu/drm/drm_dp_dual_mode_helper.c
+++ b/drivers/gpu/drm/drm_dp_dual_mode_helper.c
@@ -111,7 +111,7 @@ ssize_t drm_dp_dual_mode_write(struct i2c_adapter *adapter,
         void *data;
         int ret;
 
-        data = kmalloc(msg.len, GFP_TEMPORARY);
+        data = kmalloc(msg.len, GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
 
diff --git a/drivers/gpu/drm/drm_scdc_helper.c b/drivers/gpu/drm/drm_scdc_helper.c
index 7d1b0f011d33..935653eb3616 100644
--- a/drivers/gpu/drm/drm_scdc_helper.c
+++ b/drivers/gpu/drm/drm_scdc_helper.c
@@ -102,7 +102,7 @@ ssize_t drm_scdc_write(struct i2c_adapter *adapter, u8 offset,
         void *data;
         int err;
 
-        data = kmalloc(1 + size, GFP_TEMPORARY);
+        data = kmalloc(1 + size, GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
 
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
index a7ff2e4c00d2..026ef4e02f85 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
@@ -37,7 +37,7 @@ static struct etnaviv_gem_submit *submit_create(struct drm_device *dev,
         struct etnaviv_gem_submit *submit;
         size_t sz = size_vstruct(nr, sizeof(submit->bos[0]), sizeof(*submit));
 
-        submit = kmalloc(sz, GFP_TEMPORARY | __GFP_NOWARN | __GFP_NORETRY);
+        submit = kmalloc(sz, GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY);
         if (submit) {
                 submit->dev = dev;
                 submit->gpu = gpu;
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 57317715977f..19404c96eeb1 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2540,7 +2540,7 @@ static void *i915_gem_object_map(const struct drm_i915_gem_object *obj,
 
         if (n_pages > ARRAY_SIZE(stack_pages)) {
                 /* Too big for stack -- allocate temporary array instead */
-                pages = kvmalloc_array(n_pages, sizeof(*pages), GFP_TEMPORARY);
+                pages = kvmalloc_array(n_pages, sizeof(*pages), GFP_KERNEL);
                 if (!pages)
                         return NULL;
         }
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 50d5e24f91a9..92437f455b43 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -293,7 +293,7 @@ static int eb_create(struct i915_execbuffer *eb)
                          * as possible to perform the allocation and warn
                          * if it fails.
                          */
-                        flags = GFP_TEMPORARY;
+                        flags = GFP_KERNEL;
                         if (size > 1)
                                 flags |= __GFP_NORETRY | __GFP_NOWARN;
 
@@ -1515,7 +1515,7 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb)
                 urelocs = u64_to_user_ptr(eb->exec[i].relocs_ptr);
                 size = nreloc * sizeof(*relocs);
 
-                relocs = kvmalloc_array(size, 1, GFP_TEMPORARY);
+                relocs = kvmalloc_array(size, 1, GFP_KERNEL);
                 if (!relocs) {
                         kvfree(relocs);
                         err = -ENOMEM;
@@ -2077,7 +2077,7 @@ get_fence_array(struct drm_i915_gem_execbuffer2 *args,
                 return ERR_PTR(-EFAULT);
 
         fences = kvmalloc_array(args->num_cliprects, sizeof(*fences),
-                                __GFP_NOWARN | GFP_TEMPORARY);
+                                __GFP_NOWARN | GFP_KERNEL);
         if (!fences)
                 return ERR_PTR(-ENOMEM);
 
@@ -2463,9 +2463,9 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
 
         /* Copy in the exec list from userland */
         exec_list = kvmalloc_array(args->buffer_count, sizeof(*exec_list),
-                                   __GFP_NOWARN | GFP_TEMPORARY);
+                                   __GFP_NOWARN | GFP_KERNEL);
         exec2_list = kvmalloc_array(args->buffer_count + 1, sz,
-                                    __GFP_NOWARN | GFP_TEMPORARY);
+                                    __GFP_NOWARN | GFP_KERNEL);
         if (exec_list == NULL || exec2_list == NULL) {
                 DRM_DEBUG("Failed to allocate exec list for %d buffers\n",
                           args->buffer_count);
@@ -2543,7 +2543,7 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
 
         /* Allocate an extra slot for use by the command parser */
         exec2_list = kvmalloc_array(args->buffer_count + 1, sz,
-                                    __GFP_NOWARN | GFP_TEMPORARY);
+                                    __GFP_NOWARN | GFP_KERNEL);
         if (exec2_list == NULL) {
                 DRM_DEBUG("Failed to allocate exec list for %d buffers\n",
                           args->buffer_count);
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 0d5a988b3867..e2410eb5d96e 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -3231,7 +3231,7 @@ intel_rotate_pages(struct intel_rotation_info *rot_info,
         /* Allocate a temporary list of source pages for random access. */
         page_addr_list = kvmalloc_array(n_pages,
                                         sizeof(dma_addr_t),
-                                        GFP_TEMPORARY);
+                                        GFP_KERNEL);
         if (!page_addr_list)
                 return ERR_PTR(ret);
 
diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
index 23fd18bd1b56..709efe2357ea 100644
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -507,7 +507,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work)
         ret = -ENOMEM;
         pinned = 0;
 
-        pvec = kvmalloc_array(npages, sizeof(struct page *), GFP_TEMPORARY);
+        pvec = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);
         if (pvec != NULL) {
                 struct mm_struct *mm = obj->userptr.mm->mm;
                 unsigned int flags = 0;
@@ -643,7 +643,7 @@ i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj)
 
         if (mm == current->mm) {
                 pvec = kvmalloc_array(num_pages, sizeof(struct page *),
-                                      GFP_TEMPORARY |
+                                      GFP_KERNEL |
                                       __GFP_NORETRY |
                                       __GFP_NOWARN);
                 if (pvec) /* defer to worker if malloc fails */
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index ed5a1eb839ad..0c779671fe2d 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -787,16 +787,16 @@ int i915_error_state_buf_init(struct drm_i915_error_state_buf *ebuf,
          */
         ebuf->size = count + 1 > PAGE_SIZE ? count + 1 : PAGE_SIZE;
         ebuf->buf = kmalloc(ebuf->size,
-                                GFP_TEMPORARY | __GFP_NORETRY | __GFP_NOWARN);
+                                GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
 
         if (ebuf->buf == NULL) {
                 ebuf->size = PAGE_SIZE;
-                ebuf->buf = kmalloc(ebuf->size, GFP_TEMPORARY);
+                ebuf->buf = kmalloc(ebuf->size, GFP_KERNEL);
         }
 
         if (ebuf->buf == NULL) {
                 ebuf->size = 128;
-                ebuf->buf = kmalloc(ebuf->size, GFP_TEMPORARY);
+                ebuf->buf = kmalloc(ebuf->size, GFP_KERNEL);
         }
 
         if (ebuf->buf == NULL)
diff --git a/drivers/gpu/drm/i915/selftests/i915_random.c b/drivers/gpu/drm/i915/selftests/i915_random.c
index d044bf9a6feb..222c511bea49 100644
--- a/drivers/gpu/drm/i915/selftests/i915_random.c
+++ b/drivers/gpu/drm/i915/selftests/i915_random.c
@@ -62,7 +62,7 @@ unsigned int *i915_random_order(unsigned int count, struct rnd_state *state)
 {
         unsigned int *order, i;
 
-        order = kmalloc_array(count, sizeof(*order), GFP_TEMPORARY);
+        order = kmalloc_array(count, sizeof(*order), GFP_KERNEL);
         if (!order)
                 return order;
 
diff --git a/drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c b/drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c
index 7276194c04f7..828904b7d468 100644
--- a/drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c
@@ -117,12 +117,12 @@ static int igt_random_insert_remove(void *arg)
 
         mock_engine_reset(engine);
 
-        waiters = kvmalloc_array(count, sizeof(*waiters), GFP_TEMPORARY);
+        waiters = kvmalloc_array(count, sizeof(*waiters), GFP_KERNEL);
         if (!waiters)
                 goto out_engines;
 
         bitmap = kcalloc(DIV_ROUND_UP(count, BITS_PER_LONG), sizeof(*bitmap),
-                         GFP_TEMPORARY);
+                         GFP_KERNEL);
         if (!bitmap)
                 goto out_waiters;
 
@@ -187,12 +187,12 @@ static int igt_insert_complete(void *arg)
 
         mock_engine_reset(engine);
 
-        waiters = kvmalloc_array(count, sizeof(*waiters), GFP_TEMPORARY);
+        waiters = kvmalloc_array(count, sizeof(*waiters), GFP_KERNEL);
         if (!waiters)
                 goto out_engines;
 
         bitmap = kcalloc(DIV_ROUND_UP(count, BITS_PER_LONG), sizeof(*bitmap),
-                         GFP_TEMPORARY);
+                         GFP_KERNEL);
         if (!bitmap)
                 goto out_waiters;
 
@@ -368,7 +368,7 @@ static int igt_wakeup(void *arg)
 
         mock_engine_reset(engine);
 
-        waiters = kvmalloc_array(count, sizeof(*waiters), GFP_TEMPORARY);
+        waiters = kvmalloc_array(count, sizeof(*waiters), GFP_KERNEL);
         if (!waiters)
                 goto out_engines;
 
diff --git a/drivers/gpu/drm/i915/selftests/intel_uncore.c b/drivers/gpu/drm/i915/selftests/intel_uncore.c
index 2d0fef2cfca6..3cac22eb47ce 100644
--- a/drivers/gpu/drm/i915/selftests/intel_uncore.c
+++ b/drivers/gpu/drm/i915/selftests/intel_uncore.c
@@ -127,7 +127,7 @@ static int intel_uncore_check_forcewake_domains(struct drm_i915_private *dev_pri
                 return 0;
 
         valid = kzalloc(BITS_TO_LONGS(FW_RANGE) * sizeof(*valid),
-                        GFP_TEMPORARY);
+                        GFP_KERNEL);
         if (!valid)
                 return -ENOMEM;
 
diff --git a/drivers/gpu/drm/lib/drm_random.c b/drivers/gpu/drm/lib/drm_random.c
index 7b12a68c3b54..a78c4b483e8d 100644
--- a/drivers/gpu/drm/lib/drm_random.c
+++ b/drivers/gpu/drm/lib/drm_random.c
@@ -28,7 +28,7 @@ unsigned int *drm_random_order(unsigned int count, struct rnd_state *state)
 {
         unsigned int *order, i;
 
-        order = kmalloc_array(count, sizeof(*order), GFP_TEMPORARY);
+        order = kmalloc_array(count, sizeof(*order), GFP_KERNEL);
         if (!order)
                 return order;
 
diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index 8a75c0bd8a78..5d0a75d4b249 100644
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -40,7 +40,7 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev,
         if (sz > SIZE_MAX)
                 return NULL;
 
-        submit = kmalloc(sz, GFP_TEMPORARY | __GFP_NOWARN | __GFP_NORETRY);
+        submit = kmalloc(sz, GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY);
         if (!submit)
                 return NULL;
 
diff --git a/drivers/gpu/drm/selftests/test-drm_mm.c b/drivers/gpu/drm/selftests/test-drm_mm.c
index dfdd858eda0a..86eb4c185a28 100644
--- a/drivers/gpu/drm/selftests/test-drm_mm.c
+++ b/drivers/gpu/drm/selftests/test-drm_mm.c
@@ -1627,7 +1627,7 @@ static int igt_topdown(void *ignored)
                 goto err;
 
         bitmap = kzalloc(count / BITS_PER_LONG * sizeof(unsigned long),
-                         GFP_TEMPORARY);
+                         GFP_KERNEL);
         if (!bitmap)
                 goto err_nodes;
 
@@ -1741,7 +1741,7 @@ static int igt_bottomup(void *ignored)
                 goto err;
 
         bitmap = kzalloc(count / BITS_PER_LONG * sizeof(unsigned long),
-                         GFP_TEMPORARY);
+                         GFP_KERNEL);
         if (!bitmap)
                 goto err_nodes;
 
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index d18b3d9292fd..3ba04f371380 100644
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -1279,7 +1279,7 @@ ssize_t cxl_pci_afu_read_err_buffer(struct cxl_afu *afu, char *buf,
         }
 
         /* use bounce buffer for copy */
-        tbuf = (void *)__get_free_page(GFP_TEMPORARY);
+        tbuf = (void *)__get_free_page(GFP_KERNEL);
         if (!tbuf)
                 return -ENOMEM;
 
diff --git a/drivers/xen/gntalloc.c b/drivers/xen/gntalloc.c
index 1bf55a32a4b3..3fa40c723e8e 100644
--- a/drivers/xen/gntalloc.c
+++ b/drivers/xen/gntalloc.c
@@ -294,7 +294,7 @@ static long gntalloc_ioctl_alloc(struct gntalloc_file_private_data *priv,
                 goto out;
         }
 
-        gref_ids = kcalloc(op.count, sizeof(gref_ids[0]), GFP_TEMPORARY);
+        gref_ids = kcalloc(op.count, sizeof(gref_ids[0]), GFP_KERNEL);
         if (!gref_ids) {
                 rc = -ENOMEM;
                 goto out;
diff --git a/fs/coredump.c b/fs/coredump.c
index 592683711c64..0eec03696707 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -161,7 +161,7 @@ static int cn_print_exe_file(struct core_name *cn)
         if (!exe_file)
                 return cn_esc_printf(cn, "%s (path unknown)", current->comm);
 
-        pathbuf = kmalloc(PATH_MAX, GFP_TEMPORARY);
+        pathbuf = kmalloc(PATH_MAX, GFP_KERNEL);
         if (!pathbuf) {
                 ret = -ENOMEM;
                 goto put_exe_file;
diff --git a/fs/exec.c b/fs/exec.c
index 01a9fb9d8ac3..daa19d85c066 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1763,9 +1763,9 @@ static int do_execveat_common(int fd, struct filename *filename,
                 bprm->filename = filename->name;
         } else {
                 if (filename->name[0] == '\0')
-                        pathbuf = kasprintf(GFP_TEMPORARY, "/dev/fd/%d", fd);
+                        pathbuf = kasprintf(GFP_KERNEL, "/dev/fd/%d", fd);
                 else
-                        pathbuf = kasprintf(GFP_TEMPORARY, "/dev/fd/%d/%s",
+                        pathbuf = kasprintf(GFP_KERNEL, "/dev/fd/%d/%s",
                                             fd, filename->name);
                 if (!pathbuf) {
                         retval = -ENOMEM;
diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index acb6f97deb97..aad97b30d5e6 100644
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -241,7 +241,7 @@ struct ovl_fh *ovl_encode_fh(struct dentry *lower, bool is_upper)
         int buflen = MAX_HANDLE_SZ;
         uuid_t *uuid = &lower->d_sb->s_uuid;
 
-        buf = kmalloc(buflen, GFP_TEMPORARY);
+        buf = kmalloc(buflen, GFP_KERNEL);
         if (!buf)
                 return ERR_PTR(-ENOMEM);
 
diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index 9cb0c80e5967..3309b1912241 100644
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -833,7 +833,7 @@ static char *ovl_get_redirect(struct dentry *dentry, bool samedir)
                 goto out;
         }
 
-        buf = ret = kmalloc(buflen, GFP_TEMPORARY);
+        buf = ret = kmalloc(buflen, GFP_KERNEL);
         if (!buf)
                 goto out;
 
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index 8aef2b304b2d..c3addd1114f1 100644
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -38,7 +38,7 @@ static int ovl_check_redirect(struct dentry *dentry, struct ovl_lookup_data *d,
                         return 0;
                 goto fail;
         }
-        buf = kzalloc(prelen + res + strlen(post) + 1, GFP_TEMPORARY);
+        buf = kzalloc(prelen + res + strlen(post) + 1, GFP_KERNEL);
         if (!buf)
                 return -ENOMEM;
 
@@ -103,7 +103,7 @@ static struct ovl_fh *ovl_get_origin_fh(struct dentry *dentry)
         if (res == 0)
                 return NULL;
 
-        fh = kzalloc(res, GFP_TEMPORARY);
+        fh  = kzalloc(res, GFP_KERNEL);
         if (!fh)
                 return ERR_PTR(-ENOMEM);
 
@@ -309,7 +309,7 @@ static int ovl_check_origin(struct dentry *upperdentry,
 
         BUG_ON(*ctrp);
         if (!*stackp)
-                *stackp = kmalloc(sizeof(struct path), GFP_TEMPORARY);
+                *stackp = kmalloc(sizeof(struct path), GFP_KERNEL);
         if (!*stackp) {
                 dput(origin);
                 return -ENOMEM;
@@ -418,7 +418,7 @@ int ovl_verify_index(struct dentry *index, struct path *lowerstack,
 
         err = -ENOMEM;
         len = index->d_name.len / 2;
-        fh = kzalloc(len, GFP_TEMPORARY);
+        fh = kzalloc(len, GFP_KERNEL);
         if (!fh)
                 goto fail;
 
@@ -478,7 +478,7 @@ int ovl_get_index_name(struct dentry *origin, struct qstr *name)
                 return PTR_ERR(fh);
 
         err = -ENOMEM;
-        n = kzalloc(fh->len * 2, GFP_TEMPORARY);
+        n = kzalloc(fh->len * 2, GFP_KERNEL);
         if (n) {
                 s  = bin2hex(n, fh, fh->len);
                 *name = (struct qstr) QSTR_INIT(n, s - n);
@@ -646,7 +646,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
         if (!d.stop && poe->numlower) {
                 err = -ENOMEM;
                 stack = kcalloc(ofs->numlower, sizeof(struct path),
-                                GFP_TEMPORARY);
+                                GFP_KERNEL);
                 if (!stack)
                         goto out_put_upper;
         }
diff --git a/fs/proc/base.c b/fs/proc/base.c
index e5d89a0d0b8a..ad3b0762cc3e 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -232,7 +232,7 @@ static ssize_t proc_pid_cmdline_read(struct file *file, char __user *buf,
                 goto out_mmput;
         }
 
-        page = (char *)__get_free_page(GFP_TEMPORARY);
+        page = (char *)__get_free_page(GFP_KERNEL);
         if (!page) {
                 rv = -ENOMEM;
                 goto out_mmput;
@@ -813,7 +813,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
         if (!mm)
                 return 0;
 
-        page = (char *)__get_free_page(GFP_TEMPORARY);
+        page = (char *)__get_free_page(GFP_KERNEL);
         if (!page)
                 return -ENOMEM;
 
@@ -918,7 +918,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
         if (!mm || !mm->env_end)
                 return 0;
 
-        page = (char *)__get_free_page(GFP_TEMPORARY);
+        page = (char *)__get_free_page(GFP_KERNEL);
         if (!page)
                 return -ENOMEM;
 
@@ -1630,7 +1630,7 @@ out:
 
 static int do_proc_readlink(struct path *path, char __user *buffer, int buflen)
 {
-        char *tmp = (char*)__get_free_page(GFP_TEMPORARY);
+        char *tmp = (char *)__get_free_page(GFP_KERNEL);
         char *pathname;
         int len;
 
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 7b40e11ede9b..5589b4bd4b85 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -1474,7 +1474,7 @@ static ssize_t pagemap_read(struct file *file, char __user *buf,
         pm.show_pfn = file_ns_capable(file, &init_user_ns, CAP_SYS_ADMIN);
 
         pm.len = (PAGEMAP_WALK_SIZE >> PAGE_SHIFT);
-        pm.buffer = kmalloc(pm.len * PM_ENTRY_BYTES, GFP_TEMPORARY);
+        pm.buffer = kmalloc(pm.len * PM_ENTRY_BYTES, GFP_KERNEL);
         ret = -ENOMEM;
         if (!pm.buffer)
                 goto out_mm;
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index bcfb9f7c46f5..f780718b7391 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -288,8 +288,6 @@ struct vm_area_struct;
 #define GFP_NOWAIT      (__GFP_KSWAPD_RECLAIM)
 #define GFP_NOIO        (__GFP_RECLAIM)
 #define GFP_NOFS        (__GFP_RECLAIM | __GFP_IO)
-#define GFP_TEMPORARY   (__GFP_RECLAIM | __GFP_IO | __GFP_FS | \
-                         __GFP_RECLAIMABLE)
 #define GFP_USER        (__GFP_RECLAIM | __GFP_IO | __GFP_FS | __GFP_HARDWALL)
 #define GFP_DMA         __GFP_DMA
 #define GFP_DMA32       __GFP_DMA32
diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h
index 4c2e4737d7bc..fec6291a6703 100644
--- a/include/trace/events/mmflags.h
+++ b/include/trace/events/mmflags.h
@@ -18,7 +18,6 @@
         {(unsigned long)GFP_HIGHUSER_MOVABLE,   "GFP_HIGHUSER_MOVABLE"},\
         {(unsigned long)GFP_HIGHUSER,           "GFP_HIGHUSER"},        \
         {(unsigned long)GFP_USER,               "GFP_USER"},            \
-        {(unsigned long)GFP_TEMPORARY,          "GFP_TEMPORARY"},       \
         {(unsigned long)GFP_KERNEL_ACCOUNT,     "GFP_KERNEL_ACCOUNT"},  \
         {(unsigned long)GFP_KERNEL,             "GFP_KERNEL"},          \
         {(unsigned long)GFP_NOFS,               "GFP_NOFS"},            \
diff --git a/kernel/locking/test-ww_mutex.c b/kernel/locking/test-ww_mutex.c
index 39f56c870051..0e4cd64ad2c0 100644
--- a/kernel/locking/test-ww_mutex.c
+++ b/kernel/locking/test-ww_mutex.c
@@ -362,7 +362,7 @@ static int *get_random_order(int count)
         int *order;
         int n, r, tmp;
 
-        order = kmalloc_array(count, sizeof(*order), GFP_TEMPORARY);
+        order = kmalloc_array(count, sizeof(*order), GFP_KERNEL);
         if (!order)
                 return order;
 
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 181e139a8057..61e7f0678d33 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -702,7 +702,7 @@ static void append_filter_err(struct filter_parse_state *ps,
         int pos = ps->lasterr_pos;
         char *buf, *pbuf;
 
-        buf = (char *)__get_free_page(GFP_TEMPORARY);
+        buf = (char *)__get_free_page(GFP_KERNEL);
         if (!buf)
                 return;
 
diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index ecaac2c0526f..29c490e5d478 100644
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -576,7 +576,7 @@ char *kstrdup_quotable_cmdline(struct task_struct *task, gfp_t gfp)
         char *buffer, *quoted;
         int i, res;
 
-        buffer = kmalloc(PAGE_SIZE, GFP_TEMPORARY);
+        buffer = kmalloc(PAGE_SIZE, GFP_KERNEL);
         if (!buffer)
                 return NULL;
 
@@ -612,7 +612,7 @@ char *kstrdup_quotable_file(struct file *file, gfp_t gfp)
                 return kstrdup("<unknown>", gfp);
 
         /* We add 11 spaces for ' (deleted)' to be appended */
-        temp = kmalloc(PATH_MAX + 11, GFP_TEMPORARY);
+        temp = kmalloc(PATH_MAX + 11, GFP_KERNEL);
         if (!temp)
                 return kstrdup("<no_memory>", gfp);
 
diff --git a/mm/shmem.c b/mm/shmem.c
index ace53a582be5..07a1d22807be 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3685,7 +3685,7 @@ SYSCALL_DEFINE2(memfd_create,
         if (len > MFD_NAME_MAX_LEN + 1)
                 return -EINVAL;
 
-        name = kmalloc(len + MFD_NAME_PREFIX_LEN, GFP_TEMPORARY);
+        name = kmalloc(len + MFD_NAME_PREFIX_LEN, GFP_KERNEL);
         if (!name)
                 return -ENOMEM;
 
diff --git a/mm/slub.c b/mm/slub.c
index d39a5d3834b3..163352c537ab 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -4597,7 +4597,7 @@ static int list_locations(struct kmem_cache *s, char *buf,
         struct kmem_cache_node *n;
 
         if (!map || !alloc_loc_track(&t, PAGE_SIZE / sizeof(struct location),
-                                     GFP_TEMPORARY)) {
+                                     GFP_KERNEL)) {
                 kfree(map);
                 return sprintf(buf, "Out of memory\n");
         }
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index a1497c516d85..24ee68ecdd42 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -627,7 +627,6 @@ static const struct {
         { "GFP_HIGHUSER_MOVABLE",       "HUM" },
         { "GFP_HIGHUSER",               "HU" },
         { "GFP_USER",                   "U" },
-        { "GFP_TEMPORARY",              "TMP" },
         { "GFP_KERNEL_ACCOUNT",         "KAC" },
         { "GFP_KERNEL",                 "K" },
         { "GFP_NOFS",                   "NF" },