* [PATCH V4 2/3] MCE: fix an error of mce_bad_pages statistics
@ 2012-12-12 3:35 Xishi Qiu
2012-12-12 4:23 ` Andi Kleen
2012-12-14 2:14 ` [PATCH V4 2/3 RESEND] MCE: do code refactor of soft_offline_page Xishi Qiu
0 siblings, 2 replies; 3+ messages in thread
From: Xishi Qiu @ 2012-12-12 3:35 UTC (permalink / raw)
To: WuJianguo, Xishi Qiu, Liujiang, Simon Jeons, Andrew Morton,
Borislav Petkov, Andi Kleen, Fengguang Wu, Wanpeng Li, linux-mm,
linux-kernel
There are too many return points randomly intermingled with some
"goto done" return points. So adjust the function structure, one
for the success path, the other for the failure path.
Use atomic_long_inc instead of atomic_long_add.
Signed-off-by: Xishi Qiu <qiuxishi@huawei.com>
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
---
mm/memory-failure.c | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 3a8b4b2..e513a7b 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1421,12 +1421,13 @@ static int soft_offline_huge_page(struct page *page, int flags)
if (PageHWPoison(hpage)) {
pr_info("soft offline: %#lx hugepage already poisoned\n", pfn);
- return -EBUSY;
+ ret = -EBUSY;
+ goto out;
}
ret = get_any_page(page, pfn, flags);
if (ret < 0)
- return ret;
+ goto out;
if (ret == 0)
goto done;
@@ -1437,14 +1438,14 @@ static int soft_offline_huge_page(struct page *page, int flags)
if (ret) {
pr_info("soft offline: %#lx: migration failed %d, type %lx\n",
pfn, ret, page->flags);
- return ret;
+ goto out;
}
done:
/* keep elevated page count for bad page */
atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
set_page_hwpoison_huge_page(hpage);
dequeue_hwpoisoned_huge_page(hpage);
-
+out:
return ret;
}
@@ -1476,24 +1477,28 @@ int soft_offline_page(struct page *page, int flags)
unsigned long pfn = page_to_pfn(page);
struct page *hpage = compound_trans_head(page);
- if (PageHuge(page))
- return soft_offline_huge_page(page, flags);
+ if (PageHuge(page)) {
+ ret = soft_offline_huge_page(page, flags);
+ goto out;
+ }
if (PageTransHuge(hpage)) {
if (PageAnon(hpage) && unlikely(split_huge_page(hpage))) {
pr_info("soft offline: %#lx: failed to split THP\n",
pfn);
- return -EBUSY;
+ ret = -EBUSY;
+ goto out;
}
}
if (PageHWPoison(page)) {
pr_info("soft offline: %#lx page already poisoned\n", pfn);
- return -EBUSY;
+ ret = -EBUSY;
+ goto out;
}
ret = get_any_page(page, pfn, flags);
if (ret < 0)
- return ret;
+ goto out;
if (ret == 0)
goto done;
@@ -1512,14 +1517,15 @@ int soft_offline_page(struct page *page, int flags)
*/
ret = get_any_page(page, pfn, 0);
if (ret < 0)
- return ret;
+ goto out;
if (ret == 0)
goto done;
}
if (!PageLRU(page)) {
pr_info("soft_offline: %#lx: unknown non LRU page type %lx\n",
pfn, page->flags);
- return -EIO;
+ ret = -EIO;
+ goto out;
}
/*
@@ -1574,12 +1580,12 @@ int soft_offline_page(struct page *page, int flags)
pfn, ret, page_count(page), page->flags);
}
if (ret)
- return ret;
+ goto out;
done:
/* keep elevated page count for bad page */
- atomic_long_add(1, &mce_bad_pages);
+ atomic_long_inc(&mce_bad_pages);
SetPageHWPoison(page);
-
+out:
return ret;
}
--
1.7.1
--
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>
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH V4 2/3] MCE: fix an error of mce_bad_pages statistics
2012-12-12 3:35 [PATCH V4 2/3] MCE: fix an error of mce_bad_pages statistics Xishi Qiu
@ 2012-12-12 4:23 ` Andi Kleen
2012-12-14 2:14 ` [PATCH V4 2/3 RESEND] MCE: do code refactor of soft_offline_page Xishi Qiu
1 sibling, 0 replies; 3+ messages in thread
From: Andi Kleen @ 2012-12-12 4:23 UTC (permalink / raw)
To: Xishi Qiu
Cc: WuJianguo, Liujiang, Simon Jeons, Andrew Morton, Borislav Petkov,
Andi Kleen, Fengguang Wu, Wanpeng Li, linux-mm, linux-kernel
> if (PageHWPoison(hpage)) {
> pr_info("soft offline: %#lx hugepage already poisoned\n", pfn);
> - return -EBUSY;
> + ret = -EBUSY;
> + goto out;
Doesn't look like a code improvement to me. Single return is easier and
simpler.
-Andi
> +out:
> return ret;
> }
> --
> 1.7.1
>
>
--
ak@linux.intel.com -- Speaking for myself only.
--
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>
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH V4 2/3 RESEND] MCE: do code refactor of soft_offline_page
2012-12-12 3:35 [PATCH V4 2/3] MCE: fix an error of mce_bad_pages statistics Xishi Qiu
2012-12-12 4:23 ` Andi Kleen
@ 2012-12-14 2:14 ` Xishi Qiu
1 sibling, 0 replies; 3+ messages in thread
From: Xishi Qiu @ 2012-12-14 2:14 UTC (permalink / raw)
To: Xishi Qiu, WuJianguo, Liujiang, Simon Jeons, Andrew Morton,
Borislav Petkov, Andi Kleen, Fengguang Wu, Wanpeng Li,
n-horiguchi, linux-mm, linux-kernel
There are too many return points randomly intermingled with some
"goto done" return points. So adjust the function structure, one
for the success path, the other for the failure path.
Use atomic_long_inc instead of atomic_long_add.
Signed-off-by: Xishi Qiu <qiuxishi@huawei.com>
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Suggested-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/memory-failure.c | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 3a8b4b2..e513a7b 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1421,12 +1421,13 @@ static int soft_offline_huge_page(struct page *page, int flags)
if (PageHWPoison(hpage)) {
pr_info("soft offline: %#lx hugepage already poisoned\n", pfn);
- return -EBUSY;
+ ret = -EBUSY;
+ goto out;
}
ret = get_any_page(page, pfn, flags);
if (ret < 0)
- return ret;
+ goto out;
if (ret == 0)
goto done;
@@ -1437,14 +1438,14 @@ static int soft_offline_huge_page(struct page *page, int flags)
if (ret) {
pr_info("soft offline: %#lx: migration failed %d, type %lx\n",
pfn, ret, page->flags);
- return ret;
+ goto out;
}
done:
/* keep elevated page count for bad page */
atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
set_page_hwpoison_huge_page(hpage);
dequeue_hwpoisoned_huge_page(hpage);
-
+out:
return ret;
}
@@ -1476,24 +1477,28 @@ int soft_offline_page(struct page *page, int flags)
unsigned long pfn = page_to_pfn(page);
struct page *hpage = compound_trans_head(page);
- if (PageHuge(page))
- return soft_offline_huge_page(page, flags);
+ if (PageHuge(page)) {
+ ret = soft_offline_huge_page(page, flags);
+ goto out;
+ }
if (PageTransHuge(hpage)) {
if (PageAnon(hpage) && unlikely(split_huge_page(hpage))) {
pr_info("soft offline: %#lx: failed to split THP\n",
pfn);
- return -EBUSY;
+ ret = -EBUSY;
+ goto out;
}
}
if (PageHWPoison(page)) {
pr_info("soft offline: %#lx page already poisoned\n", pfn);
- return -EBUSY;
+ ret = -EBUSY;
+ goto out;
}
ret = get_any_page(page, pfn, flags);
if (ret < 0)
- return ret;
+ goto out;
if (ret == 0)
goto done;
@@ -1512,14 +1517,15 @@ int soft_offline_page(struct page *page, int flags)
*/
ret = get_any_page(page, pfn, 0);
if (ret < 0)
- return ret;
+ goto out;
if (ret == 0)
goto done;
}
if (!PageLRU(page)) {
pr_info("soft_offline: %#lx: unknown non LRU page type %lx\n",
pfn, page->flags);
- return -EIO;
+ ret = -EIO;
+ goto out;
}
/*
@@ -1574,12 +1580,12 @@ int soft_offline_page(struct page *page, int flags)
pfn, ret, page_count(page), page->flags);
}
if (ret)
- return ret;
+ goto out;
done:
/* keep elevated page count for bad page */
- atomic_long_add(1, &mce_bad_pages);
+ atomic_long_inc(&mce_bad_pages);
SetPageHWPoison(page);
-
+out:
return ret;
}
--
1.7.1
.
--
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>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-14 2:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-12 3:35 [PATCH V4 2/3] MCE: fix an error of mce_bad_pages statistics Xishi Qiu
2012-12-12 4:23 ` Andi Kleen
2012-12-14 2:14 ` [PATCH V4 2/3 RESEND] MCE: do code refactor of soft_offline_page Xishi Qiu
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).