On Thu, Aug 22, 2013 at 05:48:27PM +0800, Wanpeng Li wrote:
> soft_offline_page will invoke __soft_offline_page for in-use normal pages
> and soft_offline_huge_page for in-use hugetlbfs pages. Both of them will
> done the same effort as for soft offline free pages set PG_hwpoison, increase
> num_poisoned_pages etc, this patch centralize do them in soft_offline_page.
>
> Signed-off-by: Wanpeng Li <liw...@linux.vnet.ibm.com>
> ---
> mm/memory-failure.c | 16 ++++------------
> 1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> index 0a52571..3226de1 100644
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -1486,15 +1486,9 @@ static int soft_offline_huge_page(struct page *page,
> int flags)
> ret = migrate_huge_page(hpage, new_page, MPOL_MF_MOVE_ALL,
> MIGRATE_SYNC);
> put_page(hpage);
> - if (ret) {
> + if (ret)
> pr_info("soft offline: %#lx: migration failed %d, type %lx\n",
> pfn, ret, page->flags);
> - } else {
> - set_page_hwpoison_huge_page(hpage);
> - dequeue_hwpoisoned_huge_page(hpage);
> - atomic_long_add(1 << compound_order(hpage),
> - &num_poisoned_pages);
> - }
> return ret;
> }
>
> @@ -1530,8 +1524,6 @@ static int __soft_offline_page(struct page *page, int
> flags)
> if (ret == 1) {
> put_page(page);
> pr_info("soft_offline: %#lx: invalidated\n", pfn);
> - SetPageHWPoison(page);
> - atomic_long_inc(&num_poisoned_pages);
> return 0;
> }
>
> @@ -1572,11 +1564,9 @@ static int __soft_offline_page(struct page *page, int
> flags)
> lru_add_drain_all();
> if (!is_free_buddy_page(page))
> drain_all_pages();
> - SetPageHWPoison(page);
> if (!is_free_buddy_page(page))
> pr_info("soft offline: %#lx: page leaked\n",
> pfn);
> - atomic_long_inc(&num_poisoned_pages);
> }
> } else {
> pr_info("soft offline: %#lx: isolation failed: %d, page count
> %d, type %lx\n",
This change does not simply clean up code, but affects the behavior.
This memory leak check should come after SetPageHWPoison().
Thanks,
Naoya Horiguchi
> @@ -1633,7 +1623,9 @@ int soft_offline_page(struct page *page, int flags)
> ret = soft_offline_huge_page(page, flags);
> else
> ret = __soft_offline_page(page, flags);
> - } else { /* for free pages */
> + }
> +
> + if (!ret) {
> if (PageHuge(page)) {
> set_page_hwpoison_huge_page(hpage);
> dequeue_hwpoisoned_huge_page(hpage);
> --
> 1.8.1.2
>
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to majord...@kvack.org. For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"d...@kvack.org";> em...@kvack.org </a>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
