From mboxrd@z Thu Jan 1 00:00:00 1970 From: Toshi Kani Subject: [PATCH v3 17/17] ACPI/EINJ: Allow memory error injection to NVDIMM Date: Tue, 5 Jan 2016 11:54:41 -0700 Message-ID: <1452020081-26534-17-git-send-email-toshi.kani@hpe.com> References: <1452020081-26534-1-git-send-email-toshi.kani@hpe.com> Return-path: In-Reply-To: <1452020081-26534-1-git-send-email-toshi.kani@hpe.com> Sender: linux-kernel-owner@vger.kernel.org To: akpm@linux-foundation.org, bp@alien8.de Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Vishal Verma , linux-nvdimm@lists.01.org, linux-acpi@vger.kernel.org, Toshi Kani List-Id: linux-arch.vger.kernel.org In the case of memory error injection, einj_error_inject() checks if a target address is System RAM. Change this check to allow injecting a memory error to NVDIMM by calling region_intersects() with IORES_DESC_PERSISTENT_MEMORY. This enables memory error testing on both System RAM and NVDIMM. In addition, page_is_ram() is replaced with region_intersects() with IORESOURCE_SYSTEM_RAM, so that it can verify a target address range with the requested size. Cc: Rafael J. Wysocki Cc: Borislav Petkov Cc: Vishal Verma Cc: linux-nvdimm@lists.01.org Cc: linux-acpi@vger.kernel.org Acked-by: Tony Luck Reviewed-by: Dan Williams Signed-off-by: Toshi Kani --- drivers/acpi/apei/einj.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index 0431883..16cae66 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c @@ -519,7 +519,7 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, u64 param3, u64 param4) { int rc; - unsigned long pfn; + u64 base_addr, size; /* If user manually set "flags", make sure it is legal */ if (flags && (flags & @@ -545,10 +545,17 @@ 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; + + if (((param2 & PAGE_MASK) != PAGE_MASK) || + ((region_intersects(base_addr, size, IORESOURCE_SYSTEM_RAM, + IORES_DESC_NONE) != REGION_INTERSECTS) && + (region_intersects(base_addr, size, IORESOURCE_MEM, + IORES_DESC_PERSISTENT_MEMORY) != REGION_INTERSECTS))) return -EINVAL; inject: From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from g9t5009.houston.hp.com ([15.240.92.67]:43642 "EHLO g9t5009.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752423AbcAESzx (ORCPT ); Tue, 5 Jan 2016 13:55:53 -0500 From: Toshi Kani Subject: [PATCH v3 17/17] ACPI/EINJ: Allow memory error injection to NVDIMM Date: Tue, 5 Jan 2016 11:54:41 -0700 Message-ID: <1452020081-26534-17-git-send-email-toshi.kani@hpe.com> In-Reply-To: <1452020081-26534-1-git-send-email-toshi.kani@hpe.com> References: <1452020081-26534-1-git-send-email-toshi.kani@hpe.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: akpm@linux-foundation.org, bp@alien8.de Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Vishal Verma , linux-nvdimm@lists.01.org, linux-acpi@vger.kernel.org, Toshi Kani Message-ID: <20160105185441.-LNCjAEp0fVKGjBbI6s-TPhinIdByy4OMMBZeYLM3Qw@z> In the case of memory error injection, einj_error_inject() checks if a target address is System RAM. Change this check to allow injecting a memory error to NVDIMM by calling region_intersects() with IORES_DESC_PERSISTENT_MEMORY. This enables memory error testing on both System RAM and NVDIMM. In addition, page_is_ram() is replaced with region_intersects() with IORESOURCE_SYSTEM_RAM, so that it can verify a target address range with the requested size. Cc: Rafael J. Wysocki Cc: Borislav Petkov Cc: Vishal Verma Cc: linux-nvdimm@lists.01.org Cc: linux-acpi@vger.kernel.org Acked-by: Tony Luck Reviewed-by: Dan Williams Signed-off-by: Toshi Kani --- drivers/acpi/apei/einj.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index 0431883..16cae66 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c @@ -519,7 +519,7 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2, u64 param3, u64 param4) { int rc; - unsigned long pfn; + u64 base_addr, size; /* If user manually set "flags", make sure it is legal */ if (flags && (flags & @@ -545,10 +545,17 @@ 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; + + if (((param2 & PAGE_MASK) != PAGE_MASK) || + ((region_intersects(base_addr, size, IORESOURCE_SYSTEM_RAM, + IORES_DESC_NONE) != REGION_INTERSECTS) && + (region_intersects(base_addr, size, IORESOURCE_MEM, + IORES_DESC_PERSISTENT_MEMORY) != REGION_INTERSECTS))) return -EINVAL; inject: