From: Wanpeng Li <liwanp@linux.vnet.ibm.com>
To: Xishi Qiu <qiuxishi@huawei.com>
Cc: WuJianguo <wujianguo@huawei.com>, Liujiang <jiang.liu@huawei.com>,
Simon Jeons <simon.jeons@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Borislav Petkov <bp@alien8.de>, Andi Kleen <andi@firstfloor.org>,
Fengguang Wu <fengguang.wu@intel.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH V4 3/3] MCE: fix an error of mce_bad_pages statistics
Date: Wed, 12 Dec 2012 14:47:56 +0800 [thread overview]
Message-ID: <20121212064756.GB18308@hacker.(null)> (raw)
In-Reply-To: <50C7FB85.8040008@huawei.com>
On Wed, Dec 12, 2012 at 11:35:33AM +0800, Xishi Qiu wrote:
>Since MCE is an x86 concept, and this code is in mm/, it would be
>better to use the name num_poisoned_pages instead of mce_bad_pages.
>
Why the three patches have equal title? Otherwise, for this patch:
Reviewed-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
>Signed-off-by: Xishi Qiu <qiuxishi@huawei.com>
>Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
>Signed-off-by: Borislav Petkov <bp@alien8.de>
>---
> fs/proc/meminfo.c | 2 +-
> include/linux/mm.h | 2 +-
> mm/memory-failure.c | 16 ++++++++--------
> 3 files changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
>index 80e4645..c3dac61 100644
>--- a/fs/proc/meminfo.c
>+++ b/fs/proc/meminfo.c
>@@ -158,7 +158,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
> vmi.used >> 10,
> vmi.largest_chunk >> 10
> #ifdef CONFIG_MEMORY_FAILURE
>- ,atomic_long_read(&mce_bad_pages) << (PAGE_SHIFT - 10)
>+ ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
> #endif
> #ifdef CONFIG_TRANSPARENT_HUGEPAGE
> ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
>diff --git a/include/linux/mm.h b/include/linux/mm.h
>index 5432a3e..8ccc477 100644
>--- a/include/linux/mm.h
>+++ b/include/linux/mm.h
>@@ -1653,7 +1653,7 @@ extern int unpoison_memory(unsigned long pfn);
> extern int sysctl_memory_failure_early_kill;
> extern int sysctl_memory_failure_recovery;
> extern void shake_page(struct page *p, int access);
>-extern atomic_long_t mce_bad_pages;
>+extern atomic_long_t num_poisoned_pages;
> extern int soft_offline_page(struct page *page, int flags);
>
> extern void dump_page(struct page *page);
>diff --git a/mm/memory-failure.c b/mm/memory-failure.c
>index e513a7b..ff5e611 100644
>--- a/mm/memory-failure.c
>+++ b/mm/memory-failure.c
>@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
>
> int sysctl_memory_failure_recovery __read_mostly = 1;
>
>-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
>+atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
>
> #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
>
>@@ -1040,7 +1040,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
> }
>
> nr_pages = 1 << compound_trans_order(hpage);
>- atomic_long_add(nr_pages, &mce_bad_pages);
>+ atomic_long_add(nr_pages, &num_poisoned_pages);
>
> /*
> * We need/can do nothing about count=0 pages.
>@@ -1070,7 +1070,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
> if (!PageHWPoison(hpage)
> || (hwpoison_filter(p) && TestClearPageHWPoison(p))
> || (p != hpage && TestSetPageHWPoison(hpage))) {
>- atomic_long_sub(nr_pages, &mce_bad_pages);
>+ atomic_long_sub(nr_pages, &num_poisoned_pages);
> return 0;
> }
> set_page_hwpoison_huge_page(hpage);
>@@ -1128,7 +1128,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
> }
> if (hwpoison_filter(p)) {
> if (TestClearPageHWPoison(p))
>- atomic_long_sub(nr_pages, &mce_bad_pages);
>+ atomic_long_sub(nr_pages, &num_poisoned_pages);
> unlock_page(hpage);
> put_page(hpage);
> return 0;
>@@ -1323,7 +1323,7 @@ int unpoison_memory(unsigned long pfn)
> return 0;
> }
> if (TestClearPageHWPoison(p))
>- atomic_long_sub(nr_pages, &mce_bad_pages);
>+ atomic_long_sub(nr_pages, &num_poisoned_pages);
> pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
> return 0;
> }
>@@ -1337,7 +1337,7 @@ int unpoison_memory(unsigned long pfn)
> */
> if (TestClearPageHWPoison(page)) {
> pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
>- atomic_long_sub(nr_pages, &mce_bad_pages);
>+ atomic_long_sub(nr_pages, &num_poisoned_pages);
> freeit = 1;
> if (PageHuge(page))
> clear_page_hwpoison_huge_page(page);
>@@ -1442,7 +1442,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
> }
> done:
> /* keep elevated page count for bad page */
>- atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
>+ atomic_long_add(1 << compound_trans_order(hpage), &num_poisoned_pages);
> set_page_hwpoison_huge_page(hpage);
> dequeue_hwpoisoned_huge_page(hpage);
> out:
>@@ -1584,7 +1584,7 @@ int soft_offline_page(struct page *page, int flags)
>
> done:
> /* keep elevated page count for bad page */
>- atomic_long_inc(&mce_bad_pages);
>+ atomic_long_inc(&num_poisoned_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>
--
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:[~2012-12-12 6:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-12 3:35 [PATCH V4 3/3] MCE: fix an error of mce_bad_pages statistics Xishi Qiu
2012-12-12 6:47 ` Wanpeng Li
2012-12-12 6:47 ` Wanpeng Li [this message]
2012-12-12 10:25 ` Borislav Petkov
2012-12-12 10:47 ` Xishi Qiu
2012-12-14 2:14 ` [PATCH V4 3/3 RESEND] MCE: use num_poisoned_pages instead of mce_bad_pages Xishi Qiu
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='20121212064756.GB18308@hacker.(null)' \
--to=liwanp@linux.vnet.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=andi@firstfloor.org \
--cc=bp@alien8.de \
--cc=fengguang.wu@intel.com \
--cc=jiang.liu@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=qiuxishi@huawei.com \
--cc=simon.jeons@gmail.com \
--cc=wujianguo@huawei.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).