From: David Daney <ddaney.cavm@gmail.com>
To: Will Deacon <will.deacon@arm.com>,
linux-arm-kernel@lists.infradead.org,
Mark Rutland <mark.rutland@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Tony Luck <tony.luck@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
Grant Likely <grant.likely@linaro.org>,
Robert Moore <robert.moore@intel.com>,
Lv Zheng <lv.zheng@intel.com>, Hanjun Guo <hanjun.guo@linaro.org>,
Marc Zyngier <Marc.Zyngier@arm.com>,
linux-ia64@vger.kernel.org, linux-acpi@vger.kernel.org,
devel@acpica.org
Cc: linux-kernel@vger.kernel.org,
Robert Richter <rrichter@cavium.com>,
David Daney <david.daney@cavium.com>
Subject: [PATCH v4 11/14] acpi, numa, srat: Improve SRAT error detection and add messages.
Date: Mon, 18 Apr 2016 14:14:09 -0700 [thread overview]
Message-ID: <1461014052-30788-12-git-send-email-ddaney.cavm@gmail.com> (raw)
In-Reply-To: <1461014052-30788-1-git-send-email-ddaney.cavm@gmail.com>
From: David Daney <david.daney@cavium.com>
Loosely based on code from Robert Richter and Hanjun Guo.
Improve out of range node detection as well as allow for Larger SRAT
entities.
Add printing of nice messages.
Signed-off-by: David Daney <david.daney@cavium.com>
---
drivers/acpi/numa.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index c4ea877..6133eb1 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -240,8 +240,11 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
if (srat_disabled())
goto out_err;
- if (ma->header.length != sizeof(struct acpi_srat_mem_affinity))
+ if (ma->header.length < sizeof(struct acpi_srat_mem_affinity)) {
+ pr_err("SRAT: Unexpected header length: %d\n",
+ ma->header.length);
goto out_err_bad_srat;
+ }
if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)
goto out_err;
hotpluggable = ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE;
@@ -255,13 +258,17 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
pxm &= 0xff;
node = acpi_map_pxm_to_node(pxm);
- if (node < 0) {
- printk(KERN_ERR "SRAT: Too many proximity domains.\n");
+ if (node == NUMA_NO_NODE || node >= MAX_NUMNODES) {
+ pr_err("SRAT: Too many proximity domains.\n");
goto out_err_bad_srat;
}
- if (numa_add_memblk(node, start, end) < 0)
+ if (numa_add_memblk(node, start, end) < 0) {
+ pr_err("SRAT: Failed to add memblk to node %u [mem %#010Lx-%#010Lx]\n",
+ node, (unsigned long long) start,
+ (unsigned long long) end - 1);
goto out_err_bad_srat;
+ }
node_set(node, numa_nodes_parsed);
--
1.7.11.7
next prev parent reply other threads:[~2016-04-18 21:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-18 21:13 [PATCH v4 00/14] ACPI NUMA support for ARM64 David Daney
2016-04-18 21:13 ` [PATCH v4 01/14] acpi, numa: Use pr_fmt() instead of printk David Daney
2016-04-18 21:14 ` [PATCH v4 02/14] acpi, numa: Replace ACPI_DEBUG_PRINT() with pr_debug() David Daney
2016-04-18 21:14 ` [PATCH v4 03/14] acpi, numa: remove duplicate NULL check David Daney
2016-04-18 21:14 ` [PATCH v4 04/14] acpi, numa: Move acpi_numa_arch_fixup() to ia64 only David Daney
2016-04-18 21:14 ` [PATCH v4 05/14] acpi, numa: move acpi_numa_slit_init() to drivers/acpi/numa.c David Daney
2016-04-18 21:14 ` [PATCH v4 06/14] arm64, numa: rework numa_add_memblk() David Daney
2016-04-18 21:14 ` [PATCH v4 07/14] x86, acpi, numa: cleanup acpi_numa_processor_affinity_init() David Daney
2016-04-18 21:14 ` [PATCH v4 08/14] acpi, numa: move bad_srat() and srat_disabled() to drivers/acpi/numa.c David Daney
2016-04-18 21:14 ` [PATCH v4 09/14] acpi, numa: remove unneeded acpi_numa=1 David Daney
2016-04-18 21:14 ` [PATCH v4 10/14] acpi, numa: Move acpi_numa_memory_affinity_init() to drivers/acpi/numa.c David Daney
2016-04-18 21:14 ` David Daney [this message]
2016-04-18 21:14 ` [PATCH v4 12/14] arm64, acpi, numa: NUMA support based on SRAT and SLIT David Daney
2016-04-18 21:14 ` [PATCH v4 13/14] acpi, numa: Enable ACPI based NUMA on ARM64 David Daney
2016-04-18 21:14 ` [PATCH v4 14/14] arm64, acpi, numa: Default enable ACPI_NUMA with NUMA David Daney
2016-04-19 18:44 ` [PATCH v4 00/14] ACPI NUMA support for ARM64 David Daney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461014052-30788-12-git-send-email-ddaney.cavm@gmail.com \
--to=ddaney.cavm@gmail.com \
--cc=Marc.Zyngier@arm.com \
--cc=catalin.marinas@arm.com \
--cc=david.daney@cavium.com \
--cc=devel@acpica.org \
--cc=fenghua.yu@intel.com \
--cc=frowand.list@gmail.com \
--cc=grant.likely@linaro.org \
--cc=hanjun.guo@linaro.org \
--cc=hpa@zytor.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lv.zheng@intel.com \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=rjw@rjwysocki.net \
--cc=robert.moore@intel.com \
--cc=robh+dt@kernel.org \
--cc=rrichter@cavium.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=will.deacon@arm.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).