diff mbox

[3/3] arm64/numa: fix type info

Message ID 1464230639-9852-3-git-send-email-thunder.leizhen@huawei.com
State New
Headers show

Commit Message

Zhen Lei May 26, 2016, 2:43 a.m. UTC
numa_init(of_numa_init) may returned error because of numa configuration
error. So "No NUMA configuration found" is inaccurate. In fact, specific
configuration error information can be immediately printed by the
testing branch. So "No NUMA..." only needs to be printed when numa_off.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>

---
 arch/arm64/mm/numa.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--
2.5.0


--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Zhen Lei May 27, 2016, 2:35 a.m. UTC | #1
On 2016/5/27 1:12, David Daney wrote:
> The current patch to correct this problem is here:

> 

> https://lkml.org/lkml/2016/5/24/679

> 

> Since v7 of the ACPI/NUMA patches are likely going to be added to linux-next as soon as the current merge window ends, further simplifications of the informational prints should probably be rebased on top of it.

> 

> David Daney

> 


>> On Thu, 2016-05-26 at 09:22 -0700, Ganapatrao Kulkarni wrote:

>>> IIRC, it should be

>>> if (!numa_off)

>>> we want to print this message when we failed to find proper numa configuration.

>>> when numa_off is set, we will not look for any numa configuration.

>>>

>>>>

>>>> +               pr_info("%s\n", "No NUMA configuration found");

>>



OK, I think I also missed some cases.

But my problem still have not been resolved by "https://lkml.org/lkml/2016/5/24/679", see below. I will update my patches base on it.


[    0.000000] NUMA: Adding memblock [0x0 - 0x6affffff] on node 0
[    0.000000] NUMA: parsing numa-distance-map-v1
[    0.000000] NUMA: Warning: invalid memblk node 4 [mem 0x6b000000-0x7fbfffff]		//My numa configuration is incorrect, but not "No ... found"
[    0.000000] No NUMA configuration found						//Above warning is very detail, this can be removed
[    0.000000] NUMA: Faking a node at [mem 0x0000000000000000-0x00000017ffffffff]

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c
index 98dc104..9937cc1 100644
--- a/arch/arm64/mm/numa.c
+++ b/arch/arm64/mm/numa.c
@@ -362,7 +362,8 @@  static int __init dummy_numa_init(void)
 	int ret;
 	struct memblock_region *mblk;

-	pr_info("%s\n", "No NUMA configuration found");
+	if (numa_off)
+		pr_info("%s\n", "No NUMA configuration found");
 	pr_info("NUMA: Faking a node at [mem %#018Lx-%#018Lx]\n",
 	       0LLU, PFN_PHYS(max_pfn) - 1);