2015-08-10 11:56:24

by Wanpeng Li

Subject: [PATCH v2 3/5] mm/hwpoison: introduce put_hwpoison_page to put refcount for memory error handling

Introduce put_hwpoison_page to put refcount for memory
error handling.

Suggested-by: Naoya Horiguchi <[email protected]>
Signed-off-by: Wanpeng Li <[email protected]>
---
include/linux/mm.h | 1 +
mm/memory-failure.c | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 554b0f0..c0a0b9f 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2103,6 +2103,7 @@ extern int memory_failure(unsigned long pfn, int trapno, int flags);
extern void memory_failure_queue(unsigned long pfn, int trapno, int flags);
extern int unpoison_memory(unsigned long pfn);
extern int get_hwpoison_page(struct page *page);
+extern void put_hwpoison_page(struct page *page);
extern int sysctl_memory_failure_early_kill;
extern int sysctl_memory_failure_recovery;
extern void shake_page(struct page *p, int access);
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index e0eb7ab..fa9aa21 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -922,6 +922,27 @@ int get_hwpoison_page(struct page *page)
}
EXPORT_SYMBOL_GPL(get_hwpoison_page);

+/**
+ * put_hwpoison_page() - Put refcount for memory error handling:
+ * @page: raw error page (hit by memory error)
+ */
+void put_hwpoison_page(struct page *page)
+{
+ struct page *head = compound_head(page);
+
+ if (PageHuge(head)) {
+ put_page(head);
+ return;
+ }
+
+ if (PageTransHuge(head))
+ if (page != head)
+ put_page(head);
+
+ put_page(page);
+}
+EXPORT_SYMBOL_GPL(put_hwpoison_page);
+
/*
* Do all that is necessary to remove user space mappings. Unmap
* the pages and send SIGBUS to the processes if the data was dirty.
--
1.7.1

2015-08-11 23:24:52

by Andrew Morton

Subject: Re: [PATCH v2 3/5] mm/hwpoison: introduce put_hwpoison_page to put refcount for memory error handling

On Mon, 10 Aug 2015 19:28:21 +0800 Wanpeng Li <[email protected]> wrote:

> Introduce put_hwpoison_page to put refcount for memory
> error handling.
>
> ...
>
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -922,6 +922,27 @@ int get_hwpoison_page(struct page *page)
> }
> EXPORT_SYMBOL_GPL(get_hwpoison_page);
>
> +/**
> + * put_hwpoison_page() - Put refcount for memory error handling:
> + * @page: raw error page (hit by memory error)
> + */
> +void put_hwpoison_page(struct page *page)
> +{
> + struct page *head = compound_head(page);
> +
> + if (PageHuge(head)) {
> + put_page(head);
> + return;
> + }
> +
> + if (PageTransHuge(head))
> + if (page != head)
> + put_page(head);
> +
> + put_page(page);
> +}
> +EXPORT_SYMBOL_GPL(put_hwpoison_page);

I don't believe the export is needed?

2015-08-11 23:52:01

by Wanpeng Li

Subject: Re: [PATCH v2 3/5] mm/hwpoison: introduce put_hwpoison_page to put refcount for memory error handling

On 8/12/15 7:24 AM, Andrew Morton wrote:
> On Mon, 10 Aug 2015 19:28:21 +0800 Wanpeng Li <[email protected]> wrote:
>
>> Introduce put_hwpoison_page to put refcount for memory
>> error handling.
>>
>> ...
>>
>> --- a/mm/memory-failure.c
>> +++ b/mm/memory-failure.c
>> @@ -922,6 +922,27 @@ int get_hwpoison_page(struct page *page)
>> }
>> EXPORT_SYMBOL_GPL(get_hwpoison_page);
>>
>> +/**
>> + * put_hwpoison_page() - Put refcount for memory error handling:
>> + * @page: raw error page (hit by memory error)
>> + */
>> +void put_hwpoison_page(struct page *page)
>> +{
>> + struct page *head = compound_head(page);
>> +
>> + if (PageHuge(head)) {
>> + put_page(head);
>> + return;
>> + }
>> +
>> + if (PageTransHuge(head))
>> + if (page != head)
>> + put_page(head);
>> +
>> + put_page(page);
>> +}
>> +EXPORT_SYMBOL_GPL(put_hwpoison_page);
> I don't believe the export is needed?

