From patchwork Tue Mar 23 12:47:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jing zhang X-Patchwork-Id: 48336 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5F12EB7CB9 for ; Tue, 23 Mar 2010 23:47:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751946Ab0CWMrl (ORCPT ); Tue, 23 Mar 2010 08:47:41 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:61701 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751072Ab0CWMrk (ORCPT ); Tue, 23 Mar 2010 08:47:40 -0400 Received: by gyg8 with SMTP id 8so3178504gyg.19 for ; Tue, 23 Mar 2010 05:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=dvT0ABPUgTbO8+YwEbh1Q7SySv6GP0T3HcqqGOZqzEg=; b=NFLT8N3Da6o5qZTwW1wt0dPqZenT7t3+HgTnMutB1AUnPt+LHApg2Jhc2bOExA97Dl YWCSecbMt6yn8T7+yKrHfpslPBUhD0jgWrR4hxAB0++I/GT+wuJjs1ndpFFKZskim1hT +95q4+9FkbuigvpwWeeNCJv+VLEXfP3+JUeWo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=Rb0JCoK3xY5BSlKj/6nqJ9N3s0ZZ8S4AlPwzHGV91YdH/szQ4KjgGZyoBAIBaP8S8E aVp7O7DC5y7OFG3sJZFbXX6yyzKYsgusYfruzhfjUusdtnRffgqn4fMADJWLO/6IWZjj HqTAeuoyUmZtgipbInzjSa9aV/65GWvqG3G1o= MIME-Version: 1.0 Received: by 10.100.21.9 with SMTP id 9mr4309638anu.215.1269348459692; Tue, 23 Mar 2010 05:47:39 -0700 (PDT) In-Reply-To: <20100322012758.GE11560@thunk.org> References: <20100322012758.GE11560@thunk.org> Date: Tue, 23 Mar 2010 20:47:39 +0800 Message-ID: Subject: Re: [PATCH] ext4: memory leakage in ext4_mb_init() From: jing zhang To: tytso@mit.edu Cc: linux-ext4 , Andreas Dilger , Dave Kleikamp Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 2010/3/22, tytso@mit.edu : > On Sun, Mar 21, 2010 at 10:01:06PM +0800, jing zhang wrote: >> From: Jing Zhang >> >> Date: Sun Mar 21 21:59:35 2010 >> >> Cc: Theodore Ts'o >> Cc: Andreas Dilger >> Cc: Dave Kleikamp >> Signed-off-by: Jing Zhang >> >> --- >> >> --- linux-2.6.32/fs/ext4/mballoc.c 2009-12-03 11:51:22.000000000 +0800 >> +++ ext4_mm_leak/mballoc3.c 2010-03-21 21:37:18.000000000 +0800 >> @@ -2360,6 +2360,24 @@ err_freesgi: >> return -ENOMEM; >> } >> >> +static void ext4_mb_destroy_backend(struct super_block *sb) >> +{ >> + ext4_group_t ngroups = ext4_get_groups_count(sb); >> + ext4_group_t i; >> + struct ext4_sb_info *sbi = EXT4_SB(sb); >> + int j; >> + int num_meta_group_infos = (ngroups + EXT4_DESC_PER_BLOCK(sb) -1) >> + >> EXT4_DESC_PER_BLOCK_BITS(sb); >> + for (i = 0; i < ngroups; i++) >> + kfree(ext4_get_group_info(sb, i)); >> + >> + for (j = 0; j < num_meta_group_infos; j++) >> + kfree(sbi->s_group_info[j]); >> + >> + kfree(sbi->s_group_info); >> + iput(sbi->s_buddy_cache); >> +} >> + > > It would be better if this could be done by making ext4_mb_release() > more flexible, and then calling ext4_mb_release() if there is an error > setting up the data structures in ext4_mb_init(). > > - Ted > Yeah, Ted, going through ext4_mb_release() is clearer. --- for_each_possible_cpu(i) { @@ -2511,7 +2510,8 @@ int ext4_mb_release(struct super_block *sb) atomic_read(&sbi->s_mb_discarded)); } - free_percpu(sbi->s_locality_groups); + if (sbi->s_locality_groups) + free_percpu(sbi->s_locality_groups); if (sbi->s_proc) remove_proc_entry("mb_groups", sbi->s_proc); -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/linux-2.6.32/fs/ext4/mballoc.c b/ext4_mm_leak/mballoc3.c index bba1282..99ca2de 100644 --- a/linux-2.6.32/fs/ext4/mballoc.c +++ b/ext4_mm_leak/mballoc3.c @@ -2417,8 +2417,7 @@ int ext4_mb_init(struct super_block *sb, int needs_recovery) sbi->s_locality_groups = alloc_percpu(struct ext4_locality_group); if (sbi->s_locality_groups == NULL) { - kfree(sbi->s_mb_offsets); - kfree(sbi->s_mb_maxs); + ext4_mb_release(sb); return -ENOMEM; }