From: Mike Galbraith <efault@gmx.de>
To: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@elte.hu>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [rfc patch] sched/topology: fix domain reconstruction memory leakage
Date: Sat, 19 Aug 2017 08:10:49 +0200 [thread overview]
Message-ID: <1503123049.5112.49.camel@gmx.de> (raw)
Greetings,
While beating on cpu hotplug with the shiny new topology fixes
backported, my memory poor 8 socket box fairly quickly leaked itself to
death, 0c0e776a9b0f being the culprit. With the below applied, box
took a severe beating overnight without a whimper.
I'm wondering (ergo rfc) if free_sched_groups() shouldn't be renamed to
put_sched_groups() instead, with overlapping domains taking a group
reference reference as well so they can put both sg/sgc rather than put
one free the other. Those places that want an explicit free can pass
free to only explicitly free sg (or use two functions). Minimalist
approach works (minus signs, yay), but could perhaps use some "pretty".
sched/topology: fix domain reconstruction memory leakage
Since 0c0e776a9b0f, build_sched_groups() takes a reference on each
sg and sgc during domain generation, where previously it only took
a reference on the first group. Iterate groups and drop all added
references during domain destruction, otherwise CPU hotplug leaks.
Signed-off-by: Mike Galbraith <mgalbraith@suse.de>
Fixes: 0c0e776a9b0f ("sched/topology: Rewrite get_group()")
---
kernel/sched/topology.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -323,7 +323,7 @@ static struct root_domain *alloc_rootdom
return rd;
}
-static void free_sched_groups(struct sched_group *sg, int free_sgc)
+static void free_sched_groups(struct sched_group *sg, int put)
{
struct sched_group *tmp, *first;
@@ -334,10 +334,11 @@ static void free_sched_groups(struct sch
do {
tmp = sg->next;
- if (free_sgc && atomic_dec_and_test(&sg->sgc->ref))
+ if (put && atomic_dec_and_test(&sg->sgc->ref))
kfree(sg->sgc);
+ if (put < 2 || atomic_dec_and_test(&sg->ref))
+ kfree(sg);
- kfree(sg);
sg = tmp;
} while (sg != first);
}
@@ -345,15 +346,11 @@ static void free_sched_groups(struct sch
static void destroy_sched_domain(struct sched_domain *sd)
{
/*
- * If its an overlapping domain it has private groups, iterate and
- * nuke them all.
+ * If it's an overlapping domain it has private groups, iterate,
+ * freeing groups, otherwise dropping group references. In both
+ * cases, we must drop group capacity references.
*/
- if (sd->flags & SD_OVERLAP) {
- free_sched_groups(sd->groups, 1);
- } else if (atomic_dec_and_test(&sd->groups->ref)) {
- kfree(sd->groups->sgc);
- kfree(sd->groups);
- }
+ free_sched_groups(sd->groups, !(sd->flags & SD_OVERLAP)+1);
if (sd->shared && atomic_dec_and_test(&sd->shared->ref))
kfree(sd->shared);
kfree(sd);
next reply other threads:[~2017-08-19 6:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-19 6:10 Mike Galbraith [this message]
2017-08-19 6:22 ` [rfc patch] sched/topology: fix domain reconstruction memory leakage Mike Galbraith
2017-08-21 8:16 ` Peter Zijlstra
2017-08-21 11:45 ` Mike Galbraith
2017-08-21 13:30 ` Mike Galbraith
2017-08-21 13:43 ` Peter Zijlstra
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=1503123049.5112.49.camel@gmx.de \
--to=efault@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.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