Skip to content

Commit

Permalink
erofs: implement fscache-based metadata read
Browse files Browse the repository at this point in the history
This patch implements the data plane of reading metadata from bootstrap
blob file over fscache.

Be noted that currently it only supports the scenario where the backing
file has no hole. Once it hits a hole of the backing file, erofs will
fail the IO with -EOPNOTSUPP for now. The following patch will fix this
issue, i.e. implementing the demand reading mode.

Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
  • Loading branch information
lostjeffle authored and intel-lab-lkp committed Dec 27, 2021
1 parent 57d67ab commit c3453b9
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 7 deletions.
4 changes: 2 additions & 2 deletions fs/erofs/data.c
Expand Up @@ -19,8 +19,8 @@ struct page *erofs_get_meta_page(struct super_block *sb, erofs_blk_t blkaddr)
page = read_cache_page_gfp(mapping, blkaddr,
mapping_gfp_constraint(mapping, ~__GFP_FS));
} else {
/* TODO: data path in nodev mode */
page = ERR_PTR(-EINVAL);
page = erofs_readpage_from_fscache(EROFS_SB(sb)->bootstrap,
blkaddr);
}

/* should already be PageUptodate */
Expand Down
59 changes: 59 additions & 0 deletions fs/erofs/fscache.c
Expand Up @@ -6,6 +6,65 @@

static struct fscache_volume *volume;

static int erofs_begin_cache_operation(struct netfs_read_request *rreq)
{
return fscache_begin_read_operation(&rreq->cache_resources,
rreq->netfs_priv);
}

static void erofs_priv_cleanup(struct address_space *mapping, void *netfs_priv)
{
}

static void erofs_issue_op(struct netfs_read_subrequest *subreq)
{
/*
* TODO: implement demand-read logic later.
* We rely on user daemon to prepare blob files under corresponding
* directory, and we can reach here if blob files don't exist.
*/

netfs_subreq_terminated(subreq, -EOPNOTSUPP, false);
}

const struct netfs_read_request_ops erofs_req_ops = {
.begin_cache_operation = erofs_begin_cache_operation,
.cleanup = erofs_priv_cleanup,
.issue_op = erofs_issue_op,
};

struct page *erofs_readpage_from_fscache(struct erofs_cookie_ctx *ctx,
pgoff_t index)
{
struct folio *folio;
struct page *page;
struct super_block *sb = ctx->inode->i_sb;
int ret;

page = find_or_create_page(ctx->inode->i_mapping, index, GFP_KERNEL);
if (unlikely(!page)) {
erofs_err(sb, "failed to allocate page");
return ERR_PTR(-ENOMEM);
}

/* The content is already buffered in the address space */
if (PageUptodate(page)) {
unlock_page(page);
return page;
}

/* Or a new page cache is created, then read the content from fscache */
folio = page_folio(page);

ret = netfs_readpage(NULL, folio, &erofs_req_ops, ctx->cookie);
if (unlikely(ret || !PageUptodate(page))) {
erofs_err(sb, "failed to read from fscache");
return ERR_PTR(-EINVAL);
}

return page;
}

static int erofs_fscache_init_cookie(struct erofs_cookie_ctx *ctx, char *path)
{
struct fscache_cookie *cookie;
Expand Down
3 changes: 3 additions & 0 deletions fs/erofs/internal.h
Expand Up @@ -585,6 +585,9 @@ struct erofs_cookie_ctx *erofs_fscache_get_ctx(struct super_block *sb,
char *path);
void erofs_fscache_put_ctx(struct erofs_cookie_ctx *ctx);

struct page *erofs_readpage_from_fscache(struct erofs_cookie_ctx *ctx,
pgoff_t index);

#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */

#endif /* __EROFS_INTERNAL_H */
7 changes: 2 additions & 5 deletions fs/erofs/super.c
Expand Up @@ -334,25 +334,22 @@ static int erofs_init_devices(struct super_block *sb,

static int erofs_read_superblock(struct super_block *sb)
{
struct erofs_sb_info *sbi;
struct erofs_sb_info *sbi = EROFS_SB(sb);
struct page *page;
struct erofs_super_block *dsb;
unsigned int blkszbits;
void *data;
int ret;

/* TODO: metadata path in nodev mode */
if (sb->s_bdev)
page = read_mapping_page(sb->s_bdev->bd_inode->i_mapping, 0, NULL);
else
page = ERR_PTR(-EOPNOTSUPP);
page = erofs_readpage_from_fscache(sbi->bootstrap, 0);
if (IS_ERR(page)) {
erofs_err(sb, "cannot read erofs superblock");
return PTR_ERR(page);
}

sbi = EROFS_SB(sb);

data = kmap(page);
dsb = (struct erofs_super_block *)(data + EROFS_SUPER_OFFSET);

Expand Down

0 comments on commit c3453b9

Please sign in to comment.