Given that ZONE_DEVICE / dev_pagemap pages are never assembled into
compound pages, the size determination logic in kill_proc() needs
updating for the dev_pagemap case. In preparation for dev_pagemap
support rework memory_failure() and kill_proc() to pass / consume the page
size explicitly.
Cc: Naoya Horiguchi <n-horigu...@ah.jp.nec.com>
Signed-off-by: Dan Williams <dan.j.willi...@intel.com>
---
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 9d142b9b86dc..42a193ee14d3 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -179,18 +179,16 @@ EXPORT_SYMBOL_GPL(hwpoison_filter);
* ``action required'' if error happened in current execution context
*/
static int kill_proc(struct task_struct *t, unsigned long addr,
- unsigned long pfn, struct page *page, int flags)
+ unsigned long pfn, unsigned size_shift, int flags)
{
- short addr_lsb;
int ret;
pr_err("Memory failure: %#lx: Killing %s:%d due to hardware memory
corruption\n",
pfn, t->comm, t->pid);
- addr_lsb = compound_order(compound_head(page)) + PAGE_SHIFT;
if ((flags & MF_ACTION_REQUIRED) && t->mm == current->mm) {
ret = force_sig_mceerr(BUS_MCEERR_AR, (void __user *)addr,
- addr_lsb, current);
+ size_shift, current);
} else {
/*
* Don't use force here, it's convenient if the signal
@@ -199,7 +197,7 @@ static int kill_proc(struct task_struct *t, unsigned long
addr,
* to SIG_IGN, but hopefully no one will do that?
*/
ret = send_sig_mceerr(BUS_MCEERR_AO, (void __user *)addr,
- addr_lsb, t); /* synchronous? */
+ size_shift, t); /* synchronous? */
}
if (ret < 0)
pr_info("Memory failure: Error sending signal to %s:%d: %d\n",
@@ -318,7 +316,7 @@ static void add_to_kill(struct task_struct *tsk, struct
page *p,
* wrong earlier.
*/
static void kill_procs(struct list_head *to_kill, int forcekill,
- bool fail, struct page *page, unsigned long pfn,
+ bool fail, unsigned size_shift, unsigned long pfn,
int flags)
{
struct to_kill *tk, *next;
@@ -343,7 +341,7 @@ static void kill_procs(struct list_head *to_kill, int
forcekill,
* process anyways.
*/
else if (kill_proc(tk->tsk, tk->addr,
- pfn, page, flags) < 0)
+ pfn, size_shift, flags) < 0)
pr_err("Memory failure: %#lx: Cannot send
advisory machine check signal to %s:%d\n",
pfn, tk->tsk->comm, tk->tsk->pid);
}
@@ -928,6 +926,7 @@ static bool hwpoison_user_mappings(struct page *p, unsigned
long pfn,
struct address_space *mapping;
LIST_HEAD(tokill);
bool unmap_success;
+ unsigned size_shift;
int kill = 1, forcekill;
struct page *hpage = *hpagep;
bool mlocked = PageMlocked(hpage);
@@ -1012,7 +1011,8 @@ static bool hwpoison_user_mappings(struct page *p,
unsigned long pfn,
* any accesses to the poisoned memory.
*/
forcekill = PageDirty(hpage) || (flags & MF_MUST_KILL);
- kill_procs(&tokill, forcekill, !unmap_success, p, pfn, flags);
+ size_shift = compound_order(compound_head(p)) + PAGE_SHIFT;
+ kill_procs(&tokill, forcekill, !unmap_success, size_shift, pfn, flags);
return unmap_success;
}
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
