From: Chao Yu <chao@kernel.org>
To: Gao Xiang <hsiangkao@linux.alibaba.com>, linux-erofs@lists.ozlabs.org
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/2] erofs: clean up erofs_map_blocks tracepoints
Date: Thu, 23 Sep 2021 22:13:23 +0800 [thread overview]
Message-ID: <448368d3-d8a2-b872-7000-d93363aec9c6@kernel.org> (raw)
In-Reply-To: <20210921143531.81356-2-hsiangkao@linux.alibaba.com>
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 <hsiangkao@linux.alibaba.com>
> ---
> 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?
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),
>
>
next prev parent reply other threads:[~2021-09-23 14:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-21 14:35 [PATCH 1/2] erofs: fix up erofs_lookup tracepoint Gao Xiang
2021-09-21 14:35 ` Gao Xiang
2021-09-21 14:35 ` [PATCH 2/2] erofs: clean up erofs_map_blocks tracepoints Gao Xiang
2021-09-21 14:35 ` Gao Xiang
2021-09-23 14:13 ` Chao Yu [this message]
2021-09-23 14:35 ` Gao Xiang
2021-09-23 13:34 ` [PATCH 1/2] erofs: fix up erofs_lookup tracepoint Chao Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=448368d3-d8a2-b872-7000-d93363aec9c6@kernel.org \
--to=chao@kernel.org \
--cc=hsiangkao@linux.alibaba.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.