Indeed, thanks for your fix. :-)

Regards,
Wanpeng Li

2015-08-12 02:30:29

by Wanpeng Li

Subject: Re: [PATCH v2 3/5] mm/hwpoison: introduce put_hwpoison_page to put refcount for memory error handling

On 8/12/15 7:24 AM, Andrew Morton wrote:
> On Mon, 10 Aug 2015 19:28:21 +0800 Wanpeng Li <[email protected]> wrote:
>
>> Introduce put_hwpoison_page to put refcount for memory
>> error handling.
>>
>> ...
>>
>> --- a/mm/memory-failure.c
>> +++ b/mm/memory-failure.c
>> @@ -922,6 +922,27 @@ int get_hwpoison_page(struct page *page)
>> }
>> EXPORT_SYMBOL_GPL(get_hwpoison_page);
>>
>> +/**
>> + * put_hwpoison_page() - Put refcount for memory error handling:
>> + * @page: raw error page (hit by memory error)
>> + */
>> +void put_hwpoison_page(struct page *page)
>> +{
>> + struct page *head = compound_head(page);
>> +
>> + if (PageHuge(head)) {
>> + put_page(head);
>> + return;
>> + }
>> +
>> + if (PageTransHuge(head))
>> + if (page != head)
>> + put_page(head);
>> +
>> + put_page(page);
>> +}
>> +EXPORT_SYMBOL_GPL(put_hwpoison_page);
> I don't believe the export is needed?

ERROR: "put_hwpoison_page" [mm/hwpoison-inject.ko] undefined!
So I'm afraid it should be needed.

Regards,
Wanpeng Li

2015-08-12 08:59:32

by Naoya Horiguchi

Subject: Re: [PATCH v2 3/5] mm/hwpoison: introduce put_hwpoison_page to put refcount for memory error handling

On Mon, Aug 10, 2015 at 07:28:21PM +0800, Wanpeng Li wrote:
> Introduce put_hwpoison_page to put refcount for memory
> error handling.
>
> Suggested-by: Naoya Horiguchi <[email protected]>
> Signed-off-by: Wanpeng Li <[email protected]>

Thanks!

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

> ---
> include/linux/mm.h | 1 +
> mm/memory-failure.c | 21 +++++++++++++++++++++
> 2 files changed, 22 insertions(+), 0 deletions(-)
>
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index 554b0f0..c0a0b9f 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -2103,6 +2103,7 @@ extern int memory_failure(unsigned long pfn, int trapno, int flags);
> extern void memory_failure_queue(unsigned long pfn, int trapno, int flags);
> extern int unpoison_memory(unsigned long pfn);
> extern int get_hwpoison_page(struct page *page);
> +extern void put_hwpoison_page(struct page *page);
> extern int sysctl_memory_failure_early_kill;
> extern int sysctl_memory_failure_recovery;
> extern void shake_page(struct page *p, int access);
> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> index e0eb7ab..fa9aa21 100644
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -922,6 +922,27 @@ int get_hwpoison_page(struct page *page)
> }
> EXPORT_SYMBOL_GPL(get_hwpoison_page);
>
> +/**
> + * put_hwpoison_page() - Put refcount for memory error handling:
> + * @page: raw error page (hit by memory error)
> + */
> +void put_hwpoison_page(struct page *page)
> +{
> + struct page *head = compound_head(page);
> +
> + if (PageHuge(head)) {
> + put_page(head);
> + return;
> + }
> +
> + if (PageTransHuge(head))
> + if (page != head)
> + put_page(head);
> +
> + put_page(page);
> +}
> +EXPORT_SYMBOL_GPL(put_hwpoison_page);
> +
> /*
> * Do all that is necessary to remove user space mappings. Unmap
> * the pages and send SIGBUS to the processes if the data was dirty.
> --
> 1.7.1
> -