Received: by 2002:a05:6a10:5594:0:0:0:0 with SMTP id ee20csp441848pxb; Mon, 25 Apr 2022 13:22:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6/5xnVDBn6vQABGj7yZQp1l9/YyteZqt7MLGUND3jk8UMvn2b8PoDW/eBM30sWR0fw7Dj X-Received: by 2002:a17:902:7c81:b0:156:30ef:7dec with SMTP id y1-20020a1709027c8100b0015630ef7decmr19374607pll.74.1650918138151; Mon, 25 Apr 2022 13:22:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650918138; cv=none; d=google.com; s=arc-20160816; b=Pi7/F5yD084RO/E6yFlZSxAEZMedp9zug17HcyNsUVEy19MB2kf5+6AIl05P0CMVDs rkafZ779kIT2i5Bnwb+d/lP5fYGR36UjvcSAUqxLkMWLdCLRmeg5ZOpitEzcZYv9d9Aq MaAc1RI/7MFD4oOWNthXz+MAfEPQetycmFSesZtlo9j+jq7KIYztlSpkO6NIHdbvexTR p4vwoNBnna7Qvd2wVvG5HfkXgXEZEZo9OSK5KGa45jxM4jiIi5bl+ogzoyj47lXxfje9 RNlu2FTso62hb1IfnsLP9awB/IMiY+i5bR3b+7CxOgwGtcnxfhUla1iH4viQ/oZEQAJN j3tw== 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=d3b+R4qkVRfvPcE5a4au9Bd+CC/6RrRUHSgPFcB0swU=; b=AkPwoyOUimFNz7Bl9ECT0hUq9+K8mrNo2XSWnFWhIM2y47qhS4eZm1RREPvAtvQ4TI ltTh4+5t58RnnrAiOIiJJsV37RIM3T30EVbcy6aNOmQ+crtB1BEvXvUguKGg75SOyxqM XlwhxbLbeUWMADwV5VdEQYmbfr4EuQfkYsOEO55uWtkcObnRE/GjJYfkEB4N2ThOvNEb MqVywFzToqkJPZ9r8OaEcrZ8xP1STjMDuqSF/E2NKQ4QjWuDmvYniC+BfrMwNG/MfnlX znIREeFQUlyo9xSZb41cP71TMSf8mK9GkCYWHVNO9sVEqQVInYvAgq1bWom+c8IExsU1 Buug== 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 p19-20020a637f53000000b003ab3da7b5aesi4484506pgn.531.2022.04.25.13.22.00; Mon, 25 Apr 2022 13:22:18 -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 S234241AbiDYM07 (ORCPT + 99 others); Mon, 25 Apr 2022 08:26:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241786AbiDYMZY (ORCPT ); Mon, 25 Apr 2022 08:25:24 -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 9FAD660DA3; Mon, 25 Apr 2022 05:22:18 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R921e4;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=20;SR=0;TI=SMTPD_---0VBGH8HR_1650889333; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VBGH8HR_1650889333) by smtp.aliyun-inc.com(127.0.0.1); Mon, 25 Apr 2022 20:22:14 +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, zhujia.zj@bytedance.com Subject: [PATCH v10 18/21] erofs: implement fscache-based data read for non-inline layout Date: Mon, 25 Apr 2022 20:21:40 +0800 Message-Id: <20220425122143.56815-19-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220425122143.56815-1-jefflexu@linux.alibaba.com> References: <20220425122143.56815-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,SPF_HELO_NONE,SPF_PASS, 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 23d7e862eed8..b3af72af7c88 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -83,10 +83,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; + + 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, +}; + int erofs_fscache_register_cookie(struct super_block *sb, struct erofs_fscache **fscache, char *name, bool need_inode) 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