From: Tang Chen <tangchen@cn.fujitsu.com>
To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com,
lenb@kernel.org, rjw@sisk.pl, liwanp@linux.vnet.ibm.com,
tj@kernel.org, akpm@linux-foundation.org, joe@perches.com,
toshi.kani@hp.com
Cc: x86@kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org
Subject: [PATCH v2 1/4] acpi, numa, mem_hotplug: Kill save_add_info().
Date: Tue, 3 Sep 2013 16:45:38 +0800 [thread overview]
Message-ID: <1378197941-26479-2-git-send-email-tangchen@cn.fujitsu.com> (raw)
In-Reply-To: <1378197941-26479-1-git-send-email-tangchen@cn.fujitsu.com>
save_add_info() is defined as:
#ifdef CONFIG_MEMORY_HOTPLUG
static inline int save_add_info(void) {return 1;}
#else
static inline int save_add_info(void) {return 0;}
#endif
which means it is true when memory hotplug is configured.
In acpi_numa_memory_affinity_init(), it checks the memory hotplug
flag in SRAT memory affinity and save_add_info() like this:
if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info())
goto out_err;
......
node = setup_node(pxm);
numa_add_memblk(node, start, end);
......
which means if the memory range is hotpluggable, but memory hotplug is not
configured, it won't add these memory to numa_meminfo.
After this, numa_meminfo_cover_memory() will fail, which will finally cause
numa_init() to fail.
numa_init()
|->numa_register_memblks()
|->numa_meminfo_cover_memory()
When numa_init() fails, it will fallback to numa_init(dummy_numa_init), and
all numa architecture will not be setup.
This is nonsense. Even if memory hotplug is not configured, we can also use
numa architecture.
Actually, save_add_info() is added by commit 71efa8fdc55e70ec6687c897a30759f0a2c2ad7e
in 2006. And now it is useless.
So this patch kill save_add_info() and the nonsense checking.
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Acked-by: Toshi Kani <toshi.kani@hp.com>
---
arch/x86/mm/srat.c | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
index cdd0da9..1613c02 100644
--- a/arch/x86/mm/srat.c
+++ b/arch/x86/mm/srat.c
@@ -135,12 +135,6 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
pxm, apic_id, node);
}
-#ifdef CONFIG_MEMORY_HOTPLUG
-static inline int save_add_info(void) {return 1;}
-#else
-static inline int save_add_info(void) {return 0;}
-#endif
-
/* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
int __init
acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
@@ -154,8 +148,6 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
goto out_err_bad_srat;
if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)
goto out_err;
- if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info())
- goto out_err;
start = ma->base_address;
end = start + ma->length;
--
1.7.1
next prev parent reply other threads:[~2013-09-03 8:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-03 8:45 [PATCH v2 0/4] acpi: Fix and cleanup in acpi Tang Chen
2013-09-03 8:45 ` Tang Chen [this message]
2013-09-03 8:45 ` [PATCH v2 2/4] acpi cleanup: Use pr_{info|err}() instead of printk() in arch/x86/mm/srat.c Tang Chen
2013-09-05 0:33 ` Yasuaki Ishimatsu
2013-09-03 8:45 ` [PATCH v2 3/4] acpi: Check if @id is NULL in acpi_table_parse() Tang Chen
2013-09-03 8:45 ` [PATCH v2 4/4] acpi: Return -ENOENT in acpi_table_parse() and fix wrong comment Tang Chen
2013-09-04 21:39 ` Toshi Kani
2013-09-04 23:50 ` [PATCH v2 0/4] acpi: Fix and cleanup in acpi Rafael J. Wysocki
2013-09-05 1:56 ` Tang Chen
2013-09-05 11:59 ` Rafael J. Wysocki
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=1378197941-26479-2-git-send-email-tangchen@cn.fujitsu.com \
--to=tangchen@cn.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=joe@perches.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liwanp@linux.vnet.ibm.com \
--cc=mingo@redhat.com \
--cc=rjw@sisk.pl \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=toshi.kani@hp.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
all inboxes | Powered by JetHome®