From: Mel Gorman <mgorman@suse.de>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Richard Davies <richard@arachsys.com>,
Shaohua Li <shli@kernel.org>, Rik van Riel <riel@redhat.com>,
Avi Kivity <avi@redhat.com>, QEMU-devel <qemu-devel@nongnu.org>,
KVM <kvm@vger.kernel.org>, Linux-MM <linux-mm@kvack.org>,
LKML <linux-kernel@vger.kernel.org>, Mel Gorman <mgorman@suse.de>
Subject: [PATCH 3/9] Revert "mm: compaction: abort compaction loop if lock is contended or run too long"
Date: Fri, 21 Sep 2012 11:46:17 +0100 [thread overview]
Message-ID: <1348224383-1499-4-git-send-email-mgorman@suse.de> (raw)
In-Reply-To: <1348224383-1499-1-git-send-email-mgorman@suse.de>
This reverts
mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long.patch
as it is replaced by a later patch in the series.
Signed-off-by: Mel Gorman <mgorman@suse.de>
---
mm/compaction.c | 12 +++++-------
mm/internal.h | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/mm/compaction.c b/mm/compaction.c
index 1c873bb..614f18b 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -70,7 +70,8 @@ static bool compact_checklock_irqsave(spinlock_t *lock, unsigned long *flags,
/* async aborts if taking too long or contended */
if (!cc->sync) {
- cc->contended = true;
+ if (cc->contended)
+ *cc->contended = true;
return false;
}
@@ -685,7 +686,7 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone,
/* Perform the isolation */
low_pfn = isolate_migratepages_range(zone, cc, low_pfn, end_pfn);
- if (!low_pfn || cc->contended)
+ if (!low_pfn)
return ISOLATE_ABORT;
cc->migrate_pfn = low_pfn;
@@ -893,7 +894,6 @@ static unsigned long compact_zone_order(struct zone *zone,
bool sync, bool *contended,
struct page **page)
{
- unsigned long ret;
struct compact_control cc = {
.nr_freepages = 0,
.nr_migratepages = 0,
@@ -901,15 +901,13 @@ static unsigned long compact_zone_order(struct zone *zone,
.migratetype = allocflags_to_migratetype(gfp_mask),
.zone = zone,
.sync = sync,
+ .contended = contended,
.page = page,
};
INIT_LIST_HEAD(&cc.freepages);
INIT_LIST_HEAD(&cc.migratepages);
- ret = compact_zone(zone, &cc);
- if (contended)
- *contended = cc.contended;
- return ret;
+ return compact_zone(zone, &cc);
}
int sysctl_extfrag_threshold = 500;
diff --git a/mm/internal.h b/mm/internal.h
index eebbed5..386772f 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -131,7 +131,7 @@ struct compact_control {
int order; /* order a direct compactor needs */
int migratetype; /* MOVABLE, RECLAIMABLE etc */
struct zone *zone;
- bool contended; /* True if a lock was contended */
+ bool *contended; /* True if a lock was contended */
struct page **page; /* Page captured of requested size */
};
--
1.7.9.2
next prev parent reply other threads:[~2012-09-21 10:47 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-21 10:46 [PATCH 0/9] Reduce compaction scanning and lock contention Mel Gorman
2012-09-21 10:46 ` [PATCH 1/9] Revert "mm: compaction: check lock contention first before taking lock" Mel Gorman
2012-09-21 17:46 ` Rafael Aquini
2012-09-21 10:46 ` [PATCH 2/9] Revert "mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix" Mel Gorman
2012-09-21 17:47 ` Rafael Aquini
2012-09-21 10:46 ` Mel Gorman [this message]
2012-09-21 17:48 ` [PATCH 3/9] Revert "mm: compaction: abort compaction loop if lock is contended or run too long" Rafael Aquini
2012-09-21 10:46 ` [PATCH 4/9] mm: compaction: Abort compaction loop if lock is contended or run too long Mel Gorman
2012-09-21 17:50 ` Rafael Aquini
2012-09-21 21:31 ` Andrew Morton
2012-09-25 7:34 ` Minchan Kim
2012-09-21 10:46 ` [PATCH 5/9] mm: compaction: Acquire the zone->lru_lock as late as possible Mel Gorman
2012-09-21 17:51 ` Rafael Aquini
2012-09-25 7:05 ` Minchan Kim
2012-09-25 7:51 ` Mel Gorman
2012-09-25 8:13 ` Minchan Kim
2012-09-25 21:39 ` Andrew Morton
2012-09-26 0:23 ` Minchan Kim
2012-09-26 10:17 ` Mel Gorman
2012-09-21 10:46 ` [PATCH 6/9] mm: compaction: Acquire the zone->lock " Mel Gorman
2012-09-21 17:52 ` Rafael Aquini
2012-09-21 21:35 ` Andrew Morton
2012-09-24 8:52 ` Mel Gorman
2012-09-25 7:36 ` Minchan Kim
2012-09-25 7:35 ` Minchan Kim
2012-09-21 10:46 ` [PATCH 7/9] Revert "mm: have order > 0 compaction start off where it left" Mel Gorman
2012-09-21 17:52 ` Rafael Aquini
2012-09-25 7:37 ` Minchan Kim
2012-09-21 10:46 ` [PATCH 8/9] mm: compaction: Cache if a pageblock was scanned and no pages were isolated Mel Gorman
2012-09-21 17:53 ` Rafael Aquini
2012-09-21 21:36 ` Andrew Morton
2012-09-24 9:39 ` Mel Gorman
2012-09-24 21:26 ` Andrew Morton
2012-09-25 9:12 ` Mel Gorman
2012-09-25 20:03 ` Andrew Morton
2012-09-27 12:06 ` [PATCH] mm: compaction: cache if a pageblock was scanned and no pages were isolated -fix2 Mel Gorman
2012-09-27 13:12 ` [PATCH 8/9] mm: compaction: Cache if a pageblock was scanned and no pages were isolated Mel Gorman
2012-09-26 0:49 ` Minchan Kim
2012-09-27 12:14 ` Mel Gorman
2012-09-21 10:46 ` [PATCH 9/9] mm: compaction: Restart compaction from near where it left off Mel Gorman
2012-09-21 17:54 ` Rafael Aquini
2012-09-21 13:51 ` [PATCH 0/9] Reduce compaction scanning and lock contention Rik van Riel
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=1348224383-1499-4-git-send-email-mgorman@suse.de \
--to=mgorman@suse.de \
--cc=akpm@linux-foundation.org \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=qemu-devel@nongnu.org \
--cc=richard@arachsys.com \
--cc=riel@redhat.com \
--cc=shli@kernel.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).