linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
To: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Andi Kleen <andi@firstfloor.org>,
	Fengguang Wu <fengguang.wu@intel.com>,
	Tony Luck <tony.luck@intel.com>,
	gong.chen@linux.intel.com, linux-mm@kvack.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH v4 8/10] mm/hwpoison: fix memory failure still hold reference count after unpoison empty zero page
Date: Mon, 26 Aug 2013 11:45:37 -0400	[thread overview]
Message-ID: <1377531937-15nx3q8e-mutt-n-horiguchi@ah.jp.nec.com> (raw)
In-Reply-To: <1377506774-5377-8-git-send-email-liwanp@linux.vnet.ibm.com>

On Mon, Aug 26, 2013 at 04:46:12PM +0800, Wanpeng Li wrote:
> madvise hwpoison inject will poison the read-only empty zero page if there is 
> no write access before poison. Empty zero page reference count will be increased 
> for hwpoison, subsequent poison zero page will return directly since page has
> already been set PG_hwpoison, however, page reference count is still increased 
> by get_user_pages_fast. The unpoison process will unpoison the empty zero page 
> and decrease the reference count successfully for the fist time, however, 
> subsequent unpoison empty zero page will return directly since page has already 
> been unpoisoned and without decrease the page reference count of empty zero page.
> This patch fix it by decrease page reference count for empty zero page which has 
> already been unpoisoned and page count > 1.

I guess that fixing on the madvise side looks reasonable to me, because this
refcount mismatch happens only when we poison with madvise(). The root cause
is that we can get refcount multiple times on a page, even if memory_failure()
or soft_offline_page() can do its work only once.

How about making madvise_hwpoison() put a page and return immediately
(without calling memory_failure() or soft_offline_page()) when the page
is already hwpoisoned? 
I hope it also helps us avoid meaningless printk flood.

Thanks,
Naoya Horiguchi

