| Message ID | 1445626439-8424-4-git-send-email-toshi.kani@hpe.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Friday, October 23, 2015 12:53:59 PM 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 <toshi.kani@hpe.com> This is fine by me, but adding RAS maintainers Tony and Boris. Thanks, Rafael > --- > drivers/acpi/apei/einj.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c > index 0431883..ab55bbe 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,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; > + 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: -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 <toshi.kani@hpe.com> > --- > 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:
On Sun, 2015-10-25 at 11:45 +0100, Borislav Petkov wrote: > 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 <toshi.kani@hpe.com> > > --- > > 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. Sure. I will send an updated patch for 3/3, "[PATCH v2 UPDATE 3/3]". Thanks, -Toshi -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index 0431883..ab55bbe 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,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; + 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:
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> --- drivers/acpi/apei/einj.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html