From: Wei Yang <richard.weiyang@gmail.com>
To: kirill@shutemov.name, bp@alien8.de, tglx@linutronix.de,
mingo@redhat.com, hpa@zytor.com, tj@kernel.org
Cc: linux-kernel@vger.kernel.org, Wei Yang <richard.weiyang@gmail.com>
Subject: [PATCH 1/3] x86/numa_emulation: fix potential memory leak
Date: Tue, 11 Apr 2017 00:56:50 +0800 [thread overview]
Message-ID: <20170410165652.50250-2-richard.weiyang@gmail.com> (raw)
In-Reply-To: <20170410165652.50250-1-richard.weiyang@gmail.com>
numa_emulation() needs to allocate a space for phys_dist[] temporarily,
while current code may miss to release this when dfl_phys_nid ==
NUMA_NO_NODE. It is observed in code review instead of in a real case.
This patch fixes this by re-order the code path.
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
---
arch/x86/mm/numa_emulation.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c
index a8f90ce3dedf..eb017c816de6 100644
--- a/arch/x86/mm/numa_emulation.c
+++ b/arch/x86/mm/numa_emulation.c
@@ -353,6 +353,24 @@ void __init numa_emulation(struct numa_meminfo *numa_meminfo, int numa_dist_cnt)
goto no_emu;
}
+ /*
+ * Determine the max emulated nid and the default phys nid to use
+ * for unmapped nodes.
+ */
+ max_emu_nid = 0;
+ dfl_phys_nid = NUMA_NO_NODE;
+ for (i = 0; i < ARRAY_SIZE(emu_nid_to_phys); i++) {
+ if (emu_nid_to_phys[i] != NUMA_NO_NODE) {
+ max_emu_nid = i;
+ if (dfl_phys_nid == NUMA_NO_NODE)
+ dfl_phys_nid = emu_nid_to_phys[i];
+ }
+ }
+ if (dfl_phys_nid == NUMA_NO_NODE) {
+ pr_warning("NUMA: Warning: can't determine default physical node, disabling emulation\n");
+ goto no_emu;
+ }
+
/* copy the physical distance table */
if (numa_dist_cnt) {
u64 phys;
@@ -372,24 +390,6 @@ void __init numa_emulation(struct numa_meminfo *numa_meminfo, int numa_dist_cnt)
node_distance(i, j);
}
- /*
- * Determine the max emulated nid and the default phys nid to use
- * for unmapped nodes.
- */
- max_emu_nid = 0;
- dfl_phys_nid = NUMA_NO_NODE;
- for (i = 0; i < ARRAY_SIZE(emu_nid_to_phys); i++) {
- if (emu_nid_to_phys[i] != NUMA_NO_NODE) {
- max_emu_nid = i;
- if (dfl_phys_nid == NUMA_NO_NODE)
- dfl_phys_nid = emu_nid_to_phys[i];
- }
- }
- if (dfl_phys_nid == NUMA_NO_NODE) {
- pr_warning("NUMA: Warning: can't determine default physical node, disabling emulation\n");
- goto no_emu;
- }
-
/* commit */
*numa_meminfo = ei;
--
2.11.0
next prev parent reply other threads:[~2017-04-10 16:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-10 16:56 [PATCH 0/3] Refine numa_emulation Wei Yang
2017-04-10 16:56 ` Wei Yang [this message]
2017-04-11 0:16 ` [PATCH 1/3] x86/numa_emulation: fix potential memory leak David Rientjes
2017-04-10 16:56 ` [PATCH 2/3] x86/numa_emulation: assign physnode_mask directly from numa_nodes_parsed Wei Yang
2017-04-11 0:26 ` David Rientjes
2017-04-11 1:42 ` Wei Yang
2017-05-01 21:37 ` David Rientjes
2017-05-02 13:06 ` Wei Yang
2017-04-10 16:56 ` [PATCH 3/3] x86/numa_emulation: restructures numa_nodes_parsed from emulated nodes Wei Yang
2017-04-11 0:36 ` David Rientjes
2017-04-11 1:44 ` Wei Yang
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=20170410165652.50250-2-richard.weiyang@gmail.com \
--to=richard.weiyang@gmail.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=kirill@shutemov.name \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=tj@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).