> Testcase:
> 
> #define _GNU_SOURCE
> #include <stdlib.h>
> #include <stdio.h>
> #include <sys/mman.h>
> #include <unistd.h>
> #include <fcntl.h>
> #include <sys/types.h>
> #include <errno.h>
> 
> #define PAGES_TO_TEST 3
> #define PAGE_SIZE	4096
> 
> int main(void)
> {
> 	char *mem;
> 	int i;
> 
> 	mem = mmap(NULL, PAGES_TO_TEST * PAGE_SIZE,
> 			PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
> 
> 	if (madvise(mem, PAGES_TO_TEST * PAGE_SIZE, MADV_HWPOISON) == -1)
> 		return -1;
> 	
> 	munmap(mem, PAGES_TO_TEST * PAGE_SIZE);
> 
> 	return 0;
> }
> 
> Add printk to dump page reference count:
> 
> [   93.075959] Injecting memory failure for page 0x19d0 at 0xb77d8000
> [   93.076207] MCE 0x19d0: non LRU page recovery: Ignored
> [   93.076209] pfn 0x19d0, page count = 1 after memory failure
> [   93.076220] Injecting memory failure for page 0x19d0 at 0xb77d9000
> [   93.076221] MCE 0x19d0: already hardware poisoned
> [   93.076222] pfn 0x19d0, page count = 2 after memory failure
> [   93.076224] Injecting memory failure for page 0x19d0 at 0xb77da000
> [   93.076224] MCE 0x19d0: already hardware poisoned
> [   93.076225] pfn 0x19d0, page count = 3 after memory failure
> 
> Before patch:
> 
> [  139.197474] MCE: Software-unpoisoned page 0x19d0
> [  139.197479] pfn 0x19d0, page count = 2 after unpoison memory
> [  150.478130] MCE: Page was already unpoisoned 0x19d0
> [  150.478135] pfn 0x19d0, page count = 2 after unpoison memory
> [  151.548288] MCE: Page was already unpoisoned 0x19d0
> [  151.548292] pfn 0x19d0, page count = 2 after unpoison memory
> 
> After patch:
> 
> [  116.022122] MCE: Software-unpoisoned page 0x19d0
> [  116.022127] pfn 0x19d0, page count = 2 after unpoison memory
> [  117.256163] MCE: Page was already unpoisoned 0x19d0
> [  117.256167] pfn 0x19d0, page count = 1 after unpoison memory
> [  117.917772] MCE: Page was already unpoisoned 0x19d0
> [  117.917777] pfn 0x19d0, page count = 1 after unpoison memory
> 
> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
> ---
>  mm/memory-failure.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> index ca714ac..fb687fd 100644
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -1335,6 +1335,8 @@ int unpoison_memory(unsigned long pfn)
>  	page = compound_head(p);
>  
>  	if (!PageHWPoison(p)) {
> +		if (pfn == my_zero_pfn(0) && page_count(p) > 1)
> +			put_page(p);
>  		pr_info("MCE: Page was already unpoisoned %#lx\n", pfn);
>  		return 0;
>  	}
> -- 
> 1.8.1.2
>

--
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>

  reply	other threads:[~2013-08-26 15:45 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-26  8:46 [PATCH v4 1/10] mm/hwpoison: fix lose PG_dirty flag for errors on mlocked pages Wanpeng Li
2013-08-26  8:46 ` [PATCH v4 2/10] mm/hwpoison: don't need to hold compound lock for hugetlbfs page Wanpeng Li
2013-08-26  8:46 ` [PATCH v4 3/10] mm/hwpoison: fix race against poison thp Wanpeng Li
2013-08-26  8:46 ` [PATCH v4 4/10] mm/hwpoison: replacing atomic_long_sub() with atomic_long_dec() Wanpeng Li
2013-08-26  8:46 ` [PATCH v4 5/10] mm/hwpoison: don't set migration type twice to avoid hold heavy contend zone->lock Wanpeng Li
2013-08-26  8:46 ` [PATCH v4 6/10] mm/hwpoison: drop forward reference declarations __soft_offline_page() Wanpeng Li
2013-08-26  8:46 ` [PATCH v4 7/10] mm/hwpoison: add '#' to madvise_hwpoison Wanpeng Li
2013-08-26  8:46 ` [PATCH v4 8/10] mm/hwpoison: fix memory failure still hold reference count after unpoison empty zero page Wanpeng Li
2013-08-26 15:45   ` Naoya Horiguchi [this message]
2013-08-26 23:26     ` Wanpeng Li
2013-08-27  0:12       ` Naoya Horiguchi
2013-08-27  0:21         ` Wanpeng Li
2013-08-27  0:21         ` Wanpeng Li
     [not found]         ` <521bf0fc.4950320a.76ab.0f2dSMTPIN_ADDED_BROKEN@mx.google.com>
2013-08-27  0:46           ` Naoya Horiguchi
2013-08-27  1:17             ` Wanpeng Li
2013-08-27  1:17             ` Wanpeng Li
     [not found]             ` <521bfe37.83892b0a.1b94.2e7cSMTPIN_ADDED_BROKEN@mx.google.com>
2013-08-27  1:34               ` Naoya Horiguchi
2013-08-27  1:48                 ` Wanpeng Li
2013-08-27  1:48                 ` Wanpeng Li
2013-08-26 23:26     ` Wanpeng Li
     [not found]     ` <521be416.a5e8420a.6786.09d1SMTPIN_ADDED_BROKEN@mx.google.com>
2013-08-26 23:31       ` Andrew Morton
2013-08-26 23:40         ` Wanpeng Li
2013-08-26 23:40         ` Wanpeng Li
2013-08-26  8:46 ` [PATCH v4 9/10] mm/hwpoison: change permission of corrupt-pfn/unpoison-pfn to 0400 Wanpeng Li
2013-08-26  9:08   ` Wanpeng Li
2013-08-26 15:47     ` Naoya Horiguchi
2013-08-26  9:08   ` Wanpeng Li
2013-08-26  8:46 ` [PATCH v4 10/10] mm/hwpoison: fix bug triggered by unpoison empty zero page Wanpeng Li
2013-08-29  6:00 ` [PATCH v4 1/10] mm/hwpoison: fix lose PG_dirty flag for errors on mlocked pages Andi Kleen
2013-08-29  6:17   ` Wanpeng Li
2013-08-29  6:17   ` Wanpeng Li

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=1377531937-15nx3q8e-mutt-n-horiguchi@ah.jp.nec.com \
    --to=n-horiguchi@ah.jp.nec.com \
    --cc=akpm@linux-foundation.org \
    --cc=andi@firstfloor.org \
    --cc=fengguang.wu@intel.com \
    --cc=gong.chen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=liwanp@linux.vnet.ibm.com \
    --cc=tony.luck@intel.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