public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Vivek Goyal <vgoyal@redhat.com>
To: linux-kernel@vger.kernel.org, axboe@kernel.dk
Cc: dpshah@google.com, namhyung@gmail.com, vgoyal@redhat.com
Subject: [PATCH 1/3] cfq-iosched: Fix a memory leak of per cpu stats for root group
Date: Fri, 20 May 2011 20:02:45 -0400	[thread overview]
Message-ID: <1305936167-8932-2-git-send-email-vgoyal@redhat.com> (raw)
In-Reply-To: <1305936167-8932-1-git-send-email-vgoyal@redhat.com>

We allocated per cpu stats struct for root group but did not free it.
Fix it.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
 block/cfq-iosched.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index d646b27..0316f6e 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -3940,6 +3940,11 @@ static void cfq_exit_queue(struct elevator_queue *e)
 	 */
 	if (wait)
 		synchronize_rcu();
+
+#ifdef CONFIG_CFQ_GROUP_IOSCHED
+	/* Free up per cpu stats for root group */
+	free_percpu(cfqd->root_group.blkg.stats_cpu);
+#endif
 	kfree(cfqd);
 }
 
-- 
1.7.4.4


  reply	other threads:[~2011-05-21  0:03 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-21  0:02 [PATCH 0/3] block: Per cpu merge stats and cfq fix Vivek Goyal
2011-05-21  0:02 ` Vivek Goyal [this message]
2011-05-21  0:02 ` [PATCH 2/3] cfq-iosched: Make IO merge related stats per cpu Vivek Goyal
2011-05-21  0:02 ` [PATCH 3/3] block: call elv_bio_merged() when merged Vivek Goyal
2011-05-21  0:06 ` [PATCH 0/3] block: Per cpu merge stats and cfq fix Vivek Goyal
2011-05-23  8:04   ` Jens Axboe
2011-05-23 13:53     ` Namhyung Kim
2011-05-23 11:07   ` Namhyung Kim
2011-05-23  8:03 ` Jens Axboe

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=1305936167-8932-2-git-send-email-vgoyal@redhat.com \
    --to=vgoyal@redhat.com \
    --cc=axboe@kernel.dk \
    --cc=dpshah@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=namhyung@gmail.com \
    /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