From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753128AbbJYKpU (ORCPT ); Sun, 25 Oct 2015 06:45:20 -0400 Received: from mail.skyhub.de ([78.46.96.112]:40852 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750998AbbJYKpS (ORCPT ); Sun, 25 Oct 2015 06:45:18 -0400 Date: Sun, 25 Oct 2015 11:45:12 +0100 From: Borislav Petkov To: Toshi Kani Cc: akpm@linux-foundation.org, dan.j.williams@intel.com, rjw@rjwysocki.net, linux-mm@kvack.org, linux-nvdimm@ml01.01.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 3/3] ACPI/APEI/EINJ: Allow memory error injection to NVDIMM Message-ID: <20151025104512.GC6084@nazgul.tnic> References: <1445626439-8424-1-git-send-email-toshi.kani@hpe.com> <1445626439-8424-4-git-send-email-toshi.kani@hpe.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1445626439-8424-4-git-send-email-toshi.kani@hpe.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Oct 23, 2015 at 12:53:59PM -0600, Toshi Kani wrote: > In the case of memory error injection, einj_error_inject() checks > if a target address is regular RAM. Update this check to add a call > to region_intersects_pmem() to verify if a target address range is > NVDIMM. This allows injecting a memory error to both RAM and NVDIMM > for testing. > > Also, the current RAM check, page_is_ram(), is replaced with > region_intersects_ram() so that it can verify a target address > range with the requested size. > > Signed-off-by: Toshi Kani > --- > drivers/acpi/apei/einj.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) ... > @@ -545,10 +545,14 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, > /* > * Disallow crazy address masks that give BIOS leeway to pick > * injection address almost anywhere. Insist on page or > - * better granularity and that target address is normal RAM. > + * better granularity and that target address is normal RAM or > + * NVDIMM. > */ > - pfn = PFN_DOWN(param1 & param2); > - if (!page_is_ram(pfn) || ((param2 & PAGE_MASK) != PAGE_MASK)) > + base_addr = param1 & param2; > + size = (~param2) + 1; Just a minor nitpick: please separate assignments from the if-statement here with a \n. > + if (((region_intersects_ram(base_addr, size) != REGION_INTERSECTS) && > + (region_intersects_pmem(base_addr, size) != REGION_INTERSECTS)) || > + ((param2 & PAGE_MASK) != PAGE_MASK)) > return -EINVAL; > > inject: -- Regards/Gruss, Boris. ECO tip #101: Trim your mails when you reply. --