LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] leak less memory in failure paths of alloc_rt_sched_group()
@ 2008-03-02 23:09 Jesper Juhl
  2008-03-02 23:19 ` Peter Zijlstra
  0 siblings, 1 reply; 3+ messages in thread
From: Jesper Juhl @ 2008-03-02 23:09 UTC (permalink / raw)
  To: LKML; +Cc: Peter Zijlstra, Linus Torvalds, linux-mm, Ingo Molnar, Jesper Juhl


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);
 	}


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-03-02 23:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-03-02 23:09 [PATCH] leak less memory in failure paths of alloc_rt_sched_group() Jesper Juhl
2008-03-02 23:19 ` Peter Zijlstra
2008-03-02 23:29   ` Jesper Juhl

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