2017-04-09 02:38:54

by Anshuman Khandual

Subject: [PATCH] mm/softoffline: Add page flag description in error paths

It helps to provide page flag description along with the raw value in
error paths during soft offline process. From sample experiments

Before the patch:

[ 132.317977] soft offline: 0x6100: migration failed 1, type 3ffff800008018
[ 132.359057] soft offline: 0x7400: migration failed 1, type 3ffff800008018

After the patch:

[ 87.694325] soft offline: 0x5900: migration failed 1, type 3ffff800008018 (uptodate|dirty|head)
[ 87.736273] soft offline: 0x6c00: migration failed 1, type 3ffff800008018 (uptodate|dirty|head)

Signed-off-by: Anshuman Khandual <[email protected]>
---
mm/memory-failure.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 27f7210..fe64d77 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1543,8 +1543,8 @@ static int get_any_page(struct page *page, unsigned long pfn, int flags)
if (ret == 1 && !PageLRU(page)) {
/* Drop page reference which is from __get_any_page() */
put_hwpoison_page(page);
- pr_info("soft_offline: %#lx: unknown non LRU page type %lx\n",
- pfn, page->flags);
+ pr_info("soft_offline: %#lx: unknown non LRU page type %lx (%pGp)\n",
+ pfn, page->flags, &page->flags);
return -EIO;
}
}
@@ -1585,8 +1585,8 @@ static int soft_offline_huge_page(struct page *page, int flags)
ret = migrate_pages(&pagelist, new_page, NULL, MPOL_MF_MOVE_ALL,
MIGRATE_SYNC, MR_MEMORY_FAILURE);
if (ret) {
- pr_info("soft offline: %#lx: migration failed %d, type %lx\n",
- pfn, ret, page->flags);
+ pr_info("soft offline: %#lx: migration failed %d, type %lx (%pGp)\n",
+ pfn, ret, page->flags, &page->flags);
/*
* We know that soft_offline_huge_page() tries to migrate
* only one hugepage pointed to by hpage, so we need not
@@ -1677,14 +1677,14 @@ static int __soft_offline_page(struct page *page, int flags)
if (!list_empty(&pagelist))
putback_movable_pages(&pagelist);

- pr_info("soft offline: %#lx: migration failed %d, type %lx\n",
- pfn, ret, page->flags);
+ pr_info("soft offline: %#lx: migration failed %d, type %lx (%pGp)\n",
+ pfn, ret, page->flags, &page->flags);
if (ret > 0)
ret = -EIO;
}
} else {
- pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
- pfn, ret, page_count(page), page->flags);
+ pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx (%pGp)\n",
+ pfn, ret, page_count(page), page->flags, &page->flags);
}
return ret;
}
--
1.8.5.2

2017-04-10 01:00:29

by Naoya Horiguchi

Subject: Re: [PATCH] mm/softoffline: Add page flag description in error paths

On Sun, Apr 09, 2017 at 08:08:29AM +0530, Anshuman Khandual wrote:
> It helps to provide page flag description along with the raw value in
> error paths during soft offline process. From sample experiments
>
> Before the patch:
>
> [ 132.317977] soft offline: 0x6100: migration failed 1, type 3ffff800008018
> [ 132.359057] soft offline: 0x7400: migration failed 1, type 3ffff800008018
>
> After the patch:
>
> [ 87.694325] soft offline: 0x5900: migration failed 1, type 3ffff800008018 (uptodate|dirty|head)
> [ 87.736273] soft offline: 0x6c00: migration failed 1, type 3ffff800008018 (uptodate|dirty|head)
>
> Signed-off-by: Anshuman Khandual <[email protected]>

Looks good to me, thank you!

Acked-by: Naoya Horiguchi <[email protected]>

> ---
> mm/memory-failure.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> index 27f7210..fe64d77 100644
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -1543,8 +1543,8 @@ static int get_any_page(struct page *page, unsigned long pfn, int flags)
> if (ret == 1 && !PageLRU(page)) {
> /* Drop page reference which is from __get_any_page() */
> put_hwpoison_page(page);
> - pr_info("soft_offline: %#lx: unknown non LRU page type %lx\n",
> - pfn, page->flags);
> + pr_info("soft_offline: %#lx: unknown non LRU page type %lx (%pGp)\n",
> + pfn, page->flags, &page->flags);
> return -EIO;
> }
> }
> @@ -1585,8 +1585,8 @@ static int soft_offline_huge_page(struct page *page, int flags)
> ret = migrate_pages(&pagelist, new_page, NULL, MPOL_MF_MOVE_ALL,
> MIGRATE_SYNC, MR_MEMORY_FAILURE);
> if (ret) {
> - pr_info("soft offline: %#lx: migration failed %d, type %lx\n",
> - pfn, ret, page->flags);
> + pr_info("soft offline: %#lx: migration failed %d, type %lx (%pGp)\n",
> + pfn, ret, page->flags, &page->flags);
> /*
> * We know that soft_offline_huge_page() tries to migrate
> * only one hugepage pointed to by hpage, so we need not
> @@ -1677,14 +1677,14 @@ static int __soft_offline_page(struct page *page, int flags)
> if (!list_empty(&pagelist))
> putback_movable_pages(&pagelist);
>
> - pr_info("soft offline: %#lx: migration failed %d, type %lx\n",
> - pfn, ret, page->flags);
> + pr_info("soft offline: %#lx: migration failed %d, type %lx (%pGp)\n",
> + pfn, ret, page->flags, &page->flags);
> if (ret > 0)
> ret = -EIO;
> }
> } else {
> - pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
> - pfn, ret, page_count(page), page->flags);
> + pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx (%pGp)\n",
> + pfn, ret, page_count(page), page->flags, &page->flags);
> }
> return ret;
> }
> --
> 1.8.5.2
>
>