LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jesper Juhl <jesper.juhl@gmail.com>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	linux-mm@kvack.org, Ingo Molnar <mingo@elte.hu>,
	Jesper Juhl <jesper.juhl@gmail.com>
Subject: [PATCH] leak less memory in failure paths of alloc_rt_sched_group()
Date: Mon, 3 Mar 2008 00:09:18 +0100 (CET)	[thread overview]
Message-ID: <alpine.LNX.1.00.0803030002520.4939@dragon.funnycrock.com> (raw)


In kernel/sched.c b/kernel/sched.c::alloc_rt_sched_group() we currently do 
some paired memory allocations, and if one fails we bail out without 
freeing the previous one.

If we fail inside the loop we should proably roll the whole thing back. 
This patch does not do that, it simply frees the first member of the 
paired alloc if the second fails. This is not perfect, but it's a simple 
change that will, at least, result in us leaking a little less than we 
currently do when an allocation fails.

So, not perfect, but better than what we currently have.
Please consider applying.


Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
---

 sched.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/kernel/sched.c b/kernel/sched.c
index f06950c..360857f 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -7685,8 +7685,10 @@ static int alloc_rt_sched_group(struct task_group *tg)
 	if (!tg->rt_rq)
 		goto err;
 	tg->rt_se = kzalloc(sizeof(rt_se) * NR_CPUS, GFP_KERNEL);
-	if (!tg->rt_se)
+	if (!tg->rt_se) {
+		kfree(tg->rt_rq);
 		goto err;
+	}
 
 	tg->rt_runtime = 0;
 
@@ -7700,8 +7702,10 @@ static int alloc_rt_sched_group(struct task_group *tg)
 
 		rt_se = kmalloc_node(sizeof(struct sched_rt_entity),
 				GFP_KERNEL|__GFP_ZERO, cpu_to_node(i));
-		if (!rt_se)
+		if (!rt_se) {
+			kfree(rt_rq);
 			goto err;
+		}
 
 		init_tg_rt_entry(rq, tg, rt_rq, rt_se, i, 0);
 	}


             reply	other threads:[~2008-03-02 23:15 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-02 23:09 Jesper Juhl [this message]
2008-03-02 23:19 ` Peter Zijlstra
2008-03-02 23:29   ` Jesper Juhl

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=alpine.LNX.1.00.0803030002520.4939@dragon.funnycrock.com \
    --to=jesper.juhl@gmail.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mingo@elte.hu \
    --cc=torvalds@linux-foundation.org \
    --subject='Re: [PATCH] leak less memory in failure paths of alloc_rt_sched_group()' \
    /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

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).