Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d9ee6a2 authored by Andi Kleen's avatar Andi Kleen
Browse files

HWPOISON: Report correct address granuality for AO huge page errors 



The SIGBUS user space signalling is supposed to report the
address granuality of a corruption. Pass this information correctly
for huge pages by querying the hpage order.

Reviewed-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Reviewed-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
parent a337fdac

mm/memory-failure.c

+5 −5
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ EXPORT_SYMBOL_GPL(hwpoison_filter); 
 * signal.

 */

static int kill_proc_ao(struct task_struct *t, unsigned long addr, int trapno,

			unsigned long pfn)

			unsigned long pfn, struct page *page)

{

	struct siginfo si;

	int ret;
@@ -198,7 +198,7 @@ static int kill_proc_ao(struct task_struct *t, unsigned long addr, int trapno, 
#ifdef __ARCH_SI_TRAPNO

	si.si_trapno = trapno;

#endif

	si.si_addr_lsb = PAGE_SHIFT;

	si.si_addr_lsb = compound_order(compound_head(page)) + PAGE_SHIFT;

	/*

	 * Don't use force here, it's convenient if the signal

	 * can be temporarily blocked.
@@ -327,7 +327,7 @@ static void add_to_kill(struct task_struct *tsk, struct page *p, 
 * wrong earlier.

 */

static void kill_procs_ao(struct list_head *to_kill, int doit, int trapno,

			  int fail, unsigned long pfn)

			  int fail, struct page *page, unsigned long pfn)

{

	struct to_kill *tk, *next;
@@ -352,7 +352,7 @@ static void kill_procs_ao(struct list_head *to_kill, int doit, int trapno, 
			 * process anyways.

			 */

			else if (kill_proc_ao(tk->tsk, tk->addr, trapno,

					      pfn) < 0)

					      pfn, page) < 0)

				printk(KERN_ERR

		"MCE %#lx: Cannot send advisory machine check signal to %s:%d\n",

					pfn, tk->tsk->comm, tk->tsk->pid);
@@ -928,7 +928,7 @@ static int hwpoison_user_mappings(struct page *p, unsigned long pfn, 
	 * any accesses to the poisoned memory.

	 */

	kill_procs_ao(&tokill, !!PageDirty(hpage), trapno,

		      ret != SWAP_SUCCESS, pfn);

		      ret != SWAP_SUCCESS, p, pfn);



	return ret;

}