From: Phillip Lougher <phillip@squashfs.org.uk>
To: hsinyi@chromium.org
Cc: Xiongwei.Song@windriver.com, akpm@linux-foundation.org,
houtao1@huawei.com, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, m.szyprowski@samsung.com, miaoxie@huawei.com,
phillip@squashfs.org.uk, squashfs-devel@lists.sourceforge.net,
willy@infradead.org, yi.zhang@huawei.com, zhengliang6@huawei.com
Subject: [PATCH 4/3] squashfs: support reading fragments in readahead call
Date: Fri, 17 Jun 2022 04:03:45 +0100 [thread overview]
Message-ID: <20220617030345.24712-1-phillip@squashfs.org.uk> (raw)
In-Reply-To: <20220613082802.1301238-4-hsinyi@chromium.org>
This patch adds a function which can be used to read fragments in the
readahead call.
This function is necessary because filesystems built with the -tailends
(or -always-use-fragments) option may have fragments present which
cannot be currently handled.
Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
---
fs/squashfs/file.c | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/fs/squashfs/file.c b/fs/squashfs/file.c
index f0c64ee272d5..3a4cce16d7da 100644
--- a/fs/squashfs/file.c
+++ b/fs/squashfs/file.c
@@ -497,6 +497,41 @@ static int squashfs_read_folio(struct file *file, struct folio *folio)
return res;
}
+static unsigned int squashfs_readahead_fragment(struct page **page,
+ unsigned int pages, unsigned int expected)
+{
+ struct inode *inode = page[0]->mapping->host;
+ struct squashfs_cache_entry *buffer = squashfs_get_fragment(inode->i_sb,
+ squashfs_i(inode)->fragment_block,
+ squashfs_i(inode)->fragment_size);
+ struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
+ unsigned int n, mask = (1 << (msblk->block_log - PAGE_SHIFT)) - 1;
+
+ if (buffer->error)
+ goto out;
+
+ expected += squashfs_i(inode)->fragment_offset;
+
+ for (n = 0; n < pages; n++) {
+ unsigned int base = (page[n]->index & mask) << PAGE_SHIFT;
+ unsigned int offset = base + squashfs_i(inode)->fragment_offset;
+
+ if (expected > offset) {
+ unsigned int avail = min_t(unsigned int, expected -
+ offset, PAGE_SIZE);
+
+ squashfs_fill_page(page[n], buffer, offset, avail);
+ }
+
+ unlock_page(page[n]);
+ put_page(page[n]);
+ }
+
+out:
+ squashfs_cache_put(buffer);
+ return buffer->error;
+}
+
static void squashfs_readahead(struct readahead_control *ractl)
{
struct inode *inode = ractl->mapping->host;
--
2.34.1
next prev parent reply other threads:[~2022-06-17 3:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-13 8:27 [PATCH v6 0/3] Implement readahead for squashfs Hsin-Yi Wang
2022-06-13 8:28 ` [PATCH v6 1/3] Revert "squashfs: provide backing_dev_info in order to disable read-ahead" Hsin-Yi Wang
2022-06-13 8:28 ` [PATCH v6 2/3] squashfs: always build "file direct" version of page actor Hsin-Yi Wang
2022-06-13 8:28 ` [PATCH v6 3/3] squashfs: implement readahead Hsin-Yi Wang
2022-06-17 3:03 ` Phillip Lougher [this message]
2022-06-17 8:29 ` [PATCH 4/3] squashfs: support reading fragments in readahead call Hsin-Yi Wang
2022-06-17 3:06 ` [PATCH v6 3/3] squashfs: implement readahead Phillip Lougher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220617030345.24712-1-phillip@squashfs.org.uk \
--to=phillip@squashfs.org.uk \
--cc=Xiongwei.Song@windriver.com \
--cc=akpm@linux-foundation.org \
--cc=houtao1@huawei.com \
--cc=hsinyi@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=m.szyprowski@samsung.com \
--cc=miaoxie@huawei.com \
--cc=squashfs-devel@lists.sourceforge.net \
--cc=willy@infradead.org \
--cc=yi.zhang@huawei.com \
--cc=zhengliang6@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox