Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp1790052pxb; Wed, 9 Feb 2022 04:41:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJw0gMe3CqQUSrfutHwRTPBQvSpNvExN/RP18FUCn9t4gdf4XtrqJdvJcmqRykGbZyTkGb0n X-Received: by 2002:aa7:9110:: with SMTP id 16mr2134831pfh.41.1644410464350; Wed, 09 Feb 2022 04:41:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644410464; cv=none; d=google.com; s=arc-20160816; b=b+Ef7HPbEU+cIQJ+8hgce664GAVGwZLDLZHCf2jt3mL6si25uAtmT8bZzbI4bN9lsA i0KBlcTpBsTbSh/6AXGuT+N61Rf4sJGVUqob7P4cjZFWiyuA03tQlQIr8kzcKA26NzLC mNGj+NpFdFGCZMgiNXS7RfDkI8FH3pgZ7G2XMAOzW5VUsICeCPZpa+ncnLnwqJMmtRxm sM83QS+wNV6hdc4OxC13CrrJ4fcaenfgq9qiSrCK0sXNz7V0vY1X4YBtRaHmxA/5legY HRSDNNyxdAvilfbi9P0zU+xgwl3f6e6idQoMOr+OPGikLaKKSBzaXdRPWR6XVlBCfMMD fK9w== 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=zVXqevCS6vWIHEDYiRSF1K8BvHojpb/cN6QjQ9ol7dI=; b=bgSUqB5DgoTGBBUI/Ot2Kg7kETByUxFiqjrKkQyKhlZQa03boeUfd8VCsEjIWgywF8 pjJGB0T+ilPKl9q4zHvsT8hlpJw+WiTfl4Zke65/wNKUssnRazlCkaYxlptvlA2ntvxb nlFmUjXh6NGf3wX9EF2BspB5y1Zx56MTGA68FB+vIoFgJe9j0yUER2Z0yNdiI/FG3UZa ZVMYuJp9/mXQxA0WGh4q6WTLQey6A/mX8rk5PXfUtiD7VNsZ5m9nz2IFSkn3UAK2ps2+ 4zgrFLpMvT63P8fSisSz5kMUzFj/nbEyVuyRoBza5nNBhvczER5tAHSqvXn3qmupnexL GgNA== 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:18 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id a187si15967090pge.296.2022.02.09.04.41.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 04:41:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AB2A0E146FAE; Wed, 9 Feb 2022 02:25:38 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240350AbiBIGIE (ORCPT + 99 others); Wed, 9 Feb 2022 01:08:04 -0500 Received: from gmail-smtp-in.l.google.com ([23.128.96.19]:53218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235833AbiBIGBw (ORCPT ); Wed, 9 Feb 2022 01:01:52 -0500 Received: from out30-54.freemail.mail.aliyun.com (out30-54.freemail.mail.aliyun.com [115.124.30.54]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61B78C05CBA7; Tue, 8 Feb 2022 22:01:55 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R841e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04394;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=15;SR=0;TI=SMTPD_---0V3zeEdM_1644386488; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0V3zeEdM_1644386488) by smtp.aliyun-inc.com(127.0.0.1); Wed, 09 Feb 2022 14:01:29 +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 Subject: [PATCH v3 15/22] erofs: implement fscache-based data read for non-inline layout Date: Wed, 9 Feb 2022 14:01:01 +0800 Message-Id: <20220209060108.43051-16-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220209060108.43051-1-jefflexu@linux.alibaba.com> References: <20220209060108.43051-1-jefflexu@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY autolearn=no 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 This patch implements the data plane of reading data from bootstrap blob file over fscache for non-inline layout. Be noted that compressed layout is not supported yet. Signed-off-by: Jeffle Xu --- fs/erofs/fscache.c | 94 +++++++++++++++++++++++++++++++++++++++++++++ fs/erofs/inode.c | 6 ++- fs/erofs/internal.h | 1 + 3 files changed, 100 insertions(+), 1 deletion(-) diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index a29d2ecff58b..82fdde054b0b 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -4,6 +4,12 @@ */ #include "internal.h" +struct erofs_fscache_map { + struct erofs_fscache_context *m_ctx; + erofs_off_t m_pa, m_la, o_la; + u64 m_llen; +}; + static struct fscache_volume *volume; static int erofs_fscache_read_page(struct fscache_cookie *cookie, @@ -58,10 +64,98 @@ static int erofs_fscache_readpage_blob(struct file *data, struct page *page) return ret; } +static inline int erofs_fscache_get_map(struct erofs_fscache_map *fsmap, + struct erofs_map_blocks *map, + struct super_block *sb) +{ + struct erofs_sb_info *sbi = EROFS_SB(sb); + + fsmap->m_ctx = sbi->bootstrap; + fsmap->m_la = map->m_la; + fsmap->m_pa = map->m_pa; + fsmap->m_llen = map->m_llen; + + return 0; +} + +static int erofs_fscache_readpage_noinline(struct page *page, + struct erofs_fscache_map *fsmap) +{ + struct fscache_cookie *cookie = fsmap->m_ctx->cookie; + /* + * 1) For FLAT_PLAIN layout, the output map.m_la shall be equal to o_la, + * and the output map.m_pa is exactly the physical address of o_la. + * 2) For CHUNK_BASED layout, the output map.m_la is rounded down to the + * nearest chunk boundary, and the output map.m_pa is actually the + * physical address of this chunk boundary. So we need to recalculate + * the actual physical address of o_la. + */ + loff_t start = fsmap->m_pa + fsmap->o_la - fsmap->m_la; + + return erofs_fscache_read_page(cookie, page, start); +} + +static int erofs_fscache_do_readpage(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_map_blocks map; + struct erofs_fscache_map fsmap; + int ret; + + if (erofs_inode_is_data_compressed(vi->datalayout)) { + erofs_info(sb, "compressed layout not supported yet"); + return -EOPNOTSUPP; + } + + map.m_la = fsmap.o_la = page_offset(page); + + ret = erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW); + if (ret) + return ret; + + if (!(map.m_flags & EROFS_MAP_MAPPED)) { + zero_user(page, 0, PAGE_SIZE); + return 0; + } + + ret = erofs_fscache_get_map(&fsmap, &map, sb); + if (ret) + return ret; + + switch (vi->datalayout) { + case EROFS_INODE_FLAT_PLAIN: + case EROFS_INODE_CHUNK_BASED: + return erofs_fscache_readpage_noinline(page, &fsmap); + default: + DBG_BUGON(1); + return -EOPNOTSUPP; + } +} + +static int erofs_fscache_readpage(struct file *file, struct page *page) +{ + int ret; + + ret = erofs_fscache_do_readpage(page); + if (ret) + SetPageError(page); + else + SetPageUptodate(page); + + unlock_page(page); + return ret; +} + static const struct address_space_operations erofs_fscache_blob_aops = { .readpage = erofs_fscache_readpage_blob, }; +const struct address_space_operations erofs_fscache_access_aops = { + .readpage = erofs_fscache_readpage, +}; + struct page *erofs_fscache_read_cache_page(struct erofs_fscache_context *ctx, pgoff_t index) { diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c index ff62f84f47d3..2f450cb3a7b9 100644 --- a/fs/erofs/inode.c +++ b/fs/erofs/inode.c @@ -296,7 +296,11 @@ static int erofs_fill_inode(struct inode *inode, int isdir) err = z_erofs_fill_inode(inode); goto out_unlock; } - inode->i_mapping->a_ops = &erofs_raw_access_aops; + + if (erofs_bdev_mode(inode->i_sb)) + inode->i_mapping->a_ops = &erofs_raw_access_aops; + else + inode->i_mapping->a_ops = &erofs_fscache_access_aops; out_unlock: erofs_put_metabuf(&buf); diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index fca706cfaf72..548f928b0ded 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -393,6 +393,7 @@ struct page *erofs_grab_cache_page_nowait(struct address_space *mapping, extern const struct super_operations erofs_sops; extern const struct address_space_operations erofs_raw_access_aops; +extern const struct address_space_operations erofs_fscache_access_aops; extern const struct address_space_operations z_erofs_aops; /* -- 2.27.0