diff mbox

[v2,UPDATE-2,3/3] ACPI/APEI/EINJ: Allow memory error injection to NVDIMM

Message ID 1445894544-21382-1-git-send-email-toshi.kani@hpe.com (mailing list archive)
State Superseded
Headers show

Commit Message

Kani, Toshi Oct. 26, 2015, 9:22 p.m. UTC 
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 <toshi.kani@hpe.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
---
UPDATE:
 - Add a blank line before if-statement. (Borislav Petkov)
 - Check the param2 value before target memory type. (Tony Luck)
---
 drivers/acpi/apei/einj.c |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Comments

Tony Luck Oct. 26, 2015, 9:52 p.m. UTC | #1 
> Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
> Reviewed-by: Dan Williams <dan.j.williams@intel.com>

Acked-by: Tony Luck <tony.luck@intel.com>
Borislav Petkov Oct. 30, 2015, 9:40 a.m. UTC | #2 
On Mon, Oct 26, 2015 at 03:22:24PM -0600, Toshi Kani wrote:
> @@ -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;

Hmm, I missed this last time: why are the brackets there?

AFAIK, bitwise NOT has a higher precedence than addition.
Kani, Toshi Oct. 30, 2015, 1:48 p.m. UTC | #3 
On Fri, 2015-10-30 at 10:40 +0100, Borislav Petkov wrote:
> On Mon, Oct 26, 2015 at 03:22:24PM -0600, Toshi Kani wrote:
> > @@ -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;
> 
> Hmm, I missed this last time: why are the brackets there?
> 
> AFAIK, bitwise NOT has a higher precedence than addition.

Yes, the brackets are not necessary.  I put them as self-explanatory of the
precedence.  Shall I remove them, and send you an updated patch?

Thanks,
-Toshi
Borislav Petkov Oct. 30, 2015, 2:47 p.m. UTC | #4 
On Fri, Oct 30, 2015 at 07:48:51AM -0600, Toshi Kani wrote:
> Yes, the brackets are not necessary. I put them as self-explanatory of
> the precedence. Shall I remove them, and send you an updated patch?

Not necessary, I have my high hopes that Rafael can remove them when
applying :-)
diff mbox

Patch

diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index 0431883..5d7c0b4 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: