| Message ID | 20230515113344.6869-4-mgorman@techsingularity.net (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Follow-up "Fix excessive CPU usage during compaction" | expand |
On 5/15/23 13:33, Mel Gorman wrote: > isolate_migratepages_block should mark a pageblock as skip if scanning > started on an aligned pageblock boundary but it only updates the skip > flag if the first migration candidate is also aligned. Tracing during > a compaction stress load (mmtests: workload-usemem-stress-numa-compact) > that many pageblocks are not marked skip causing excessive scanning of > blocks that had been recently checked. Update pageblock skip based on > "valid_page" which is set if scanning started on a pageblock boundary. > > Signed-off-by: Mel Gorman <mgorman@techsingularity.net> I wonder if this has an unintended side-effect that if we resume isolate_migratepages_block() of a partially compacted pageblock to finish it, test_and_set_skip() will now tell us to abort, because we already set the skip bit in the previous call. This would include the cc->finish_pageblock rescan cases. So unless I miss something that already prevents that, I agree we should not tie setting the skip bit to pageblock_aligned(pfn), but maybe if we are not pageblock aligned, we should ignore the already-set skip bit, as it was most likely being set by us in the previous iteration and should not prevent us from finishing the pageblock? > --- > mm/compaction.c | 15 +++++---------- > 1 file changed, 5 insertions(+), 10 deletions(-) > > diff --git a/mm/compaction.c b/mm/compaction.c > index accc6568091a..d7be990b1d60 100644 > --- a/mm/compaction.c > +++ b/mm/compaction.c > @@ -392,18 +392,14 @@ void reset_isolation_suitable(pg_data_t *pgdat) > * Sets the pageblock skip bit if it was clear. Note that this is a hint as > * locks are not required for read/writers. Returns true if it was already set. > */ > -static bool test_and_set_skip(struct compact_control *cc, struct page *page, > - unsigned long pfn) > +static bool test_and_set_skip(struct compact_control *cc, struct page *page) > { > bool skip; > > - /* Do no update if skip hint is being ignored */ > + /* Do not update if skip hint is being ignored */ > if (cc->ignore_skip_hint) > return false; > > - if (!pageblock_aligned(pfn)) > - return false; > - > skip = get_pageblock_skip(page); > if (!skip && !cc->no_set_skip_hint) > set_pageblock_skip(page); > @@ -470,8 +466,7 @@ static void update_cached_migrate(struct compact_control *cc, unsigned long pfn) > { > } > > -static bool test_and_set_skip(struct compact_control *cc, struct page *page, > - unsigned long pfn) > +static bool test_and_set_skip(struct compact_control *cc, struct page *page) > { > return false; > } > @@ -1075,9 +1070,9 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, > lruvec_memcg_debug(lruvec, page_folio(page)); > > /* Try get exclusive access under lock */ > - if (!skip_updated) { > + if (!skip_updated && valid_page) { > skip_updated = true; > - if (test_and_set_skip(cc, page, low_pfn)) > + if (test_and_set_skip(cc, valid_page)) > goto isolate_abort; > } >
On Thu, May 25, 2023 at 03:37:43PM +0200, Vlastimil Babka wrote: > On 5/15/23 13:33, Mel Gorman wrote: > > isolate_migratepages_block should mark a pageblock as skip if scanning > > started on an aligned pageblock boundary but it only updates the skip > > flag if the first migration candidate is also aligned. Tracing during > > a compaction stress load (mmtests: workload-usemem-stress-numa-compact) > > that many pageblocks are not marked skip causing excessive scanning of > > blocks that had been recently checked. Update pageblock skip based on > > "valid_page" which is set if scanning started on a pageblock boundary. > > > > Signed-off-by: Mel Gorman <mgorman@techsingularity.net> > > I wonder if this has an unintended side-effect that if we resume > isolate_migratepages_block() of a partially compacted pageblock to finish > it, test_and_set_skip() will now tell us to abort, because we already set > the skip bit in the previous call. This would include the > cc->finish_pageblock rescan cases. > > So unless I miss something that already prevents that, I agree we should not > tie setting the skip bit to pageblock_aligned(pfn), but maybe if we are not > pageblock aligned, we should ignore the already-set skip bit, as it was most > likely being set by us in the previous iteration and should not prevent us > from finishing the pageblock? > Hmm, I think you're right. While it should not hit the original bug, migration candidates are missed until the next compaction scan which could be tricky to detect. Something like this as a separate patch? Build tested only but the intent is for an unaligned start to set the skip bet if already unset but otherwise complete the scan. Like earlier fixes, this might overscan some pageblocks in a given context but we are probably hitting the limits on how compaction can run efficiently in the current scheme without causing other side-effects :( diff --git a/mm/compaction.c b/mm/compaction.c index 91af6a8b7a98..761a2dd7d78a 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -792,6 +792,7 @@ 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; + bool start_aligned; int ret = 0; cc->migrate_pfn = low_pfn; @@ -824,6 +825,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, } /* Time to isolate some pages for migration */ + start_aligned = pageblock_aligned(start_pfn); for (; low_pfn < end_pfn; low_pfn++) { if (skip_on_failure && low_pfn >= next_skip_pfn) { @@ -1069,10 +1071,15 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, lruvec_memcg_debug(lruvec, page_folio(page)); - /* Try get exclusive access under lock */ + /* Try get exclusive access under lock. Isolation is + * only aborted if the start was pageblock aligned + * as this may be a partial resumed scan that set + * the bit on a recent scan but the scan must reach + * the end of the pageblock. + */ if (!skip_updated && valid_page) { skip_updated = true; - if (test_and_set_skip(cc, valid_page)) + if (test_and_set_skip(cc, valid_page) && start_aligned) goto isolate_abort; }
On 5/29/23 12:33, Mel Gorman wrote: > On Thu, May 25, 2023 at 03:37:43PM +0200, Vlastimil Babka wrote: >> On 5/15/23 13:33, Mel Gorman wrote: >> > isolate_migratepages_block should mark a pageblock as skip if scanning >> > started on an aligned pageblock boundary but it only updates the skip >> > flag if the first migration candidate is also aligned. Tracing during >> > a compaction stress load (mmtests: workload-usemem-stress-numa-compact) >> > that many pageblocks are not marked skip causing excessive scanning of >> > blocks that had been recently checked. Update pageblock skip based on >> > "valid_page" which is set if scanning started on a pageblock boundary. >> > >> > Signed-off-by: Mel Gorman <mgorman@techsingularity.net> >> >> I wonder if this has an unintended side-effect that if we resume >> isolate_migratepages_block() of a partially compacted pageblock to finish >> it, test_and_set_skip() will now tell us to abort, because we already set >> the skip bit in the previous call. This would include the >> cc->finish_pageblock rescan cases. >> >> So unless I miss something that already prevents that, I agree we should not >> tie setting the skip bit to pageblock_aligned(pfn), but maybe if we are not >> pageblock aligned, we should ignore the already-set skip bit, as it was most >> likely being set by us in the previous iteration and should not prevent us >> from finishing the pageblock? >> > > Hmm, I think you're right. While it should not hit the original bug, > migration candidates are missed until the next compaction scan which > could be tricky to detect. Something like this as a separate patch? > Build tested only but the intent is for an unaligned start to set the skip > bet if already unset but otherwise complete the scan. Like earlier fixes, > this might overscan some pageblocks in a given context but we are probably > hitting the limits on how compaction can run efficiently in the current > scheme without causing other side-effects :( Yeah that should work! I think it should be even folded to 3/4 but if you want separate, fine too. > diff --git a/mm/compaction.c b/mm/compaction.c > index 91af6a8b7a98..761a2dd7d78a 100644 > --- a/mm/compaction.c > +++ b/mm/compaction.c > @@ -792,6 +792,7 @@ 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; > + bool start_aligned; > int ret = 0; > > cc->migrate_pfn = low_pfn; > @@ -824,6 +825,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, > } > > /* Time to isolate some pages for migration */ > + start_aligned = pageblock_aligned(start_pfn); > for (; low_pfn < end_pfn; low_pfn++) { > > if (skip_on_failure && low_pfn >= next_skip_pfn) { > @@ -1069,10 +1071,15 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, > > lruvec_memcg_debug(lruvec, page_folio(page)); > > - /* Try get exclusive access under lock */ > + /* Try get exclusive access under lock. Isolation is > + * only aborted if the start was pageblock aligned > + * as this may be a partial resumed scan that set > + * the bit on a recent scan but the scan must reach > + * the end of the pageblock. > + */ > if (!skip_updated && valid_page) { > skip_updated = true; > - if (test_and_set_skip(cc, valid_page)) > + if (test_and_set_skip(cc, valid_page) && start_aligned) > goto isolate_abort; > } >
On 6/6/2023 9:11 PM, Vlastimil Babka wrote: > On 6/2/23 14:48, Mel Gorman wrote: >> On Fri, Jun 02, 2023 at 02:19:00PM +0200, Vlastimil Babka wrote: >>> On 6/2/23 13:16, Mel Gorman wrote: >>>> On Mon, May 29, 2023 at 02:43:48PM +0200, Vlastimil Babka wrote: >>>>> On 5/29/23 12:33, Mel Gorman wrote: >>>>>> On Thu, May 25, 2023 at 03:37:43PM +0200, Vlastimil Babka wrote: >>>>>>> On 5/15/23 13:33, Mel Gorman wrote: >>>>>>>> isolate_migratepages_block should mark a pageblock as skip if scanning >>>>>>>> started on an aligned pageblock boundary but it only updates the skip >>>>>>>> flag if the first migration candidate is also aligned. Tracing during >>>>>>>> a compaction stress load (mmtests: workload-usemem-stress-numa-compact) >>>>>>>> that many pageblocks are not marked skip causing excessive scanning of >>>>>>>> blocks that had been recently checked. Update pageblock skip based on >>>>>>>> "valid_page" which is set if scanning started on a pageblock boundary. >>>>>>>> >>>>>>>> Signed-off-by: Mel Gorman <mgorman@techsingularity.net> >>>>>>> >>>>>>> I wonder if this has an unintended side-effect that if we resume >>>>>>> isolate_migratepages_block() of a partially compacted pageblock to finish >>>>>>> it, test_and_set_skip() will now tell us to abort, because we already set >>>>>>> the skip bit in the previous call. This would include the >>>>>>> cc->finish_pageblock rescan cases. >>>>>>> >>>>>>> So unless I miss something that already prevents that, I agree we should not >>>>>>> tie setting the skip bit to pageblock_aligned(pfn), but maybe if we are not >>>>>>> pageblock aligned, we should ignore the already-set skip bit, as it was most >>>>>>> likely being set by us in the previous iteration and should not prevent us >>>>>>> from finishing the pageblock? >>>>>>> >>>>>> >>>>>> Hmm, I think you're right. While it should not hit the original bug, >>>>>> migration candidates are missed until the next compaction scan which >>>>>> could be tricky to detect. Something like this as a separate patch? >>>>>> Build tested only but the intent is for an unaligned start to set the skip >>>>>> bet if already unset but otherwise complete the scan. Like earlier fixes, >>>>>> this might overscan some pageblocks in a given context but we are probably >>>>>> hitting the limits on how compaction can run efficiently in the current >>>>>> scheme without causing other side-effects :( >>>>> >>>>> Yeah that should work! I think it should be even folded to 3/4 but if you >>>>> want separate, fine too. >>>>> >>>> >>>> I was not happy with the test results so limited the scope of the patch >>>> which performed much better both in terms of absolute performance and >>>> compaction activity. >>> >>> That's surprising. Does that mean that if we isolate COMPACT_CLUSTER_MAX >>> pages, migrate them without failing, but it's not enough to succeed (i.e. >>> there are more pages we need to migrate to free up a whole pageblock), it's >>> better to give up on the rest of the pageblock rather than continue? >> >> I don't have precise enough data to answer that with certainty but probably >> yes, at least in terms of scan activity. The first version had spikes of >> pages scanned for migration that are not always reproducible and not on >> all machines. > > Well, that kinda sucks. So for the patch (with adding the missing NOT below). > > Acked-by: Vlastimil Babka <vbabka@suse.cz> > > But in raises a question whether we should terminate compaction under the > right conditions after a successful migration immediately, rather than > invoke another iteration of isolate_migratepages_block() where we could skip > over some pages uselessly only to abort at first valid page due to the skip bit. > It would save some cycles and be much more obvious than now, where anyone > trying to understand how it works in detail might conclude it's an oversight? IIUC, for direct compactor, we can terminate compaction if there is a suitable free page, that means other pages scanning in this pageblock are uselessly like you said, and we can skip them to save cpu cycles. So we can remove below COMPACT_CONTINUE validation in __compact_finished(): /* * Always finish scanning a pageblock to reduce the possibility of * fallbacks in the future. This is particularly important when * migration source is unmovable/reclaimable but it's not worth * special casing. */ if (!pageblock_aligned(cc->migrate_pfn)) return COMPACT_CONTINUE; And in this case, we also should call update_cached_migrate() to record the partial cc->migrate_pfn, which is the start position for next scanning. Please correct me if I missed something. Thanks. >>> As >>> that's AFAIU the scenario where cc->finish_pageblock is false when we >>> revisit an unfinished pageblock. >>> >>>> Are you still ok with this version? >>> >>> It's better than previously in that cc->finish_pageblock == true case is not >>> sabotaged anymore. But the result as described above seems to be a weird >>> non-intuitive and non-obvious heuristic. How did the test differences look like? >>> >> >> 5 machines were tested in all (different Intel and AMD generations), >> 2 showed unexpected spikes in scan activity. 1 showed high migration >> scan counts for workloads workload-thpchallenge-kernel-build-xfs >> and workload-usemem-stress-numa-compact. They are both basically >> compaction stressors with the first one using a kernel build >> in the background to generate noise. For the second machine, only >> workload-usemem-stress-numa-compact was affected. In all other test cases >> and machines, the patches were equivalent in terms of behaviour but the >> extreme counter-examples led be to conclude the fix should be as constrained >> as possible unless there is a good reason to do otherwise. >> >>>> Vlastimil Babka pointed out the following problem with >>>> mm-compaction-update-pageblock-skip-when-first-migration-candidate-is-not-at-the-start.patch >>>> >>>> I wonder if this has an unintended side-effect that if we resume >>>> isolate_migratepages_block() of a partially compacted pageblock >>>> to finish it, test_and_set_skip() will now tell us to abort, >>>> because we already set the skip bit in the previous call. This >>>> would include the cc->finish_pageblock rescan cases. >>>> >>>> He is correct and a partial rescan as implemented in "mm, compaction: >>>> finish pageblocks on complete migration failure" would abort >>>> prematurely. >>>> >>>> Test and set the skip bit when acquiring "exclusive access" to a pageblock >>>> for migration but only abort if the calling context is rescanning to >>>> finish a pageblock. >>> >>> Should it say NOT rescanning to finish a pageblock? >>> >> >> Yep, it should. The sentence was a last minute update before pushing >> send :( >> >
On Tue, Jun 06, 2023 at 03:11:27PM +0200, Vlastimil Babka wrote: > On 6/2/23 14:48, Mel Gorman wrote: > > On Fri, Jun 02, 2023 at 02:19:00PM +0200, Vlastimil Babka wrote: > >> On 6/2/23 13:16, Mel Gorman wrote: > >> > On Mon, May 29, 2023 at 02:43:48PM +0200, Vlastimil Babka wrote: > >> >> On 5/29/23 12:33, Mel Gorman wrote: > >> >> > On Thu, May 25, 2023 at 03:37:43PM +0200, Vlastimil Babka wrote: > >> >> >> On 5/15/23 13:33, Mel Gorman wrote: > >> >> >> > isolate_migratepages_block should mark a pageblock as skip if scanning > >> >> >> > started on an aligned pageblock boundary but it only updates the skip > >> >> >> > flag if the first migration candidate is also aligned. Tracing during > >> >> >> > a compaction stress load (mmtests: workload-usemem-stress-numa-compact) > >> >> >> > that many pageblocks are not marked skip causing excessive scanning of > >> >> >> > blocks that had been recently checked. Update pageblock skip based on > >> >> >> > "valid_page" which is set if scanning started on a pageblock boundary. > >> >> >> > > >> >> >> > Signed-off-by: Mel Gorman <mgorman@techsingularity.net> > >> >> >> > >> >> >> I wonder if this has an unintended side-effect that if we resume > >> >> >> isolate_migratepages_block() of a partially compacted pageblock to finish > >> >> >> it, test_and_set_skip() will now tell us to abort, because we already set > >> >> >> the skip bit in the previous call. This would include the > >> >> >> cc->finish_pageblock rescan cases. > >> >> >> > >> >> >> So unless I miss something that already prevents that, I agree we should not > >> >> >> tie setting the skip bit to pageblock_aligned(pfn), but maybe if we are not > >> >> >> pageblock aligned, we should ignore the already-set skip bit, as it was most > >> >> >> likely being set by us in the previous iteration and should not prevent us > >> >> >> from finishing the pageblock? > >> >> >> > >> >> > > >> >> > Hmm, I think you're right. While it should not hit the original bug, > >> >> > migration candidates are missed until the next compaction scan which > >> >> > could be tricky to detect. Something like this as a separate patch? > >> >> > Build tested only but the intent is for an unaligned start to set the skip > >> >> > bet if already unset but otherwise complete the scan. Like earlier fixes, > >> >> > this might overscan some pageblocks in a given context but we are probably > >> >> > hitting the limits on how compaction can run efficiently in the current > >> >> > scheme without causing other side-effects :( > >> >> > >> >> Yeah that should work! I think it should be even folded to 3/4 but if you > >> >> want separate, fine too. > >> >> > >> > > >> > I was not happy with the test results so limited the scope of the patch > >> > which performed much better both in terms of absolute performance and > >> > compaction activity. > >> > >> That's surprising. Does that mean that if we isolate COMPACT_CLUSTER_MAX > >> pages, migrate them without failing, but it's not enough to succeed (i.e. > >> there are more pages we need to migrate to free up a whole pageblock), it's > >> better to give up on the rest of the pageblock rather than continue? > > > > I don't have precise enough data to answer that with certainty but probably > > yes, at least in terms of scan activity. The first version had spikes of > > pages scanned for migration that are not always reproducible and not on > > all machines. > > Well, that kinda sucks. So for the patch (with adding the missing NOT below). > > Acked-by: Vlastimil Babka <vbabka@suse.cz> > > But in raises a question whether we should terminate compaction under the > right conditions after a successful migration immediately, rather than > invoke another iteration of isolate_migratepages_block() where we could skip > over some pages uselessly only to abort at first valid page due to the skip bit. > It would save some cycles and be much more obvious than now, where anyone > trying to understand how it works in detail might conclude it's an oversight? > It sounds like a solid idea and would be a good standalone patch with the usual supporting data. At a quick glance, the check for a page stored on compact_control happens surprisingly late which makes me think we probably over-compact in direct compaction in particular. It would need supporting data because it probably means that compaction cost gets spread over multiple tasks requiring high-order pages instead of one unlucky task doing compaction works that unrelated tasks indirectly benefit from. It's probably more sensible behaviour that tasks requiring high-order pages pay the cost if kcompactd cannot keep up but supporting data would tell us one way or the other.
diff --git a/mm/compaction.c b/mm/compaction.c index accc6568091a..d7be990b1d60 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -392,18 +392,14 @@ void reset_isolation_suitable(pg_data_t *pgdat) * Sets the pageblock skip bit if it was clear. Note that this is a hint as * locks are not required for read/writers. Returns true if it was already set. */ -static bool test_and_set_skip(struct compact_control *cc, struct page *page, - unsigned long pfn) +static bool test_and_set_skip(struct compact_control *cc, struct page *page) { bool skip; - /* Do no update if skip hint is being ignored */ + /* Do not update if skip hint is being ignored */ if (cc->ignore_skip_hint) return false; - if (!pageblock_aligned(pfn)) - return false; - skip = get_pageblock_skip(page); if (!skip && !cc->no_set_skip_hint) set_pageblock_skip(page); @@ -470,8 +466,7 @@ static void update_cached_migrate(struct compact_control *cc, unsigned long pfn) { } -static bool test_and_set_skip(struct compact_control *cc, struct page *page, - unsigned long pfn) +static bool test_and_set_skip(struct compact_control *cc, struct page *page) { return false; } @@ -1075,9 +1070,9 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, lruvec_memcg_debug(lruvec, page_folio(page)); /* Try get exclusive access under lock */ - if (!skip_updated) { + if (!skip_updated && valid_page) { skip_updated = true; - if (test_and_set_skip(cc, page, low_pfn)) + if (test_and_set_skip(cc, valid_page)) goto isolate_abort; }
isolate_migratepages_block should mark a pageblock as skip if scanning started on an aligned pageblock boundary but it only updates the skip flag if the first migration candidate is also aligned. Tracing during a compaction stress load (mmtests: workload-usemem-stress-numa-compact) that many pageblocks are not marked skip causing excessive scanning of blocks that had been recently checked. Update pageblock skip based on "valid_page" which is set if scanning started on a pageblock boundary. Signed-off-by: Mel Gorman <mgorman@techsingularity.net> --- mm/compaction.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)