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=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 1CA0AC43331 for ; Tue, 31 Mar 2020 03:55:58 +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 DE6B12072D for ; Tue, 31 Mar 2020 03:55:57 +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="AMOHADyX"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="i8aZrW/j"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="TY3vUDa9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE6B12072D 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-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jJ80L-0008Uy-Ea; Tue, 31 Mar 2020 03:55:57 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jJ80H-0008Uf-2v for linux-f2fs-devel@lists.sourceforge.net; Tue, 31 Mar 2020 03:55:53 +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=GME74zyoFb5YJQa71VFenwsdy2uDNCSk+RSlLHO/clk=; b=AMOHADyX2okrSonmGzP3WX3fHV 0dYkUrdowGmN229EE+vLhqs/lEU5geI3tvg/X8xOc6McNp6W/Q0AvEb4Ljr79bw+BflDPuMizAPRH 0dwmcCzPiLmsmoPgiGsMwuncf+VW62N8sag+UBnw5xjXlY+Gpj/Qff53Rfrl5EbNdvLM=; 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=GME74zyoFb5YJQa71VFenwsdy2uDNCSk+RSlLHO/clk=; b=i8aZrW/jyjfdImwSFcdRDqODi5 zJFXnhypAE/0Sy/sTJy/cGWcVMOimK2R5sAa0iBfKBFMFENj00ji/0PMDVFrrQ4tCH4KUpddeTQcI uByXM1zdVec0AE8dotg9sYe0DNSq+ETHCRQ0KpnAzY7Xe+LVm6KHp1w/lOafocDXNMPA=; 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.92.2) id 1jJ80C-00GIaL-8x for linux-f2fs-devel@lists.sourceforge.net; Tue, 31 Mar 2020 03:55:52 +0000 Received: from localhost (unknown [104.132.1.66]) (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 BF4802072D; Tue, 31 Mar 2020 03:55:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585626937; bh=fF6TSlgWxsY6znxycH05tV8uo9ST8k5HuEb//N9tG8Q=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=TY3vUDa9VITnTr8J9rMGyfT8o0c9XOJPRRTmzrISz+Iq2py8GjYwVxk0RdR0eMhv9 XeFnw/m0POZm8xBUvZetblM2lIzOCQwHwOUfoWwJyjq/Plm+fftXiTi3lWFvi40A8K 1szIvkN3SFc6PBpFMU8Hiedj0nYfGwzuTUQOudFo= Date: Mon, 30 Mar 2020 20:55:37 -0700 From: Jaegeuk Kim To: Chao Yu Message-ID: <20200331035537.GC79749@google.com> References: <20200330100349.56127-1-yuchao0@huawei.com> <20200330184230.GB34947@google.com> <2b5ec2a6-218a-a291-a6fc-d87cd40be4db@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <2b5ec2a6-218a-a291-a6fc-d87cd40be4db@huawei.com> X-Headers-End: 1jJ80C-00GIaL-8x Subject: Re: [f2fs-dev] [PATCH] f2fs: use round_up()/DIV_ROUND_UP() 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 03/31, Chao Yu wrote: > On 2020/3/31 2:42, Jaegeuk Kim wrote: > > On 03/30, Chao Yu wrote: > >> .i_cluster_size should be power of 2, so we can use round_up() instead > >> of roundup() to enhance the calculation. > >> > >> In addition, use DIV_ROUND_UP to clean up codes. > >> > >> Signed-off-by: Chao Yu > >> --- > >> fs/f2fs/data.c | 16 ++++++---------- > >> fs/f2fs/file.c | 17 +++++------------ > >> 2 files changed, 11 insertions(+), 22 deletions(-) > >> > >> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > >> index 0a829a89f596..8257d5e7aa3b 100644 > >> --- a/fs/f2fs/data.c > >> +++ b/fs/f2fs/data.c > >> @@ -1969,8 +1969,6 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page, > >> bool is_readahead) > >> { > >> struct bio *bio = *bio_ret; > >> - const unsigned blkbits = inode->i_blkbits; > >> - const unsigned blocksize = 1 << blkbits; > >> sector_t block_in_file; > >> sector_t last_block; > >> sector_t last_block_in_file; > >> @@ -1979,8 +1977,8 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page, > >> > >> block_in_file = (sector_t)page_index(page); > >> last_block = block_in_file + nr_pages; > >> - last_block_in_file = (f2fs_readpage_limit(inode) + blocksize - 1) >> > >> - blkbits; > >> + last_block_in_file = DIV_ROUND_UP(f2fs_readpage_limit(inode), > >> + PAGE_SIZE); > > > > What if PAGE_SIZE is bigger than 4KB? > > We don't support 8kb+ sized-page, right? That's only assumption below. I don't think we can just replace block with PAGE in every places. > > static int __init init_f2fs_fs(void) > { > int err; > > if (PAGE_SIZE != F2FS_BLKSIZE) { > printk("F2FS not supported on PAGE_SIZE(%lu) != %d\n", > PAGE_SIZE, F2FS_BLKSIZE); > return -EINVAL; > } > > Thanks, > > > > >> if (last_block > last_block_in_file) > >> last_block = last_block_in_file; > >> > >> @@ -2062,7 +2060,7 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page, > >> */ > >> f2fs_wait_on_block_writeback(inode, block_nr); > >> > >> - if (bio_add_page(bio, page, blocksize, 0) < blocksize) > >> + if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) > >> goto submit_and_realloc; > >> > >> inc_page_count(F2FS_I_SB(inode), F2FS_RD_DATA); > >> @@ -2091,16 +2089,14 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret, > >> struct bio *bio = *bio_ret; > >> unsigned int start_idx = cc->cluster_idx << cc->log_cluster_size; > >> sector_t last_block_in_file; > >> - const unsigned blkbits = inode->i_blkbits; > >> - const unsigned blocksize = 1 << blkbits; > >> struct decompress_io_ctx *dic = NULL; > >> int i; > >> int ret = 0; > >> > >> f2fs_bug_on(sbi, f2fs_cluster_is_empty(cc)); > >> > >> - last_block_in_file = (f2fs_readpage_limit(inode) + > >> - blocksize - 1) >> blkbits; > >> + last_block_in_file = DIV_ROUND_UP(f2fs_readpage_limit(inode), > >> + PAGE_SIZE); > >> > >> /* get rid of pages beyond EOF */ > >> for (i = 0; i < cc->cluster_size; i++) { > >> @@ -2197,7 +2193,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret, > >> > >> f2fs_wait_on_block_writeback(inode, blkaddr); > >> > >> - if (bio_add_page(bio, page, blocksize, 0) < blocksize) > >> + if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) > >> goto submit_and_realloc; > >> > >> inc_page_count(sbi, F2FS_RD_DATA); > >> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > >> index c2d38a1c4972..0f8be076620c 100644 > >> --- a/fs/f2fs/file.c > >> +++ b/fs/f2fs/file.c > >> @@ -736,16 +736,9 @@ int f2fs_truncate_blocks(struct inode *inode, u64 from, bool lock) > >> * for compressed file, only support cluster size > >> * aligned truncation. > >> */ > >> - if (f2fs_compressed_file(inode)) { > >> - size_t cluster_shift = PAGE_SHIFT + > >> - F2FS_I(inode)->i_log_cluster_size; > >> - size_t cluster_mask = (1 << cluster_shift) - 1; > >> - > >> - free_from = from >> cluster_shift; > >> - if (from & cluster_mask) > >> - free_from++; > >> - free_from <<= cluster_shift; > >> - } > >> + if (f2fs_compressed_file(inode)) > >> + free_from = round_up(from, > >> + F2FS_I(inode)->i_cluster_size << PAGE_SHIFT); > >> #endif > >> > >> err = f2fs_do_truncate_blocks(inode, free_from, lock); > >> @@ -3537,7 +3530,7 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) > >> > >> end_offset = ADDRS_PER_PAGE(dn.node_page, inode); > >> count = min(end_offset - dn.ofs_in_node, last_idx - page_idx); > >> - count = roundup(count, F2FS_I(inode)->i_cluster_size); > >> + count = round_up(count, F2FS_I(inode)->i_cluster_size); > >> > >> ret = release_compress_blocks(&dn, count); > >> > >> @@ -3689,7 +3682,7 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) > >> > >> end_offset = ADDRS_PER_PAGE(dn.node_page, inode); > >> count = min(end_offset - dn.ofs_in_node, last_idx - page_idx); > >> - count = roundup(count, F2FS_I(inode)->i_cluster_size); > >> + count = round_up(count, F2FS_I(inode)->i_cluster_size); > >> > >> ret = reserve_compress_blocks(&dn, count); > >> > >> -- > >> 2.18.0.rc1 > > . > > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel 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=-7.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 D7321C43331 for ; Tue, 31 Mar 2020 03:55:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D0CA20748 for ; Tue, 31 Mar 2020 03:55:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585626940; bh=fF6TSlgWxsY6znxycH05tV8uo9ST8k5HuEb//N9tG8Q=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=E/J/q3HbjGSQUkilOBNEh7tNQBKKbdUrLtd3dMri+GM01LHo1LXIBoea4w7C9saAW Z1P9uHjkmuktWaYCv/SMaj8N4YoYWaRSyFApL3LrC/QM1oTlgCqTn5fSFpbBfKsbKb 7on0/7U+2BC5GG1oi+DOd+uDjHC+EzIMIWFVIMog= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729824AbgCaDzj (ORCPT ); Mon, 30 Mar 2020 23:55:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:37144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727358AbgCaDzj (ORCPT ); Mon, 30 Mar 2020 23:55:39 -0400 Received: from localhost (unknown [104.132.1.66]) (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 BF4802072D; Tue, 31 Mar 2020 03:55:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585626937; bh=fF6TSlgWxsY6znxycH05tV8uo9ST8k5HuEb//N9tG8Q=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=TY3vUDa9VITnTr8J9rMGyfT8o0c9XOJPRRTmzrISz+Iq2py8GjYwVxk0RdR0eMhv9 XeFnw/m0POZm8xBUvZetblM2lIzOCQwHwOUfoWwJyjq/Plm+fftXiTi3lWFvi40A8K 1szIvkN3SFc6PBpFMU8Hiedj0nYfGwzuTUQOudFo= Date: Mon, 30 Mar 2020 20:55:37 -0700 From: Jaegeuk Kim To: Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, chao@kernel.org Subject: Re: [PATCH] f2fs: use round_up()/DIV_ROUND_UP() Message-ID: <20200331035537.GC79749@google.com> References: <20200330100349.56127-1-yuchao0@huawei.com> <20200330184230.GB34947@google.com> <2b5ec2a6-218a-a291-a6fc-d87cd40be4db@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2b5ec2a6-218a-a291-a6fc-d87cd40be4db@huawei.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/31, Chao Yu wrote: > On 2020/3/31 2:42, Jaegeuk Kim wrote: > > On 03/30, Chao Yu wrote: > >> .i_cluster_size should be power of 2, so we can use round_up() instead > >> of roundup() to enhance the calculation. > >> > >> In addition, use DIV_ROUND_UP to clean up codes. > >> > >> Signed-off-by: Chao Yu > >> --- > >> fs/f2fs/data.c | 16 ++++++---------- > >> fs/f2fs/file.c | 17 +++++------------ > >> 2 files changed, 11 insertions(+), 22 deletions(-) > >> > >> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > >> index 0a829a89f596..8257d5e7aa3b 100644 > >> --- a/fs/f2fs/data.c > >> +++ b/fs/f2fs/data.c > >> @@ -1969,8 +1969,6 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page, > >> bool is_readahead) > >> { > >> struct bio *bio = *bio_ret; > >> - const unsigned blkbits = inode->i_blkbits; > >> - const unsigned blocksize = 1 << blkbits; > >> sector_t block_in_file; > >> sector_t last_block; > >> sector_t last_block_in_file; > >> @@ -1979,8 +1977,8 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page, > >> > >> block_in_file = (sector_t)page_index(page); > >> last_block = block_in_file + nr_pages; > >> - last_block_in_file = (f2fs_readpage_limit(inode) + blocksize - 1) >> > >> - blkbits; > >> + last_block_in_file = DIV_ROUND_UP(f2fs_readpage_limit(inode), > >> + PAGE_SIZE); > > > > What if PAGE_SIZE is bigger than 4KB? > > We don't support 8kb+ sized-page, right? That's only assumption below. I don't think we can just replace block with PAGE in every places. > > static int __init init_f2fs_fs(void) > { > int err; > > if (PAGE_SIZE != F2FS_BLKSIZE) { > printk("F2FS not supported on PAGE_SIZE(%lu) != %d\n", > PAGE_SIZE, F2FS_BLKSIZE); > return -EINVAL; > } > > Thanks, > > > > >> if (last_block > last_block_in_file) > >> last_block = last_block_in_file; > >> > >> @@ -2062,7 +2060,7 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page, > >> */ > >> f2fs_wait_on_block_writeback(inode, block_nr); > >> > >> - if (bio_add_page(bio, page, blocksize, 0) < blocksize) > >> + if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) > >> goto submit_and_realloc; > >> > >> inc_page_count(F2FS_I_SB(inode), F2FS_RD_DATA); > >> @@ -2091,16 +2089,14 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret, > >> struct bio *bio = *bio_ret; > >> unsigned int start_idx = cc->cluster_idx << cc->log_cluster_size; > >> sector_t last_block_in_file; > >> - const unsigned blkbits = inode->i_blkbits; > >> - const unsigned blocksize = 1 << blkbits; > >> struct decompress_io_ctx *dic = NULL; > >> int i; > >> int ret = 0; > >> > >> f2fs_bug_on(sbi, f2fs_cluster_is_empty(cc)); > >> > >> - last_block_in_file = (f2fs_readpage_limit(inode) + > >> - blocksize - 1) >> blkbits; > >> + last_block_in_file = DIV_ROUND_UP(f2fs_readpage_limit(inode), > >> + PAGE_SIZE); > >> > >> /* get rid of pages beyond EOF */ > >> for (i = 0; i < cc->cluster_size; i++) { > >> @@ -2197,7 +2193,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret, > >> > >> f2fs_wait_on_block_writeback(inode, blkaddr); > >> > >> - if (bio_add_page(bio, page, blocksize, 0) < blocksize) > >> + if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) > >> goto submit_and_realloc; > >> > >> inc_page_count(sbi, F2FS_RD_DATA); > >> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > >> index c2d38a1c4972..0f8be076620c 100644 > >> --- a/fs/f2fs/file.c > >> +++ b/fs/f2fs/file.c > >> @@ -736,16 +736,9 @@ int f2fs_truncate_blocks(struct inode *inode, u64 from, bool lock) > >> * for compressed file, only support cluster size > >> * aligned truncation. > >> */ > >> - if (f2fs_compressed_file(inode)) { > >> - size_t cluster_shift = PAGE_SHIFT + > >> - F2FS_I(inode)->i_log_cluster_size; > >> - size_t cluster_mask = (1 << cluster_shift) - 1; > >> - > >> - free_from = from >> cluster_shift; > >> - if (from & cluster_mask) > >> - free_from++; > >> - free_from <<= cluster_shift; > >> - } > >> + if (f2fs_compressed_file(inode)) > >> + free_from = round_up(from, > >> + F2FS_I(inode)->i_cluster_size << PAGE_SHIFT); > >> #endif > >> > >> err = f2fs_do_truncate_blocks(inode, free_from, lock); > >> @@ -3537,7 +3530,7 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) > >> > >> end_offset = ADDRS_PER_PAGE(dn.node_page, inode); > >> count = min(end_offset - dn.ofs_in_node, last_idx - page_idx); > >> - count = roundup(count, F2FS_I(inode)->i_cluster_size); > >> + count = round_up(count, F2FS_I(inode)->i_cluster_size); > >> > >> ret = release_compress_blocks(&dn, count); > >> > >> @@ -3689,7 +3682,7 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) > >> > >> end_offset = ADDRS_PER_PAGE(dn.node_page, inode); > >> count = min(end_offset - dn.ofs_in_node, last_idx - page_idx); > >> - count = roundup(count, F2FS_I(inode)->i_cluster_size); > >> + count = round_up(count, F2FS_I(inode)->i_cluster_size); > >> > >> ret = reserve_compress_blocks(&dn, count); > >> > >> -- > >> 2.18.0.rc1 > > . > >