Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1254937 > unrolled thread

[PATCH v2 0/3] Allow EINJ to inject memory error to NVDIMM

Started byToshi Kani <toshi.kani@hpe.com>
First post2015-10-23 21:00 +0200
Last post2015-10-23 21:10 +0200
Articles 6 — 4 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH v2 0/3] Allow EINJ to inject memory error to NVDIMM Toshi Kani <toshi.kani@hpe.com> - 2015-10-23 21:00 +0200
    [PATCH v2 3/3] ACPI/APEI/EINJ: Allow memory error injection to NVDIMM Toshi Kani <toshi.kani@hpe.com> - 2015-10-23 21:00 +0200
      Re: [PATCH v2 3/3] ACPI/APEI/EINJ: Allow memory error injection to NVDIMM "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2015-10-24 17:00 +0200
      Re: [PATCH v2 3/3] ACPI/APEI/EINJ: Allow memory error injection to  NVDIMM Borislav Petkov <bp@alien8.de> - 2015-10-25 11:50 +0100
        Re: [PATCH v2 3/3] ACPI/APEI/EINJ: Allow memory error injection to  NVDIMM Toshi Kani <toshi.kani@hpe.com> - 2015-10-26 16:00 +0100
    Re: [PATCH v2 0/3] Allow EINJ to inject memory error to NVDIMM Dan Williams <dan.j.williams@intel.com> - 2015-10-23 21:10 +0200

#1254937 — [PATCH v2 0/3] Allow EINJ to inject memory error to NVDIMM

FromToshi Kani <toshi.kani@hpe.com>
Date2015-10-23 21:00 +0200
Subject[PATCH v2 0/3] Allow EINJ to inject memory error to NVDIMM
Message-ID<qmPJg-1zw-9@gated-at.bofh.it>
This patch-set extends the EINJ driver to allow injecting a memory
error to NVDIMM.  It first extends iomem resource interface to support
checking a NVDIMM region.

Patch 1/3 changes region_intersects() to accept non-RAM regions, and
adds region_intersects_ram().

Patch 2/3 adds region_intersects_pmem() to check a NVDIMM region.

Patch 3/3 changes the EINJ driver to allow injecting a memory error
to NVDIMM.

---
v2:
 - Change the EINJ driver to call region_intersects_ram() for checking
   RAM with a specified size. (Dan Williams)
 - Add export to region_intersects_ram().

---
Toshi Kani (3):
 1/3 resource: Add @flags to region_intersects()
 2/3 resource: Add region_intersects_pmem()
 3/3 ACPI/APEI/EINJ: Allow memory error injection to NVDIMM

---
 drivers/acpi/apei/einj.c | 12 ++++++++----
 include/linux/mm.h       |  5 ++++-
 kernel/memremap.c        |  5 ++---
 kernel/resource.c        | 35 ++++++++++++++++++++++++++++-------
 4 files changed, 42 insertions(+), 15 deletions(-)
--
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/

[toc] | [next] | [standalone]

#1254940 — [PATCH v2 3/3] ACPI/APEI/EINJ: Allow memory error injection to NVDIMM

FromToshi Kani <toshi.kani@hpe.com>
Date2015-10-23 21:00 +0200
Subject[PATCH v2 3/3] ACPI/APEI/EINJ: Allow memory error injection to NVDIMM
Message-ID<qmPJg-1zw-19@gated-at.bofh.it>
In reply to#1254937
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(-)

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-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/

[toc] | [prev] | [next] | [standalone]

#1255201 — Re: [PATCH v2 3/3] ACPI/APEI/EINJ: Allow memory error injection to NVDIMM

From"Rafael J. Wysocki" <rjw@rjwysocki.net>
Date2015-10-24 17:00 +0200
SubjectRe: [PATCH v2 3/3] ACPI/APEI/EINJ: Allow memory error injection to NVDIMM
Message-ID<qn8sy-3q2-15@gated-at.bofh.it>
In reply to#1254940
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-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/

[toc] | [prev] | [next] | [standalone]

#1255349 — Re: [PATCH v2 3/3] ACPI/APEI/EINJ: Allow memory error injection to NVDIMM

FromBorislav Petkov <bp@alien8.de>
Date2015-10-25 11:50 +0100
SubjectRe: [PATCH v2 3/3] ACPI/APEI/EINJ: Allow memory error injection to NVDIMM
Message-ID<qnr29-1Dl-17@gated-at.bofh.it>
In reply to#1254940
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:

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--
--
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/

[toc] | [prev] | [next] | [standalone]

#1256093 — Re: [PATCH v2 3/3] ACPI/APEI/EINJ: Allow memory error injection to NVDIMM

FromToshi Kani <toshi.kani@hpe.com>
Date2015-10-26 16:00 +0100
SubjectRe: [PATCH v2 3/3] ACPI/APEI/EINJ: Allow memory error injection to NVDIMM
Message-ID<qnRpE-143-19@gated-at.bofh.it>
In reply to#1255349
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-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/

[toc] | [prev] | [next] | [standalone]

#1254944

FromDan Williams <dan.j.williams@intel.com>
Date2015-10-23 21:10 +0200
Message-ID<qmPSX-20c-35@gated-at.bofh.it>
In reply to#1254937
On Fri, Oct 23, 2015 at 11:53 AM, Toshi Kani <toshi.kani@hpe.com> wrote:
> This patch-set extends the EINJ driver to allow injecting a memory
> error to NVDIMM.  It first extends iomem resource interface to support
> checking a NVDIMM region.
>
> Patch 1/3 changes region_intersects() to accept non-RAM regions, and
> adds region_intersects_ram().
>
> Patch 2/3 adds region_intersects_pmem() to check a NVDIMM region.
>
> Patch 3/3 changes the EINJ driver to allow injecting a memory error
> to NVDIMM.
>
> ---
> v2:
>  - Change the EINJ driver to call region_intersects_ram() for checking
>    RAM with a specified size. (Dan Williams)
>  - Add export to region_intersects_ram().
>
> ---

For the series:

Reviewed-by: Dan Williams <dan.j.williams@intel.com>
--
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/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web