From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1755366Ab0AMOWL@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755366Ab0AMOWL (ORCPT <rfc822;w@1wt.eu>);
	Wed, 13 Jan 2010 09:22:11 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755171Ab0AMOWK
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Wed, 13 Jan 2010 09:22:10 -0500
Received: from mail-pw0-f42.google.com ([209.85.160.42]:49010 "EHLO
	mail-pw0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755162Ab0AMOWJ (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 13 Jan 2010 09:22:09 -0500
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=date:from:to:cc:subject:message-id:references:mime-version
         :content-type:content-disposition:in-reply-to:user-agent;
        b=HhdZcJEu4jQOj7GMOkbmfGvMOhRhx331uKIHf/fLunrH/aAWM5ehm6OzC07nmlXHwS
         UGErc1HC9siZC2+D8vZF+kjl+Jzumj+SORYywASybQ8QcktXm3uABiXs1hq/jIoK7lOk
         IPFwLMYiLxD5HRjulO0x3zzo8Gf7Ydugy6iEw=
Date: Wed, 13 Jan 2010 22:23:57 +0800
From: =?utf-8?Q?Am=C3=A9rico?= Wang <xiyou.wangcong@gmail.com>
To: Wu Fengguang <fengguang.wu@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
       LKML <linux-kernel@vger.kernel.org>, Ingo Molnar <mingo@elte.hu>,
       Andi Kleen <andi@firstfloor.org>, Pekka Enberg <penberg@cs.helsinki.fi>,
       KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
       Nick Piggin <npiggin@suse.de>,
       Hugh Dickins <hugh.dickins@tiscali.co.uk>,
       Linux Memory Management List <linux-mm@kvack.org>
Subject: Re: [PATCH 8/8] hwpoison: prevent /dev/kcore from accessing
	hwpoison pages
Message-ID: <20100113142357.GA4038@hack>
References: <20100113135305.013124116@intel.com> <20100113135958.291404947@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20100113135958.291404947@intel.com>
User-Agent: Mutt/1.5.19 (2009-01-05)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


Your $subject, I think you mean /proc/kcore...

On Wed, Jan 13, 2010 at 09:53:13PM +0800, Wu Fengguang wrote:
>Silently fill buffer with zeros when encounter hwpoison pages
>(accessing the hwpoison page content is deadly).
>
>This patch does not cover X86_32 - which has a dumb kern_addr_valid().
>It is unlikely anyone run a 32bit kernel will care about the hwpoison
>feature - its usable memory is limited.
>
>CC: Ingo Molnar <mingo@elte.hu>
>CC: Andi Kleen <andi@firstfloor.org> 
>CC: Pekka Enberg <penberg@cs.helsinki.fi>
>Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>

This patch looks fine for me.
Reviewed-by: WANG Cong <xiyou.wangcong@gmail.com>

>---
> arch/x86/mm/init_64.c |   16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
>--- linux-mm.orig/arch/x86/mm/init_64.c	2010-01-13 21:23:04.000000000 +0800
>+++ linux-mm/arch/x86/mm/init_64.c	2010-01-13 21:25:32.000000000 +0800
>@@ -825,6 +825,7 @@ int __init reserve_bootmem_generic(unsig
> int kern_addr_valid(unsigned long addr)
> {
> 	unsigned long above = ((long)addr) >> __VIRTUAL_MASK_SHIFT;
>+	unsigned long pfn;
> 	pgd_t *pgd;
> 	pud_t *pud;
> 	pmd_t *pmd;
>@@ -845,14 +846,23 @@ int kern_addr_valid(unsigned long addr)
> 	if (pmd_none(*pmd))
> 		return 0;
> 
>-	if (pmd_large(*pmd))
>-		return pfn_valid(pmd_pfn(*pmd));
>+	if (pmd_large(*pmd)) {
>+		pfn = pmd_pfn(*pmd);
>+		pfn += pte_index(addr);
>+		goto check_pfn;
>+	}
> 
> 	pte = pte_offset_kernel(pmd, addr);
> 	if (pte_none(*pte))
> 		return 0;
> 
>-	return pfn_valid(pte_pfn(*pte));
>+	pfn = pte_pfn(*pte);
>+check_pfn:
>+	if (!pfn_valid(pfn))
>+		return 0;
>+	if (PageHWPoison(pfn_to_page(pfn)))
>+		return 0;
>+	return 1;
> }
> 
> /*
>
>
>--
>To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html
>Please read the FAQ at  http://www.tux.org/lkml/

-- 
Live like a child, think like the god.