From nobody Sat Sep 13 11:16:01 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D86D4C636CC for ; Fri, 3 Feb 2023 03:53:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232142AbjBCDxN (ORCPT ); Thu, 2 Feb 2023 22:53:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231761AbjBCDxH (ORCPT ); Thu, 2 Feb 2023 22:53:07 -0500 Received: from out30-111.freemail.mail.aliyun.com (out30-111.freemail.mail.aliyun.com [115.124.30.111]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4B722366C for ; Thu, 2 Feb 2023 19:53:06 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R521e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046056;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0Van-IJ7_1675396384; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0Van-IJ7_1675396384) by smtp.aliyun-inc.com; Fri, 03 Feb 2023 11:53:04 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, linux-erofs@lists.ozlabs.org, huyue2@coolpad.com Cc: linux-kernel@vger.kernel.org Subject: [PATCH 1/3] erofs: add print symbols for various flags in trace Date: Fri, 3 Feb 2023 11:53:01 +0800 Message-Id: <20230203035303.35082-2-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230203035303.35082-1-jefflexu@linux.alibaba.com> References: <20230203035303.35082-1-jefflexu@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As new flags introduced, the corresponding print symbols for trace are not added accordingly. Add these missing print symbols for these flags. Signed-off-by: Jingbo Xu --- include/trace/events/erofs.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/include/trace/events/erofs.h b/include/trace/events/erofs.h index 4f4c44ea3a65..c0dbe9c4f656 100644 --- a/include/trace/events/erofs.h +++ b/include/trace/events/erofs.h @@ -19,12 +19,18 @@ struct erofs_map_blocks; { 1, "DIR" }) =20 #define show_map_flags(flags) __print_flags(flags, "|", \ - { EROFS_GET_BLOCKS_RAW, "RAW" }) + { EROFS_GET_BLOCKS_RAW, "RAW" }, \ + { EROFS_GET_BLOCKS_FIEMAP, "FIEMAP" }, \ + { EROFS_GET_BLOCKS_READMORE, "READMORE" }, \ + { EROFS_GET_BLOCKS_FINDTAIL, "FINDTAIL" }) =20 #define show_mflags(flags) __print_flags(flags, "", \ - { EROFS_MAP_MAPPED, "M" }, \ - { EROFS_MAP_META, "I" }, \ - { EROFS_MAP_ENCODED, "E" }) + { EROFS_MAP_MAPPED, "M" }, \ + { EROFS_MAP_META, "I" }, \ + { EROFS_MAP_ENCODED, "E" }, \ + { EROFS_MAP_FULL_MAPPED, "F" }, \ + { EROFS_MAP_FRAGMENT, "R" }, \ + { EROFS_MAP_PARTIAL_REF, "P" }) =20 TRACE_EVENT(erofs_lookup, =20 --=20 2.19.1.6.gb485710b From nobody Sat Sep 13 11:16:01 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C0FEC636CC for ; Fri, 3 Feb 2023 03:53:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232178AbjBCDxQ (ORCPT ); Thu, 2 Feb 2023 22:53:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231916AbjBCDxJ (ORCPT ); Thu, 2 Feb 2023 22:53:09 -0500 Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBF1A298C3 for ; Thu, 2 Feb 2023 19:53:07 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R161e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046049;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0VanENqc_1675396384; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VanENqc_1675396384) by smtp.aliyun-inc.com; Fri, 03 Feb 2023 11:53:05 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, linux-erofs@lists.ozlabs.org, huyue2@coolpad.com Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2/3] erofs: remove unused flags parameter of erofs_map_blocks() Date: Fri, 3 Feb 2023 11:53:02 +0800 Message-Id: <20230203035303.35082-3-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230203035303.35082-1-jefflexu@linux.alibaba.com> References: <20230203035303.35082-1-jefflexu@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" For erofs_map_blocks() and erofs_map_blocks_flatmode(), the flags argument is always EROFS_GET_BLOCKS_RAW, as the compression routine implements its own map_blocks() variant. Signed-off-by: Jingbo Xu --- fs/erofs/data.c | 14 ++++++-------- fs/erofs/fscache.c | 4 ++-- fs/erofs/internal.h | 5 ++--- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index f57f921683d7..32e66d29968f 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -74,8 +74,7 @@ void *erofs_read_metabuf(struct erofs_buf *buf, struct su= per_block *sb, } =20 static int erofs_map_blocks_flatmode(struct inode *inode, - struct erofs_map_blocks *map, - int flags) + struct erofs_map_blocks *map) { erofs_blk_t nblocks, lastblk; u64 offset =3D map->m_la; @@ -117,8 +116,7 @@ static int erofs_map_blocks_flatmode(struct inode *inod= e, return 0; } =20 -int erofs_map_blocks(struct inode *inode, - struct erofs_map_blocks *map, int flags) +int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map) { struct super_block *sb =3D inode->i_sb; struct erofs_inode *vi =3D EROFS_I(inode); @@ -130,7 +128,7 @@ int erofs_map_blocks(struct inode *inode, void *kaddr; int err =3D 0; =20 - trace_erofs_map_blocks_enter(inode, map, flags); + trace_erofs_map_blocks_enter(inode, map, EROFS_GET_BLOCKS_RAW); map->m_deviceid =3D 0; if (map->m_la >=3D inode->i_size) { /* leave out-of-bound access unmapped */ @@ -140,7 +138,7 @@ int erofs_map_blocks(struct inode *inode, } =20 if (vi->datalayout !=3D EROFS_INODE_CHUNK_BASED) { - err =3D erofs_map_blocks_flatmode(inode, map, flags); + err =3D erofs_map_blocks_flatmode(inode, map); goto out; } =20 @@ -192,7 +190,7 @@ int erofs_map_blocks(struct inode *inode, out: if (!err) map->m_llen =3D map->m_plen; - trace_erofs_map_blocks_exit(inode, map, flags, 0); + trace_erofs_map_blocks_exit(inode, map, EROFS_GET_BLOCKS_RAW, err); return err; } =20 @@ -255,7 +253,7 @@ static int erofs_iomap_begin(struct inode *inode, loff_= t offset, loff_t length, map.m_la =3D offset; map.m_llen =3D length; =20 - ret =3D erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW); + ret =3D erofs_map_blocks(inode, &map); if (ret < 0) return ret; =20 diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index d47b04dfdc48..7f1ef2ffc4db 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -229,7 +229,7 @@ static int erofs_fscache_data_read_slice(struct erofs_f= scache_request *primary) int ret; =20 map.m_la =3D pos; - ret =3D erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW); + ret =3D erofs_map_blocks(inode, &map); if (ret) return ret; =20 @@ -377,7 +377,7 @@ static int erofs_fscache_share_file_open(struct inode *= inode, struct file *filp) struct file *realfile; int ret; =20 - ret =3D erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW); + ret =3D erofs_map_blocks(inode, &map); if (ret) return ret; =20 diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index a63a9e951fe0..323c2c775023 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -445,7 +445,7 @@ struct erofs_map_blocks { unsigned int m_flags; }; =20 -/* Flags used by erofs_map_blocks_flatmode() */ +/* Used to map raw data */ #define EROFS_GET_BLOCKS_RAW 0x0001 /* * Used to get the exact decompressed length, e.g. fiemap (consider lookba= ck @@ -502,8 +502,7 @@ void *erofs_read_metabuf(struct erofs_buf *buf, struct = super_block *sb, int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *dev); int erofs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, u64 start, u64 len); -int erofs_map_blocks(struct inode *inode, - struct erofs_map_blocks *map, int flags); +int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map); =20 /* inode.c */ static inline unsigned long erofs_inode_hash(erofs_nid_t nid) --=20 2.19.1.6.gb485710b From nobody Sat Sep 13 11:16:01 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D38CC61DA4 for ; Fri, 3 Feb 2023 03:53:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232243AbjBCDxW (ORCPT ); Thu, 2 Feb 2023 22:53:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231866AbjBCDxK (ORCPT ); Thu, 2 Feb 2023 22:53:10 -0500 Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0148233CA for ; Thu, 2 Feb 2023 19:53:08 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045176;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0Van4Hcy_1675396385; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0Van4Hcy_1675396385) by smtp.aliyun-inc.com; Fri, 03 Feb 2023 11:53:06 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, linux-erofs@lists.ozlabs.org, huyue2@coolpad.com Cc: linux-kernel@vger.kernel.org Subject: [PATCH 3/3] erofs: call erofs_map_dev() inside erofs_map_blocks() Date: Fri, 3 Feb 2023 11:53:03 +0800 Message-Id: <20230203035303.35082-4-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230203035303.35082-1-jefflexu@linux.alibaba.com> References: <20230203035303.35082-1-jefflexu@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" For now erofs_map_blocks() is always followed by erofs_map_dev(). Make erofs_map_dev() called inside erofs_map_blocks() to reduce code duplication. Signed-off-by: Jingbo Xu --- fs/erofs/data.c | 21 ++++++++++----------- fs/erofs/fscache.c | 20 ++------------------ fs/erofs/internal.h | 3 ++- 3 files changed, 14 insertions(+), 30 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index 32e66d29968f..cbe7a6d6846d 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -116,7 +116,8 @@ static int erofs_map_blocks_flatmode(struct inode *inod= e, return 0; } =20 -int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map) +int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map, + struct erofs_map_dev *mdev) { struct super_block *sb =3D inode->i_sb; struct erofs_inode *vi =3D EROFS_I(inode); @@ -188,8 +189,14 @@ int erofs_map_blocks(struct inode *inode, struct erofs= _map_blocks *map) out_unlock: erofs_put_metabuf(&buf); out: - if (!err) + if (!err) { map->m_llen =3D map->m_plen; + *mdev =3D (struct erofs_map_dev) { + .m_deviceid =3D map->m_deviceid, + .m_pa =3D map->m_pa, + }; + err =3D erofs_map_dev(sb, mdev); + } trace_erofs_map_blocks_exit(inode, map, EROFS_GET_BLOCKS_RAW, err); return err; } @@ -253,15 +260,7 @@ static int erofs_iomap_begin(struct inode *inode, loff= _t offset, loff_t length, map.m_la =3D offset; map.m_llen =3D length; =20 - ret =3D erofs_map_blocks(inode, &map); - if (ret < 0) - return ret; - - mdev =3D (struct erofs_map_dev) { - .m_deviceid =3D map.m_deviceid, - .m_pa =3D map.m_pa, - }; - ret =3D erofs_map_dev(inode->i_sb, &mdev); + ret =3D erofs_map_blocks(inode, &map, &mdev); if (ret) return ret; =20 diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 7f1ef2ffc4db..140ccacc1043 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -229,7 +229,7 @@ static int erofs_fscache_data_read_slice(struct erofs_f= scache_request *primary) int ret; =20 map.m_la =3D pos; - ret =3D erofs_map_blocks(inode, &map); + ret =3D erofs_map_blocks(inode, &map, &mdev); if (ret) return ret; =20 @@ -270,14 +270,6 @@ static int erofs_fscache_data_read_slice(struct erofs_= fscache_request *primary) count =3D min_t(size_t, map.m_llen - (pos - map.m_la), count); DBG_BUGON(!count || count % PAGE_SIZE); =20 - mdev =3D (struct erofs_map_dev) { - .m_deviceid =3D map.m_deviceid, - .m_pa =3D map.m_pa, - }; - ret =3D erofs_map_dev(sb, &mdev); - if (ret) - return ret; - req =3D erofs_fscache_req_chain(primary, count); if (IS_ERR(req)) return PTR_ERR(req); @@ -377,15 +369,7 @@ static int erofs_fscache_share_file_open(struct inode = *inode, struct file *filp) struct file *realfile; int ret; =20 - ret =3D erofs_map_blocks(inode, &map); - if (ret) - return ret; - - mdev =3D (struct erofs_map_dev) { - .m_deviceid =3D map.m_deviceid, - .m_pa =3D map.m_pa, - }; - ret =3D erofs_map_dev(inode->i_sb, &mdev); + ret =3D erofs_map_blocks(inode, &map, &mdev); if (ret) return ret; =20 diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 323c2c775023..c54dec32a868 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -502,7 +502,8 @@ void *erofs_read_metabuf(struct erofs_buf *buf, struct = super_block *sb, int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *dev); int erofs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, u64 start, u64 len); -int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map); +int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map, + struct erofs_map_dev *mdev); =20 /* inode.c */ static inline unsigned long erofs_inode_hash(erofs_nid_t nid) --=20 2.19.1.6.gb485710b