From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0521C3A589 for ; Tue, 20 Aug 2019 17:41:31 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 815F222DBF for ; Tue, 20 Aug 2019 17:41:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="XSjmwQKt"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="RZvBKWJL"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="IAvojfdq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 815F222DBF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1i088R-0006ZJ-2e; Tue, 20 Aug 2019 17:41:31 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1i088P-0006Z4-Q4 for linux-f2fs-devel@lists.sourceforge.net; Tue, 20 Aug 2019 17:41:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Q6WX7RD7JkFPMZ096ddZwwMCJQ2QX/pXKZjnOUBiEpg=; b=XSjmwQKtaAJXEt/w5zWgiTWHYI 6JsvAM8HXR/UM4/f5m05vjm1KWbaU7L9xibt8fX9ogdQ5+8sfu5L7m/QSXp1pCeeznVSaJjUFTsZy /Hvv7+eARC/vqhjMYm3oNXbQPjaUZf9ZPmAc2W9+hX9zp9YvM6njC8ZrL2rZwiiGj+kI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Q6WX7RD7JkFPMZ096ddZwwMCJQ2QX/pXKZjnOUBiEpg=; b=RZvBKWJLY8fVVc+9mmZKrIlbO0 I+JMXORmmIlAN7Sz/1clIKjPaiL73QKxL9/PW/niSQC2QntBBUYg4tEn/mwm+QM9h9fenfmoIxd+9 8gCipMHTK0GC24dHmZcli50lJyJL45Cm7GlWtivG2wpNdwC2OI9GUFuxYehaHagcJOg4=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1i088N-009k0F-SF for linux-f2fs-devel@lists.sourceforge.net; Tue, 20 Aug 2019 17:41:29 +0000 Received: from localhost (unknown [104.132.0.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3E8F722DBF; Tue, 20 Aug 2019 17:41:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566322882; bh=FWVnJU/734BjtZUeoOiF/IC901HwXFICLvTYoWO93WI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=IAvojfdq/UJu9x+Exg4sCzdRb/jZtg0ZqF3jcxVtXiDp4ovHPGZC5MXfRM1naC/6V btJmrXmNCLK3D9YH8DIwP3Ef7iwZ0LFGWfYwtfRr65cHLXB6PTm3vx+C/eiWs6cMXc pbwaCeOo9VDp7H5doRdSvZL1riZc2Sha9YDDogDA= Date: Tue, 20 Aug 2019 10:41:21 -0700 From: Jaegeuk Kim To: Chao Yu Message-ID: <20190820174121.GB58214@jaegeuk-macbookpro.roam.corp.google.com> References: <20190726074120.3278-1-yuchao0@huawei.com> <20190819202007.GA23891@jaegeuk-macbookpro.roam.corp.google.com> <99a2713a-50d2-8a77-87d9-661ab7ed3a0c@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <99a2713a-50d2-8a77-87d9-661ab7ed3a0c@huawei.com> User-Agent: Mutt/1.8.2 (2017-04-18) X-Headers-End: 1i088N-009k0F-SF Subject: Re: [f2fs-dev] [PATCH v2] f2fs: allocate memory in batch in build_sit_info() X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 08/20, Chao Yu wrote: > On 2019/8/20 4:20, Jaegeuk Kim wrote: > > On 07/26, Chao Yu wrote: > >> build_sit_info() allocate all bitmaps for each segment one by one, > >> it's quite low efficiency, this pach changes to allocate large > >> continuous memory at a time, and divide it and assign for each bitmaps > >> of segment. For large size image, it can expect improving its mount > >> speed. > > > > Hmm, I hit a kernel panic when mounting a partition during fault injection test: > > > > 726 #ifdef CONFIG_F2FS_CHECK_FS > > 727 if (f2fs_test_bit(offset, sit_i->sit_bitmap) != > > 728 f2fs_test_bit(offset, sit_i->sit_bitmap_mir)) > > 729 f2fs_bug_on(sbi, 1); > > 730 #endif > > We didn't change anything about sit_i->sit_bitmap{_mir,}, it's so wired we panic > here... :( > > I double check the change, but find nothing suspicious, btw, my fault injection > testcase shows normal. > > Jaegeuk, do you have any idea about this issue? I'm bisecting. :P > > Thanks, > > > > > For your information, I'm testing without this patch. > > > > Thanks, > > > >> > >> Signed-off-by: Chen Gong > >> Signed-off-by: Chao Yu > >> --- > >> v2: > >> - fix warning triggered in kmalloc() if requested memory size exceeds 4MB. > >> fs/f2fs/segment.c | 51 +++++++++++++++++++++-------------------------- > >> fs/f2fs/segment.h | 1 + > >> 2 files changed, 24 insertions(+), 28 deletions(-) > >> > >> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c > >> index a661ac32e829..d720eacd9c57 100644 > >> --- a/fs/f2fs/segment.c > >> +++ b/fs/f2fs/segment.c > >> @@ -3941,7 +3941,7 @@ static int build_sit_info(struct f2fs_sb_info *sbi) > >> struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi); > >> struct sit_info *sit_i; > >> unsigned int sit_segs, start; > >> - char *src_bitmap; > >> + char *src_bitmap, *bitmap; > >> unsigned int bitmap_size; > >> > >> /* allocate memory for SIT information */ > >> @@ -3964,27 +3964,31 @@ static int build_sit_info(struct f2fs_sb_info *sbi) > >> if (!sit_i->dirty_sentries_bitmap) > >> return -ENOMEM; > >> > >> +#ifdef CONFIG_F2FS_CHECK_FS > >> + bitmap_size = MAIN_SEGS(sbi) * SIT_VBLOCK_MAP_SIZE * 4; > >> +#else > >> + bitmap_size = MAIN_SEGS(sbi) * SIT_VBLOCK_MAP_SIZE * 3; > >> +#endif > >> + sit_i->bitmap = f2fs_kvzalloc(sbi, bitmap_size, GFP_KERNEL); > >> + if (!sit_i->bitmap) > >> + return -ENOMEM; > >> + > >> + bitmap = sit_i->bitmap; > >> + > >> for (start = 0; start < MAIN_SEGS(sbi); start++) { > >> - sit_i->sentries[start].cur_valid_map > >> - = f2fs_kzalloc(sbi, SIT_VBLOCK_MAP_SIZE, GFP_KERNEL); > >> - sit_i->sentries[start].ckpt_valid_map > >> - = f2fs_kzalloc(sbi, SIT_VBLOCK_MAP_SIZE, GFP_KERNEL); > >> - if (!sit_i->sentries[start].cur_valid_map || > >> - !sit_i->sentries[start].ckpt_valid_map) > >> - return -ENOMEM; > >> + sit_i->sentries[start].cur_valid_map = bitmap; > >> + bitmap += SIT_VBLOCK_MAP_SIZE; > >> + > >> + sit_i->sentries[start].ckpt_valid_map = bitmap; > >> + bitmap += SIT_VBLOCK_MAP_SIZE; > >> > >> #ifdef CONFIG_F2FS_CHECK_FS > >> - sit_i->sentries[start].cur_valid_map_mir > >> - = f2fs_kzalloc(sbi, SIT_VBLOCK_MAP_SIZE, GFP_KERNEL); > >> - if (!sit_i->sentries[start].cur_valid_map_mir) > >> - return -ENOMEM; > >> + sit_i->sentries[start].cur_valid_map_mir = bitmap; > >> + bitmap += SIT_VBLOCK_MAP_SIZE; > >> #endif > >> > >> - sit_i->sentries[start].discard_map > >> - = f2fs_kzalloc(sbi, SIT_VBLOCK_MAP_SIZE, > >> - GFP_KERNEL); > >> - if (!sit_i->sentries[start].discard_map) > >> - return -ENOMEM; > >> + sit_i->sentries[start].discard_map = bitmap; > >> + bitmap += SIT_VBLOCK_MAP_SIZE; > >> } > >> > >> sit_i->tmp_map = f2fs_kzalloc(sbi, SIT_VBLOCK_MAP_SIZE, GFP_KERNEL); > >> @@ -4492,21 +4496,12 @@ static void destroy_free_segmap(struct f2fs_sb_info *sbi) > >> static void destroy_sit_info(struct f2fs_sb_info *sbi) > >> { > >> struct sit_info *sit_i = SIT_I(sbi); > >> - unsigned int start; > >> > >> if (!sit_i) > >> return; > >> > >> - if (sit_i->sentries) { > >> - for (start = 0; start < MAIN_SEGS(sbi); start++) { > >> - kvfree(sit_i->sentries[start].cur_valid_map); > >> -#ifdef CONFIG_F2FS_CHECK_FS > >> - kvfree(sit_i->sentries[start].cur_valid_map_mir); > >> -#endif > >> - kvfree(sit_i->sentries[start].ckpt_valid_map); > >> - kvfree(sit_i->sentries[start].discard_map); > >> - } > >> - } > >> + if (sit_i->sentries) > >> + kvfree(sit_i->bitmap); > >> kvfree(sit_i->tmp_map); > >> > >> kvfree(sit_i->sentries); > >> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h > >> index b74602813a05..ec4d568fd58c 100644 > >> --- a/fs/f2fs/segment.h > >> +++ b/fs/f2fs/segment.h > >> @@ -226,6 +226,7 @@ struct sit_info { > >> block_t sit_base_addr; /* start block address of SIT area */ > >> block_t sit_blocks; /* # of blocks used by SIT area */ > >> block_t written_valid_blocks; /* # of valid blocks in main area */ > >> + char *bitmap; /* all bitmaps pointer */ > >> char *sit_bitmap; /* SIT bitmap pointer */ > >> #ifdef CONFIG_F2FS_CHECK_FS > >> char *sit_bitmap_mir; /* SIT bitmap mirror */ > >> -- > >> 2.18.0.rc1 > > . > > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel