linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Mel Gorman <mgorman@suse.de>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Andrea Arcangeli <aarcange@redhat.com>,
	Ingo Molnar <mingo@kernel.org>,
	Simon Jeons <simon.jeons@gmail.com>,
	Wanpeng Li <liwanp@linux.vnet.ibm.com>,
	Hugh Dickins <hughd@google.com>, Mel Gorman <mgorman@suse.de>,
	Linux-MM <linux-mm@kvack.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 2/6] mm: numa: Take THP into account when migrating pages for NUMA balancing
Date: Tue, 22 Jan 2013 17:12:38 +0000	[thread overview]
Message-ID: <1358874762-19717-3-git-send-email-mgorman@suse.de> (raw)
In-Reply-To: <1358874762-19717-1-git-send-email-mgorman@suse.de>

Wanpeng Li pointed out that numamigrate_isolate_page() assumes that only one
base page is being migrated when in fact it can also be checking THP. The
consequences are that a migration will be attempted when a target node
is nearly full and fail later. It's unlikely to be user-visible but it
should be fixed. While we are there, migrate_balanced_pgdat() should treat
nr_migrate_pages as an unsigned long as it is treated as a watermark.

Suggested-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Signed-off-by: Mel Gorman <mgorman@suse.de>
---
 mm/migrate.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mm/migrate.c b/mm/migrate.c
index c387786..73e432d 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1459,7 +1459,7 @@ int migrate_vmas(struct mm_struct *mm, const nodemask_t *to,
  * pages. Currently it only checks the watermarks which crude
  */
 static bool migrate_balanced_pgdat(struct pglist_data *pgdat,
-				   int nr_migrate_pages)
+				   unsigned long nr_migrate_pages)
 {
 	int z;
 	for (z = pgdat->nr_zones - 1; z >= 0; z--) {
@@ -1557,8 +1557,10 @@ int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page)
 {
 	int ret = 0;
 
+	VM_BUG_ON(compound_order(page) && !PageTransHuge(page));
+
 	/* Avoid migrating to a node that is nearly full */
-	if (migrate_balanced_pgdat(pgdat, 1)) {
+	if (migrate_balanced_pgdat(pgdat, 1UL << compound_order(page))) {
 		int page_lru;
 
 		if (isolate_lru_page(page)) {
-- 
1.7.9.2

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  parent reply	other threads:[~2013-01-22 17:12 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-22 17:12 [PATCH 0/6] Follow up work on NUMA Balancing Mel Gorman
2013-01-22 17:12 ` [PATCH 1/6] mm: numa: Fix minor typo in numa_next_scan Mel Gorman
2013-01-22 17:12 ` Mel Gorman [this message]
2013-01-22 17:12 ` [PATCH 3/6] mm: numa: Handle side-effects in count_vm_numa_events() for !CONFIG_NUMA_BALANCING Mel Gorman
2013-01-22 22:40   ` Andrew Morton
2013-01-23  9:27     ` Mel Gorman
2013-01-22 17:12 ` [PATCH 4/6] mm: Move page flags layout to separate header Mel Gorman
2013-01-22 17:12 ` [PATCH 5/6] mm: Fold page->_last_nid into page->flags where possible Mel Gorman
2013-01-22 22:46   ` Andrew Morton
2013-01-23 13:17     ` Mel Gorman
2013-01-23 21:45       ` KOSAKI Motohiro
2013-01-23 13:18     ` [PATCH] mm: init: Report on last-nid information stored in page->flags Mel Gorman
2013-01-23 14:25     ` [PATCH 5/6] mm: Fold page->_last_nid into page->flags where possible Mel Gorman
2013-01-23 21:56       ` Andrew Morton
2013-01-24 10:55         ` [PATCH] mm: Rename page struct field helpers Mel Gorman
2013-01-29  4:39           ` Hugh Dickins
2013-01-30 11:58             ` Mel Gorman
2013-01-30 20:32               ` Hugh Dickins
2013-01-23 15:23     ` [PATCH] mm: uninline page_xchg_last_nid() Mel Gorman
2013-01-22 17:12 ` [PATCH 6/6] mm: numa: Cleanup flow of transhuge page migration Mel Gorman
2013-01-27 21:20   ` Hugh Dickins

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=1358874762-19717-3-git-send-email-mgorman@suse.de \
    --to=mgorman@suse.de \
    --cc=a.p.zijlstra@chello.nl \
    --cc=aarcange@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=hughd@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=liwanp@linux.vnet.ibm.com \
    --cc=mingo@kernel.org \
    --cc=simon.jeons@gmail.com \
    /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).