Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp894416pxp; Wed, 16 Mar 2022 20:27:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXcYbev0LPAlH6DhhzhwRz4I8sl87bAWpzqb+iy+5FhfzLwOMJSCz6me0Dpr5RJ4SJG1TH X-Received: by 2002:a17:90a:8d85:b0:1b8:a215:e3e4 with SMTP id d5-20020a17090a8d8500b001b8a215e3e4mr13391327pjo.175.1647487667889; Wed, 16 Mar 2022 20:27:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647487667; cv=none; d=google.com; s=arc-20160816; b=WoHxt7sB59O5KBmi2VJk7B8d8vc/aTTJecXe3XOEMsFetNffjgAtKwNecBsA3o5yme oaur++PyhQwOYVFGqqQSgzqO2DbldPWUUyTijDM8zQyerCeEk6FPrtCrT0OIPg+I66cJ WsWsbZ6AxEgOKYS0XRdMxIDJUsnzBKj+GI8GHSECKrs5z9O2457wzFR653Ir7Nrr6pPR J770xZ5IwWdcRjZyOYvf8/tj6O+OkIBFvHzWQmL3Th9H8O3jsNL47MFGl+sb3PoYDBQH GRHMEk013PlLYeEwrZIfAEJ6E74GqYrpNoQlZHoJM8zALxlpfexjOx9+IrrYWt5aBglG 7Prg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=OjoGgZGDR4xkcVnTfbc8nUF/Ow08Qq+af/gi5R3OYzw=; b=kAsOoYtB/ov2mHt3RZLLjDDo6MdqWS7KrHlpCQLwCOPodlc52RZI3kEqqjVPF2Sdq4 1HpOx5tDj6nbL8M7vqSuwcs0F+CdPrEnxRSmlEgtbjBL0LKWmoJlmDVFWWnVM2RFdlNw J40Qs9cnYFvnxSLf4iGvsjeqUF5bIg6g7WZIjhHfeeRB3w5Ec5g1mOOywn12dt5la6s1 ndBzVqxpIycJqYlWf1p4ssHUOAqLSH1PHqq09Z0yppbmw0GtmrDuzDXQiOsvRLHbTTxK nIiFUUVtWxv5Thvx+ot3I6AK3cUrROXo+98r//yGvCVcHpekXZmDBY2cjUibiSHPF0Bn OjTw== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id bg7-20020a056a02010700b003816043eea4si935454pgb.153.2022.03.16.20.27.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Mar 2022 20:27:47 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A118C36B4F; Wed, 16 Mar 2022 20:26:24 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356330AbiCPNU4 (ORCPT + 99 others); Wed, 16 Mar 2022 09:20:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356324AbiCPNTr (ORCPT ); Wed, 16 Mar 2022 09:19:47 -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 B3CC94617E; Wed, 16 Mar 2022 06:18:02 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R861e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04400;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=16;SR=0;TI=SMTPD_---0V7NEPse_1647436676; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0V7NEPse_1647436676) by smtp.aliyun-inc.com(127.0.0.1); Wed, 16 Mar 2022 21:17:57 +0800 From: Jeffle Xu To: dhowells@redhat.com, linux-cachefs@redhat.com, xiang@kernel.org, chao@kernel.org, linux-erofs@lists.ozlabs.org Cc: torvalds@linux-foundation.org, gregkh@linuxfoundation.org, willy@infradead.org, linux-fsdevel@vger.kernel.org, joseph.qi@linux.alibaba.com, bo.liu@linux.alibaba.com, tao.peng@linux.alibaba.com, gerry@linux.alibaba.com, eguan@linux.alibaba.com, linux-kernel@vger.kernel.org, luodaowen.backend@bytedance.com Subject: [PATCH v5 22/22] erofs: add 'uuid' mount option Date: Wed, 16 Mar 2022 21:17:23 +0800 Message-Id: <20220316131723.111553-23-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220316131723.111553-1-jefflexu@linux.alibaba.com> References: <20220316131723.111553-1-jefflexu@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce 'uuid' mount option to enable on-demand read sementics. In this case, erofs could be mounted from blob files instead of blkdev. By then users could specify the path of bootstrap blob file containing the complete erofs image. Signed-off-by: Jeffle Xu --- fs/erofs/super.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 2942029a7049..8bc4b782f9a9 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -400,6 +400,7 @@ enum { Opt_dax, Opt_dax_enum, Opt_device, + Opt_uuid, Opt_err }; @@ -424,6 +425,7 @@ static const struct fs_parameter_spec erofs_fs_parameters[] = { fsparam_flag("dax", Opt_dax), fsparam_enum("dax", Opt_dax_enum, erofs_dax_param_enums), fsparam_string("device", Opt_device), + fsparam_string("uuid", Opt_uuid), {} }; @@ -519,6 +521,12 @@ static int erofs_fc_parse_param(struct fs_context *fc, } ++ctx->devs->extra_devices; break; + case Opt_uuid: + kfree(ctx->opt.uuid); + ctx->opt.uuid = kstrdup(param->string, GFP_KERNEL); + if (!ctx->opt.uuid) + return -ENOMEM; + break; default: return -ENOPARAM; } @@ -593,9 +601,14 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_magic = EROFS_SUPER_MAGIC; - if (!sb_set_blocksize(sb, EROFS_BLKSIZ)) { - erofs_err(sb, "failed to set erofs blksize"); - return -EINVAL; + if (erofs_bdev_mode(sb)) { + if (!sb_set_blocksize(sb, EROFS_BLKSIZ)) { + erofs_err(sb, "failed to set erofs blksize"); + return -EINVAL; + } + } else { + sb->s_blocksize = EROFS_BLKSIZ; + sb->s_blocksize_bits = LOG_BLOCK_SIZE; } sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); @@ -604,11 +617,12 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_fs_info = sbi; sbi->opt = ctx->opt; - sbi->dax_dev = fs_dax_get_by_bdev(sb->s_bdev, &sbi->dax_part_off); sbi->devs = ctx->devs; ctx->devs = NULL; - if (!erofs_bdev_mode(sb)) { + if (erofs_bdev_mode(sb)) { + sbi->dax_dev = fs_dax_get_by_bdev(sb->s_bdev, &sbi->dax_part_off); + } else { struct erofs_fscache_context *bootstrap; bootstrap = erofs_fscache_get_ctx(sb, ctx->opt.uuid, true); @@ -620,6 +634,8 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) err = super_setup_bdi(sb); if (err) return err; + + sbi->dax_dev = NULL; } err = erofs_read_superblock(sb); @@ -682,6 +698,11 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) static int erofs_fc_get_tree(struct fs_context *fc) { + struct erofs_fs_context *ctx = fc->fs_private; + + if (ctx->opt.uuid) + return get_tree_nodev(fc, erofs_fc_fill_super); + return get_tree_bdev(fc, erofs_fc_fill_super); } @@ -731,6 +752,7 @@ static void erofs_fc_free(struct fs_context *fc) struct erofs_fs_context *ctx = fc->fs_private; erofs_free_dev_context(ctx->devs); + kfree(ctx->opt.uuid); kfree(ctx); } @@ -771,7 +793,10 @@ static void erofs_kill_sb(struct super_block *sb) WARN_ON(sb->s_magic != EROFS_SUPER_MAGIC); - kill_block_super(sb); + if (erofs_bdev_mode(sb)) + kill_block_super(sb); + else + generic_shutdown_super(sb); sbi = EROFS_SB(sb); if (!sbi) @@ -889,7 +914,12 @@ static int erofs_statfs(struct dentry *dentry, struct kstatfs *buf) { struct super_block *sb = dentry->d_sb; struct erofs_sb_info *sbi = EROFS_SB(sb); - u64 id = huge_encode_dev(sb->s_bdev->bd_dev); + u64 id; + + if (erofs_bdev_mode(sb)) + id = huge_encode_dev(sb->s_bdev->bd_dev); + else + id = 0; /* TODO */ buf->f_type = sb->s_magic; buf->f_bsize = EROFS_BLKSIZ; -- 2.27.0