From patchwork Tue Jan 18 13:12:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingbo Xu X-Patchwork-Id: 12716321 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 40AA3C43217 for ; Tue, 18 Jan 2022 13:12:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242499AbiARNMy (ORCPT ); Tue, 18 Jan 2022 08:12:54 -0500 Received: from out30-130.freemail.mail.aliyun.com ([115.124.30.130]:38229 "EHLO out30-130.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242521AbiARNMm (ORCPT ); Tue, 18 Jan 2022 08:12:42 -0500 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R581e4;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=12;SR=0;TI=SMTPD_---0V2C2ay._1642511558; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0V2C2ay._1642511558) by smtp.aliyun-inc.com(127.0.0.1); Tue, 18 Jan 2022 21:12:38 +0800 From: Jeffle Xu To: dhowells@redhat.com, linux-cachefs@redhat.com, xiang@kernel.org, chao@kernel.org, linux-erofs@lists.ozlabs.org Cc: 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 Subject: [PATCH v2 18/20] erofs: implement fscache-based data read for data blobs Date: Tue, 18 Jan 2022 21:12:14 +0800 Message-Id: <20220118131216.85338-19-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220118131216.85338-1-jefflexu@linux.alibaba.com> References: <20220118131216.85338-1-jefflexu@linux.alibaba.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org This patch 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, 16 insertions(+), 3 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index 51ccbc02dd73..56db391a3411 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -200,6 +200,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_ctx = EROFS_SB(sb)->bootstrap; if (map->m_deviceid) { down_read(&devs->rwsem); @@ -211,6 +212,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_ctx = dif->ctx; up_read(&devs->rwsem); } else if (devs->extra_devices) { down_read(&devs->rwsem); @@ -228,6 +230,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_ctx = dif->ctx; break; } } diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 8c56bd54b2af..e8df35ee4ba8 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -144,8 +144,8 @@ static int erofs_fscache_readpage(struct file *file, struct page *page) struct inode *inode = page->mapping->host; struct erofs_inode *vi = EROFS_I(inode); struct super_block *sb = inode->i_sb; - struct erofs_sb_info *sbi = EROFS_SB(sb); struct erofs_map_blocks map; + struct erofs_map_dev mdev; struct erofs_fscache_map fsmap; int ret; @@ -168,9 +168,18 @@ static int erofs_fscache_readpage(struct file *file, struct page *page) return 0; } - fsmap.m_ctx = sbi->bootstrap; + 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; + + fsmap.m_ctx = mdev.m_ctx; fsmap.m_la = map.m_la; - fsmap.m_pa = map.m_pa; + fsmap.m_pa = mdev.m_pa; fsmap.m_llen = map.m_llen; switch (vi->datalayout) { diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 5d514c7b73cc..6ccf14952b2d 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -486,6 +486,7 @@ struct erofs_map_dev { struct block_device *m_bdev; struct dax_device *m_daxdev; u64 m_dax_part_off; + struct erofs_fscache_context *m_ctx; erofs_off_t m_pa; unsigned int m_deviceid;