From nobody Sat Feb 7 17:09:30 2026 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 B1B97C7EE29 for ; Tue, 13 Jun 2023 07:41:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238786AbjFMHlZ (ORCPT ); Tue, 13 Jun 2023 03:41:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235184AbjFMHlU (ORCPT ); Tue, 13 Jun 2023 03:41:20 -0400 Received: from out30-101.freemail.mail.aliyun.com (out30-101.freemail.mail.aliyun.com [115.124.30.101]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3317BAA for ; Tue, 13 Jun 2023 00:41:19 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R151e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045192;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0Vl18NbP_1686642075; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0Vl18NbP_1686642075) by smtp.aliyun-inc.com; Tue, 13 Jun 2023 15:41:16 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, huyue2@coolpad.com, linux-erofs@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH v8 1/5] erofs: use absolute position in xattr iterator Date: Tue, 13 Jun 2023 15:41:10 +0800 Message-Id: <20230613074114.120115-2-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230613074114.120115-1-jefflexu@linux.alibaba.com> References: <20230613074114.120115-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" Replace blkaddr/ofs with pos in 'struct erofs_xattr_iter'. After erofs_bread() is introduced to replace raw page cache APIs for metadata I/Os handling, xattr_iter_fixup() is no longer needed anymore. In addition, it is also unnecessary to check if the iterated position is span over the block boundary as absolute offset is used instead of blkaddr + offset pairs. Signed-off-by: Jingbo Xu Reviewed-by: Gao Xiang --- fs/erofs/xattr.c | 162 +++++++++++++++++++---------------------------- 1 file changed, 65 insertions(+), 97 deletions(-) diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c index d9e041d27a35..4c11d4f4cf07 100644 --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -7,26 +7,11 @@ #include #include "xattr.h" =20 -static inline erofs_blk_t erofs_xattr_blkaddr(struct super_block *sb, - unsigned int xattr_id) -{ - return EROFS_SB(sb)->xattr_blkaddr + - erofs_blknr(sb, xattr_id * sizeof(__u32)); -} - -static inline unsigned int erofs_xattr_blkoff(struct super_block *sb, - unsigned int xattr_id) -{ - return erofs_blkoff(sb, xattr_id * sizeof(__u32)); -} - struct xattr_iter { struct super_block *sb; struct erofs_buf buf; + erofs_off_t pos; void *kaddr; - - erofs_blk_t blkaddr; - unsigned int ofs; }; =20 static int erofs_init_inode_xattrs(struct inode *inode) @@ -82,17 +67,16 @@ static int erofs_init_inode_xattrs(struct inode *inode) =20 it.buf =3D __EROFS_BUF_INITIALIZER; erofs_init_metabuf(&it.buf, sb); - it.blkaddr =3D erofs_blknr(sb, erofs_iloc(inode) + vi->inode_isize); - it.ofs =3D erofs_blkoff(sb, erofs_iloc(inode) + vi->inode_isize); + it.pos =3D erofs_iloc(inode) + vi->inode_isize; =20 /* read in shared xattr array (non-atomic, see kmalloc below) */ - it.kaddr =3D erofs_bread(&it.buf, it.blkaddr, EROFS_KMAP); + it.kaddr =3D erofs_bread(&it.buf, erofs_blknr(sb, it.pos), EROFS_KMAP); if (IS_ERR(it.kaddr)) { ret =3D PTR_ERR(it.kaddr); goto out_unlock; } =20 - ih =3D (struct erofs_xattr_ibody_header *)(it.kaddr + it.ofs); + ih =3D it.kaddr + erofs_blkoff(sb, it.pos); vi->xattr_shared_count =3D ih->h_shared_count; vi->xattr_shared_xattrs =3D kmalloc_array(vi->xattr_shared_count, sizeof(uint), GFP_KERNEL); @@ -103,25 +87,20 @@ static int erofs_init_inode_xattrs(struct inode *inode) } =20 /* let's skip ibody header */ - it.ofs +=3D sizeof(struct erofs_xattr_ibody_header); + it.pos +=3D sizeof(struct erofs_xattr_ibody_header); =20 for (i =3D 0; i < vi->xattr_shared_count; ++i) { - if (it.ofs >=3D sb->s_blocksize) { - /* cannot be unaligned */ - DBG_BUGON(it.ofs !=3D sb->s_blocksize); - - it.kaddr =3D erofs_bread(&it.buf, ++it.blkaddr, EROFS_KMAP); - if (IS_ERR(it.kaddr)) { - kfree(vi->xattr_shared_xattrs); - vi->xattr_shared_xattrs =3D NULL; - ret =3D PTR_ERR(it.kaddr); - goto out_unlock; - } - it.ofs =3D 0; + it.kaddr =3D erofs_bread(&it.buf, erofs_blknr(sb, it.pos), + EROFS_KMAP); + if (IS_ERR(it.kaddr)) { + kfree(vi->xattr_shared_xattrs); + vi->xattr_shared_xattrs =3D NULL; + ret =3D PTR_ERR(it.kaddr); + goto out_unlock; } - vi->xattr_shared_xattrs[i] =3D - le32_to_cpu(*(__le32 *)(it.kaddr + it.ofs)); - it.ofs +=3D sizeof(__le32); + vi->xattr_shared_xattrs[i] =3D le32_to_cpu(*(__le32 *) + (it.kaddr + erofs_blkoff(sb, it.pos))); + it.pos +=3D sizeof(__le32); } erofs_put_metabuf(&it.buf); =20 @@ -150,24 +129,11 @@ struct xattr_iter_handlers { unsigned int len); }; =20 -static inline int xattr_iter_fixup(struct xattr_iter *it) -{ - if (it->ofs < it->sb->s_blocksize) - return 0; - - it->blkaddr +=3D erofs_blknr(it->sb, it->ofs); - it->kaddr =3D erofs_bread(&it->buf, it->blkaddr, EROFS_KMAP); - if (IS_ERR(it->kaddr)) - return PTR_ERR(it->kaddr); - it->ofs =3D erofs_blkoff(it->sb, it->ofs); - return 0; -} - static int inline_xattr_iter_begin(struct xattr_iter *it, struct inode *inode) { struct erofs_inode *const vi =3D EROFS_I(inode); - unsigned int xattr_header_sz, inline_xattr_ofs; + unsigned int xattr_header_sz; =20 xattr_header_sz =3D sizeof(struct erofs_xattr_ibody_header) + sizeof(u32) * vi->xattr_shared_count; @@ -176,11 +142,9 @@ static int inline_xattr_iter_begin(struct xattr_iter *= it, return -ENOATTR; } =20 - inline_xattr_ofs =3D vi->inode_isize + xattr_header_sz; - - it->blkaddr =3D erofs_blknr(it->sb, erofs_iloc(inode) + inline_xattr_ofs); - it->ofs =3D erofs_blkoff(it->sb, erofs_iloc(inode) + inline_xattr_ofs); - it->kaddr =3D erofs_bread(&it->buf, it->blkaddr, EROFS_KMAP); + it->pos =3D erofs_iloc(inode) + vi->inode_isize + xattr_header_sz; + it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(it->sb, it->pos), + EROFS_KMAP); if (IS_ERR(it->kaddr)) return PTR_ERR(it->kaddr); return vi->xattr_isize - xattr_header_sz; @@ -188,27 +152,29 @@ static int inline_xattr_iter_begin(struct xattr_iter = *it, =20 /* * Regardless of success or failure, `xattr_foreach' will end up with - * `ofs' pointing to the next xattr item rather than an arbitrary position. + * `pos' pointing to the next xattr item rather than an arbitrary position. */ static int xattr_foreach(struct xattr_iter *it, const struct xattr_iter_handlers *op, unsigned int *tlimit) { struct erofs_xattr_entry entry; + struct super_block *sb =3D it->sb; unsigned int value_sz, processed, slice; int err; =20 - /* 0. fixup blkaddr, ofs, ipage */ - err =3D xattr_iter_fixup(it); - if (err) - return err; + /* 0. fixup blkaddr, pos */ + it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(sb, it->pos), EROFS_KMAP); + if (IS_ERR(it->kaddr)) + return PTR_ERR(it->kaddr); =20 /* * 1. read xattr entry to the memory, * since we do EROFS_XATTR_ALIGN * therefore entry should be in the page */ - entry =3D *(struct erofs_xattr_entry *)(it->kaddr + it->ofs); + entry =3D *(struct erofs_xattr_entry *) + (it->kaddr + erofs_blkoff(sb, it->pos)); if (tlimit) { unsigned int entry_sz =3D erofs_xattr_entry_size(&entry); =20 @@ -220,40 +186,40 @@ static int xattr_foreach(struct xattr_iter *it, *tlimit -=3D entry_sz; } =20 - it->ofs +=3D sizeof(struct erofs_xattr_entry); + it->pos +=3D sizeof(struct erofs_xattr_entry); value_sz =3D le16_to_cpu(entry.e_value_size); =20 /* handle entry */ err =3D op->entry(it, &entry); if (err) { - it->ofs +=3D entry.e_name_len + value_sz; + it->pos +=3D entry.e_name_len + value_sz; goto out; } =20 - /* 2. handle xattr name (ofs will finally be at the end of name) */ + /* 2. handle xattr name (pos will finally be at the end of name) */ processed =3D 0; =20 while (processed < entry.e_name_len) { - if (it->ofs >=3D it->sb->s_blocksize) { - DBG_BUGON(it->ofs > it->sb->s_blocksize); - - err =3D xattr_iter_fixup(it); - if (err) - goto out; - it->ofs =3D 0; + it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(sb, it->pos), + EROFS_KMAP); + if (IS_ERR(it->kaddr)) { + err =3D PTR_ERR(it->kaddr); + goto out; } =20 - slice =3D min_t(unsigned int, it->sb->s_blocksize - it->ofs, + slice =3D min_t(unsigned int, + sb->s_blocksize - erofs_blkoff(sb, it->pos), entry.e_name_len - processed); =20 /* handle name */ - err =3D op->name(it, processed, it->kaddr + it->ofs, slice); + err =3D op->name(it, processed, + it->kaddr + erofs_blkoff(sb, it->pos), slice); if (err) { - it->ofs +=3D entry.e_name_len - processed + value_sz; + it->pos +=3D entry.e_name_len - processed + value_sz; goto out; } =20 - it->ofs +=3D slice; + it->pos +=3D slice; processed +=3D slice; } =20 @@ -263,31 +229,31 @@ static int xattr_foreach(struct xattr_iter *it, if (op->alloc_buffer) { err =3D op->alloc_buffer(it, value_sz); if (err) { - it->ofs +=3D value_sz; + it->pos +=3D value_sz; goto out; } } =20 while (processed < value_sz) { - if (it->ofs >=3D it->sb->s_blocksize) { - DBG_BUGON(it->ofs > it->sb->s_blocksize); - - err =3D xattr_iter_fixup(it); - if (err) - goto out; - it->ofs =3D 0; + it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(sb, it->pos), + EROFS_KMAP); + if (IS_ERR(it->kaddr)) { + err =3D PTR_ERR(it->kaddr); + goto out; } =20 - slice =3D min_t(unsigned int, it->sb->s_blocksize - it->ofs, + slice =3D min_t(unsigned int, + sb->s_blocksize - erofs_blkoff(sb, it->pos), value_sz - processed); - op->value(it, processed, it->kaddr + it->ofs, slice); - it->ofs +=3D slice; + op->value(it, processed, it->kaddr + erofs_blkoff(sb, it->pos), + slice); + it->pos +=3D slice; processed +=3D slice; } =20 out: /* xattrs should be 4-byte aligned (on-disk constraint) */ - it->ofs =3D EROFS_XATTR_ALIGN(it->ofs); + it->pos =3D EROFS_XATTR_ALIGN(it->pos); return err < 0 ? err : 0; } =20 @@ -394,14 +360,15 @@ static int shared_getxattr(struct inode *inode, struc= t getxattr_iter *it) { struct erofs_inode *const vi =3D EROFS_I(inode); struct super_block *const sb =3D it->it.sb; - unsigned int i, xsid; + struct erofs_sb_info *sbi =3D EROFS_SB(sb); + unsigned int i; int ret =3D -ENOATTR; =20 for (i =3D 0; i < vi->xattr_shared_count; ++i) { - xsid =3D vi->xattr_shared_xattrs[i]; - it->it.blkaddr =3D erofs_xattr_blkaddr(sb, xsid); - it->it.ofs =3D erofs_xattr_blkoff(sb, xsid); - it->it.kaddr =3D erofs_bread(&it->it.buf, it->it.blkaddr, EROFS_KMAP); + it->it.pos =3D erofs_pos(sb, sbi->xattr_blkaddr) + + vi->xattr_shared_xattrs[i] * sizeof(__le32); + it->it.kaddr =3D erofs_bread(&it->it.buf, + erofs_blknr(sb, it->it.pos), EROFS_KMAP); if (IS_ERR(it->it.kaddr)) return PTR_ERR(it->it.kaddr); =20 @@ -599,14 +566,15 @@ static int shared_listxattr(struct listxattr_iter *it) struct inode *const inode =3D d_inode(it->dentry); struct erofs_inode *const vi =3D EROFS_I(inode); struct super_block *const sb =3D it->it.sb; - unsigned int i, xsid; + struct erofs_sb_info *sbi =3D EROFS_SB(sb); + unsigned int i; int ret =3D 0; =20 for (i =3D 0; i < vi->xattr_shared_count; ++i) { - xsid =3D vi->xattr_shared_xattrs[i]; - it->it.blkaddr =3D erofs_xattr_blkaddr(sb, xsid); - it->it.ofs =3D erofs_xattr_blkoff(sb, xsid); - it->it.kaddr =3D erofs_bread(&it->it.buf, it->it.blkaddr, EROFS_KMAP); + it->it.pos =3D erofs_pos(sb, sbi->xattr_blkaddr) + + vi->xattr_shared_xattrs[i] * sizeof(__le32); + it->it.kaddr =3D erofs_bread(&it->it.buf, + erofs_blknr(sb, it->it.pos), EROFS_KMAP); if (IS_ERR(it->it.kaddr)) return PTR_ERR(it->it.kaddr); =20 --=20 2.19.1.6.gb485710b From nobody Sat Feb 7 17:09:30 2026 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 7AA7CC77B7A for ; Tue, 13 Jun 2023 07:41:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240230AbjFMHlc (ORCPT ); Tue, 13 Jun 2023 03:41:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236390AbjFMHlY (ORCPT ); Tue, 13 Jun 2023 03:41:24 -0400 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 94146BA for ; Tue, 13 Jun 2023 00:41:21 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R201e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045192;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0Vl1En-._1686642076; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0Vl1En-._1686642076) by smtp.aliyun-inc.com; Tue, 13 Jun 2023 15:41:17 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, huyue2@coolpad.com, linux-erofs@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH v8 2/5] erofs: unify xattr_iter structures Date: Tue, 13 Jun 2023 15:41:11 +0800 Message-Id: <20230613074114.120115-3-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230613074114.120115-1-jefflexu@linux.alibaba.com> References: <20230613074114.120115-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" Unify xattr_iter/listxattr_iter/getxattr_iter structures into erofs_xattr_iter structure. This is in preparation for the following further cleanup. Signed-off-by: Jingbo Xu Reviewed-by: Gao Xiang --- fs/erofs/xattr.c | 146 ++++++++++++++++++++--------------------------- 1 file changed, 62 insertions(+), 84 deletions(-) diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c index 4c11d4f4cf07..b2802121e3aa 100644 --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -7,17 +7,27 @@ #include #include "xattr.h" =20 -struct xattr_iter { +struct erofs_xattr_iter { struct super_block *sb; struct erofs_buf buf; erofs_off_t pos; void *kaddr; + + char *buffer; + int buffer_size, buffer_ofs; + + /* getxattr */ + int index, infix_len; + struct qstr name; + + /* listxattr */ + struct dentry *dentry; }; =20 static int erofs_init_inode_xattrs(struct inode *inode) { struct erofs_inode *const vi =3D EROFS_I(inode); - struct xattr_iter it; + struct erofs_xattr_iter it; unsigned int i; struct erofs_xattr_ibody_header *ih; struct super_block *sb =3D inode->i_sb; @@ -121,15 +131,15 @@ static int erofs_init_inode_xattrs(struct inode *inod= e) * and need to be handled */ struct xattr_iter_handlers { - int (*entry)(struct xattr_iter *_it, struct erofs_xattr_entry *entry); - int (*name)(struct xattr_iter *_it, unsigned int processed, char *buf, + int (*entry)(struct erofs_xattr_iter *it, struct erofs_xattr_entry *entry= ); + int (*name)(struct erofs_xattr_iter *it, unsigned int processed, char *bu= f, unsigned int len); - int (*alloc_buffer)(struct xattr_iter *_it, unsigned int value_sz); - void (*value)(struct xattr_iter *_it, unsigned int processed, char *buf, + int (*alloc_buffer)(struct erofs_xattr_iter *it, unsigned int value_sz); + void (*value)(struct erofs_xattr_iter *it, unsigned int processed, char *= buf, unsigned int len); }; =20 -static int inline_xattr_iter_begin(struct xattr_iter *it, +static int inline_xattr_iter_begin(struct erofs_xattr_iter *it, struct inode *inode) { struct erofs_inode *const vi =3D EROFS_I(inode); @@ -154,7 +164,7 @@ static int inline_xattr_iter_begin(struct xattr_iter *i= t, * Regardless of success or failure, `xattr_foreach' will end up with * `pos' pointing to the next xattr item rather than an arbitrary position. */ -static int xattr_foreach(struct xattr_iter *it, +static int xattr_foreach(struct erofs_xattr_iter *it, const struct xattr_iter_handlers *op, unsigned int *tlimit) { @@ -257,18 +267,10 @@ static int xattr_foreach(struct xattr_iter *it, return err < 0 ? err : 0; } =20 -struct getxattr_iter { - struct xattr_iter it; - - char *buffer; - int buffer_size, index, infix_len; - struct qstr name; -}; - -static int erofs_xattr_long_entrymatch(struct getxattr_iter *it, +static int erofs_xattr_long_entrymatch(struct erofs_xattr_iter *it, struct erofs_xattr_entry *entry) { - struct erofs_sb_info *sbi =3D EROFS_SB(it->it.sb); + struct erofs_sb_info *sbi =3D EROFS_SB(it->sb); struct erofs_xattr_prefix_item *pf =3D sbi->xattr_prefixes + (entry->e_name_index & EROFS_XATTR_LONG_PREFIX_MASK); =20 @@ -286,11 +288,9 @@ static int erofs_xattr_long_entrymatch(struct getxattr= _iter *it, return 0; } =20 -static int xattr_entrymatch(struct xattr_iter *_it, +static int xattr_entrymatch(struct erofs_xattr_iter *it, struct erofs_xattr_entry *entry) { - struct getxattr_iter *it =3D container_of(_it, struct getxattr_iter, it); - /* should also match the infix for long name prefixes */ if (entry->e_name_index & EROFS_XATTR_LONG_PREFIX) return erofs_xattr_long_entrymatch(it, entry); @@ -302,32 +302,27 @@ static int xattr_entrymatch(struct xattr_iter *_it, return 0; } =20 -static int xattr_namematch(struct xattr_iter *_it, +static int xattr_namematch(struct erofs_xattr_iter *it, unsigned int processed, char *buf, unsigned int len) { - struct getxattr_iter *it =3D container_of(_it, struct getxattr_iter, it); - if (memcmp(buf, it->name.name + it->infix_len + processed, len)) return -ENOATTR; return 0; } =20 -static int xattr_checkbuffer(struct xattr_iter *_it, +static int xattr_checkbuffer(struct erofs_xattr_iter *it, unsigned int value_sz) { - struct getxattr_iter *it =3D container_of(_it, struct getxattr_iter, it); int err =3D it->buffer_size < value_sz ? -ERANGE : 0; =20 it->buffer_size =3D value_sz; return !it->buffer ? 1 : err; } =20 -static void xattr_copyvalue(struct xattr_iter *_it, +static void xattr_copyvalue(struct erofs_xattr_iter *it, unsigned int processed, char *buf, unsigned int len) { - struct getxattr_iter *it =3D container_of(_it, struct getxattr_iter, it); - memcpy(it->buffer + processed, buf, len); } =20 @@ -338,41 +333,41 @@ static const struct xattr_iter_handlers find_xattr_ha= ndlers =3D { .value =3D xattr_copyvalue }; =20 -static int inline_getxattr(struct inode *inode, struct getxattr_iter *it) +static int inline_getxattr(struct inode *inode, struct erofs_xattr_iter *i= t) { int ret; unsigned int remaining; =20 - ret =3D inline_xattr_iter_begin(&it->it, inode); + ret =3D inline_xattr_iter_begin(it, inode); if (ret < 0) return ret; =20 remaining =3D ret; while (remaining) { - ret =3D xattr_foreach(&it->it, &find_xattr_handlers, &remaining); + ret =3D xattr_foreach(it, &find_xattr_handlers, &remaining); if (ret !=3D -ENOATTR) break; } return ret ? ret : it->buffer_size; } =20 -static int shared_getxattr(struct inode *inode, struct getxattr_iter *it) +static int shared_getxattr(struct inode *inode, struct erofs_xattr_iter *i= t) { struct erofs_inode *const vi =3D EROFS_I(inode); - struct super_block *const sb =3D it->it.sb; + struct super_block *const sb =3D it->sb; struct erofs_sb_info *sbi =3D EROFS_SB(sb); unsigned int i; int ret =3D -ENOATTR; =20 for (i =3D 0; i < vi->xattr_shared_count; ++i) { - it->it.pos =3D erofs_pos(sb, sbi->xattr_blkaddr) + + it->pos =3D erofs_pos(sb, sbi->xattr_blkaddr) + vi->xattr_shared_xattrs[i] * sizeof(__le32); - it->it.kaddr =3D erofs_bread(&it->it.buf, - erofs_blknr(sb, it->it.pos), EROFS_KMAP); - if (IS_ERR(it->it.kaddr)) - return PTR_ERR(it->it.kaddr); + it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(sb, it->pos), + EROFS_KMAP); + if (IS_ERR(it->kaddr)) + return PTR_ERR(it->kaddr); =20 - ret =3D xattr_foreach(&it->it, &find_xattr_handlers, NULL); + ret =3D xattr_foreach(it, &find_xattr_handlers, NULL); if (ret !=3D -ENOATTR) break; } @@ -394,7 +389,7 @@ int erofs_getxattr(struct inode *inode, int index, void *buffer, size_t buffer_size) { int ret; - struct getxattr_iter it; + struct erofs_xattr_iter it; =20 if (!name) return -EINVAL; @@ -404,22 +399,21 @@ int erofs_getxattr(struct inode *inode, int index, return ret; =20 it.index =3D index; - it.name.len =3D strlen(name); + it.name =3D (struct qstr)QSTR_INIT(name, strlen(name)); if (it.name.len > EROFS_NAME_LEN) return -ERANGE; =20 - it.it.sb =3D inode->i_sb; - it.it.buf =3D __EROFS_BUF_INITIALIZER; - erofs_init_metabuf(&it.it.buf, it.it.sb); - it.name.name =3D name; - + it.sb =3D inode->i_sb; + it.buf =3D __EROFS_BUF_INITIALIZER; + erofs_init_metabuf(&it.buf, it.sb); it.buffer =3D buffer; it.buffer_size =3D buffer_size; + it.buffer_ofs =3D 0; =20 ret =3D inline_getxattr(inode, &it); if (ret =3D=3D -ENOATTR) ret =3D shared_getxattr(inode, &it); - erofs_put_metabuf(&it.it.buf); + erofs_put_metabuf(&it.buf); return ret; } =20 @@ -465,25 +459,15 @@ const struct xattr_handler *erofs_xattr_handlers[] = =3D { NULL, }; =20 -struct listxattr_iter { - struct xattr_iter it; - - struct dentry *dentry; - char *buffer; - int buffer_size, buffer_ofs; -}; - -static int xattr_entrylist(struct xattr_iter *_it, +static int xattr_entrylist(struct erofs_xattr_iter *it, struct erofs_xattr_entry *entry) { - struct listxattr_iter *it =3D - container_of(_it, struct listxattr_iter, it); unsigned int base_index =3D entry->e_name_index; unsigned int prefix_len, infix_len =3D 0; const char *prefix, *infix =3D NULL; =20 if (entry->e_name_index & EROFS_XATTR_LONG_PREFIX) { - struct erofs_sb_info *sbi =3D EROFS_SB(_it->sb); + struct erofs_sb_info *sbi =3D EROFS_SB(it->sb); struct erofs_xattr_prefix_item *pf =3D sbi->xattr_prefixes + (entry->e_name_index & EROFS_XATTR_LONG_PREFIX_MASK); =20 @@ -515,23 +499,17 @@ static int xattr_entrylist(struct xattr_iter *_it, return 0; } =20 -static int xattr_namelist(struct xattr_iter *_it, +static int xattr_namelist(struct erofs_xattr_iter *it, unsigned int processed, char *buf, unsigned int len) { - struct listxattr_iter *it =3D - container_of(_it, struct listxattr_iter, it); - memcpy(it->buffer + it->buffer_ofs, buf, len); it->buffer_ofs +=3D len; return 0; } =20 -static int xattr_skipvalue(struct xattr_iter *_it, +static int xattr_skipvalue(struct erofs_xattr_iter *it, unsigned int value_sz) { - struct listxattr_iter *it =3D - container_of(_it, struct listxattr_iter, it); - it->buffer[it->buffer_ofs++] =3D '\0'; return 1; } @@ -543,42 +521,42 @@ static const struct xattr_iter_handlers list_xattr_ha= ndlers =3D { .value =3D NULL }; =20 -static int inline_listxattr(struct listxattr_iter *it) +static int inline_listxattr(struct erofs_xattr_iter *it) { int ret; unsigned int remaining; =20 - ret =3D inline_xattr_iter_begin(&it->it, d_inode(it->dentry)); + ret =3D inline_xattr_iter_begin(it, d_inode(it->dentry)); if (ret < 0) return ret; =20 remaining =3D ret; while (remaining) { - ret =3D xattr_foreach(&it->it, &list_xattr_handlers, &remaining); + ret =3D xattr_foreach(it, &list_xattr_handlers, &remaining); if (ret) break; } return ret ? ret : it->buffer_ofs; } =20 -static int shared_listxattr(struct listxattr_iter *it) +static int shared_listxattr(struct erofs_xattr_iter *it) { struct inode *const inode =3D d_inode(it->dentry); struct erofs_inode *const vi =3D EROFS_I(inode); - struct super_block *const sb =3D it->it.sb; + struct super_block *const sb =3D it->sb; struct erofs_sb_info *sbi =3D EROFS_SB(sb); unsigned int i; int ret =3D 0; =20 for (i =3D 0; i < vi->xattr_shared_count; ++i) { - it->it.pos =3D erofs_pos(sb, sbi->xattr_blkaddr) + + it->pos =3D erofs_pos(sb, sbi->xattr_blkaddr) + vi->xattr_shared_xattrs[i] * sizeof(__le32); - it->it.kaddr =3D erofs_bread(&it->it.buf, - erofs_blknr(sb, it->it.pos), EROFS_KMAP); - if (IS_ERR(it->it.kaddr)) - return PTR_ERR(it->it.kaddr); + it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(sb, it->pos), + EROFS_KMAP); + if (IS_ERR(it->kaddr)) + return PTR_ERR(it->kaddr); =20 - ret =3D xattr_foreach(&it->it, &list_xattr_handlers, NULL); + ret =3D xattr_foreach(it, &list_xattr_handlers, NULL); if (ret) break; } @@ -589,7 +567,7 @@ ssize_t erofs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size) { int ret; - struct listxattr_iter it; + struct erofs_xattr_iter it; =20 ret =3D erofs_init_inode_xattrs(d_inode(dentry)); if (ret =3D=3D -ENOATTR) @@ -597,9 +575,9 @@ ssize_t erofs_listxattr(struct dentry *dentry, if (ret) return ret; =20 - it.it.sb =3D dentry->d_sb; - it.it.buf =3D __EROFS_BUF_INITIALIZER; - erofs_init_metabuf(&it.it.buf, it.it.sb); + it.sb =3D dentry->d_sb; + it.buf =3D __EROFS_BUF_INITIALIZER; + erofs_init_metabuf(&it.buf, it.sb); it.dentry =3D dentry; it.buffer =3D buffer; it.buffer_size =3D buffer_size; @@ -608,7 +586,7 @@ ssize_t erofs_listxattr(struct dentry *dentry, ret =3D inline_listxattr(&it); if (ret >=3D 0 || ret =3D=3D -ENOATTR) ret =3D shared_listxattr(&it); - erofs_put_metabuf(&it.it.buf); + erofs_put_metabuf(&it.buf); return ret; } =20 --=20 2.19.1.6.gb485710b From nobody Sat Feb 7 17:09:30 2026 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 640FBC77B7A for ; Tue, 13 Jun 2023 07:41:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239225AbjFMHl2 (ORCPT ); Tue, 13 Jun 2023 03:41:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235289AbjFMHlW (ORCPT ); Tue, 13 Jun 2023 03:41:22 -0400 Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66D0AAA for ; Tue, 13 Jun 2023 00:41:21 -0700 (PDT) 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=ay29a033018045176;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0Vl18Ncv_1686642077; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0Vl18Ncv_1686642077) by smtp.aliyun-inc.com; Tue, 13 Jun 2023 15:41:18 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, huyue2@coolpad.com, linux-erofs@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH v8 3/5] erofs: make the size of read data stored in buffer_ofs Date: Tue, 13 Jun 2023 15:41:12 +0800 Message-Id: <20230613074114.120115-4-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230613074114.120115-1-jefflexu@linux.alibaba.com> References: <20230613074114.120115-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" Since now xattr_iter structures have been unified, make the size of the read data stored in buffer_ofs. Don't bother reusing buffer_size for this use, which may be confusing. This is in preparation for the following further cleanup. Signed-off-by: Jingbo Xu Reviewed-by: Gao Xiang --- fs/erofs/xattr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c index b2802121e3aa..8a114c7b6c66 100644 --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -315,7 +315,7 @@ static int xattr_checkbuffer(struct erofs_xattr_iter *i= t, { int err =3D it->buffer_size < value_sz ? -ERANGE : 0; =20 - it->buffer_size =3D value_sz; + it->buffer_ofs =3D value_sz; return !it->buffer ? 1 : err; } =20 @@ -348,7 +348,7 @@ static int inline_getxattr(struct inode *inode, struct = erofs_xattr_iter *it) if (ret !=3D -ENOATTR) break; } - return ret ? ret : it->buffer_size; + return ret ? ret : it->buffer_ofs; } =20 static int shared_getxattr(struct inode *inode, struct erofs_xattr_iter *i= t) @@ -371,7 +371,7 @@ static int shared_getxattr(struct inode *inode, struct = erofs_xattr_iter *it) if (ret !=3D -ENOATTR) break; } - return ret ? ret : it->buffer_size; + return ret ? ret : it->buffer_ofs; } =20 static bool erofs_xattr_user_list(struct dentry *dentry) --=20 2.19.1.6.gb485710b From nobody Sat Feb 7 17:09:30 2026 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 26313C7EE29 for ; Tue, 13 Jun 2023 07:41:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240589AbjFMHlj (ORCPT ); Tue, 13 Jun 2023 03:41:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238470AbjFMHlZ (ORCPT ); Tue, 13 Jun 2023 03:41:25 -0400 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 AED8FCC for ; Tue, 13 Jun 2023 00:41:22 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R281e4;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_---0Vl1HGQU_1686642078; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0Vl1HGQU_1686642078) by smtp.aliyun-inc.com; Tue, 13 Jun 2023 15:41:19 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, huyue2@coolpad.com, linux-erofs@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH v8 4/5] erofs: unify inline/shared xattr iterators for listxattr/getxattr Date: Tue, 13 Jun 2023 15:41:13 +0800 Message-Id: <20230613074114.120115-5-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230613074114.120115-1-jefflexu@linux.alibaba.com> References: <20230613074114.120115-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" Make inline_{list,get}xattr() as well as inline_xattr_iter_begin() unified as erofs_xattr_iter_inline(), and shared_{list,get}xattr() unified as erofs_xattr_iter_shared(). After these changes, both erofs_xattr_iter_{inline,shared}() return 0 on success, and negative error on failure. One thing worth noting is that, the logic of returning it->buffer_ofs when there's no shared xattrs in shared_listxattr() is moved to erofs_listxattr() to make the unification possible. The only difference is that, semantically the old behavior will return ENOATTR rather than it->buffer_ofs if ENOATTR encountered when listxattr is parsing upon a specific shared xattr, while now the new behavior will return it->buffer_ofs in this case. This is not an issue, as listxattr upon a specific xattr won't return ENOATTR. Signed-off-by: Jingbo Xu --- fs/erofs/xattr.c | 188 ++++++++++++++++++----------------------------- 1 file changed, 73 insertions(+), 115 deletions(-) diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c index 8a114c7b6c66..c3cb01a8b446 100644 --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -139,27 +139,6 @@ struct xattr_iter_handlers { unsigned int len); }; =20 -static int inline_xattr_iter_begin(struct erofs_xattr_iter *it, - struct inode *inode) -{ - struct erofs_inode *const vi =3D EROFS_I(inode); - unsigned int xattr_header_sz; - - xattr_header_sz =3D sizeof(struct erofs_xattr_ibody_header) + - sizeof(u32) * vi->xattr_shared_count; - if (xattr_header_sz >=3D vi->xattr_isize) { - DBG_BUGON(xattr_header_sz > vi->xattr_isize); - return -ENOATTR; - } - - it->pos =3D erofs_iloc(inode) + vi->inode_isize + xattr_header_sz; - it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(it->sb, it->pos), - EROFS_KMAP); - if (IS_ERR(it->kaddr)) - return PTR_ERR(it->kaddr); - return vi->xattr_isize - xattr_header_sz; -} - /* * Regardless of success or failure, `xattr_foreach' will end up with * `pos' pointing to the next xattr item rather than an arbitrary position. @@ -333,47 +312,6 @@ static const struct xattr_iter_handlers find_xattr_han= dlers =3D { .value =3D xattr_copyvalue }; =20 -static int inline_getxattr(struct inode *inode, struct erofs_xattr_iter *i= t) -{ - int ret; - unsigned int remaining; - - ret =3D inline_xattr_iter_begin(it, inode); - if (ret < 0) - return ret; - - remaining =3D ret; - while (remaining) { - ret =3D xattr_foreach(it, &find_xattr_handlers, &remaining); - if (ret !=3D -ENOATTR) - break; - } - return ret ? ret : it->buffer_ofs; -} - -static int shared_getxattr(struct inode *inode, struct erofs_xattr_iter *i= t) -{ - struct erofs_inode *const vi =3D EROFS_I(inode); - struct super_block *const sb =3D it->sb; - struct erofs_sb_info *sbi =3D EROFS_SB(sb); - unsigned int i; - int ret =3D -ENOATTR; - - for (i =3D 0; i < vi->xattr_shared_count; ++i) { - it->pos =3D erofs_pos(sb, sbi->xattr_blkaddr) + - vi->xattr_shared_xattrs[i] * sizeof(__le32); - it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(sb, it->pos), - EROFS_KMAP); - if (IS_ERR(it->kaddr)) - return PTR_ERR(it->kaddr); - - ret =3D xattr_foreach(it, &find_xattr_handlers, NULL); - if (ret !=3D -ENOATTR) - break; - } - return ret ? ret : it->buffer_ofs; -} - static bool erofs_xattr_user_list(struct dentry *dentry) { return test_opt(&EROFS_SB(dentry->d_sb)->opt, XATTR_USER); @@ -384,39 +322,6 @@ static bool erofs_xattr_trusted_list(struct dentry *de= ntry) return capable(CAP_SYS_ADMIN); } =20 -int erofs_getxattr(struct inode *inode, int index, - const char *name, - void *buffer, size_t buffer_size) -{ - int ret; - struct erofs_xattr_iter it; - - if (!name) - return -EINVAL; - - ret =3D erofs_init_inode_xattrs(inode); - if (ret) - return ret; - - it.index =3D index; - it.name =3D (struct qstr)QSTR_INIT(name, strlen(name)); - if (it.name.len > EROFS_NAME_LEN) - return -ERANGE; - - it.sb =3D inode->i_sb; - it.buf =3D __EROFS_BUF_INITIALIZER; - erofs_init_metabuf(&it.buf, it.sb); - it.buffer =3D buffer; - it.buffer_size =3D buffer_size; - it.buffer_ofs =3D 0; - - ret =3D inline_getxattr(inode, &it); - if (ret =3D=3D -ENOATTR) - ret =3D shared_getxattr(inode, &it); - erofs_put_metabuf(&it.buf); - return ret; -} - static int erofs_xattr_generic_get(const struct xattr_handler *handler, struct dentry *unused, struct inode *inode, const char *name, void *buffer, size_t size) @@ -521,32 +426,49 @@ static const struct xattr_iter_handlers list_xattr_ha= ndlers =3D { .value =3D NULL }; =20 -static int inline_listxattr(struct erofs_xattr_iter *it) +static int erofs_xattr_iter_inline(struct erofs_xattr_iter *it, + struct inode *inode, bool getxattr) { + struct erofs_inode *const vi =3D EROFS_I(inode); + const struct xattr_iter_handlers *op; + unsigned int xattr_header_sz, remaining; int ret; - unsigned int remaining; =20 - ret =3D inline_xattr_iter_begin(it, d_inode(it->dentry)); - if (ret < 0) - return ret; + xattr_header_sz =3D sizeof(struct erofs_xattr_ibody_header) + + sizeof(u32) * vi->xattr_shared_count; + if (xattr_header_sz >=3D vi->xattr_isize) { + DBG_BUGON(xattr_header_sz > vi->xattr_isize); + return -ENOATTR; + } + + it->pos =3D erofs_iloc(inode) + vi->inode_isize + xattr_header_sz; + it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(it->sb, it->pos), + EROFS_KMAP); + if (IS_ERR(it->kaddr)) + return PTR_ERR(it->kaddr); + + remaining =3D vi->xattr_isize - xattr_header_sz; + op =3D getxattr ? &find_xattr_handlers : &list_xattr_handlers; =20 - remaining =3D ret; while (remaining) { - ret =3D xattr_foreach(it, &list_xattr_handlers, &remaining); - if (ret) + ret =3D xattr_foreach(it, op, &remaining); + if ((getxattr && ret !=3D -ENOATTR) || (!getxattr && ret)) break; } - return ret ? ret : it->buffer_ofs; + return ret; } =20 -static int shared_listxattr(struct erofs_xattr_iter *it) +static int erofs_xattr_iter_shared(struct erofs_xattr_iter *it, + struct inode *inode, bool getxattr) { - struct inode *const inode =3D d_inode(it->dentry); struct erofs_inode *const vi =3D EROFS_I(inode); struct super_block *const sb =3D it->sb; struct erofs_sb_info *sbi =3D EROFS_SB(sb); unsigned int i; - int ret =3D 0; + const struct xattr_iter_handlers *op; + int ret =3D -ENOATTR; + + op =3D getxattr ? &find_xattr_handlers : &list_xattr_handlers; =20 for (i =3D 0; i < vi->xattr_shared_count; ++i) { it->pos =3D erofs_pos(sb, sbi->xattr_blkaddr) + @@ -556,11 +478,44 @@ static int shared_listxattr(struct erofs_xattr_iter *= it) if (IS_ERR(it->kaddr)) return PTR_ERR(it->kaddr); =20 - ret =3D xattr_foreach(it, &list_xattr_handlers, NULL); - if (ret) + ret =3D xattr_foreach(it, op, NULL); + if ((getxattr && ret !=3D -ENOATTR) || (!getxattr && ret)) break; } - return ret ? ret : it->buffer_ofs; + return ret; +} + +int erofs_getxattr(struct inode *inode, int index, + const char *name, + void *buffer, size_t buffer_size) +{ + int ret; + struct erofs_xattr_iter it; + + if (!name) + return -EINVAL; + + ret =3D erofs_init_inode_xattrs(inode); + if (ret) + return ret; + + it.index =3D index; + it.name =3D (struct qstr)QSTR_INIT(name, strlen(name)); + if (it.name.len > EROFS_NAME_LEN) + return -ERANGE; + + it.sb =3D inode->i_sb; + it.buf =3D __EROFS_BUF_INITIALIZER; + erofs_init_metabuf(&it.buf, it.sb); + it.buffer =3D buffer; + it.buffer_size =3D buffer_size; + it.buffer_ofs =3D 0; + + ret =3D erofs_xattr_iter_inline(&it, inode, true); + if (ret =3D=3D -ENOATTR) + ret =3D erofs_xattr_iter_shared(&it, inode, true); + erofs_put_metabuf(&it.buf); + return ret ? ret : it.buffer_ofs; } =20 ssize_t erofs_listxattr(struct dentry *dentry, @@ -568,8 +523,9 @@ ssize_t erofs_listxattr(struct dentry *dentry, { int ret; struct erofs_xattr_iter it; + struct inode *inode =3D d_inode(dentry); =20 - ret =3D erofs_init_inode_xattrs(d_inode(dentry)); + ret =3D erofs_init_inode_xattrs(inode); if (ret =3D=3D -ENOATTR) return 0; if (ret) @@ -583,11 +539,13 @@ ssize_t erofs_listxattr(struct dentry *dentry, it.buffer_size =3D buffer_size; it.buffer_ofs =3D 0; =20 - ret =3D inline_listxattr(&it); - if (ret >=3D 0 || ret =3D=3D -ENOATTR) - ret =3D shared_listxattr(&it); + ret =3D erofs_xattr_iter_inline(&it, inode, false); + if (!ret || ret =3D=3D -ENOATTR) + ret =3D erofs_xattr_iter_shared(&it, inode, false); + if (ret =3D=3D -ENOATTR) + ret =3D 0; erofs_put_metabuf(&it.buf); - return ret; + return ret ? ret : it.buffer_ofs; } =20 void erofs_xattr_prefixes_cleanup(struct super_block *sb) --=20 2.19.1.6.gb485710b From nobody Sat Feb 7 17:09:30 2026 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 242F2C7EE29 for ; Tue, 13 Jun 2023 07:41:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240611AbjFMHlq (ORCPT ); Tue, 13 Jun 2023 03:41:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236390AbjFMHlg (ORCPT ); Tue, 13 Jun 2023 03:41:36 -0400 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 82618AA for ; Tue, 13 Jun 2023 00:41:23 -0700 (PDT) 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=ay29a033018045192;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0Vl1EOLv_1686642079; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0Vl1EOLv_1686642079) by smtp.aliyun-inc.com; Tue, 13 Jun 2023 15:41:20 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, huyue2@coolpad.com, linux-erofs@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH v8 5/5] erofs: use separate xattr parsers for listxattr/getxattr Date: Tue, 13 Jun 2023 15:41:14 +0800 Message-Id: <20230613074114.120115-6-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230613074114.120115-1-jefflexu@linux.alibaba.com> References: <20230613074114.120115-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" There's a callback styled xattr parser, i.e. xattr_foreach(), which is shared among listxattr and getxattr. Convert it to two separate xattr parsers to serve listxattr and getxattr for better readability. Signed-off-by: Jingbo Xu --- fs/erofs/xattr.c | 371 +++++++++++++++++------------------------------ 1 file changed, 137 insertions(+), 234 deletions(-) diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c index c3cb01a8b446..4376f654474d 100644 --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -123,195 +123,6 @@ static int erofs_init_inode_xattrs(struct inode *inod= e) return ret; } =20 -/* - * the general idea for these return values is - * if 0 is returned, go on processing the current xattr; - * 1 (> 0) is returned, skip this round to process the next xattr; - * -err (< 0) is returned, an error (maybe ENOXATTR) occurred - * and need to be handled - */ -struct xattr_iter_handlers { - int (*entry)(struct erofs_xattr_iter *it, struct erofs_xattr_entry *entry= ); - int (*name)(struct erofs_xattr_iter *it, unsigned int processed, char *bu= f, - unsigned int len); - int (*alloc_buffer)(struct erofs_xattr_iter *it, unsigned int value_sz); - void (*value)(struct erofs_xattr_iter *it, unsigned int processed, char *= buf, - unsigned int len); -}; - -/* - * Regardless of success or failure, `xattr_foreach' will end up with - * `pos' pointing to the next xattr item rather than an arbitrary position. - */ -static int xattr_foreach(struct erofs_xattr_iter *it, - const struct xattr_iter_handlers *op, - unsigned int *tlimit) -{ - struct erofs_xattr_entry entry; - struct super_block *sb =3D it->sb; - unsigned int value_sz, processed, slice; - int err; - - /* 0. fixup blkaddr, pos */ - it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(sb, it->pos), EROFS_KMAP); - if (IS_ERR(it->kaddr)) - return PTR_ERR(it->kaddr); - - /* - * 1. read xattr entry to the memory, - * since we do EROFS_XATTR_ALIGN - * therefore entry should be in the page - */ - entry =3D *(struct erofs_xattr_entry *) - (it->kaddr + erofs_blkoff(sb, it->pos)); - if (tlimit) { - unsigned int entry_sz =3D erofs_xattr_entry_size(&entry); - - /* xattr on-disk corruption: xattr entry beyond xattr_isize */ - if (*tlimit < entry_sz) { - DBG_BUGON(1); - return -EFSCORRUPTED; - } - *tlimit -=3D entry_sz; - } - - it->pos +=3D sizeof(struct erofs_xattr_entry); - value_sz =3D le16_to_cpu(entry.e_value_size); - - /* handle entry */ - err =3D op->entry(it, &entry); - if (err) { - it->pos +=3D entry.e_name_len + value_sz; - goto out; - } - - /* 2. handle xattr name (pos will finally be at the end of name) */ - processed =3D 0; - - while (processed < entry.e_name_len) { - it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(sb, it->pos), - EROFS_KMAP); - if (IS_ERR(it->kaddr)) { - err =3D PTR_ERR(it->kaddr); - goto out; - } - - slice =3D min_t(unsigned int, - sb->s_blocksize - erofs_blkoff(sb, it->pos), - entry.e_name_len - processed); - - /* handle name */ - err =3D op->name(it, processed, - it->kaddr + erofs_blkoff(sb, it->pos), slice); - if (err) { - it->pos +=3D entry.e_name_len - processed + value_sz; - goto out; - } - - it->pos +=3D slice; - processed +=3D slice; - } - - /* 3. handle xattr value */ - processed =3D 0; - - if (op->alloc_buffer) { - err =3D op->alloc_buffer(it, value_sz); - if (err) { - it->pos +=3D value_sz; - goto out; - } - } - - while (processed < value_sz) { - it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(sb, it->pos), - EROFS_KMAP); - if (IS_ERR(it->kaddr)) { - err =3D PTR_ERR(it->kaddr); - goto out; - } - - slice =3D min_t(unsigned int, - sb->s_blocksize - erofs_blkoff(sb, it->pos), - value_sz - processed); - op->value(it, processed, it->kaddr + erofs_blkoff(sb, it->pos), - slice); - it->pos +=3D slice; - processed +=3D slice; - } - -out: - /* xattrs should be 4-byte aligned (on-disk constraint) */ - it->pos =3D EROFS_XATTR_ALIGN(it->pos); - return err < 0 ? err : 0; -} - -static int erofs_xattr_long_entrymatch(struct erofs_xattr_iter *it, - struct erofs_xattr_entry *entry) -{ - struct erofs_sb_info *sbi =3D EROFS_SB(it->sb); - struct erofs_xattr_prefix_item *pf =3D sbi->xattr_prefixes + - (entry->e_name_index & EROFS_XATTR_LONG_PREFIX_MASK); - - if (pf >=3D sbi->xattr_prefixes + sbi->xattr_prefix_count) - return -ENOATTR; - - if (it->index !=3D pf->prefix->base_index || - it->name.len !=3D entry->e_name_len + pf->infix_len) - return -ENOATTR; - - if (memcmp(it->name.name, pf->prefix->infix, pf->infix_len)) - return -ENOATTR; - - it->infix_len =3D pf->infix_len; - return 0; -} - -static int xattr_entrymatch(struct erofs_xattr_iter *it, - struct erofs_xattr_entry *entry) -{ - /* should also match the infix for long name prefixes */ - if (entry->e_name_index & EROFS_XATTR_LONG_PREFIX) - return erofs_xattr_long_entrymatch(it, entry); - - if (it->index !=3D entry->e_name_index || - it->name.len !=3D entry->e_name_len) - return -ENOATTR; - it->infix_len =3D 0; - return 0; -} - -static int xattr_namematch(struct erofs_xattr_iter *it, - unsigned int processed, char *buf, unsigned int len) -{ - if (memcmp(buf, it->name.name + it->infix_len + processed, len)) - return -ENOATTR; - return 0; -} - -static int xattr_checkbuffer(struct erofs_xattr_iter *it, - unsigned int value_sz) -{ - int err =3D it->buffer_size < value_sz ? -ERANGE : 0; - - it->buffer_ofs =3D value_sz; - return !it->buffer ? 1 : err; -} - -static void xattr_copyvalue(struct erofs_xattr_iter *it, - unsigned int processed, - char *buf, unsigned int len) -{ - memcpy(it->buffer + processed, buf, len); -} - -static const struct xattr_iter_handlers find_xattr_handlers =3D { - .entry =3D xattr_entrymatch, - .name =3D xattr_namematch, - .alloc_buffer =3D xattr_checkbuffer, - .value =3D xattr_copyvalue -}; - static bool erofs_xattr_user_list(struct dentry *dentry) { return test_opt(&EROFS_SB(dentry->d_sb)->opt, XATTR_USER); @@ -364,20 +175,49 @@ const struct xattr_handler *erofs_xattr_handlers[] = =3D { NULL, }; =20 -static int xattr_entrylist(struct erofs_xattr_iter *it, - struct erofs_xattr_entry *entry) +static int erofs_xattr_copy_to_buffer(struct erofs_xattr_iter *it, + unsigned int len) +{ + unsigned int slice, processed; + struct super_block *sb =3D it->sb; + void *src; + + for (processed =3D 0; processed < len; processed +=3D slice) { + it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(sb, it->pos), + EROFS_KMAP); + if (IS_ERR(it->kaddr)) + return PTR_ERR(it->kaddr); + + src =3D it->kaddr + erofs_blkoff(sb, it->pos); + slice =3D min_t(unsigned int, sb->s_blocksize - + erofs_blkoff(sb, it->pos), len - processed); + memcpy(it->buffer + it->buffer_ofs, src, slice); + it->buffer_ofs +=3D slice; + it->pos +=3D slice; + } + return 0; +} + +static int erofs_listxattr_foreach(struct erofs_xattr_iter *it) { - unsigned int base_index =3D entry->e_name_index; - unsigned int prefix_len, infix_len =3D 0; + struct erofs_xattr_entry entry; + unsigned int base_index, name_total, prefix_len, infix_len =3D 0; const char *prefix, *infix =3D NULL; + int err; =20 - if (entry->e_name_index & EROFS_XATTR_LONG_PREFIX) { + /* 1. handle xattr entry */ + entry =3D *(struct erofs_xattr_entry *) + (it->kaddr + erofs_blkoff(it->sb, it->pos)); + it->pos +=3D sizeof(struct erofs_xattr_entry); + + base_index =3D entry.e_name_index; + if (entry.e_name_index & EROFS_XATTR_LONG_PREFIX) { struct erofs_sb_info *sbi =3D EROFS_SB(it->sb); struct erofs_xattr_prefix_item *pf =3D sbi->xattr_prefixes + - (entry->e_name_index & EROFS_XATTR_LONG_PREFIX_MASK); + (entry.e_name_index & EROFS_XATTR_LONG_PREFIX_MASK); =20 if (pf >=3D sbi->xattr_prefixes + sbi->xattr_prefix_count) - return 1; + return 0; infix =3D pf->prefix->infix; infix_len =3D pf->infix_len; base_index =3D pf->prefix->base_index; @@ -385,53 +225,102 @@ static int xattr_entrylist(struct erofs_xattr_iter *= it, =20 prefix =3D erofs_xattr_prefix(base_index, it->dentry); if (!prefix) - return 1; + return 0; prefix_len =3D strlen(prefix); + name_total =3D prefix_len + infix_len + entry.e_name_len + 1; =20 if (!it->buffer) { - it->buffer_ofs +=3D prefix_len + infix_len + - entry->e_name_len + 1; - return 1; + it->buffer_ofs +=3D name_total; + return 0; } =20 - if (it->buffer_ofs + prefix_len + infix_len + - + entry->e_name_len + 1 > it->buffer_size) + if (it->buffer_ofs + name_total > it->buffer_size) return -ERANGE; =20 memcpy(it->buffer + it->buffer_ofs, prefix, prefix_len); memcpy(it->buffer + it->buffer_ofs + prefix_len, infix, infix_len); it->buffer_ofs +=3D prefix_len + infix_len; - return 0; -} =20 -static int xattr_namelist(struct erofs_xattr_iter *it, - unsigned int processed, char *buf, unsigned int len) -{ - memcpy(it->buffer + it->buffer_ofs, buf, len); - it->buffer_ofs +=3D len; + /* 2. handle xattr name */ + err =3D erofs_xattr_copy_to_buffer(it, entry.e_name_len); + if (err) + return err; + + it->buffer[it->buffer_ofs++] =3D '\0'; return 0; } =20 -static int xattr_skipvalue(struct erofs_xattr_iter *it, - unsigned int value_sz) +static int erofs_getxattr_foreach(struct erofs_xattr_iter *it) { - it->buffer[it->buffer_ofs++] =3D '\0'; - return 1; -} + struct super_block *sb =3D it->sb; + struct erofs_xattr_entry entry; + unsigned int slice, processed, value_sz; =20 -static const struct xattr_iter_handlers list_xattr_handlers =3D { - .entry =3D xattr_entrylist, - .name =3D xattr_namelist, - .alloc_buffer =3D xattr_skipvalue, - .value =3D NULL -}; + /* 1. handle xattr entry */ + entry =3D *(struct erofs_xattr_entry *) + (it->kaddr + erofs_blkoff(sb, it->pos)); + it->pos +=3D sizeof(struct erofs_xattr_entry); + value_sz =3D le16_to_cpu(entry.e_value_size); + + /* should also match the infix for long name prefixes */ + if (entry.e_name_index & EROFS_XATTR_LONG_PREFIX) { + struct erofs_sb_info *sbi =3D EROFS_SB(sb); + struct erofs_xattr_prefix_item *pf =3D sbi->xattr_prefixes + + (entry.e_name_index & EROFS_XATTR_LONG_PREFIX_MASK); + + if (pf >=3D sbi->xattr_prefixes + sbi->xattr_prefix_count) + return -ENOATTR; + + if (it->index !=3D pf->prefix->base_index || + it->name.len !=3D entry.e_name_len + pf->infix_len) + return -ENOATTR; + + if (memcmp(it->name.name, pf->prefix->infix, pf->infix_len)) + return -ENOATTR; + + it->infix_len =3D pf->infix_len; + } else { + if (it->index !=3D entry.e_name_index || + it->name.len !=3D entry.e_name_len) + return -ENOATTR; + + it->infix_len =3D 0; + } + + /* 2. handle xattr name */ + for (processed =3D 0; processed < entry.e_name_len; processed +=3D slice)= { + it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(sb, it->pos), + EROFS_KMAP); + if (IS_ERR(it->kaddr)) + return PTR_ERR(it->kaddr); + + slice =3D min_t(unsigned int, + sb->s_blocksize - erofs_blkoff(sb, it->pos), + entry.e_name_len - processed); + if (memcmp(it->name.name + it->infix_len + processed, + it->kaddr + erofs_blkoff(sb, it->pos), slice)) + return -ENOATTR; + it->pos +=3D slice; + } + + /* 3. handle xattr value */ + if (!it->buffer) { + it->buffer_ofs =3D value_sz; + return 0; + } + + if (it->buffer_size < value_sz) + return -ERANGE; + + return erofs_xattr_copy_to_buffer(it, value_sz); +} =20 static int erofs_xattr_iter_inline(struct erofs_xattr_iter *it, struct inode *inode, bool getxattr) { struct erofs_inode *const vi =3D EROFS_I(inode); - const struct xattr_iter_handlers *op; - unsigned int xattr_header_sz, remaining; + unsigned int xattr_header_sz, remaining, entry_sz; + erofs_off_t next_pos; int ret; =20 xattr_header_sz =3D sizeof(struct erofs_xattr_ibody_header) + @@ -441,19 +330,33 @@ static int erofs_xattr_iter_inline(struct erofs_xattr= _iter *it, return -ENOATTR; } =20 - it->pos =3D erofs_iloc(inode) + vi->inode_isize + xattr_header_sz; - it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(it->sb, it->pos), - EROFS_KMAP); - if (IS_ERR(it->kaddr)) - return PTR_ERR(it->kaddr); - remaining =3D vi->xattr_isize - xattr_header_sz; - op =3D getxattr ? &find_xattr_handlers : &list_xattr_handlers; + it->pos =3D erofs_iloc(inode) + vi->inode_isize + xattr_header_sz; =20 while (remaining) { - ret =3D xattr_foreach(it, op, &remaining); + it->kaddr =3D erofs_bread(&it->buf, erofs_blknr(it->sb, it->pos), + EROFS_KMAP); + if (IS_ERR(it->kaddr)) + return PTR_ERR(it->kaddr); + + entry_sz =3D erofs_xattr_entry_size(it->kaddr + + erofs_blkoff(it->sb, it->pos)); + /* xattr on-disk corruption: xattr entry beyond xattr_isize */ + if (remaining < entry_sz) { + DBG_BUGON(1); + return -EFSCORRUPTED; + } + remaining -=3D entry_sz; + next_pos =3D it->pos + entry_sz; + + if (getxattr) + ret =3D erofs_getxattr_foreach(it); + else + ret =3D erofs_listxattr_foreach(it); if ((getxattr && ret !=3D -ENOATTR) || (!getxattr && ret)) break; + + it->pos =3D next_pos; } return ret; } @@ -465,11 +368,8 @@ static int erofs_xattr_iter_shared(struct erofs_xattr_= iter *it, struct super_block *const sb =3D it->sb; struct erofs_sb_info *sbi =3D EROFS_SB(sb); unsigned int i; - const struct xattr_iter_handlers *op; int ret =3D -ENOATTR; =20 - op =3D getxattr ? &find_xattr_handlers : &list_xattr_handlers; - for (i =3D 0; i < vi->xattr_shared_count; ++i) { it->pos =3D erofs_pos(sb, sbi->xattr_blkaddr) + vi->xattr_shared_xattrs[i] * sizeof(__le32); @@ -478,7 +378,10 @@ static int erofs_xattr_iter_shared(struct erofs_xattr_= iter *it, if (IS_ERR(it->kaddr)) return PTR_ERR(it->kaddr); =20 - ret =3D xattr_foreach(it, op, NULL); + if (getxattr) + ret =3D erofs_getxattr_foreach(it); + else + ret =3D erofs_listxattr_foreach(it); if ((getxattr && ret !=3D -ENOATTR) || (!getxattr && ret)) break; } --=20 2.19.1.6.gb485710b