From: Pavel Tatashin <pasha.tatashin@soleen.com>
To: pasha.tatashin@soleen.com, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, akpm@linux-foundation.org, vbabka@suse.cz,
mhocko@suse.com, david@redhat.com, osalvador@suse.de,
dan.j.williams@intel.com, sashal@kernel.org,
tyhicks@linux.microsoft.com, iamjoonsoo.kim@lge.com,
mike.kravetz@oracle.com, rostedt@goodmis.org, mingo@redhat.com,
jgg@ziepe.ca, peterz@infradead.org, mgorman@suse.de,
willy@infradead.org, rientjes@google.com, jhubbard@nvidia.com
Subject: [PATCH 5/6] mm: honor PF_MEMALLOC_NOMOVABLE for all allocations
Date: Wed, 2 Dec 2020 00:23:29 -0500 [thread overview]
Message-ID: <20201202052330.474592-6-pasha.tatashin@soleen.com> (raw)
In-Reply-To: <20201202052330.474592-1-pasha.tatashin@soleen.com>
PF_MEMALLOC_NOMOVABLE is only honored for CMA allocations, extend
this flag to work for any allocations by removing __GFP_MOVABLE from
gfp_mask when this flag is passed in the current context, thus
prohibiting allocations from ZONE_MOVABLE.
Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
---
mm/hugetlb.c | 2 +-
mm/page_alloc.c | 26 ++++++++++++++++----------
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 02213c74ed6b..00e786201d8b 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1036,7 +1036,7 @@ static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid)
bool nomovable = !!(current->flags & PF_MEMALLOC_NOMOVABLE);
list_for_each_entry(page, &h->hugepage_freelists[nid], lru) {
- if (nomovable && is_migrate_cma_page(page))
+ if (nomovable && is_migrate_movable(get_pageblock_migratetype(page)))
continue;
if (PageHWPoison(page))
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 611799c72da5..7a6d86d0bc5f 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3766,20 +3766,25 @@ alloc_flags_nofragment(struct zone *zone, gfp_t gfp_mask)
return alloc_flags;
}
-static inline unsigned int current_alloc_flags(gfp_t gfp_mask,
- unsigned int alloc_flags)
+static inline unsigned int cma_alloc_flags(gfp_t gfp_mask,
+ unsigned int alloc_flags)
{
#ifdef CONFIG_CMA
- unsigned int pflags = current->flags;
-
- if (!(pflags & PF_MEMALLOC_NOMOVABLE) &&
- gfp_migratetype(gfp_mask) == MIGRATE_MOVABLE)
+ if (gfp_migratetype(gfp_mask) == MIGRATE_MOVABLE)
alloc_flags |= ALLOC_CMA;
-
#endif
return alloc_flags;
}
+static inline gfp_t current_gfp_checkmovable(gfp_t gfp_mask)
+{
+ unsigned int pflags = current->flags;
+
+ if ((pflags & PF_MEMALLOC_NOMOVABLE))
+ return gfp_mask & ~__GFP_MOVABLE;
+ return gfp_mask;
+}
+
/*
* get_page_from_freelist goes through the zonelist trying to allocate
* a page.
@@ -4423,7 +4428,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask)
} else if (unlikely(rt_task(current)) && !in_interrupt())
alloc_flags |= ALLOC_HARDER;
- alloc_flags = current_alloc_flags(gfp_mask, alloc_flags);
+ alloc_flags = cma_alloc_flags(gfp_mask, alloc_flags);
return alloc_flags;
}
@@ -4725,7 +4730,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
reserve_flags = __gfp_pfmemalloc_flags(gfp_mask);
if (reserve_flags)
- alloc_flags = current_alloc_flags(gfp_mask, reserve_flags);
+ alloc_flags = cma_alloc_flags(gfp_mask, reserve_flags);
/*
* Reset the nodemask and zonelist iterators if memory policies can be
@@ -4894,7 +4899,7 @@ static inline bool prepare_alloc_pages(gfp_t gfp_mask, unsigned int order,
if (should_fail_alloc_page(gfp_mask, order))
return false;
- *alloc_flags = current_alloc_flags(gfp_mask, *alloc_flags);
+ *alloc_flags = cma_alloc_flags(gfp_mask, *alloc_flags);
/* Dirty zone balancing only done in the fast path */
ac->spread_dirty_pages = (gfp_mask & __GFP_WRITE);
@@ -4932,6 +4937,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, int preferred_nid,
}
gfp_mask &= gfp_allowed_mask;
+ gfp_mask = current_gfp_checkmovable(gfp_mask);
alloc_mask = gfp_mask;
if (!prepare_alloc_pages(gfp_mask, order, preferred_nid, nodemask, &ac, &alloc_mask, &alloc_flags))
return NULL;
--
2.25.1
next prev parent reply other threads:[~2020-12-02 5:24 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 5:23 [PATCH 0/6] prohibit pinning pages in ZONE_MOVABLE Pavel Tatashin
2020-12-02 5:23 ` [PATCH 1/6] mm/gup: perform check_dax_vmas only when FS_DAX is enabled Pavel Tatashin
2020-12-02 16:22 ` Ira Weiny
2020-12-02 18:15 ` Pavel Tatashin
2020-12-02 16:29 ` Jason Gunthorpe
2020-12-02 18:16 ` Pavel Tatashin
2020-12-03 7:59 ` John Hubbard
2020-12-03 14:52 ` Pavel Tatashin
2020-12-02 5:23 ` [PATCH 2/6] mm/gup: don't pin migrated cma pages in movable zone Pavel Tatashin
2020-12-02 16:31 ` David Hildenbrand
2020-12-02 18:17 ` Pavel Tatashin
2020-12-03 8:01 ` John Hubbard
2020-12-03 8:46 ` Michal Hocko
2020-12-03 14:58 ` Pavel Tatashin
2020-12-02 5:23 ` [PATCH 3/6] mm/gup: make __gup_longterm_locked common Pavel Tatashin
2020-12-02 16:31 ` Ira Weiny
2020-12-02 16:33 ` Ira Weiny
2020-12-02 18:19 ` Pavel Tatashin
2020-12-03 0:03 ` Pavel Tatashin
2020-12-03 8:03 ` John Hubbard
2020-12-03 15:02 ` Pavel Tatashin
2020-12-02 5:23 ` [PATCH 4/6] mm cma: rename PF_MEMALLOC_NOCMA to PF_MEMALLOC_NOMOVABLE Pavel Tatashin
2020-12-03 8:04 ` John Hubbard
2020-12-03 15:02 ` Pavel Tatashin
2020-12-03 8:57 ` Michal Hocko
2020-12-03 15:02 ` Pavel Tatashin
2020-12-02 5:23 ` Pavel Tatashin [this message]
2020-12-03 8:17 ` [PATCH 5/6] mm: honor PF_MEMALLOC_NOMOVABLE for all allocations John Hubbard
2020-12-03 15:06 ` Pavel Tatashin
2020-12-03 16:51 ` John Hubbard
2020-12-03 9:17 ` Michal Hocko
2020-12-03 15:15 ` Pavel Tatashin
2020-12-04 8:43 ` Michal Hocko
2020-12-04 8:54 ` Michal Hocko
2020-12-04 16:07 ` Pavel Tatashin
2020-12-02 5:23 ` [PATCH 6/6] mm/gup: migrate pinned pages out of movable zone Pavel Tatashin
2020-12-02 16:35 ` Jason Gunthorpe
2020-12-03 0:19 ` Pavel Tatashin
2020-12-03 1:08 ` Jason Gunthorpe
2020-12-03 1:34 ` Pavel Tatashin
2020-12-03 14:17 ` Jason Gunthorpe
2020-12-03 16:40 ` Pavel Tatashin
2020-12-03 16:59 ` Jason Gunthorpe
2020-12-03 17:14 ` Pavel Tatashin
2020-12-03 19:15 ` Pavel Tatashin
2020-12-03 19:36 ` Jason Gunthorpe
2020-12-04 16:24 ` Pavel Tatashin
2020-12-04 17:06 ` Jason Gunthorpe
2020-12-04 20:05 ` Daniel Jordan
2020-12-04 20:16 ` Pavel Tatashin
2020-12-08 2:27 ` Daniel Jordan
2020-12-04 20:52 ` Jason Gunthorpe
2020-12-08 2:48 ` Daniel Jordan
2020-12-08 13:24 ` Jason Gunthorpe
2020-12-03 8:22 ` John Hubbard
2020-12-03 15:55 ` Pavel Tatashin
2020-12-04 4:13 ` Joonsoo Kim
2020-12-04 17:43 ` Pavel Tatashin
2020-12-07 7:13 ` Joonsoo Kim
2020-12-04 4:02 ` [PATCH 0/6] prohibit pinning pages in ZONE_MOVABLE Joonsoo Kim
2020-12-04 15:55 ` Pavel Tatashin
2020-12-04 16:10 ` Jason Gunthorpe
2020-12-04 17:50 ` Pavel Tatashin
2020-12-04 18:01 ` David Hildenbrand
2020-12-04 18:10 ` Pavel Tatashin
2020-12-07 7:12 ` Joonsoo Kim
2020-12-07 12:13 ` Michal Hocko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201202052330.474592-6-pasha.tatashin@soleen.com \
--to=pasha.tatashin@soleen.com \
--cc=akpm@linux-foundation.org \
--cc=dan.j.williams@intel.com \
--cc=david@redhat.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=jgg@ziepe.ca \
--cc=jhubbard@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mhocko@suse.com \
--cc=mike.kravetz@oracle.com \
--cc=mingo@redhat.com \
--cc=osalvador@suse.de \
--cc=peterz@infradead.org \
--cc=rientjes@google.com \
--cc=rostedt@goodmis.org \
--cc=sashal@kernel.org \
--cc=tyhicks@linux.microsoft.com \
--cc=vbabka@suse.cz \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).