Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932142AbbKXVit (ORCPT ); Tue, 24 Nov 2015 16:38:49 -0500 Received: from g4t3428.houston.hp.com ([15.201.208.56]:6211 "EHLO g4t3428.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755145AbbKXVid (ORCPT ); Tue, 24 Nov 2015 16:38:33 -0500 From: Toshi Kani To: akpm@linux-foundation.org, rjw@rjwysocki.net, dan.j.williams@intel.com Cc: tony.luck@intel.com, bp@alien8.de, vishal.l.verma@intel.com, linux-mm@kvack.org, linux-nvdimm@ml01.01.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Toshi Kani Subject: [PATCH v3 3/3] ACPI/APEI/EINJ: Allow memory error injection to NVDIMM Date: Tue, 24 Nov 2015 15:33:38 -0700 Message-Id: <1448404418-28800-4-git-send-email-toshi.kani@hpe.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1448404418-28800-1-git-send-email-toshi.kani@hpe.com> References: <1448404418-28800-1-git-send-email-toshi.kani@hpe.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2227 Lines: 57 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. In addition, 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 Reviewed-by: Dan Williams Acked-by: Tony Luck Cc: Rafael J. Wysocki Cc: Borislav Petkov Cc: Vishal Verma --- drivers/acpi/apei/einj.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index 0431883..52792d2 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,15 @@ 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_ram(base_addr, size) != REGION_INTERSECTS) && + (region_intersects_pmem(base_addr, size) != REGION_INTERSECTS))) return -EINVAL; inject: -- 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/