From nobody Fri Sep 12 18:09:00 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDD9AC636CC for ; Wed, 8 Feb 2023 07:16:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230353AbjBHHQ1 (ORCPT ); Wed, 8 Feb 2023 02:16:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229949AbjBHHQY (ORCPT ); Wed, 8 Feb 2023 02:16:24 -0500 Received: from out30-112.freemail.mail.aliyun.com (out30-112.freemail.mail.aliyun.com [115.124.30.112]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28D5123C53 for ; Tue, 7 Feb 2023 23:16:21 -0800 (PST) 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=ay29a033018045192;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0VbAXJMh_1675840579; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VbAXJMh_1675840579) by smtp.aliyun-inc.com; Wed, 08 Feb 2023 15:16:19 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, linux-erofs@lists.ozlabs.org, zhujia.zj@bytedance.com Cc: huyue2@coolpad.com, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] erofs: remove unused device mapping in meta routine Date: Wed, 8 Feb 2023 15:16:18 +0800 Message-Id: <404848a1e43ff2d585c91e222beae4de8b9fb5f3.1675840368.git.jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: References: 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" Currently metadata is always on bootstrap, and thus device mapping is not needed so far. Remove the redundant device mapping in the meta routine. Signed-off-by: Jingbo Xu Reviewed-by: Jia Zhu --- fs/erofs/fscache.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 014e20962376..03de4dc99302 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -164,18 +164,8 @@ static int erofs_fscache_read_folios_async(struct fsca= che_cookie *cookie, static int erofs_fscache_meta_read_folio(struct file *data, struct folio *= folio) { int ret; - struct super_block *sb =3D folio_mapping(folio)->host->i_sb; + struct erofs_fscache *ctx =3D folio_mapping(folio)->host->i_private; struct erofs_fscache_request *req; - struct erofs_map_dev mdev =3D { - .m_deviceid =3D 0, - .m_pa =3D folio_pos(folio), - }; - - ret =3D erofs_map_dev(sb, &mdev); - if (ret) { - folio_unlock(folio); - return ret; - } =20 req =3D erofs_fscache_req_alloc(folio_mapping(folio), folio_pos(folio), folio_size(folio)); @@ -184,8 +174,8 @@ static int erofs_fscache_meta_read_folio(struct file *d= ata, struct folio *folio) return PTR_ERR(req); } =20 - ret =3D erofs_fscache_read_folios_async(mdev.m_fscache->cookie, - req, mdev.m_pa, folio_size(folio)); + ret =3D erofs_fscache_read_folios_async(ctx->cookie, req, + folio_pos(folio), folio_size(folio)); if (ret) req->error =3D ret; =20 @@ -469,6 +459,7 @@ struct erofs_fscache *erofs_fscache_acquire_cookie(stru= ct super_block *sb, inode->i_size =3D OFFSET_MAX; inode->i_mapping->a_ops =3D &erofs_fscache_meta_aops; mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS); + inode->i_private =3D ctx; =20 ctx->inode =3D inode; } --=20 2.19.1.6.gb485710b From nobody Fri Sep 12 18:09:00 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E41AC636D3 for ; Wed, 8 Feb 2023 07:16:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230377AbjBHHQj (ORCPT ); Wed, 8 Feb 2023 02:16:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230252AbjBHHQh (ORCPT ); Wed, 8 Feb 2023 02:16:37 -0500 Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B24E30EAD for ; Tue, 7 Feb 2023 23:16:27 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046059;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0VbAXJP5_1675840583; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VbAXJP5_1675840583) by smtp.aliyun-inc.com; Wed, 08 Feb 2023 15:16:24 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, linux-erofs@lists.ozlabs.org, zhujia.zj@bytedance.com Cc: huyue2@coolpad.com, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] erofs: maintain cookies of share domain in self-contained list Date: Wed, 8 Feb 2023 15:16:23 +0800 Message-Id: <99618b85e5802aacf498387b48c61f1307c6f1f7.1675840368.git.jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: References: 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" We'd better not touch sb->s_inodes list and inode->i_count directly. Let's maintain cookies of share domain in a self-contained list in erofs. Besides, relinquish cookie with the mutext held. Otherwise if a cookie is registered when the old cookie with the same name in the same domain has been removed from the list but not relinquished yet, fscache may complain "Duplicate cookie detected". Signed-off-by: Jingbo Xu Reviewed-by: Jia Zhu --- fs/erofs/fscache.c | 48 ++++++++++++++++++++++----------------------- fs/erofs/internal.h | 4 ++++ 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 03de4dc99302..2f5930e177cc 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -7,8 +7,11 @@ #include "internal.h" =20 static DEFINE_MUTEX(erofs_domain_list_lock); -static DEFINE_MUTEX(erofs_domain_cookies_lock); static LIST_HEAD(erofs_domain_list); + +static DEFINE_MUTEX(erofs_domain_cookies_lock); +static LIST_HEAD(erofs_domain_cookies_list); + static struct vfsmount *erofs_pseudo_mnt; =20 struct erofs_fscache_request { @@ -318,8 +321,6 @@ const struct address_space_operations erofs_fscache_acc= ess_aops =3D { =20 static void erofs_fscache_domain_put(struct erofs_domain *domain) { - if (!domain) - return; mutex_lock(&erofs_domain_list_lock); if (refcount_dec_and_test(&domain->ref)) { list_del(&domain->list); @@ -434,6 +435,8 @@ struct erofs_fscache *erofs_fscache_acquire_cookie(stru= ct super_block *sb, ctx =3D kzalloc(sizeof(*ctx), GFP_KERNEL); if (!ctx) return ERR_PTR(-ENOMEM); + INIT_LIST_HEAD(&ctx->node); + refcount_set(&ctx->ref, 1); =20 cookie =3D fscache_acquire_cookie(volume, FSCACHE_ADV_WANT_CACHE_SIZE, name, strlen(name), NULL, 0, 0); @@ -479,6 +482,7 @@ static void erofs_fscache_relinquish_cookie(struct erof= s_fscache *ctx) fscache_unuse_cookie(ctx->cookie, NULL, NULL); fscache_relinquish_cookie(ctx->cookie, false); iput(ctx->inode); + iput(ctx->anon_inode); kfree(ctx->name); kfree(ctx); } @@ -511,6 +515,7 @@ struct erofs_fscache *erofs_fscache_domain_init_cookie(= struct super_block *sb, =20 ctx->domain =3D domain; ctx->anon_inode =3D inode; + list_add(&ctx->node, &erofs_domain_cookies_list); inode->i_private =3D ctx; refcount_inc(&domain->ref); return ctx; @@ -524,29 +529,23 @@ struct erofs_fscache *erofs_domain_register_cookie(st= ruct super_block *sb, char *name, unsigned int flags) { - struct inode *inode; struct erofs_fscache *ctx; struct erofs_domain *domain =3D EROFS_SB(sb)->domain; - struct super_block *psb =3D erofs_pseudo_mnt->mnt_sb; =20 mutex_lock(&erofs_domain_cookies_lock); - spin_lock(&psb->s_inode_list_lock); - list_for_each_entry(inode, &psb->s_inodes, i_sb_list) { - ctx =3D inode->i_private; - if (!ctx || ctx->domain !=3D domain || strcmp(ctx->name, name)) + list_for_each_entry(ctx, &erofs_domain_cookies_list, node) { + if (ctx->domain !=3D domain || strcmp(ctx->name, name)) continue; if (!(flags & EROFS_REG_COOKIE_NEED_NOEXIST)) { - igrab(inode); + refcount_inc(&ctx->ref); } else { erofs_err(sb, "%s already exists in domain %s", name, domain->domain_id); ctx =3D ERR_PTR(-EEXIST); } - spin_unlock(&psb->s_inode_list_lock); mutex_unlock(&erofs_domain_cookies_lock); return ctx; } - spin_unlock(&psb->s_inode_list_lock); ctx =3D erofs_fscache_domain_init_cookie(sb, name, flags); mutex_unlock(&erofs_domain_cookies_lock); return ctx; @@ -563,23 +562,22 @@ struct erofs_fscache *erofs_fscache_register_cookie(s= truct super_block *sb, =20 void erofs_fscache_unregister_cookie(struct erofs_fscache *ctx) { - bool drop; - struct erofs_domain *domain; + struct erofs_domain *domain =3D NULL; =20 if (!ctx) return; - domain =3D ctx->domain; - if (domain) { - mutex_lock(&erofs_domain_cookies_lock); - drop =3D atomic_read(&ctx->anon_inode->i_count) =3D=3D 1; - iput(ctx->anon_inode); - mutex_unlock(&erofs_domain_cookies_lock); - if (!drop) - return; - } + if (!ctx->domain) + return erofs_fscache_relinquish_cookie(ctx); =20 - erofs_fscache_relinquish_cookie(ctx); - erofs_fscache_domain_put(domain); + mutex_lock(&erofs_domain_cookies_lock); + if (refcount_dec_and_test(&ctx->ref)) { + domain =3D ctx->domain; + list_del(&ctx->node); + erofs_fscache_relinquish_cookie(ctx); + } + mutex_unlock(&erofs_domain_cookies_lock); + if (domain) + erofs_fscache_domain_put(domain); } =20 int erofs_fscache_register_fs(struct super_block *sb) diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 48a2f33de15a..8358cf5f731e 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -109,7 +109,11 @@ struct erofs_fscache { struct fscache_cookie *cookie; struct inode *inode; struct inode *anon_inode; + + /* used for share domain mode */ struct erofs_domain *domain; + struct list_head node; + refcount_t ref; char *name; }; =20 --=20 2.19.1.6.gb485710b From nobody Fri Sep 12 18:09:00 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 974C1C636CC for ; Wed, 8 Feb 2023 07:16:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230408AbjBHHQs (ORCPT ); Wed, 8 Feb 2023 02:16:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230366AbjBHHQp (ORCPT ); Wed, 8 Feb 2023 02:16:45 -0500 Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BEF33400D for ; Tue, 7 Feb 2023 23:16:33 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R101e4;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=6;SR=0;TI=SMTPD_---0VbAhOmj_1675840589; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VbAhOmj_1675840589) by smtp.aliyun-inc.com; Wed, 08 Feb 2023 15:16:29 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, linux-erofs@lists.ozlabs.org, zhujia.zj@bytedance.com Cc: huyue2@coolpad.com, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] erofs: unify anonymous inodes for blob Date: Wed, 8 Feb 2023 15:16:28 +0800 Message-Id: X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: References: 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" Currently there're two anonymous inodes (inode and anon_inode in struct erofs_fscache) for each blob. The former was introduced as the address_space of page cache for bootstrap. The latter was initially introduced as both the address_space of page cache and also a sentinel in the shared domain. Since now the management of cookies in share domain has been decoupled with the anonymous inode, there's no need to maintain an extra anonymous inode. Let's unify these two anonymous inodes. Besides, in non-share-domain mode only bootstrap will allocate anonymous inode. To simplify the implementation, always allocate anonymous inode for both bootstrap and data blobs. Similarly release anonymous inodes for data blobs when .put_super() is called, or we'll get "VFS: Busy inodes after unmount." warning. Also remove the redundant set_nlink() when initializing the anonymous inode, since i_nlink has already been initialized to 1 when the inode gets allocated. Signed-off-by: Jingbo Xu Reviewed-by: Jia Zhu --- fs/erofs/fscache.c | 70 ++++++++++++++++----------------------------- fs/erofs/internal.h | 6 ++-- fs/erofs/super.c | 2 ++ 3 files changed, 28 insertions(+), 50 deletions(-) diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 2f5930e177cc..8353a5fe8c71 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -424,12 +424,12 @@ static int erofs_fscache_register_domain(struct super= _block *sb) =20 static struct erofs_fscache *erofs_fscache_acquire_cookie(struct super_block *sb, - char *name, - unsigned int flags) + struct super_block *isb, char *name) { struct fscache_volume *volume =3D EROFS_SB(sb)->volume; struct erofs_fscache *ctx; struct fscache_cookie *cookie; + struct inode *inode; int ret; =20 ctx =3D kzalloc(sizeof(*ctx), GFP_KERNEL); @@ -445,33 +445,27 @@ struct erofs_fscache *erofs_fscache_acquire_cookie(st= ruct super_block *sb, ret =3D -EINVAL; goto err; } - fscache_use_cookie(cookie, false); - ctx->cookie =3D cookie; - - if (flags & EROFS_REG_COOKIE_NEED_INODE) { - struct inode *const inode =3D new_inode(sb); - - if (!inode) { - erofs_err(sb, "failed to get anon inode for %s", name); - ret =3D -ENOMEM; - goto err_cookie; - } - - set_nlink(inode, 1); - inode->i_size =3D OFFSET_MAX; - inode->i_mapping->a_ops =3D &erofs_fscache_meta_aops; - mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS); - inode->i_private =3D ctx; =20 - ctx->inode =3D inode; + inode =3D new_inode(isb); + if (!inode) { + erofs_err(sb, "failed to get anon inode for %s", name); + ret =3D -ENOMEM; + goto err_cookie; } =20 + inode->i_size =3D OFFSET_MAX; + inode->i_mapping->a_ops =3D &erofs_fscache_meta_aops; + mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS); + inode->i_private =3D ctx; + + ctx->cookie =3D cookie; + ctx->inode =3D inode; return ctx; =20 err_cookie: - fscache_unuse_cookie(ctx->cookie, NULL, NULL); - fscache_relinquish_cookie(ctx->cookie, false); + fscache_unuse_cookie(cookie, NULL, NULL); + fscache_relinquish_cookie(cookie, false); err: kfree(ctx); return ERR_PTR(ret); @@ -482,46 +476,31 @@ static void erofs_fscache_relinquish_cookie(struct er= ofs_fscache *ctx) fscache_unuse_cookie(ctx->cookie, NULL, NULL); fscache_relinquish_cookie(ctx->cookie, false); iput(ctx->inode); - iput(ctx->anon_inode); kfree(ctx->name); kfree(ctx); } =20 static struct erofs_fscache *erofs_fscache_domain_init_cookie(struct super_block = *sb, - char *name, - unsigned int flags) + char *name) { - int err; - struct inode *inode; struct erofs_fscache *ctx; struct erofs_domain *domain =3D EROFS_SB(sb)->domain; =20 - ctx =3D erofs_fscache_acquire_cookie(sb, name, flags); + ctx =3D erofs_fscache_acquire_cookie(sb, erofs_pseudo_mnt->mnt_sb, name); if (IS_ERR(ctx)) return ctx; =20 ctx->name =3D kstrdup(name, GFP_KERNEL); if (!ctx->name) { - err =3D -ENOMEM; - goto out; - } - - inode =3D new_inode(erofs_pseudo_mnt->mnt_sb); - if (!inode) { - err =3D -ENOMEM; - goto out; + erofs_fscache_relinquish_cookie(ctx); + return ERR_PTR(-ENOMEM); } =20 + refcount_inc(&domain->ref); ctx->domain =3D domain; - ctx->anon_inode =3D inode; list_add(&ctx->node, &erofs_domain_cookies_list); - inode->i_private =3D ctx; - refcount_inc(&domain->ref); return ctx; -out: - erofs_fscache_relinquish_cookie(ctx); - return ERR_PTR(err); } =20 static @@ -546,7 +525,7 @@ struct erofs_fscache *erofs_domain_register_cookie(stru= ct super_block *sb, mutex_unlock(&erofs_domain_cookies_lock); return ctx; } - ctx =3D erofs_fscache_domain_init_cookie(sb, name, flags); + ctx =3D erofs_fscache_domain_init_cookie(sb, name); mutex_unlock(&erofs_domain_cookies_lock); return ctx; } @@ -557,7 +536,7 @@ struct erofs_fscache *erofs_fscache_register_cookie(str= uct super_block *sb, { if (EROFS_SB(sb)->domain_id) return erofs_domain_register_cookie(sb, name, flags); - return erofs_fscache_acquire_cookie(sb, name, flags); + return erofs_fscache_acquire_cookie(sb, sb, name); } =20 void erofs_fscache_unregister_cookie(struct erofs_fscache *ctx) @@ -585,7 +564,7 @@ int erofs_fscache_register_fs(struct super_block *sb) int ret; struct erofs_sb_info *sbi =3D EROFS_SB(sb); struct erofs_fscache *fscache; - unsigned int flags; + unsigned int flags =3D 0; =20 if (sbi->domain_id) ret =3D erofs_fscache_register_domain(sb); @@ -604,7 +583,6 @@ int erofs_fscache_register_fs(struct super_block *sb) * * Acquired domain/volume will be relinquished in kill_sb() on error. */ - flags =3D EROFS_REG_COOKIE_NEED_INODE; if (sbi->domain_id) flags |=3D EROFS_REG_COOKIE_NEED_NOEXIST; fscache =3D erofs_fscache_register_cookie(sb, sbi->fsid, flags); diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 8358cf5f731e..125e4aa8d295 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -107,8 +107,7 @@ struct erofs_domain { =20 struct erofs_fscache { struct fscache_cookie *cookie; - struct inode *inode; - struct inode *anon_inode; + struct inode *inode; /* anonymous indoe for the blob */ =20 /* used for share domain mode */ struct erofs_domain *domain; @@ -450,8 +449,7 @@ extern const struct file_operations erofs_dir_fops; extern const struct iomap_ops z_erofs_iomap_report_ops; =20 /* flags for erofs_fscache_register_cookie() */ -#define EROFS_REG_COOKIE_NEED_INODE 1 -#define EROFS_REG_COOKIE_NEED_NOEXIST 2 +#define EROFS_REG_COOKIE_NEED_NOEXIST 1 =20 void erofs_unmap_metabuf(struct erofs_buf *buf); void erofs_put_metabuf(struct erofs_buf *buf); diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 715efa94eed4..19b1ae79cec4 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -968,6 +968,8 @@ static void erofs_put_super(struct super_block *sb) iput(sbi->packed_inode); sbi->packed_inode =3D NULL; #endif + erofs_free_dev_context(sbi->devs); + sbi->devs =3D NULL; erofs_fscache_unregister_fs(sb); } =20 --=20 2.19.1.6.gb485710b From nobody Fri Sep 12 18:09:00 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60DF3C05027 for ; Wed, 8 Feb 2023 07:18:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230356AbjBHHSN (ORCPT ); Wed, 8 Feb 2023 02:18:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230252AbjBHHR7 (ORCPT ); Wed, 8 Feb 2023 02:17:59 -0500 Received: from out30-132.freemail.mail.aliyun.com (out30-132.freemail.mail.aliyun.com [115.124.30.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0F5821A34 for ; Tue, 7 Feb 2023 23:17:32 -0800 (PST) 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=ay29a033018046049;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0VbAZ945_1675840635; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VbAZ945_1675840635) by smtp.aliyun-inc.com; Wed, 08 Feb 2023 15:17:16 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, linux-erofs@lists.ozlabs.org, zhujia.zj@bytedance.com, houtao1@huawei.com Cc: huyue2@coolpad.com, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] erofs: simplify the name collision checking in share domain mode Date: Wed, 8 Feb 2023 15:17:15 +0800 Message-Id: <489d47915bcc71ef3c3ec7b8a437ec6e09c4c3db.1675840368.git.jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: References: 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" When share domain is enabled, data blobs can be shared among filesystem instances in the same domain for data deduplication, while bootstrap blobs are always dedicated to the corresponding filesystem instance, and have no need to be shared. In the initial implementation of share domain (commit 7d41963759fe ("erofs: Support sharing cookies in the same domain")), bootstrap blobs are also in the share domain, and thus can be referenced by the following filesystem instances. In this case, mounting twice with the same fsid and domain_id will trigger warning in sysfs. Commit 27f2a2dcc626 ("erofs: check the uniqueness of fsid in shared domain in advance") fixes this by introducing the name collision checking. This patch attempts to fix the above issue in another simpler way. Since the bootstrap blobs have no need to be shared, move them out of the share domain, so that one bootstrap blob can not be referenced by other filesystem instances. Attempt to mount twice with the same fsid and domain_id will fail with info of duplicate cookies, which is consistent with the behavior in non-share-domain mode. Signed-off-by: Jingbo Xu Reviewed-by: Jia Zhu --- fs/erofs/fscache.c | 36 ++++++++---------------------------- fs/erofs/internal.h | 4 ++-- fs/erofs/super.c | 2 +- 3 files changed, 11 insertions(+), 31 deletions(-) diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 8353a5fe8c71..8da6e05e9d23 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -505,25 +505,18 @@ struct erofs_fscache *erofs_fscache_domain_init_cooki= e(struct super_block *sb, =20 static struct erofs_fscache *erofs_domain_register_cookie(struct super_block *sb, - char *name, - unsigned int flags) + char *name) { struct erofs_fscache *ctx; struct erofs_domain *domain =3D EROFS_SB(sb)->domain; =20 mutex_lock(&erofs_domain_cookies_lock); list_for_each_entry(ctx, &erofs_domain_cookies_list, node) { - if (ctx->domain !=3D domain || strcmp(ctx->name, name)) - continue; - if (!(flags & EROFS_REG_COOKIE_NEED_NOEXIST)) { + if (ctx->domain =3D=3D domain && !strcmp(ctx->name, name)) { refcount_inc(&ctx->ref); - } else { - erofs_err(sb, "%s already exists in domain %s", name, - domain->domain_id); - ctx =3D ERR_PTR(-EEXIST); + mutex_unlock(&erofs_domain_cookies_lock); + return ctx; } - mutex_unlock(&erofs_domain_cookies_lock); - return ctx; } ctx =3D erofs_fscache_domain_init_cookie(sb, name); mutex_unlock(&erofs_domain_cookies_lock); @@ -531,11 +524,10 @@ struct erofs_fscache *erofs_domain_register_cookie(st= ruct super_block *sb, } =20 struct erofs_fscache *erofs_fscache_register_cookie(struct super_block *sb, - char *name, - unsigned int flags) + char *name) { if (EROFS_SB(sb)->domain_id) - return erofs_domain_register_cookie(sb, name, flags); + return erofs_domain_register_cookie(sb, name); return erofs_fscache_acquire_cookie(sb, sb, name); } =20 @@ -564,7 +556,6 @@ int erofs_fscache_register_fs(struct super_block *sb) int ret; struct erofs_sb_info *sbi =3D EROFS_SB(sb); struct erofs_fscache *fscache; - unsigned int flags =3D 0; =20 if (sbi->domain_id) ret =3D erofs_fscache_register_domain(sb); @@ -573,19 +564,8 @@ int erofs_fscache_register_fs(struct super_block *sb) if (ret) return ret; =20 - /* - * When shared domain is enabled, using NEED_NOEXIST to guarantee - * the primary data blob (aka fsid) is unique in the shared domain. - * - * For non-shared-domain case, fscache_acquire_volume() invoked by - * erofs_fscache_register_volume() has already guaranteed - * the uniqueness of primary data blob. - * - * Acquired domain/volume will be relinquished in kill_sb() on error. - */ - if (sbi->domain_id) - flags |=3D EROFS_REG_COOKIE_NEED_NOEXIST; - fscache =3D erofs_fscache_register_cookie(sb, sbi->fsid, flags); + /* acquired domain/volume will be relinquished in kill_sb() on error */ + fscache =3D erofs_fscache_acquire_cookie(sb, sb, sbi->fsid); if (IS_ERR(fscache)) return PTR_ERR(fscache); =20 diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 125e4aa8d295..fded736bc3d5 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -570,7 +570,7 @@ int erofs_fscache_register_fs(struct super_block *sb); void erofs_fscache_unregister_fs(struct super_block *sb); =20 struct erofs_fscache *erofs_fscache_register_cookie(struct super_block *sb, - char *name, unsigned int flags); + char *name); void erofs_fscache_unregister_cookie(struct erofs_fscache *fscache); #else static inline int erofs_fscache_register_fs(struct super_block *sb) @@ -581,7 +581,7 @@ static inline void erofs_fscache_unregister_fs(struct s= uper_block *sb) {} =20 static inline struct erofs_fscache *erofs_fscache_register_cookie(struct super_block *sb, - char *name, unsigned int flags) + char *name) { return ERR_PTR(-EOPNOTSUPP); } diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 19b1ae79cec4..8706ca34f26a 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -244,7 +244,7 @@ static int erofs_init_device(struct erofs_buf *buf, str= uct super_block *sb, } =20 if (erofs_is_fscache_mode(sb)) { - fscache =3D erofs_fscache_register_cookie(sb, dif->path, 0); + fscache =3D erofs_fscache_register_cookie(sb, dif->path); if (IS_ERR(fscache)) return PTR_ERR(fscache); dif->fscache =3D fscache; --=20 2.19.1.6.gb485710b From nobody Fri Sep 12 18:09:00 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD706C05027 for ; Wed, 8 Feb 2023 07:32:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230513AbjBHHcQ (ORCPT ); Wed, 8 Feb 2023 02:32:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230364AbjBHHcO (ORCPT ); Wed, 8 Feb 2023 02:32:14 -0500 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 058A7301BD for ; Tue, 7 Feb 2023 23:32:10 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R621e4;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=6;SR=0;TI=SMTPD_---0VbB.w4-_1675841526; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VbB.w4-_1675841526) by smtp.aliyun-inc.com; Wed, 08 Feb 2023 15:32:07 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, linux-erofs@lists.ozlabs.org, zhujia.zj@bytedance.com Cc: huyue2@coolpad.com, linux-kernel@vger.kernel.org Subject: [PATCH] erofs: relinquish volume with mutex held Date: Wed, 8 Feb 2023 15:32:06 +0800 Message-Id: <20230208073206.111814-1-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: References: 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" Relinquish fscache volume with mutex held. Otherwise if a new domain is registered when the old domain with the same name gets removed from the list but not relinquished yet, fscache may complain the collision. Signed-off-by: Jingbo Xu Reviewed-by: Jia Zhu --- fs/erofs/fscache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 8da6e05e9d23..35b2d8b5773e 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -328,8 +328,8 @@ static void erofs_fscache_domain_put(struct erofs_domai= n *domain) kern_unmount(erofs_pseudo_mnt); erofs_pseudo_mnt =3D NULL; } - mutex_unlock(&erofs_domain_list_lock); fscache_relinquish_volume(domain->volume, NULL, false); + mutex_unlock(&erofs_domain_list_lock); kfree(domain->domain_id); kfree(domain); return; --=20 2.19.1.6.gb485710b