1 files changed, 23 insertions, 3 deletions

diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h
index 830953ebb391..9daabe138c99 100644
--- a/include/linux/sched/mm.h
+++ b/include/linux/sched/mm.h
@@ -149,13 +149,21 @@ static inline bool in_vfork(struct task_struct *tsk)
         return ret;
 }
 
-/* __GFP_IO isn't allowed if PF_MEMALLOC_NOIO is set in current->flags
- * __GFP_FS is also cleared as it implies __GFP_IO.
+/*
+ * Applies per-task gfp context to the given allocation flags.
+ * PF_MEMALLOC_NOIO implies GFP_NOIO
+ * PF_MEMALLOC_NOFS implies GFP_NOFS
  */
-static inline gfp_t memalloc_noio_flags(gfp_t flags)
+static inline gfp_t current_gfp_context(gfp_t flags)
 {
+        /*
+         * NOIO implies both NOIO and NOFS and it is a weaker context
+         * so always make sure it makes precendence
+         */
         if (unlikely(current->flags & PF_MEMALLOC_NOIO))
                 flags &= ~(__GFP_IO | __GFP_FS);
+        else if (unlikely(current->flags & PF_MEMALLOC_NOFS))
+                flags &= ~__GFP_FS;
         return flags;
 }
 
@@ -171,4 +179,16 @@ static inline void memalloc_noio_restore(unsigned int flags)
         current->flags = (current->flags & ~PF_MEMALLOC_NOIO) | flags;
 }
 
+static inline unsigned int memalloc_nofs_save(void)
+{
+        unsigned int flags = current->flags & PF_MEMALLOC_NOFS;
+        current->flags |= PF_MEMALLOC_NOFS;
+        return flags;
+}
+
+static inline void memalloc_nofs_restore(unsigned int flags)
+{
+        current->flags = (current->flags & ~PF_MEMALLOC_NOFS) | flags;
+}
+
 #endif /* _LINUX_SCHED_MM_H */