From: Vlastimil Babka <vbabka@suse.cz>
To: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-mm@kvack.org
Subject: Re: [PATCH 1/2] mm/page-alloc: Rename gfp_mask to gfp
Date: Tue, 26 Jan 2021 14:43:40 +0100 [thread overview]
Message-ID: <d76d6c81-192a-f10c-3b9d-2018d9cce4ba@suse.cz> (raw)
In-Reply-To: <20210124120357.701077-2-willy@infradead.org>
On 1/24/21 1:03 PM, Matthew Wilcox (Oracle) wrote:
> Shorten some overly-long lines by renaming this identifier.
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
> ---
> mm/page_alloc.c | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index b031a5ae0bd5..d72ef706f6e6 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -4963,7 +4963,7 @@ static inline bool prepare_alloc_pages(gfp_t gfp_mask, unsigned int order,
> * This is the 'heart' of the zoned buddy allocator.
> */
> struct page *
> -__alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, int preferred_nid,
> +__alloc_pages_nodemask(gfp_t gfp, unsigned int order, int preferred_nid,
> nodemask_t *nodemask)
> {
> struct page *page;
> @@ -4976,20 +4976,21 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, int preferred_nid,
> * so bail out early if the request is out of bound.
> */
> if (unlikely(order >= MAX_ORDER)) {
> - WARN_ON_ONCE(!(gfp_mask & __GFP_NOWARN));
> + WARN_ON_ONCE(!(gfp & __GFP_NOWARN));
> return NULL;
> }
>
> - gfp_mask &= gfp_allowed_mask;
> - alloc_mask = gfp_mask;
> - if (!prepare_alloc_pages(gfp_mask, order, preferred_nid, nodemask, &ac, &alloc_mask, &alloc_flags))
> + gfp &= gfp_allowed_mask;
> + alloc_mask = gfp;
> + if (!prepare_alloc_pages(gfp, order, preferred_nid, nodemask, &ac,
> + &alloc_mask, &alloc_flags))
> return NULL;
>
> /*
> * Forbid the first pass from falling back to types that fragment
> * memory until all local zones are considered.
> */
> - alloc_flags |= alloc_flags_nofragment(ac.preferred_zoneref->zone, gfp_mask);
> + alloc_flags |= alloc_flags_nofragment(ac.preferred_zoneref->zone, gfp);
>
> /* First allocation attempt */
> page = get_page_from_freelist(alloc_mask, order, alloc_flags, &ac);
> @@ -5002,7 +5003,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, int preferred_nid,
> * from a particular context which has been marked by
> * memalloc_no{fs,io}_{save,restore}.
> */
> - alloc_mask = current_gfp_context(gfp_mask);
> + alloc_mask = current_gfp_context(gfp);
> ac.spread_dirty_pages = false;
>
> /*
> @@ -5014,8 +5015,8 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, int preferred_nid,
> page = __alloc_pages_slowpath(alloc_mask, order, &ac);
>
> out:
> - if (memcg_kmem_enabled() && (gfp_mask & __GFP_ACCOUNT) && page &&
> - unlikely(__memcg_kmem_charge_page(page, gfp_mask, order) != 0)) {
> + if (memcg_kmem_enabled() && (gfp & __GFP_ACCOUNT) && page &&
> + unlikely(__memcg_kmem_charge_page(page, gfp, order) != 0)) {
> __free_pages(page, order);
> page = NULL;
> }
>
next prev parent reply other threads:[~2021-01-26 13:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-24 12:03 [PATCH 0/2] Get rid of __alloc_pages wrapper Matthew Wilcox (Oracle)
2021-01-24 12:03 ` [PATCH 1/2] mm/page-alloc: Rename gfp_mask to gfp Matthew Wilcox (Oracle)
2021-01-26 13:43 ` Vlastimil Babka [this message]
2021-01-24 12:03 ` [PATCH 2/2] mm: Combine __alloc_pages and __alloc_pages_nodemask Matthew Wilcox (Oracle)
2021-01-26 13:47 ` Vlastimil Babka
2021-01-27 9:34 ` Michal Hocko
2021-01-24 17:11 ` [PATCH 3/2] mm: Rename alloc_pages_current to alloc_pages Matthew Wilcox
2021-01-26 16:05 ` Vlastimil Babka
2021-01-27 9:39 ` 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=d76d6c81-192a-f10c-3b9d-2018d9cce4ba@suse.cz \
--to=vbabka@suse.cz \
--cc=linux-mm@kvack.org \
--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).