From: Joonsoo Kim <iamjoonsoo.kim@lge.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: Mel Gorman <mgorman@suse.de>, Rik van Riel <riel@redhat.com>, Rafael Aquini <aquini@redhat.com>, Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>, Christoph Lameter <cl@linux.com>, Joonsoo Kim <js1304@gmail.com>, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Vlastimil Babka <vbabka@suse.cz>, Zhang Yanfei <zhangyanfei@cn.fujitsu.com>, Wanpeng Li <liwanp@linux.vnet.ibm.com>, Joonsoo Kim <iamjoonsoo.kim@lge.com> Subject: [PATCH v3 2/6] mm/migrate: correct failure handling if !hugepage_migration_support() Date: Fri, 13 Dec 2013 15:53:27 +0900 [thread overview] Message-ID: <1386917611-11319-3-git-send-email-iamjoonsoo.kim@lge.com> (raw) In-Reply-To: <1386917611-11319-1-git-send-email-iamjoonsoo.kim@lge.com> We should remove the page from the list if we fail with ENOSYS, since migrate_pages() consider error cases except -ENOMEM and -EAGAIN as permanent failure and it assumes that the page would be removed from the list. Without this patch, we could overcount number of failure. In addition, we should put back the new hugepage if !hugepage_migration_support(). If not, we would leak hugepage memory. Acked-by: Christoph Lameter <cl@linux.com> Reviewed-by: Wanpeng Li <liwanp@linux.vnet.ibm.com> Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com> diff --git a/mm/migrate.c b/mm/migrate.c index c6ac87a..b1cfd01 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1011,7 +1011,7 @@ static int unmap_and_move_huge_page(new_page_t get_new_page, { int rc = 0; int *result = NULL; - struct page *new_hpage = get_new_page(hpage, private, &result); + struct page *new_hpage; struct anon_vma *anon_vma = NULL; /* @@ -1021,9 +1021,12 @@ static int unmap_and_move_huge_page(new_page_t get_new_page, * tables or check whether the hugepage is pmd-based or not before * kicking migration. */ - if (!hugepage_migration_support(page_hstate(hpage))) + if (!hugepage_migration_support(page_hstate(hpage))) { + putback_active_hugepage(hpage); return -ENOSYS; + } + new_hpage = get_new_page(hpage, private, &result); if (!new_hpage) return -ENOMEM; -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Joonsoo Kim <iamjoonsoo.kim@lge.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: Mel Gorman <mgorman@suse.de>, Rik van Riel <riel@redhat.com>, Rafael Aquini <aquini@redhat.com>, Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>, Christoph Lameter <cl@linux.com>, Joonsoo Kim <js1304@gmail.com>, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Vlastimil Babka <vbabka@suse.cz>, Zhang Yanfei <zhangyanfei@cn.fujitsu.com>, Wanpeng Li <liwanp@linux.vnet.ibm.com>, Joonsoo Kim <iamjoonsoo.kim@lge.com> Subject: [PATCH v3 2/6] mm/migrate: correct failure handling if !hugepage_migration_support() Date: Fri, 13 Dec 2013 15:53:27 +0900 [thread overview] Message-ID: <1386917611-11319-3-git-send-email-iamjoonsoo.kim@lge.com> (raw) In-Reply-To: <1386917611-11319-1-git-send-email-iamjoonsoo.kim@lge.com> We should remove the page from the list if we fail with ENOSYS, since migrate_pages() consider error cases except -ENOMEM and -EAGAIN as permanent failure and it assumes that the page would be removed from the list. Without this patch, we could overcount number of failure. In addition, we should put back the new hugepage if !hugepage_migration_support(). If not, we would leak hugepage memory. Acked-by: Christoph Lameter <cl@linux.com> Reviewed-by: Wanpeng Li <liwanp@linux.vnet.ibm.com> Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com> diff --git a/mm/migrate.c b/mm/migrate.c index c6ac87a..b1cfd01 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1011,7 +1011,7 @@ static int unmap_and_move_huge_page(new_page_t get_new_page, { int rc = 0; int *result = NULL; - struct page *new_hpage = get_new_page(hpage, private, &result); + struct page *new_hpage; struct anon_vma *anon_vma = NULL; /* @@ -1021,9 +1021,12 @@ static int unmap_and_move_huge_page(new_page_t get_new_page, * tables or check whether the hugepage is pmd-based or not before * kicking migration. */ - if (!hugepage_migration_support(page_hstate(hpage))) + if (!hugepage_migration_support(page_hstate(hpage))) { + putback_active_hugepage(hpage); return -ENOSYS; + } + new_hpage = get_new_page(hpage, private, &result); if (!new_hpage) return -ENOMEM; -- 1.7.9.5 -- 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>
next prev parent reply other threads:[~2013-12-13 6:51 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-12-13 6:53 [PATCH v3 0/6] correct and clean-up migration related stuff Joonsoo Kim 2013-12-13 6:53 ` Joonsoo Kim 2013-12-13 6:53 ` [PATCH v3 1/6] mm/migrate: add comment about permanent failure path Joonsoo Kim 2013-12-13 6:53 ` Joonsoo Kim 2013-12-16 10:55 ` Rafael Aquini 2013-12-16 10:55 ` Rafael Aquini 2013-12-13 6:53 ` Joonsoo Kim [this message] 2013-12-13 6:53 ` [PATCH v3 2/6] mm/migrate: correct failure handling if !hugepage_migration_support() Joonsoo Kim 2013-12-13 22:05 ` Naoya Horiguchi 2013-12-13 22:05 ` Naoya Horiguchi 2013-12-13 6:53 ` [PATCH v3 3/6] mm/mempolicy: correct putback method for isolate pages if failed Joonsoo Kim 2013-12-13 6:53 ` Joonsoo Kim 2013-12-13 6:53 ` [PATCH v3 4/6] mm/migrate: remove putback_lru_pages, fix comment on putback_movable_pages Joonsoo Kim 2013-12-13 6:53 ` Joonsoo Kim 2013-12-13 6:53 ` [PATCH v3 5/6] mm/compaction: respect ignore_skip_hint in update_pageblock_skip Joonsoo Kim 2013-12-13 6:53 ` Joonsoo Kim 2013-12-13 6:53 ` [PATCH v3 6/6] mm/migrate: remove unused function, fail_migrate_page() Joonsoo Kim 2013-12-13 6:53 ` Joonsoo Kim
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=1386917611-11319-3-git-send-email-iamjoonsoo.kim@lge.com \ --to=iamjoonsoo.kim@lge.com \ --cc=akpm@linux-foundation.org \ --cc=aquini@redhat.com \ --cc=cl@linux.com \ --cc=js1304@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=liwanp@linux.vnet.ibm.com \ --cc=mgorman@suse.de \ --cc=n-horiguchi@ah.jp.nec.com \ --cc=riel@redhat.com \ --cc=vbabka@suse.cz \ --cc=zhangyanfei@cn.fujitsu.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.