Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp791649pxb; Fri, 15 Apr 2022 11:22:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJRun9lgBJoViV2zpDD4y7D1YUdoVL61ufmYeI6V5O3AwACMYi35LZWYmcF9MhuNRfoLT3 X-Received: by 2002:a17:907:d13:b0:6e0:b799:8fcc with SMTP id gn19-20020a1709070d1300b006e0b7998fccmr279810ejc.11.1650046949164; Fri, 15 Apr 2022 11:22:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650046949; cv=none; d=google.com; s=arc-20160816; b=qnnRUsd3CBAXIhi+SKol6tuQo03JhRlQfA+ZnRxugwALeCqrMjmoOY6npmy7zShDYA wFpzalJ8zv8xN0hqf9HoGHFRqOYs5ZO7m/FKO+o03bQT/e/f4Din78YPGsIoXL+PtGSS NOiwCeRkcvixOlAGzBv8+9vmIfpV7ij32P5DUFuFBf9tySlUyOcADXG79QPIiOoiI+PL yf1xuGL/UPRpz1qxIxwANClS3tel7aTWE7mjXiNPUunygiQzQ/FbauRMFIGqnMvo5yWW nU2Yet6K3rxcVW26WdfpNryXtte4i1S3h5SZHb8RbCl/4cqWK42tcSRbZza6DFZak0Fa iz7Q== 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=H1TUqhEELlFh18GNX+TAicrD8JOqNQxzaJrFSUrGo64=; b=KveGiTj2taVvPUA02MvF/FR+M1Ajva45twPOuKyfhloYdG3Guo/8dO9+9wOjJL26Hc 6A1KE9AHaRPY+04OvmzKiCMFtmLBdAd0rrIeDgMrw+TFKrNl+pXgNgSBjM8dBOFT5xNC tomBpqUfMQ0W4kwTFmoJol6W3YnKLDDzEVKnMtgnm1FwHedrXO3Sznb49vWechz26cpg vFgIbFfxwN4c0ilLZ9Vi0JZA+w+XVRu3NCXRMq0DTVwrtxQU/ipTOfZ0z99iJGmNGGk9 26HPriEOZhRE92O5KIVfhwaAXV8eJhEaEtwcG3WmsB//tXlaZ+jmMk0mF3LYrPRqneY0 Ecyg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s17-20020a17090699d100b006e7ee1a3502si1369590ejn.955.2022.04.15.11.22.03; Fri, 15 Apr 2022 11:22:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353861AbiDOMkz (ORCPT + 99 others); Fri, 15 Apr 2022 08:40:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353726AbiDOMja (ORCPT ); Fri, 15 Apr 2022 08:39:30 -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 D4518C6EEE; Fri, 15 Apr 2022 05:36:49 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R131e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04426;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=19;SR=0;TI=SMTPD_---0VA7Cc4d_1650026203; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VA7Cc4d_1650026203) by smtp.aliyun-inc.com(127.0.0.1); Fri, 15 Apr 2022 20:36:44 +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, zhangjiachen.jaycee@bytedance.com Subject: [PATCH v9 18/21] erofs: implement fscache-based data read for non-inline layout Date: Fri, 15 Apr 2022 20:36:11 +0800 Message-Id: <20220415123614.54024-19-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220415123614.54024-1-jefflexu@linux.alibaba.com> References: <20220415123614.54024-1-jefflexu@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham 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 Implement the data plane of reading data from data blobs over fscache for non-inline layout. Signed-off-by: Jeffle Xu Reviewed-by: Gao Xiang --- fs/erofs/fscache.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ fs/erofs/inode.c | 4 ++++ fs/erofs/internal.h | 2 ++ 3 files changed, 57 insertions(+) diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 3f00eb34ac35..b799b0fe1b67 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -84,10 +84,61 @@ static int erofs_fscache_meta_readpage(struct file *data, struct page *page) return ret; } +static int erofs_fscache_readpage(struct file *file, struct page *page) +{ + struct folio *folio = page_folio(page); + struct inode *inode = folio_mapping(folio)->host; + struct super_block *sb = inode->i_sb; + struct erofs_map_blocks map; + struct erofs_map_dev mdev; + erofs_off_t pos; + loff_t pstart; + int ret = 0; + + DBG_BUGON(folio_size(folio) != EROFS_BLKSIZ); + + pos = folio_pos(folio); + map.m_la = pos; + + ret = erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW); + if (ret) + goto out_unlock; + + if (!(map.m_flags & EROFS_MAP_MAPPED)) { + folio_zero_range(folio, 0, folio_size(folio)); + goto out_uptodate; + } + + mdev = (struct erofs_map_dev) { + .m_deviceid = map.m_deviceid, + .m_pa = map.m_pa, + }; + + ret = erofs_map_dev(sb, &mdev); + if (ret) + goto out_unlock; + + pstart = mdev.m_pa + (pos - map.m_la); + ret = erofs_fscache_read_folios(mdev.m_fscache->cookie, + folio_mapping(folio), folio_pos(folio), + folio_size(folio), pstart); + +out_uptodate: + if (!ret) + folio_mark_uptodate(folio); +out_unlock: + folio_unlock(folio); + return ret; +} + static const struct address_space_operations erofs_fscache_meta_aops = { .readpage = erofs_fscache_meta_readpage, }; +const struct address_space_operations erofs_fscache_access_aops = { + .readpage = erofs_fscache_readpage, +}; + /* * Create an fscache context for data blob. * Return: 0 on success and allocated fscache context is assigned to @fscache, diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c index e8b37ba5e9ad..8d3f56c6469b 100644 --- a/fs/erofs/inode.c +++ b/fs/erofs/inode.c @@ -297,6 +297,10 @@ static int erofs_fill_inode(struct inode *inode, int isdir) goto out_unlock; } inode->i_mapping->a_ops = &erofs_raw_access_aops; +#ifdef CONFIG_EROFS_FS_ONDEMAND + if (erofs_is_fscache_mode(inode->i_sb)) + inode->i_mapping->a_ops = &erofs_fscache_access_aops; +#endif out_unlock: erofs_put_metabuf(&buf); diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index fa488af8dfcf..c8f6ac910976 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -639,6 +639,8 @@ int erofs_fscache_register_cookie(struct super_block *sb, struct erofs_fscache **fscache, char *name, bool need_inode); void erofs_fscache_unregister_cookie(struct erofs_fscache **fscache); + +extern const struct address_space_operations erofs_fscache_access_aops; #else static inline int erofs_fscache_register_fs(struct super_block *sb) { -- 2.27.0