| Message ID | 1445556044-30322-4-git-send-email-toshi.kani@hpe.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Thu, Oct 22, 2015 at 4:20 PM, Toshi Kani <toshi.kani@hpe.com> wrote: > In the case of memory error injection, einj_error_inject() checks > if a target address is regular RAM. Change this check to allow > injecting a memory error to both RAM and NVDIMM so that memory > errors can be tested on NVDIMM as well. > > Signed-off-by: Toshi Kani <toshi.kani@hpe.com> > --- > 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..696f45a 100644 > --- a/drivers/acpi/apei/einj.c > +++ b/drivers/acpi/apei/einj.c > @@ -519,7 +519,7 @@ static int (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 (((!page_is_ram(PFN_DOWN(base_addr))) && > + (region_intersects_pmem(base_addr, size) != REGION_INTERSECTS)) || > + ((param2 & PAGE_MASK) != PAGE_MASK)) Hmm, should we also convert the page_is_ram() call to region_intersects_ram() so that we check the entire range from base_addr to base_addr + size?
On Thu, 2015-10-22 at 17:14 -0700, Dan Williams wrote: > On Thu, Oct 22, 2015 at 4:20 PM, Toshi Kani <toshi.kani@hpe.com> wrote: > > In the case of memory error injection, einj_error_inject() checks > > if a target address is regular RAM. Change this check to allow > > injecting a memory error to both RAM and NVDIMM so that memory > > errors can be tested on NVDIMM as well. > > > > Signed-off-by: Toshi Kani <toshi.kani@hpe.com> > > --- > > 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..696f45a 100644 > > --- a/drivers/acpi/apei/einj.c > > +++ b/drivers/acpi/apei/einj.c > > @@ -519,7 +519,7 @@ static int > (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 (((!page_is_ram(PFN_DOWN(base_addr))) && > > + (region_intersects_pmem(base_addr, size) != REGION_INTERSECTS)) > > || > > + ((param2 & PAGE_MASK) != PAGE_MASK)) > > Hmm, should we also convert the page_is_ram() call to > region_intersects_ram() so that we check the entire range from > base_addr to base_addr + size? Agreed. I will update to use region_intersects_ram(). Thanks, -Toshi
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index 0431883..696f45a 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 (((!page_is_ram(PFN_DOWN(base_addr))) && + (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. Change this check to allow injecting a memory error to both RAM and NVDIMM so that memory errors can be tested on NVDIMM as well. Signed-off-by: Toshi Kani <toshi.kani@hpe.com> --- drivers/acpi/apei/einj.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)