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=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, 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 C1FD2C433EF for ; Thu, 23 Sep 2021 14:36:13 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 E28276109E for ; Thu, 23 Sep 2021 14:36:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E28276109E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.ozlabs.org Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4HFd574Phsz2ywB for ; Fri, 24 Sep 2021 00:36:11 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=uxmkk4Mk; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=198.145.29.99; helo=mail.kernel.org; envelope-from=xiang@kernel.org; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=uxmkk4Mk; dkim-atps=neutral Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4HFd5063Zfz2yg1 for ; Fri, 24 Sep 2021 00:36:04 +1000 (AEST) Received: by mail.kernel.org (Postfix) with ESMTPSA id 997E16109E; Thu, 23 Sep 2021 14:35:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632407762; bh=KFUibeGBJ4FkuumzysDaWGrAI4qssDwrzJIbW8ZA1mc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=uxmkk4MkjRA85QZ9+7nnvqJEW+LePEe9LKTxu4vlwKZRQXIg8RVbzcRwqa0/1T+MH x2MTIPRWrmpjAKYBFz9grTvGo2tulRZnufcbj0tDh++s2td74K8MX1fqCM3fCfiWeH Q2dFuYS9Allrexba/V5xoV24Eol0T4kCZy56yx9kjy6s92WC+OM+kV9JBU0Pr4t7BD zA3PuWb2gc9L4MxRn9CmREOZBqmdtQxeK5xoUtt8BlXqpEgbB9rrGdJGQqgbbNa3xl flffZUoio7S7w67ce3NBd467YM1bSJ/ieaj2po0EVMu/0dLVhMbzQcAzsRzRyr4xFQ 5MEI8SiatnvxA== Date: Thu, 23 Sep 2021 22:35:45 +0800 From: Gao Xiang To: Chao Yu Subject: Re: [PATCH 2/2] erofs: clean up erofs_map_blocks tracepoints Message-ID: <20210923143238.GB1852@hsiangkao-HP-ZHAN-66-Pro-G1> Mail-Followup-To: Chao Yu , Gao Xiang , linux-erofs@lists.ozlabs.org, LKML References: <20210921143531.81356-1-hsiangkao@linux.alibaba.com> <20210921143531.81356-2-hsiangkao@linux.alibaba.com> <448368d3-d8a2-b872-7000-d93363aec9c6@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <448368d3-d8a2-b872-7000-d93363aec9c6@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: linux-erofs@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development of Linux EROFS file system List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gao Xiang , linux-erofs@lists.ozlabs.org, LKML Errors-To: linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Sender: "Linux-erofs" Hi Chao, On Thu, Sep 23, 2021 at 10:13:23PM +0800, Chao Yu wrote: > On 2021/9/21 22:35, Gao Xiang wrote: > > Since the new type of chunk-based files is introduced, there is no > > need to leave flatmode tracepoints. Rename to erofs_map_blocks. > > > > Add the missing FIEMAP tracepoint map flag as well. > > > > Signed-off-by: Gao Xiang > > --- > > fs/erofs/data.c | 31 ++++++++++++++----------------- > > include/trace/events/erofs.h | 7 ++++--- > > 2 files changed, 18 insertions(+), 20 deletions(-) > > > > diff --git a/fs/erofs/data.c b/fs/erofs/data.c > > index 9db8297..020c3e0 100644 > > --- a/fs/erofs/data.c > > +++ b/fs/erofs/data.c > > @@ -26,14 +26,11 @@ static int erofs_map_blocks_flatmode(struct inode *inode, > > struct erofs_map_blocks *map, > > int flags) > > { > > - int err = 0; > > erofs_blk_t nblocks, lastblk; > > u64 offset = map->m_la; > > struct erofs_inode *vi = EROFS_I(inode); > > bool tailendpacking = (vi->datalayout == EROFS_INODE_FLAT_INLINE); > > - trace_erofs_map_blocks_flatmode_enter(inode, map, flags); > > - > > nblocks = DIV_ROUND_UP(inode->i_size, PAGE_SIZE); > > lastblk = nblocks - tailendpacking; > > @@ -57,8 +54,7 @@ static int erofs_map_blocks_flatmode(struct inode *inode, > > "inline data cross block boundary @ nid %llu", > > vi->nid); > > DBG_BUGON(1); > > - err = -EFSCORRUPTED; > > - goto err_out; > > + return -EFSCORRUPTED; > > } > > map->m_flags |= EROFS_MAP_META; > > @@ -67,14 +63,10 @@ static int erofs_map_blocks_flatmode(struct inode *inode, > > "internal error @ nid: %llu (size %llu), m_la 0x%llx", > > vi->nid, inode->i_size, map->m_la); > > DBG_BUGON(1); > > - err = -EIO; > > - goto err_out; > > + return -EIO; > > } > > - > > map->m_llen = map->m_plen; > > -err_out: > > - trace_erofs_map_blocks_flatmode_exit(inode, map, flags, 0); > > - return err; > > + return 0; > > } > > static int erofs_map_blocks(struct inode *inode, > > @@ -89,6 +81,7 @@ static int erofs_map_blocks(struct inode *inode, > > erofs_off_t pos; > > int err = 0; > > + trace_erofs_map_blocks_enter(inode, map, flags); > > if (map->m_la >= inode->i_size) { > > /* leave out-of-bound access unmapped */ > > map->m_flags = 0; > > @@ -96,8 +89,10 @@ static int erofs_map_blocks(struct inode *inode, > > map->m_flags = 0; > map->m_plen = 0; > > It needs to reset map->m_llen to zero here like we did after 'out' label before? Yeah, thanks for catching that! I will fix it in the next version (PATCH 2/2 will be delayed for 5.16...) p.s. I might need to apply the following patches for 5.15 cycle in advance, could you help review these as well? Many thanks! 1. erofs: fix misbehavior of unsupported chunk format check 2. erofs: fix compacted_2b if compacted_4b_initial > totalidx Thanks, Gao Xiang > > Thanks, > > > goto out; > > } > > - if (vi->datalayout != EROFS_INODE_CHUNK_BASED) > > - return erofs_map_blocks_flatmode(inode, map, flags); > > + if (vi->datalayout != EROFS_INODE_CHUNK_BASED) { > > + err = erofs_map_blocks_flatmode(inode, map, flags); > > + goto out; > > + } > > if (vi->chunkformat & EROFS_CHUNK_FORMAT_INDEXES) > > unit = sizeof(*idx); /* chunk index */ > > @@ -109,9 +104,10 @@ static int erofs_map_blocks(struct inode *inode, > > vi->xattr_isize, unit) + unit * chunknr; > > page = erofs_get_meta_page(inode->i_sb, erofs_blknr(pos)); > > - if (IS_ERR(page)) > > - return PTR_ERR(page); > > - > > + if (IS_ERR(page)) { > > + err = PTR_ERR(page); > > + goto out; > > + } > > map->m_la = chunknr << vi->chunkbits; > > map->m_plen = min_t(erofs_off_t, 1UL << vi->chunkbits, > > roundup(inode->i_size - map->m_la, EROFS_BLKSIZ)); > > @@ -147,11 +143,12 @@ static int erofs_map_blocks(struct inode *inode, > > map->m_flags = EROFS_MAP_MAPPED; > > break; > > } > > + map->m_llen = map->m_plen; > > out_unlock: > > unlock_page(page); > > put_page(page); > > out: > > - map->m_llen = map->m_plen; > > + trace_erofs_map_blocks_exit(inode, map, flags, 0); > > return err; > > } > > diff --git a/include/trace/events/erofs.h b/include/trace/events/erofs.h > > index db4f2ce..5c91edd 100644 > > --- a/include/trace/events/erofs.h > > +++ b/include/trace/events/erofs.h > > @@ -19,7 +19,8 @@ > > { 1, "DIR" }) > > #define show_map_flags(flags) __print_flags(flags, "|", \ > > - { EROFS_GET_BLOCKS_RAW, "RAW" }) > > + { EROFS_GET_BLOCKS_RAW, "RAW" }, \ > > + { EROFS_GET_BLOCKS_FIEMAP, "FIEMAP" }) > > #define show_mflags(flags) __print_flags(flags, "", \ > > { EROFS_MAP_MAPPED, "M" }, \ > > @@ -169,7 +170,7 @@ > > __entry->flags ? show_map_flags(__entry->flags) : "NULL") > > ); > > -DEFINE_EVENT(erofs__map_blocks_enter, erofs_map_blocks_flatmode_enter, > > +DEFINE_EVENT(erofs__map_blocks_enter, erofs_map_blocks_enter, > > TP_PROTO(struct inode *inode, struct erofs_map_blocks *map, > > unsigned flags), > > @@ -221,7 +222,7 @@ > > show_mflags(__entry->mflags), __entry->ret) > > ); > > -DEFINE_EVENT(erofs__map_blocks_exit, erofs_map_blocks_flatmode_exit, > > +DEFINE_EVENT(erofs__map_blocks_exit, erofs_map_blocks_exit, > > TP_PROTO(struct inode *inode, struct erofs_map_blocks *map, > > unsigned flags, int ret), > >