From: David Hildenbrand <david@redhat.com>
To: Oscar Salvador <osalvador@suse.de>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Mike Kravetz <mike.kravetz@oracle.com>,
Vlastimil Babka <vbabka@suse.cz>,
Michal Hocko <mhocko@kernel.org>,
Muchun Song <songmuchun@bytedance.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v7 2/7] mm,compaction: Let isolate_migratepages_{range,block} return error codes
Date: Wed, 14 Apr 2021 13:54:17 +0200 [thread overview]
Message-ID: <2628d20e-3304-1a0c-5246-cfc2320cce8b@redhat.com> (raw)
In-Reply-To: <20210413104747.12177-3-osalvador@suse.de>
On 13.04.21 12:47, Oscar Salvador wrote:
> Currently, isolate_migratepages_{range,block} and their callers use
> a pfn == 0 vs pfn != 0 scheme to let the caller know whether there was
> any error during isolation.
> This does not work as soon as we need to start reporting different error
> codes and make sure we pass them down the chain, so they are properly
> interpreted by functions like e.g: alloc_contig_range.
>
> Let us rework isolate_migratepages_{range,block} so we can report error
> codes.
> Since isolate_migratepages_block will stop returning the next pfn to be
> scanned, we reuse the cc->migrate_pfn field to keep track of that.
>
> Signed-off-by: Oscar Salvador <osalvador@suse.de>
> Acked-by: Vlastimil Babka <vbabka@suse.cz>
> ---
> mm/compaction.c | 54 +++++++++++++++++++++++++++---------------------------
> mm/internal.h | 10 ++++++++--
> mm/page_alloc.c | 7 +++----
> 3 files changed, 38 insertions(+), 33 deletions(-)
>
> diff --git a/mm/compaction.c b/mm/compaction.c
> index 8c5028bfbd56..eeba4668c22c 100644
> --- a/mm/compaction.c
> +++ b/mm/compaction.c
> @@ -787,15 +787,15 @@ static bool too_many_isolated(pg_data_t *pgdat)
> *
> * Isolate all pages that can be migrated from the range specified by
> * [low_pfn, end_pfn). The range is expected to be within same pageblock.
> - * Returns zero if there is a fatal signal pending, otherwise PFN of the
> - * first page that was not scanned (which may be both less, equal to or more
> - * than end_pfn).
> + * Returns errno, like -EAGAIN or -EINTR in case e.g signal pending or congestion,
> + * or 0.
> + * cc->migrate_pfn will contain the next pfn to scan (which may be both less,
> + * equal to or more that end_pfn).
I failed to parse the last sentence -- e.g., using "both" and then
listing three options. Also, s/than/than/? Can we simplify to
"cc->migrate_pfn will contain the next pfn to scan"
> *
> * The pages are isolated on cc->migratepages list (not required to be empty),
> - * and cc->nr_migratepages is updated accordingly. The cc->migrate_pfn field
> - * is neither read nor updated.
> + * and cc->nr_migratepages is updated accordingly.
> */
> -static unsigned long
> +static int
> isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
> unsigned long end_pfn, isolate_mode_t isolate_mode)
> {
> @@ -809,6 +809,9 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
> bool skip_on_failure = false;
> unsigned long next_skip_pfn = 0;
> bool skip_updated = false;
> + int ret = 0;
> +
> + cc->migrate_pfn = low_pfn;
>
> /*
> * Ensure that there are not too many pages isolated from the LRU
> @@ -818,16 +821,16 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
> while (unlikely(too_many_isolated(pgdat))) {
> /* stop isolation if there are still pages not migrated */
> if (cc->nr_migratepages)
> - return 0;
> + return -EAGAIN;
>
> /* async migration should just abort */
> if (cc->mode == MIGRATE_ASYNC)
> - return 0;
> + return -EAGAIN;
>
> congestion_wait(BLK_RW_ASYNC, HZ/10);
>
> if (fatal_signal_pending(current))
> - return 0;
> + return -EINTR;
> }
>
> cond_resched();
> @@ -875,8 +878,8 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
>
> if (fatal_signal_pending(current)) {
> cc->contended = true;
> + ret = -EINTR;
>
> - low_pfn = 0;
> goto fatal_pending;
> }
>
> @@ -1130,7 +1133,9 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
> if (nr_isolated)
> count_compact_events(COMPACTISOLATED, nr_isolated);
>
> - return low_pfn;
> + cc->migrate_pfn = low_pfn;
> +
> + return ret;
> }
>
> /**
> @@ -1139,15 +1144,15 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
> * @start_pfn: The first PFN to start isolating.
> * @end_pfn: The one-past-last PFN.
> *
> - * Returns zero if isolation fails fatally due to e.g. pending signal.
> - * Otherwise, function returns one-past-the-last PFN of isolated page
> - * (which may be greater than end_pfn if end fell in a middle of a THP page).
> + * Returns errno, like -EAGAIN or -EINTR in case e.g signal pending or congestion,
errno is usually positive.
> + * or 0.
I'd be more specific here. Something like
"
Returns 0 if isolation succeeded. Returns -EINTR if a fatal signal is
pending. Returns -EAGAIN when contended and the caller should retry.
In any case, cc->migrate_pfn is set to one-past-the-last PFN that has
been isolated.
"
--
Thanks,
David / dhildenb
next prev parent reply other threads:[~2021-04-14 11:54 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 10:47 [PATCH v7 0/7] Make alloc_contig_range handle Hugetlb pages Oscar Salvador
2021-04-13 10:47 ` [PATCH v7 1/7] mm,page_alloc: Bail out earlier on -ENOMEM in alloc_contig_migrate_range Oscar Salvador
2021-04-13 17:00 ` Mike Kravetz
2021-04-13 10:47 ` [PATCH v7 2/7] mm,compaction: Let isolate_migratepages_{range,block} return error codes Oscar Salvador
2021-04-13 17:52 ` Mike Kravetz
2021-04-14 11:54 ` David Hildenbrand [this message]
2021-04-15 8:42 ` Oscar Salvador
2021-04-13 10:47 ` [PATCH v7 3/7] mm,hugetlb: Clear HPageFreed outside of the lock Oscar Salvador
2021-04-13 13:23 ` Michal Hocko
2021-04-13 21:19 ` Mike Kravetz
2021-04-14 6:04 ` Michal Hocko
2021-04-14 7:41 ` Oscar Salvador
2021-04-14 8:28 ` Michal Hocko
2021-04-14 10:01 ` Oscar Salvador
2021-04-14 10:03 ` Oscar Salvador
2021-04-14 10:32 ` Michal Hocko
2021-04-14 10:49 ` Oscar Salvador
2021-04-14 11:09 ` Michal Hocko
2021-04-14 12:02 ` David Hildenbrand
2021-04-14 16:45 ` Mike Kravetz
2021-04-13 10:47 ` [PATCH v7 4/7] mm,hugetlb: Split prep_new_huge_page functionality Oscar Salvador
2021-04-13 13:24 ` Michal Hocko
2021-04-13 13:26 ` Michal Hocko
2021-04-13 21:33 ` Mike Kravetz
2021-04-14 4:59 ` Oscar Salvador
2021-04-14 12:15 ` David Hildenbrand
2021-04-14 17:03 ` Mike Kravetz
2021-04-13 10:47 ` [PATCH v7 5/7] mm: Make alloc_contig_range handle free hugetlb pages Oscar Salvador
2021-04-13 13:40 ` Michal Hocko
2021-04-15 8:29 ` Oscar Salvador
2021-04-13 22:29 ` Mike Kravetz
2021-04-14 4:54 ` Oscar Salvador
2021-04-14 12:26 ` David Hildenbrand
2021-04-15 8:28 ` Oscar Salvador
2021-04-13 10:47 ` [PATCH v7 6/7] mm: Make alloc_contig_range handle in-use " Oscar Salvador
2021-04-13 22:48 ` Mike Kravetz
2021-04-14 4:52 ` Oscar Salvador
2021-04-14 17:07 ` Mike Kravetz
2021-04-13 10:47 ` [PATCH v7 7/7] mm,page_alloc: Drop unnecessary checks from pfn_range_valid_contig Oscar Salvador
2021-04-13 22:53 ` Mike Kravetz
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=2628d20e-3304-1a0c-5246-cfc2320cce8b@redhat.com \
--to=david@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=mike.kravetz@oracle.com \
--cc=osalvador@suse.de \
--cc=songmuchun@bytedance.com \
--cc=vbabka@suse.cz \
/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).