Received: by 2002:a05:6a10:5594:0:0:0:0 with SMTP id ee20csp430269pxb; Mon, 25 Apr 2022 13:05:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMSJa9Yk5u6WtEuj8MWPgbfCOYCX+1ta+J4mY8LpZcD1IzdWOjYyatLUhrT5zr30KNI8tp X-Received: by 2002:a17:907:3ea6:b0:6f3:936f:d836 with SMTP id hs38-20020a1709073ea600b006f3936fd836mr6962995ejc.323.1650917128496; Mon, 25 Apr 2022 13:05:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650917128; cv=none; d=google.com; s=arc-20160816; b=lgKSVk66FJBve7tXxwgV/mwPK2U6vQ5W3EpwAFPBsm761AN4WIm8W2/SZ3yxhg68aC rxm6GRFmeYt5xoARMSQ+dnz1b1kAryTtykcgFUzdNUg7sqe1hDR2W9hk9KTyQuIZCuDz 6+YT6uD/egKR25kxZrViExbzpfeELnrIafTDYWwgH9p9UfAooRp8/PMOnMQxdSXevRnj BNlbXNW4WJCFciY3zjSFNKCDGksfy2byDmgU7jyYh0b/YMeUx7Tie9UOWMbQBc21z9Vx jWUly0X2xR4ZbgjaT03I0+8Iluu8pmd8LjlaNNKL1Fet6IlqNUSo3r0874vutnFDLW0F U5aw== 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=E+e/Bj57oJpdhYnqljaJ8a7Nc8MR1FuSG8mdD34wghk=; b=KRlfWFO5g0wykCZr7BEkNf+OQ8z3nfIu4dK0um60uIQjoJRBAZHpQ54ZgNcKl9Zn1x /TlE6tiuwI3LHrOd9WcHzJ3fY99JZKnptiTIN3+DiY7qIPQRj1xx4h4PVsPVz01OvgsK Tftn4nNm424tCbRL/g00npH0aqcRKUy1KjdABtxMQchsvCEZ7qOen7nU2govNTXW8buF HgFTZJI8k93sj7gH29YxrP0/bXfWFEVtjiRsPFtDn6/SnqnS70turuB6s2AyMAe/+fzm ipUtz8ir/A9JowZXydewaHH+vcGISk4dLZGvyoqW473ECaZzAoQLRD8QkLfn+XVBsTg1 2L3w== 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 k27-20020a1709062a5b00b006df76385cb1si13557475eje.337.2022.04.25.13.05.01; Mon, 25 Apr 2022 13:05:28 -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 S241233AbiDYM1b (ORCPT + 99 others); Mon, 25 Apr 2022 08:27:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241545AbiDYMZ1 (ORCPT ); Mon, 25 Apr 2022 08:25:27 -0400 Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8BBD62BCA; Mon, 25 Apr 2022 05:22:22 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R611e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04395;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=20;SR=0;TI=SMTPD_---0VBE4bLd_1650889336; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VBE4bLd_1650889336) by smtp.aliyun-inc.com(127.0.0.1); Mon, 25 Apr 2022 20:22:17 +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 20/21] erofs: implement fscache-based data readahead Date: Mon, 25 Apr 2022 20:21:42 +0800 Message-Id: <20220425122143.56815-21-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 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 | 90 ++++++++++++++++++++++++++++++++++++++++++++++ fs/erofs/super.c | 4 +++ 2 files changed, 94 insertions(+) diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 5b779812a5ee..a402d8f0a063 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -162,12 +162,102 @@ static int erofs_fscache_readpage(struct file *file, struct page *page) return ret; } +static 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; + + offset = start + done; + count = min_t(size_t, map.m_llen - (pos - map.m_la), + len - done); + + 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; + } + + 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; + } + + 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)); + /* + * For the error cases, the folios will be unlocked when + * .readahead() returns. + */ + 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, }; int erofs_fscache_register_cookie(struct super_block *sb, diff --git a/fs/erofs/super.c b/fs/erofs/super.c index c6755bcae4a6..f68ba929100d 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -619,6 +619,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; } else { if (!sb_set_blocksize(sb, EROFS_BLKSIZ)) { erofs_err(sb, "failed to set erofs blksize"); -- 2.27.0