Skip to content

Commit 9e13767

Browse files
gerald-schaefergregkh
authored andcommitted
s390/mm: Fix VM_FAULT_HWPOISON handling in do_exception()
commit df39038 upstream. There is no support for HWPOISON, MEMORY_FAILURE, or ARCH_HAS_COPY_MC on s390. Therefore we do not expect to see VM_FAULT_HWPOISON in do_exception(). However, since commit af19487 ("mm: make PTE_MARKER_SWAPIN_ERROR more general"), it is possible to see VM_FAULT_HWPOISON in combination with PTE_MARKER_POISONED, even on architectures that do not support HWPOISON otherwise. In this case, we will end up on the BUG() in do_exception(). Fix this by treating VM_FAULT_HWPOISON the same as VM_FAULT_SIGBUS, similar to x86 when MEMORY_FAILURE is not configured. Also print unexpected fault flags, for easier debugging. Note that VM_FAULT_HWPOISON_LARGE is not expected, because s390 cannot support swap entries on other levels than PTE level. Cc: stable@vger.kernel.org # 6.6+ Fixes: af19487 ("mm: make PTE_MARKER_SWAPIN_ERROR more general") Reported-by: Yunseong Kim <yskelg@gmail.com> Tested-by: Yunseong Kim <yskelg@gmail.com> Acked-by: Alexander Gordeev <agordeev@linux.ibm.com> Signed-off-by: Gerald Schaefer <gerald.schaefer@linux.ibm.com> Message-ID: <20240715180416.3632453-1-gerald.schaefer@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d347c9a commit 9e13767

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

arch/s390/mm/fault.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,12 +432,13 @@ static void do_exception(struct pt_regs *regs, int access)
432432
handle_fault_error_nolock(regs, 0);
433433
else
434434
do_sigsegv(regs, SEGV_MAPERR);
435-
} else if (fault & VM_FAULT_SIGBUS) {
435+
} else if (fault & (VM_FAULT_SIGBUS | VM_FAULT_HWPOISON)) {
436436
if (!user_mode(regs))
437437
handle_fault_error_nolock(regs, 0);
438438
else
439439
do_sigbus(regs);
440440
} else {
441+
pr_emerg("Unexpected fault flags: %08x\n", fault);
441442
BUG();
442443
}
443444
}

0 commit comments

Comments
 (0)