From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail202.messagelabs.com (mail202.messagelabs.com [216.82.254.227]) by kanga.kvack.org (Postfix) with ESMTP id 48E6A6B0083 for ; Wed, 5 Aug 2009 05:36:35 -0400 (EDT) From: Andi Kleen References: <200908051136.682859934@firstfloor.org> In-Reply-To: <200908051136.682859934@firstfloor.org> Subject: [PATCH] [6/19] HWPOISON: Add various poison checks in mm/memory.c v2 Message-Id: <20090805093633.C6124B15D8@basil.firstfloor.org> Date: Wed, 5 Aug 2009 11:36:33 +0200 (CEST) Sender: owner-linux-mm@kvack.org To: akpm@linux-foundation.org, npiggin@suse.de, linux-kernel@vger.kernel.org, linux-mm@kvack.org, fengguang.wu@intel.com, hidehiro.kawai.ez@hitachi.com List-ID: Bail out early when hardware poisoned pages are found in page fault handling. Since they are poisoned they should not be mapped freshly into processes, because that would cause another (potentially deadly) machine check This is generally handled in the same way as OOM, just a different error code is returned to the architecture code. v2: Do a page unlock if needed (Fengguang Wu) Signed-off-by: Andi Kleen --- mm/memory.c | 6 ++++++ 1 file changed, 6 insertions(+) Index: linux/mm/memory.c =================================================================== --- linux.orig/mm/memory.c +++ linux/mm/memory.c @@ -2711,6 +2711,12 @@ static int __do_fault(struct mm_struct * if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE))) return ret; + if (unlikely(PageHWPoison(vmf.page))) { + if (ret & VM_FAULT_LOCKED) + unlock_page(vmf.page); + return VM_FAULT_HWPOISON; + } + /* * For consistency in subsequent calls, make the faulted page always * locked. -- 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: email@kvack.org