From nobody Sat Feb 7 22:21:14 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 AC6C8C77B7A for ; Thu, 18 May 2023 02:46:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229665AbjERCqB (ORCPT ); Wed, 17 May 2023 22:46:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229518AbjERCp5 (ORCPT ); Wed, 17 May 2023 22:45:57 -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 630E530EC for ; Wed, 17 May 2023 19:45:56 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R891e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0ViutgWP_1684377952; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0ViutgWP_1684377952) by smtp.aliyun-inc.com; Thu, 18 May 2023 10:45:53 +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 v3 1/5] erofs: introduce erofs_xattr_iter_fixup_aligned() helper Date: Thu, 18 May 2023 10:45:47 +0800 Message-Id: <20230518024551.123990-2-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230518024551.123990-1-jefflexu@linux.alibaba.com> References: <20230518024551.123990-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" Introduce erofs_xattr_iter_fixup_aligned() helper where it.ofs <=3D EROFS_BLKSIZ is mandatory. Signed-off-by: Jingbo Xu --- fs/erofs/xattr.c | 79 +++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 44 deletions(-) diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c index bbfe7ce170d2..b79be2a556ba 100644 --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -29,6 +29,28 @@ struct xattr_iter { unsigned int ofs; }; =20 +static inline int erofs_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_read_metabuf(&it->buf, it->sb, it->blkaddr, EROFS_KMA= P); + if (IS_ERR(it->kaddr)) + return PTR_ERR(it->kaddr); + it->ofs =3D erofs_blkoff(it->sb, it->ofs); + return 0; +} + +static inline int erofs_xattr_iter_fixup_aligned(struct xattr_iter *it) +{ + if (it->ofs > it->sb->s_blocksize) { + DBG_BUGON(1); + return -EFSCORRUPTED; + } + return erofs_xattr_iter_fixup(it); +} + static int erofs_init_inode_xattrs(struct inode *inode) { struct erofs_inode *const vi =3D EROFS_I(inode); @@ -80,6 +102,7 @@ static int erofs_init_inode_xattrs(struct inode *inode) goto out_unlock; } =20 + it.sb =3D sb; it.buf =3D __EROFS_BUF_INITIALIZER; it.blkaddr =3D erofs_blknr(sb, erofs_iloc(inode) + vi->inode_isize); it.ofs =3D erofs_blkoff(sb, erofs_iloc(inode) + vi->inode_isize); @@ -105,19 +128,11 @@ static int erofs_init_inode_xattrs(struct inode *inod= e) it.ofs +=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_read_metabuf(&it.buf, sb, ++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; + ret =3D erofs_xattr_iter_fixup_aligned(&it); + if (ret) { + kfree(vi->xattr_shared_xattrs); + vi->xattr_shared_xattrs =3D NULL; + goto out_unlock; } vi->xattr_shared_xattrs[i] =3D le32_to_cpu(*(__le32 *)(it.kaddr + it.ofs)); @@ -150,20 +165,6 @@ 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_read_metabuf(&it->buf, it->sb, 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) { @@ -201,7 +202,7 @@ static int xattr_foreach(struct xattr_iter *it, int err; =20 /* 0. fixup blkaddr, ofs, ipage */ - err =3D xattr_iter_fixup(it); + err =3D erofs_xattr_iter_fixup(it); if (err) return err; =20 @@ -236,14 +237,9 @@ static int xattr_foreach(struct xattr_iter *it, 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; - } + err =3D erofs_xattr_iter_fixup_aligned(it); + if (err) + goto out; =20 slice =3D min_t(unsigned int, it->sb->s_blocksize - it->ofs, entry.e_name_len - processed); @@ -271,14 +267,9 @@ static int xattr_foreach(struct xattr_iter *it, } =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; - } + err =3D erofs_xattr_iter_fixup_aligned(it); + if (err) + goto out; =20 slice =3D min_t(unsigned int, it->sb->s_blocksize - it->ofs, value_sz - processed); --=20 2.19.1.6.gb485710b From nobody Sat Feb 7 22:21:14 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 8E495C77B7A for ; Thu, 18 May 2023 02:46:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229761AbjERCqG (ORCPT ); Wed, 17 May 2023 22:46:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229634AbjERCqA (ORCPT ); Wed, 17 May 2023 22:46:00 -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 C243F30FE for ; Wed, 17 May 2023 19:45:57 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R961e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046059;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0ViuqtKG_1684377954; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0ViuqtKG_1684377954) by smtp.aliyun-inc.com; Thu, 18 May 2023 10:45:54 +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 v3 2/5] erofs: unify xattr_iter structures Date: Thu, 18 May 2023 10:45:48 +0800 Message-Id: <20230518024551.123990-3-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230518024551.123990-1-jefflexu@linux.alibaba.com> References: <20230518024551.123990-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 --- fs/erofs/xattr.c | 172 ++++++++++++++++++++--------------------------- 1 file changed, 72 insertions(+), 100 deletions(-) diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c index b79be2a556ba..1e44aa108134 100644 --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -20,16 +20,22 @@ static inline unsigned int erofs_xattr_blkoff(struct su= per_block *sb, return erofs_blkoff(sb, xattr_id * sizeof(__u32)); } =20 -struct xattr_iter { +struct erofs_xattr_iter { struct super_block *sb; struct erofs_buf buf; void *kaddr; - erofs_blk_t blkaddr; unsigned int ofs; + + char *buffer; + int buffer_size, buffer_ofs; + + int index, infix_len; + struct qstr name; + struct dentry *dentry; }; =20 -static inline int erofs_xattr_iter_fixup(struct xattr_iter *it) +static inline int erofs_xattr_iter_fixup(struct erofs_xattr_iter *it) { if (it->ofs < it->sb->s_blocksize) return 0; @@ -42,7 +48,7 @@ static inline int erofs_xattr_iter_fixup(struct xattr_ite= r *it) return 0; } =20 -static inline int erofs_xattr_iter_fixup_aligned(struct xattr_iter *it) +static inline int erofs_xattr_iter_fixup_aligned(struct erofs_xattr_iter *= it) { if (it->ofs > it->sb->s_blocksize) { DBG_BUGON(1); @@ -54,7 +60,7 @@ static inline int erofs_xattr_iter_fixup_aligned(struct x= attr_iter *it) 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; @@ -157,15 +163,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); @@ -193,7 +199,7 @@ static int inline_xattr_iter_begin(struct xattr_iter *i= t, * Regardless of success or failure, `xattr_foreach' will end up with * `ofs' 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) { @@ -284,18 +290,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 @@ -313,11 +311,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); @@ -329,32 +325,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 @@ -365,41 +356,40 @@ 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; unsigned int i, xsid; 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_read_metabuf(&it->it.buf, sb, - it->it.blkaddr, EROFS_KMAP); - if (IS_ERR(it->it.kaddr)) - return PTR_ERR(it->it.kaddr); - - ret =3D xattr_foreach(&it->it, &find_xattr_handlers, NULL); + it->blkaddr =3D erofs_xattr_blkaddr(sb, xsid); + it->ofs =3D erofs_xattr_blkoff(sb, xsid); + it->kaddr =3D erofs_read_metabuf(&it->buf, sb, it->blkaddr, 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; } @@ -421,31 +411,30 @@ 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; + if (strlen(name) > EROFS_NAME_LEN) + return -ERANGE; =20 ret =3D erofs_init_inode_xattrs(inode); if (ret) return ret; =20 - it.index =3D index; - it.name.len =3D strlen(name); - if (it.name.len > EROFS_NAME_LEN) - return -ERANGE; - - it.it.buf =3D __EROFS_BUF_INITIALIZER; - it.name.name =3D name; - - it.buffer =3D buffer; - it.buffer_size =3D buffer_size; + it =3D (struct erofs_xattr_iter) { + .buf =3D __EROFS_BUF_INITIALIZER, + .sb =3D inode->i_sb, + .name =3D QSTR_INIT(name, strlen(name)), + .index =3D index, + .buffer =3D buffer, + .buffer_size =3D buffer_size, + }; =20 - it.it.sb =3D inode->i_sb; 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 @@ -491,25 +480,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 @@ -541,23 +520,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; } @@ -569,42 +542,41 @@ 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; unsigned int i, xsid; 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_read_metabuf(&it->it.buf, sb, - it->it.blkaddr, EROFS_KMAP); - if (IS_ERR(it->it.kaddr)) - return PTR_ERR(it->it.kaddr); - - ret =3D xattr_foreach(&it->it, &list_xattr_handlers, NULL); + it->blkaddr =3D erofs_xattr_blkaddr(sb, xsid); + it->ofs =3D erofs_xattr_blkoff(sb, xsid); + it->kaddr =3D erofs_read_metabuf(&it->buf, sb, it->blkaddr, EROFS_KMAP); + if (IS_ERR(it->kaddr)) + return PTR_ERR(it->kaddr); + + ret =3D xattr_foreach(it, &list_xattr_handlers, NULL); if (ret) break; } @@ -615,7 +587,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) @@ -623,18 +595,18 @@ ssize_t erofs_listxattr(struct dentry *dentry, if (ret) return ret; =20 - it.it.buf =3D __EROFS_BUF_INITIALIZER; - it.dentry =3D dentry; - it.buffer =3D buffer; - it.buffer_size =3D buffer_size; - it.buffer_ofs =3D 0; - - it.it.sb =3D dentry->d_sb; + it =3D (struct erofs_xattr_iter) { + .buf =3D __EROFS_BUF_INITIALIZER, + .sb =3D dentry->d_sb, + .dentry =3D dentry, + .buffer =3D buffer, + .buffer_size =3D buffer_size, + }; =20 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 22:21:14 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 B3443C77B7D for ; Thu, 18 May 2023 02:46:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229660AbjERCqD (ORCPT ); Wed, 17 May 2023 22:46:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229612AbjERCp7 (ORCPT ); Wed, 17 May 2023 22:45:59 -0400 Received: from out30-97.freemail.mail.aliyun.com (out30-97.freemail.mail.aliyun.com [115.124.30.97]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CA6E30EC for ; Wed, 17 May 2023 19:45:58 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R401e4;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_---0Viut.Cy_1684377955; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0Viut.Cy_1684377955) by smtp.aliyun-inc.com; Thu, 18 May 2023 10:45:55 +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 v3 3/5] erofs: make the size of read data stored in buffer_ofs Date: Thu, 18 May 2023 10:45:49 +0800 Message-Id: <20230518024551.123990-4-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230518024551.123990-1-jefflexu@linux.alibaba.com> References: <20230518024551.123990-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 --- 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 1e44aa108134..87d76ccea692 100644 --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -338,7 +338,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 @@ -371,7 +371,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) @@ -393,7 +393,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 22:21:14 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 888A4C7EE2A for ; Thu, 18 May 2023 02:46:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229810AbjERCqI (ORCPT ); Wed, 17 May 2023 22:46:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229668AbjERCqB (ORCPT ); Wed, 17 May 2023 22:46:01 -0400 Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 138FC135 for ; Wed, 17 May 2023 19:45:59 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0Viut.Db_1684377956; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0Viut.Db_1684377956) by smtp.aliyun-inc.com; Thu, 18 May 2023 10:45:57 +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 v3 4/5] erofs: unify inline/share xattr iterators for listxattr/getxattr Date: Thu, 18 May 2023 10:45:50 +0800 Message-Id: <20230518024551.123990-5-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230518024551.123990-1-jefflexu@linux.alibaba.com> References: <20230518024551.123990-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_getxattr() and inline_listxattr() unified as iter_inline_xattr(), shared_getxattr() and shared_listxattr() unified as iter_shared_xattr(). After the unification, both iter_inline_xattr() and iter_shared_xattr() 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 | 211 ++++++++++++++++++----------------------------- 1 file changed, 80 insertions(+), 131 deletions(-) diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c index 87d76ccea692..435146628eed 100644 --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -7,19 +7,6 @@ #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 erofs_xattr_iter { struct super_block *sb; struct erofs_buf buf; @@ -33,6 +20,8 @@ struct erofs_xattr_iter { int index, infix_len; struct qstr name; struct dentry *dentry; + struct inode *inode; + bool getxattr; }; =20 static inline int erofs_xattr_iter_fixup(struct erofs_xattr_iter *it) @@ -171,30 +160,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, inline_xattr_ofs; - - 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; - } - - 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_read_metabuf(&it->buf, inode->i_sb, it->blkaddr, - 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 * `ofs' pointing to the next xattr item rather than an arbitrary position. @@ -356,46 +321,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; - unsigned int i, xsid; - int ret =3D -ENOATTR; - - for (i =3D 0; i < vi->xattr_shared_count; ++i) { - xsid =3D vi->xattr_shared_xattrs[i]; - it->blkaddr =3D erofs_xattr_blkaddr(sb, xsid); - it->ofs =3D erofs_xattr_blkoff(sb, xsid); - it->kaddr =3D erofs_read_metabuf(&it->buf, sb, it->blkaddr, 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); @@ -406,38 +331,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; - if (strlen(name) > EROFS_NAME_LEN) - return -ERANGE; - - ret =3D erofs_init_inode_xattrs(inode); - if (ret) - return ret; - - it =3D (struct erofs_xattr_iter) { - .buf =3D __EROFS_BUF_INITIALIZER, - .sb =3D inode->i_sb, - .name =3D QSTR_INIT(name, strlen(name)), - .index =3D index, - .buffer =3D buffer, - .buffer_size =3D buffer_size, - }; - - 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) @@ -542,45 +435,97 @@ 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_iter_inline_xattr(struct erofs_xattr_iter *it) { + struct erofs_inode *const vi =3D EROFS_I(it->inode); + const struct xattr_iter_handlers *op; + unsigned int xattr_header_sz, remaining; + erofs_off_t pos; 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; + } + + pos =3D erofs_iloc(it->inode) + vi->inode_isize + xattr_header_sz; + it->blkaddr =3D erofs_blknr(it->sb, pos); + it->ofs =3D erofs_blkoff(it->sb, pos); + it->kaddr =3D erofs_read_metabuf(&it->buf, it->sb, it->blkaddr, EROFS_KMA= P); + if (IS_ERR(it->kaddr)) + return PTR_ERR(it->kaddr); + + remaining =3D vi->xattr_isize - xattr_header_sz; + op =3D it->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 ((it->getxattr && ret !=3D -ENOATTR) || (!it->getxattr && ret)) break; } - return ret ? ret : it->buffer_ofs; + return ret; } =20 -static int shared_listxattr(struct erofs_xattr_iter *it) +static int erofs_iter_shared_xattr(struct erofs_xattr_iter *it) { - struct inode *const inode =3D d_inode(it->dentry); - struct erofs_inode *const vi =3D EROFS_I(inode); + struct erofs_inode *const vi =3D EROFS_I(it->inode); struct super_block *const sb =3D it->sb; + const struct xattr_iter_handlers *op; unsigned int i, xsid; - int ret =3D 0; + int ret =3D -ENOATTR; + + op =3D it->getxattr ? &find_xattr_handlers : &list_xattr_handlers; =20 for (i =3D 0; i < vi->xattr_shared_count; ++i) { xsid =3D vi->xattr_shared_xattrs[i]; - it->blkaddr =3D erofs_xattr_blkaddr(sb, xsid); - it->ofs =3D erofs_xattr_blkoff(sb, xsid); + it->blkaddr =3D EROFS_SB(sb)->xattr_blkaddr + + erofs_blknr(sb, xsid * sizeof(__u32)); + it->ofs =3D erofs_blkoff(sb, xsid * sizeof(__u32)); it->kaddr =3D erofs_read_metabuf(&it->buf, sb, it->blkaddr, EROFS_KMAP); 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 ((it->getxattr && ret !=3D -ENOATTR) || (!it->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; + if (strlen(name) > EROFS_NAME_LEN) + return -ERANGE; + + ret =3D erofs_init_inode_xattrs(inode); + if (ret) + return ret; + + it =3D (struct erofs_xattr_iter) { + .buf =3D __EROFS_BUF_INITIALIZER, + .sb =3D inode->i_sb, + .inode =3D inode, + .name =3D QSTR_INIT(name, strlen(name)), + .index =3D index, + .buffer =3D buffer, + .buffer_size =3D buffer_size, + .getxattr =3D true, + }; + + ret =3D erofs_iter_inline_xattr(&it); + if (ret =3D=3D -ENOATTR) + ret =3D erofs_iter_shared_xattr(&it); + erofs_put_metabuf(&it.buf); + return ret ? ret : it.buffer_ofs; } =20 ssize_t erofs_listxattr(struct dentry *dentry, @@ -599,15 +544,19 @@ ssize_t erofs_listxattr(struct dentry *dentry, .buf =3D __EROFS_BUF_INITIALIZER, .sb =3D dentry->d_sb, .dentry =3D dentry, + .inode =3D d_inode(dentry), .buffer =3D buffer, .buffer_size =3D buffer_size, + .getxattr =3D false, }; =20 - ret =3D inline_listxattr(&it); - if (ret >=3D 0 || ret =3D=3D -ENOATTR) - ret =3D shared_listxattr(&it); + ret =3D erofs_iter_inline_xattr(&it); + if (!ret || ret =3D=3D -ENOATTR) + ret =3D erofs_iter_shared_xattr(&it); + 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 22:21:14 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 155F1C77B7D for ; Thu, 18 May 2023 02:46:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229834AbjERCqL (ORCPT ); Wed, 17 May 2023 22:46:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229751AbjERCqD (ORCPT ); Wed, 17 May 2023 22:46:03 -0400 Received: from out30-131.freemail.mail.aliyun.com (out30-131.freemail.mail.aliyun.com [115.124.30.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D624C3C01 for ; Wed, 17 May 2023 19:46:00 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R211e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046050;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0ViuseHy_1684377957; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0ViuseHy_1684377957) by smtp.aliyun-inc.com; Thu, 18 May 2023 10:45:58 +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 v3 5/5] erofs: use separate xattr parsers for listxattr/getxattr Date: Thu, 18 May 2023 10:45:51 +0800 Message-Id: <20230518024551.123990-6-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230518024551.123990-1-jefflexu@linux.alibaba.com> References: <20230518024551.123990-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 for listxattr and getxattr. Signed-off-by: Jingbo Xu --- fs/erofs/xattr.c | 389 +++++++++++++++++++++-------------------------- 1 file changed, 170 insertions(+), 219 deletions(-) diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c index 435146628eed..111735fb6fbc 100644 --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -12,7 +12,7 @@ struct erofs_xattr_iter { struct erofs_buf buf; void *kaddr; erofs_blk_t blkaddr; - unsigned int ofs; + unsigned int ofs, t_ofs; =20 char *buffer; int buffer_size, buffer_ofs; @@ -21,6 +21,7 @@ struct erofs_xattr_iter { struct qstr name; struct dentry *dentry; struct inode *inode; + unsigned int remaining; /* size of inline xattrs to be iterated */ bool getxattr; }; =20 @@ -46,6 +47,28 @@ static inline int erofs_xattr_iter_fixup_aligned(struct = erofs_xattr_iter *it) return erofs_xattr_iter_fixup(it); } =20 +static int erofs_xattr_iter_prep(struct erofs_xattr_iter *it) +{ + unsigned int entry_sz; + int err; + + err =3D erofs_xattr_iter_fixup(it); + if (err) + return err; + + entry_sz =3D erofs_xattr_entry_size(it->kaddr + it->ofs); + it->t_ofs =3D it->ofs + entry_sz; + if (it->remaining) { + /* xattr on-disk corruption: xattr entry beyond xattr_isize */ + if (it->remaining < entry_sz) { + DBG_BUGON(1); + return -EFSCORRUPTED; + } + it->remaining -=3D entry_sz; + } + return 0; +} + static int erofs_init_inode_xattrs(struct inode *inode) { struct erofs_inode *const vi =3D EROFS_I(inode); @@ -144,183 +167,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 - * `ofs' 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; - unsigned int value_sz, processed, slice; - int err; - - /* 0. fixup blkaddr, ofs, ipage */ - err =3D erofs_xattr_iter_fixup(it); - if (err) - return err; - - /* - * 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); - 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->ofs +=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->ofs +=3D entry.e_name_len + value_sz; - goto out; - } - - /* 2. handle xattr name (ofs will finally be at the end of name) */ - processed =3D 0; - - while (processed < entry.e_name_len) { - err =3D erofs_xattr_iter_fixup_aligned(it); - if (err) - goto out; - - slice =3D min_t(unsigned int, it->sb->s_blocksize - it->ofs, - entry.e_name_len - processed); - - /* handle name */ - err =3D op->name(it, processed, it->kaddr + it->ofs, slice); - if (err) { - it->ofs +=3D entry.e_name_len - processed + value_sz; - goto out; - } - - it->ofs +=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->ofs +=3D value_sz; - goto out; - } - } - - while (processed < value_sz) { - err =3D erofs_xattr_iter_fixup_aligned(it); - if (err) - goto out; - - slice =3D min_t(unsigned int, it->sb->s_blocksize - it->ofs, - value_sz - processed); - op->value(it, processed, it->kaddr + it->ofs, slice); - it->ofs +=3D slice; - processed +=3D slice; - } - -out: - /* xattrs should be 4-byte aligned (on-disk constraint) */ - it->ofs =3D EROFS_XATTR_ALIGN(it->ofs); - 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); @@ -373,20 +219,74 @@ const struct xattr_handler *erofs_xattr_handlers[] = =3D { NULL, }; =20 -static int xattr_entrylist(struct erofs_xattr_iter *it, - struct erofs_xattr_entry *entry) +typedef int (*erofs_xattr_body_handler)(struct erofs_xattr_iter *it, + unsigned int processed, char *buf, unsigned int len); + +static int erofs_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 erofs_xattr_copy(struct erofs_xattr_iter *it, + unsigned int unused, char *buf, unsigned int len) +{ + memcpy(it->buffer + it->buffer_ofs, buf, len); + it->buffer_ofs +=3D len; + return 0; +} + +static int erofs_xattr_body(struct erofs_xattr_iter *it, unsigned int len, + erofs_xattr_body_handler handler) +{ + unsigned int slice, processed =3D 0; + + while (processed < len) { + int err =3D erofs_xattr_iter_fixup_aligned(it); + if (err) + return err; + + slice =3D min_t(unsigned int, it->sb->s_blocksize - it->ofs, + len - processed); + err =3D handler(it, processed, it->kaddr + it->ofs, slice); + if (err) + return err; + + it->ofs +=3D slice; + processed +=3D slice; + } + return 0; +} + +/* + * Wen returning 0 or ENOATTR, erofs_[list|get]xattr_foreach() will end up + * with `ofs' pointing to the next xattr item rather than an arbitrary pos= ition. + */ +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, prefix_len, infix_len =3D 0; const char *prefix, *infix =3D NULL; + int err; + + err =3D erofs_xattr_iter_prep(it); + if (err) + return err; + + /* 1. handle xattr entry */ + entry =3D *(struct erofs_xattr_entry *)(it->kaddr + it->ofs); + it->ofs +=3D sizeof(struct erofs_xattr_entry); + base_index =3D entry.e_name_index; =20 - if (entry->e_name_index & EROFS_XATTR_LONG_PREFIX) { + 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; + goto out; infix =3D pf->prefix->infix; infix_len =3D pf->infix_len; base_index =3D pf->prefix->base_index; @@ -394,52 +294,102 @@ static int xattr_entrylist(struct erofs_xattr_iter *= it, =20 prefix =3D erofs_xattr_prefix(base_index, it->dentry); if (!prefix) - return 1; + goto out; prefix_len =3D strlen(prefix); =20 if (!it->buffer) { - it->buffer_ofs +=3D prefix_len + infix_len + - entry->e_name_len + 1; - return 1; + it->buffer_ofs +=3D prefix_len + infix_len + entry.e_name_len + 1; + goto out; } =20 if (it->buffer_ofs + prefix_len + infix_len + - + entry->e_name_len + 1 > it->buffer_size) + entry.e_name_len + 1 > 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 can't be ENOATTR) */ + err =3D erofs_xattr_body(it, entry.e_name_len, erofs_xattr_copy); + if (err) + return err; + + it->buffer[it->buffer_ofs++] =3D '\0'; + it->ofs +=3D le16_to_cpu(entry.e_value_size); + it->ofs =3D EROFS_XATTR_ALIGN(it->ofs); + return 0; +out: + it->ofs =3D it->t_ofs; 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 erofs_xattr_entry entry; + unsigned int value_sz; + int err; =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 -}; + err =3D erofs_xattr_iter_prep(it); + if (err) + return err; + + /* 1. handle xattr entry */ + entry =3D *(struct erofs_xattr_entry *)(it->kaddr + it->ofs); + it->ofs +=3D sizeof(struct erofs_xattr_entry); + value_sz =3D le16_to_cpu(entry.e_value_size); + + err =3D -ENOATTR; + /* 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(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) + goto out; + + if (it->index !=3D pf->prefix->base_index || + it->name.len !=3D entry.e_name_len + pf->infix_len) + goto out; + + if (memcmp(it->name.name, pf->prefix->infix, pf->infix_len)) + goto out; + + it->infix_len =3D pf->infix_len; + } else { + if (it->index !=3D entry.e_name_index || + it->name.len !=3D entry.e_name_len) + goto out; + it->infix_len =3D 0; + } + + /* 2. handle xattr name */ + err =3D erofs_xattr_body(it, entry.e_name_len, erofs_xattr_namematch); + if (err) + goto out; + + /* 3. handle xattr value */ + if (!it->buffer) { + it->buffer_ofs =3D value_sz; + goto out; /* err =3D=3D 0 */ + } + if (it->buffer_size < value_sz) + return -ERANGE; + + /* no need normalizing ofs on error (err can't be ENOATTR) */ + err =3D erofs_xattr_body(it, value_sz, erofs_xattr_copy); + it->ofs =3D EROFS_XATTR_ALIGN(it->ofs); + return err; +out: + it->ofs =3D it->t_ofs; + return err; +} =20 static int erofs_iter_inline_xattr(struct erofs_xattr_iter *it) { struct erofs_inode *const vi =3D EROFS_I(it->inode); - const struct xattr_iter_handlers *op; - unsigned int xattr_header_sz, remaining; + unsigned int xattr_header_sz; erofs_off_t pos; int ret; =20 @@ -457,11 +407,12 @@ static int erofs_iter_inline_xattr(struct erofs_xattr= _iter *it) if (IS_ERR(it->kaddr)) return PTR_ERR(it->kaddr); =20 - remaining =3D vi->xattr_isize - xattr_header_sz; - op =3D it->getxattr ? &find_xattr_handlers : &list_xattr_handlers; - - while (remaining) { - ret =3D xattr_foreach(it, op, &remaining); + it->remaining =3D vi->xattr_isize - xattr_header_sz; + while (it->remaining) { + if (it->getxattr) + ret =3D erofs_getxattr_foreach(it); + else + ret =3D erofs_listxattr_foreach(it); if ((it->getxattr && ret !=3D -ENOATTR) || (!it->getxattr && ret)) break; } @@ -472,12 +423,9 @@ static int erofs_iter_shared_xattr(struct erofs_xattr_= iter *it) { struct erofs_inode *const vi =3D EROFS_I(it->inode); struct super_block *const sb =3D it->sb; - const struct xattr_iter_handlers *op; unsigned int i, xsid; int ret =3D -ENOATTR; =20 - op =3D it->getxattr ? &find_xattr_handlers : &list_xattr_handlers; - for (i =3D 0; i < vi->xattr_shared_count; ++i) { xsid =3D vi->xattr_shared_xattrs[i]; it->blkaddr =3D EROFS_SB(sb)->xattr_blkaddr + @@ -487,7 +435,10 @@ static int erofs_iter_shared_xattr(struct erofs_xattr_= iter *it) if (IS_ERR(it->kaddr)) return PTR_ERR(it->kaddr); =20 - ret =3D xattr_foreach(it, op, NULL); + if (it->getxattr) + ret =3D erofs_getxattr_foreach(it); + else + ret =3D erofs_listxattr_foreach(it); if ((it->getxattr && ret !=3D -ENOATTR) || (!it->getxattr && ret)) break; } --=20 2.19.1.6.gb485710b