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=unavailable 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 837FAC606B0 for ; Tue, 9 Jul 2019 05:06:55 +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 51885216C4; Tue, 9 Jul 2019 05:06:55 +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="YOfJMVeH"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="a4HEwv3x"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="JkBXnKwq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 51885216C4 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 1hkiL8-0005Ye-M9; Tue, 09 Jul 2019 05:06:54 +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 1hkiL7-0005YQ-DU for linux-f2fs-devel@lists.sourceforge.net; Tue, 09 Jul 2019 05:06:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: MIME-Version:Date:Message-ID:From:References:Cc:To:Subject:Sender:Reply-To: 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=hlHF19UVidxEQ1kswlRrNeAyoGg8rzOvsIma8rjf9Wc=; b=YOfJMVeHDJllVLn4xQwutKBuaE qgfUC8zZjbqvoxwH+UU2JyTEk5Um+du4hCk5p2BstqOjunTCo8a3ZDS9MMaDbjvQHzCcGMn4ksh6C CasaFaGtVGB0YVdkfPzFVzfK8ECuz9T48UnttGFAI9u8iAAdIELIU5eh5zBqEvbp+RZU=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date: Message-ID:From:References:Cc:To:Subject:Sender:Reply-To: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=hlHF19UVidxEQ1kswlRrNeAyoGg8rzOvsIma8rjf9Wc=; b=a4HEwv3x7HoYM1TOzg5XnLaDkP CS91JrcTkKpxi+TCsYlBFi+kiIKof1OpaU3x2DaGrrxKmIA3Nr9MXqOWvoHCEsweQkn6jVrCi9T37 ILW6jPce8SK6sMcECxJ6x3ba3roBF2csUGA9LjKRwDUbkqTgraR7sHWo1N20ZhpEGIB4=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1hkiL3-00Cdzo-47 for linux-f2fs-devel@lists.sourceforge.net; Tue, 09 Jul 2019 05:06:53 +0000 Received: from [192.168.0.101] (unknown [49.65.245.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 14CED2073D; Tue, 9 Jul 2019 05:06:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562648803; bh=vRLaNB39pENRx8xaYHGCilgHvRIBsh6uU1qpFKxiZUg=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=JkBXnKwq258WetNLII677gJ2yQ9iCULpibiBmajAtfFg5IR+FSPzOeu3gAl4YxBtm AGTDmST91bdQFhcdSlks6oR2E0WSaDgeJ22T4T0jA86hsC1WsBHqJOTmZUER/yPYvx crYAwck8wyWbX8ycVhdZiaNPK7ZPLRb7i1EsHgog= To: Jaegeuk Kim , Chao Yu References: <20190704081730.46414-1-yuchao0@huawei.com> <20190708234633.GB21769@jaegeuk-macbookpro.roam.corp.google.com> From: Chao Yu Message-ID: <86fb078c-0f9e-8d08-7e3b-29a2b6c8b107@kernel.org> Date: Tue, 9 Jul 2019 13:06:36 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190708234633.GB21769@jaegeuk-macbookpro.roam.corp.google.com> Content-Language: en-US X-Headers-End: 1hkiL3-00Cdzo-47 Subject: Re: [f2fs-dev] [PATCH] 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 2019-7-9 7:46, Jaegeuk Kim wrote: > On 07/04, 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 > > It may give more failure rate? For android, I think there should be no problem, since while startup, memory should be sufficient for f2fs mount. For server or desktop, if there is any failure on memory allocation, f2fs_kzalloc will fallback to vmalloc, so that would not be worse than before, right? Or if you worry about this really, could we add a fast path: build_sit_info() - try allocate sit_i->bitmap - success: divide memory - fail: fallback to old method Thanks, > >> of segment. For large size image, it can expect improving its mount >> speed. >> >> Signed-off-by: Chen Gong >> Signed-off-by: Chao Yu >> --- >> 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 402fbbbb2d7c..73c803af1f31 100644 >> --- a/fs/f2fs/segment.c >> +++ b/fs/f2fs/segment.c >> @@ -3929,7 +3929,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 */ >> @@ -3950,27 +3950,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_kzalloc(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); >> @@ -4440,21 +4444,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 2fd53462fa27..4d171b489130 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