From patchwork Fri Mar 25 12:22:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingbo Xu X-Patchwork-Id: 12791556 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 0202DC433F5 for ; Fri, 25 Mar 2022 12:24:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359109AbiCYMZl (ORCPT ); Fri, 25 Mar 2022 08:25:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1359116AbiCYMYw (ORCPT ); Fri, 25 Mar 2022 08:24:52 -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 22108D760E; Fri, 25 Mar 2022 05:23:02 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R181e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04395;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=18;SR=0;TI=SMTPD_---0V89rBrD_1648210975; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0V89rBrD_1648210975) by smtp.aliyun-inc.com(127.0.0.1); Fri, 25 Mar 2022 20:22:55 +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, tianzichen@kuaishou.com, fannaihao@baidu.com Subject: [PATCH v6 20/22] erofs: implement fscache-based data read for data blobs Date: Fri, 25 Mar 2022 20:22:21 +0800 Message-Id: <20220325122223.102958-21-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220325122223.102958-1-jefflexu@linux.alibaba.com> References: <20220325122223.102958-1-jefflexu@linux.alibaba.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Implements the data plane of reading data from data blob file over fscache. Signed-off-by: Jeffle Xu --- fs/erofs/data.c | 3 +++ fs/erofs/fscache.c | 15 +++++++++++++-- fs/erofs/internal.h | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index b4571bea93d5..b9a05de3c3b2 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -206,6 +206,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map) map->m_bdev = sb->s_bdev; map->m_daxdev = EROFS_SB(sb)->dax_dev; map->m_dax_part_off = EROFS_SB(sb)->dax_part_off; + map->m_fscache = EROFS_SB(sb)->bootstrap; if (map->m_deviceid) { down_read(&devs->rwsem); @@ -217,6 +218,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map) map->m_bdev = dif->bdev; map->m_daxdev = dif->dax_dev; map->m_dax_part_off = dif->dax_part_off; + map->m_fscache = dif->blob; up_read(&devs->rwsem); } else if (devs->extra_devices) { down_read(&devs->rwsem); @@ -234,6 +236,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map) map->m_bdev = dif->bdev; map->m_daxdev = dif->dax_dev; map->m_dax_part_off = dif->dax_part_off; + map->m_fscache = dif->blob; break; } } diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index d75958470645..cbb39657615e 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -63,9 +63,20 @@ static int erofs_fscache_readpage_blob(struct file *data, struct page *page) static inline int erofs_fscache_get_map(struct erofs_map_blocks *map, struct super_block *sb) { - struct erofs_sb_info *sbi = EROFS_SB(sb); + struct erofs_map_dev mdev; + int ret; + + mdev = (struct erofs_map_dev) { + .m_deviceid = map->m_deviceid, + .m_pa = map->m_pa, + }; + + ret = erofs_map_dev(sb, &mdev); + if (ret) + return ret; - map->m_fscache = sbi->bootstrap; + map->m_fscache = mdev.m_fscache; + map->m_pa = mdev.m_pa; return 0; } diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 94a118caf580..cea08f12a2c3 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -487,6 +487,7 @@ struct erofs_map_dev { struct block_device *m_bdev; struct dax_device *m_daxdev; u64 m_dax_part_off; + struct erofs_fscache *m_fscache; erofs_off_t m_pa; unsigned int m_deviceid;