From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754876AbZFODVC (ORCPT ); Sun, 14 Jun 2009 23:21:02 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754258AbZFODPZ (ORCPT ); Sun, 14 Jun 2009 23:15:25 -0400 Received: from mga03.intel.com ([143.182.124.21]:42714 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753798AbZFODPF (ORCPT ); Sun, 14 Jun 2009 23:15:05 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.42,220,1243839600"; d="scan'208";a="154267410" Message-Id: <20090615031253.530308256@intel.com> References: <20090615024520.786814520@intel.com> User-Agent: quilt/0.46-1 Date: Mon, 15 Jun 2009 10:45:29 +0800 From: Wu Fengguang To: Andrew Morton Cc: LKML , Andi Kleen cc: Ingo Molnar cc: Mel Gorman cc: "Wu, Fengguang" , Thomas Gleixner , "H. Peter Anvin" , Peter Zijlstra , Nick Piggin , Hugh Dickins , Andi Kleen , "riel@redhat.com" , "chris.mason@oracle.com" , "linux-mm@kvack.org" Subject: [PATCH 09/22] HWPOISON: Handle hardware poisoned pages in try_to_unmap Content-Disposition: inline; filename=try-to-unmap-poison Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen When a page has the poison bit set replace the PTE with a poison entry. This causes the right error handling to be done later when a process runs into it. Also add a new flag to not do that (needed for the memory-failure handler later) Reviewed-by: Wu Fengguang Signed-off-by: Andi Kleen --- include/linux/rmap.h | 1 + mm/rmap.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) --- sound-2.6.orig/mm/rmap.c +++ sound-2.6/mm/rmap.c @@ -958,7 +958,14 @@ static int try_to_unmap_one(struct page /* Update high watermark before we lower rss */ update_hiwater_rss(mm); - if (PageAnon(page)) { + if (PageHWPoison(page) && !(flags & TTU_IGNORE_HWPOISON)) { + if (PageAnon(page)) + dec_mm_counter(mm, anon_rss); + else if (!is_migration_entry(pte_to_swp_entry(*pte))) + dec_mm_counter(mm, file_rss); + set_pte_at(mm, address, pte, + swp_entry_to_pte(make_hwpoison_entry(page))); + } else if (PageAnon(page)) { swp_entry_t entry = { .val = page_private(page) }; if (PageSwapCache(page)) { --- sound-2.6.orig/include/linux/rmap.h +++ sound-2.6/include/linux/rmap.h @@ -94,6 +94,7 @@ enum ttu_flags { TTU_IGNORE_MLOCK = (1 << 8), /* ignore mlock */ TTU_IGNORE_ACCESS = (1 << 9), /* don't age */ + TTU_IGNORE_HWPOISON = (1 << 10),/* corrupted page is recoverable */ }; #define TTU_ACTION(x) ((x) & TTU_ACTION_MASK) --