Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp454666pxb; Thu, 31 Mar 2022 09:07:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0t2p/TkkvxEcY0mAJ0Vo+nqS3NimyeGxkJixPOqbL+tbSL5bsZEMFQVmb/8ws2xWDIgw+ X-Received: by 2002:a17:902:7006:b0:156:3cbe:6b04 with SMTP id y6-20020a170902700600b001563cbe6b04mr5665966plk.68.1648742821725; Thu, 31 Mar 2022 09:07:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648742821; cv=none; d=google.com; s=arc-20160816; b=zHllCh2rcbemGsSFWKRQmngPTACMKZBY7FbT6Y4NxfrFxJiijIU0T+RdKp72RSAh/n U3kLVBTjLmGzUQb99XU5ssKvIDrtaOkJ60KnXkJ5amoKZiXHcS7kD+Ps6O0QIwaLN96l RIxTZ+ZqmPJcApBaauNfE9lBk9lhx4DbYIR/hj+PW4nTKU1z79iVobkWNTdnXavCPRyT bQS5d22WBT/h//sh9aXhZlj9Ttw4tEqCCXWFcj00P54DBiCfeoz5+3t6I3BFaMJ5MM4n IkO5Pqd95AYAII/9NtBm2a19fwVgFIJwfVRI+btslz5sJ3AlXHoIhNB8fIrwgeZLYtrR Njlg== 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=Y5RcOFuNrVwKiWmaPfhSLa2gYtqggj8ecQRDtLwb8e4=; b=FouGBi4hK7jZzjSBPapE4wY9ZZCjLq3bWBlifVHJxE7Vmn3sOoiQ0tTcJNdC1JDmik CWUGOIqZiiDsLJFHhSpyX3LevJzWu32ERLG6rNiAktcS8PL3yw3f2nB5SFZaRud/lZ9d rM1J93zqPIHIQ/dZk2Sj6ZZim/yNie0tbTU62T6STXzfFX7y8WQ/Dtyucn2WvWJIvO2x sDb4r6+kdLIWctj+hw8QpZY0jjhKu/KubIO5xTGagjJx8ECzCQeCOiM74RkwKIQSDfjG dTfPpE1jDWvogrvXm/PLwYp2Nz64YdEoQIlTGpcAsduIZk9jegCDorBD0tdKrkZQ7APx 7WlA== 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 a6-20020a170902b58600b00153b2d1661esi1915132pls.550.2022.03.31.09.06.46; Thu, 31 Mar 2022 09:07:01 -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 S235493AbiCaMBV (ORCPT + 99 others); Thu, 31 Mar 2022 08:01:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235528AbiCaMA1 (ORCPT ); Thu, 31 Mar 2022 08:00:27 -0400 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 DA90D11A2C; Thu, 31 Mar 2022 04:58:26 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R751e4;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=18;SR=0;TI=SMTPD_---0V8imrwp_1648727901; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0V8imrwp_1648727901) by smtp.aliyun-inc.com(127.0.0.1); Thu, 31 Mar 2022 19:58:22 +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 Subject: [PATCH v7 18/19] erofs: implement fscache-based data readahead Date: Thu, 31 Mar 2022 19:57:52 +0800 Message-Id: <20220331115753.89431-19-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220331115753.89431-1-jefflexu@linux.alibaba.com> References: <20220331115753.89431-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 fscache-based data readahead. Also registers an individual bdi for each erofs instance to enable readahead. Signed-off-by: Jeffle Xu --- fs/erofs/fscache.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++ fs/erofs/super.c | 4 ++ 2 files changed, 98 insertions(+) diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index d32cb5840c6d..620d44210809 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -148,12 +148,106 @@ static int erofs_fscache_readpage(struct file *file, struct page *page) return ret; } +static inline void erofs_fscache_unlock_folios(struct readahead_control *rac, + size_t len) +{ + while (len) { + struct folio *folio = readahead_folio(rac); + + len -= folio_size(folio); + folio_mark_uptodate(folio); + folio_unlock(folio); + } +} + +static void erofs_fscache_readahead(struct readahead_control *rac) +{ + struct inode *inode = rac->mapping->host; + struct super_block *sb = inode->i_sb; + size_t len, count, done = 0; + erofs_off_t pos; + loff_t start, offset; + int ret; + + if (!readahead_count(rac)) + return; + + start = readahead_pos(rac); + len = readahead_length(rac); + + do { + struct erofs_map_blocks map; + struct erofs_map_dev mdev; + + pos = start + done; + map.m_la = pos; + + ret = erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW); + if (ret) + return; + + /* + * 1) For CHUNK_BASED layout, the output m_la is rounded down to + * the nearest chunk boundary, and the output m_llen actually + * starts from the start of the containing chunk. + * 2) For other cases, the output m_la is equal to o_la. + */ + offset = start + done; + count = min_t(size_t, map.m_llen - (pos - map.m_la), len - done); + + /* Read-ahead Hole */ + if (!(map.m_flags & EROFS_MAP_MAPPED)) { + struct iov_iter iter; + + iov_iter_xarray(&iter, READ, &rac->mapping->i_pages, + offset, count); + iov_iter_zero(count, &iter); + + erofs_fscache_unlock_folios(rac, count); + ret = count; + continue; + } + + /* Read-ahead Inline */ + if (map.m_flags & EROFS_MAP_META) { + struct folio *folio = readahead_folio(rac); + + ret = erofs_fscache_readpage_inline(folio, &map); + if (!ret) { + folio_mark_uptodate(folio); + ret = folio_size(folio); + } + + folio_unlock(folio); + continue; + } + + /* Read-ahead No-inline */ + 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 = erofs_fscache_read_folios(mdev.m_fscache->cookie, + rac->mapping, offset, count, + mdev.m_pa + (pos - map.m_la)); + if (!ret) { + erofs_fscache_unlock_folios(rac, count); + ret = count; + } + } while (ret > 0 && ((done += ret) < len)); +} + 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, + .readahead = erofs_fscache_readahead, }; /* diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 8c7181cd37e6..a5e4de60a0d8 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -621,6 +621,10 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) sbi->opt.fsid, true); if (err) return err; + + err = super_setup_bdi(sb); + if (err) + return err; } err = erofs_read_superblock(sb); -- 2.27.0