From patchwork Tue Jan 18 13:12:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingbo Xu X-Patchwork-Id: 12716319 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 A2E92C433F5 for ; Tue, 18 Jan 2022 13:12:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242407AbiARNMt (ORCPT ); Tue, 18 Jan 2022 08:12:49 -0500 Received: from out30-54.freemail.mail.aliyun.com ([115.124.30.54]:52131 "EHLO out30-54.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242369AbiARNMi (ORCPT ); Tue, 18 Jan 2022 08:12:38 -0500 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R141e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04407;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=12;SR=0;TI=SMTPD_---0V2C5Cov_1642511555; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0V2C5Cov_1642511555) by smtp.aliyun-inc.com(127.0.0.1); Tue, 18 Jan 2022 21:12:36 +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 16/20] erofs: implement fscache-based data read for inline layout Date: Tue, 18 Jan 2022 21:12:12 +0800 Message-Id: <20220118131216.85338-17-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 bootstrap blob file over fscache for inline layout. Signed-off-by: Jeffle Xu --- fs/erofs/fscache.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 588c33ab6a90..8c56bd54b2af 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -100,6 +100,45 @@ static int erofs_fscache_readpage_noinline(struct page *page, return netfs_readpage(NULL, folio, &erofs_req_ops, &priv); } +static int erofs_fscache_readpage_inline(struct page *page, + struct erofs_fscache_map *fsmap) +{ + struct inode *inode = page->mapping->host; + struct super_block *sb = inode->i_sb; + struct erofs_buf buf = __EROFS_BUF_INITIALIZER; + erofs_blk_t blknr; + size_t offset, len; + void *src, *dst; + + /* + * For inline (tail packing) layout, the offset may be non-zero, while + * the offset can be calculated from corresponding physical address + * directly. + * Currently only flat layout supports inline (FLAT_INLINE), and the + * output map.m_pa is exactly the physical address of o_la in this case. + */ + offset = erofs_blkoff(fsmap->m_pa); + blknr = erofs_blknr(fsmap->m_pa); + len = fsmap->m_llen; + + src = erofs_read_metabuf(&buf, sb, blknr, EROFS_KMAP); + if (IS_ERR(src)) { + SetPageError(page); + unlock_page(page); + return PTR_ERR(src); + } + + dst = kmap(page); + memcpy(dst, src + offset, len); + kunmap(page); + + erofs_put_metabuf(&buf); + + SetPageUptodate(page); + unlock_page(page); + return 0; +} + static int erofs_fscache_readpage(struct file *file, struct page *page) { struct inode *inode = page->mapping->host; @@ -138,6 +177,8 @@ static int erofs_fscache_readpage(struct file *file, struct page *page) case EROFS_INODE_FLAT_PLAIN: case EROFS_INODE_CHUNK_BASED: return erofs_fscache_readpage_noinline(page, &fsmap); + case EROFS_INODE_FLAT_INLINE: + return erofs_fscache_readpage_inline(page, &fsmap); default: DBG_BUGON(1); ret = -EOPNOTSUPP;