[PATCH] tmp

[David Hildenbrand (Arm)]

Signed-off-by: David Hildenbrand (Arm) <david@xxxxxxxxxx>
---
 include/linux/sched.h    |  2 +-
 include/linux/sched/mm.h | 11 +++++++++++
 mm/mempolicy.c           | 14 ++++++++++++--
 mm/page_alloc.c          |  7 ++++++-
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index ee06cba5c6f5..9c850b7be6bf 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1778,7 +1778,7 @@ extern struct pid *cad_pid;
 						 * I am cleaning dirty pages from some other bdi. */
 #define PF_KTHREAD		0x00200000	/* I am a kernel thread */
 #define PF_RANDOMIZE		0x00400000	/* Randomize virtual address space */
-#define PF__HOLE__00800000	0x00800000
+#define PF__MEMALLOC_FOLIO	0x00800000	/* Allocating a folio that can end up on
private memory nodes */
 #define PF__HOLE__01000000	0x01000000
 #define PF__HOLE__02000000	0x02000000
 #define PF_NO_SETAFFINITY	0x04000000	/* Userland is not allowed to meddle with
cpus_mask */
diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h
index 95d0040df584..2101a447c084 100644
--- a/include/linux/sched/mm.h
+++ b/include/linux/sched/mm.h
@@ -471,6 +471,17 @@ static inline void memalloc_pin_restore(unsigned int flags)
 	memalloc_flags_restore(flags);
 }

+static inline unsigned int memalloc_folio_save(void)
+{
+	return memalloc_flags_save(PF_MEMALLOC_FOLIO);
+}
+
+static inline void memalloc_folio_restore(unsigned int flags)
+{
+	memalloc_flags_restore(flags);
+}
+
+
 #ifdef CONFIG_MEMCG
 DECLARE_PER_CPU(struct mem_cgroup *, int_active_memcg);
 /**
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 36699fabd3c2..a78b0e5a1fce 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -2506,8 +2506,13 @@ static struct page *alloc_pages_mpol(gfp_t gfp, unsigned
int order,
 struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int order,
 		struct mempolicy *pol, pgoff_t ilx, int nid)
 {
-	struct page *page = alloc_pages_mpol(gfp | __GFP_COMP, order, pol,
+	struct page *page;
+	int flags;
+
+	flags = memalloc_folio_save();
+	page = alloc_pages_mpol(gfp | __GFP_COMP, order, pol,
 			ilx, nid);
+	memalloc_folio_restore(flags);
 	if (!page)
 		return NULL;

@@ -2588,7 +2593,12 @@ EXPORT_SYMBOL(alloc_pages_noprof);

 struct folio *folio_alloc_noprof(gfp_t gfp, unsigned int order)
 {
-	return page_rmappable_folio(alloc_pages_noprof(gfp | __GFP_COMP, order));
+	struct folio *folio;
+	int flags;
+
+	flags = memalloc_folio_save();
+	folio = page_rmappable_folio(alloc_pages_noprof(gfp | __GFP_COMP, order));
+	memalloc_folio_restore(flags);
+	return folio;
 }
 EXPORT_SYMBOL(folio_alloc_noprof);

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index ee902a468c2f..37434b37f7af 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5345,8 +5345,13 @@ EXPORT_SYMBOL(__alloc_pages_noprof);
 struct folio *__folio_alloc_noprof(gfp_t gfp, unsigned int order, int
preferred_nid,
 		nodemask_t *nodemask)
 {
-	struct page *page = __alloc_pages_noprof(gfp | __GFP_COMP, order,
+	struct page *page;
+	int flags;
+
+	flags = memalloc_folio_save();
+	page = __alloc_pages_noprof(gfp | __GFP_COMP, order,
 					preferred_nid, nodemask);
+	memalloc_folio_restore(flags);
 	return page_rmappable_folio(page);
 }
 EXPORT_SYMBOL(__folio_alloc_noprof);
-- 
2.43.0


-- 
Cheers,

David