From: Huang Jianan via Linux-erofs <linux-erofs@lists.ozlabs.org>
To: linux-erofs@lists.ozlabs.org
Cc: guoweichao@oppo.com, zhangshiming@oppo.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/2] erofs: decompress in endio if possible
Date: Fri, 5 Mar 2021 16:14:56 +0800 [thread overview]
Message-ID: <4c1defe3-b62d-5efe-be2d-9055f3b7df06@oppo.com> (raw)
In-Reply-To: <20210305080803.789634-2-huangjianan@oppo.com>
On 2021/3/5 16:08, Huang Jianan wrote:
> z_erofs_decompressqueue_endio may not be executed in the atomic
> context, for example, when dm-verity is turned on. In this scenario,
> data can be decompressed directly to get rid of additional kworker
> scheduling overhead. Also, it makes no sense to apply synchronous
> decompression for such case.
>
> Signed-off-by: Huang Jianan <huangjianan@oppo.com>
> Signed-off-by: Guo Weichao <guoweichao@oppo.com>
> ---
> fs/erofs/internal.h | 3 +++
> fs/erofs/super.c | 4 ++++
> fs/erofs/zdata.c | 13 +++++++++++--
> 3 files changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
> index 67a7ec945686..b817cb85d67b 100644
> --- a/fs/erofs/internal.h
> +++ b/fs/erofs/internal.h
> @@ -70,6 +70,9 @@ struct erofs_sb_info {
>
> /* pseudo inode to manage cached pages */
> struct inode *managed_cache;
> +
> + /* decide whether to decompress synchronously */
> + bool readahead_sync_decompress;
> #endif /* CONFIG_EROFS_FS_ZIP */
> u32 blocks;
> u32 meta_blkaddr;
> diff --git a/fs/erofs/super.c b/fs/erofs/super.c
> index d5a6b9b888a5..77819efe9b15 100644
> --- a/fs/erofs/super.c
> +++ b/fs/erofs/super.c
> @@ -175,6 +175,10 @@ static int erofs_read_superblock(struct super_block *sb)
> sbi->root_nid = le16_to_cpu(dsb->root_nid);
> sbi->inos = le64_to_cpu(dsb->inos);
>
> +#ifdef CONFIG_EROFS_FS_ZIP
> + sbi->readahead_sync_decompress = false;
> +#endif
> +
> sbi->build_time = le64_to_cpu(dsb->build_time);
> sbi->build_time_nsec = le32_to_cpu(dsb->build_time_nsec);
>
> diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
> index 6cb356c4217b..49ffc817dd9e 100644
> --- a/fs/erofs/zdata.c
> +++ b/fs/erofs/zdata.c
> @@ -706,6 +706,7 @@ static int z_erofs_do_read_page(struct z_erofs_decompress_frontend *fe,
> goto out;
> }
>
> +static void z_erofs_decompressqueue_work(struct work_struct *work);
> static void z_erofs_decompress_kickoff(struct z_erofs_decompressqueue *io,
> bool sync, int bios)
> {
> @@ -720,8 +721,14 @@ static void z_erofs_decompress_kickoff(struct z_erofs_decompressqueue *io,
> return;
> }
>
> - if (!atomic_add_return(bios, &io->pending_bios))
> - queue_work(z_erofs_workqueue, &io->u.work);
> + if (!atomic_add_return(bios, &io->pending_bios)) {
> + if (in_atomic() || irqs_disabled()) {
> + queue_work(z_erofs_workqueue, &io->u.work);
> + sbi->readahead_sync_decompress = true;
> + } else {
> + z_erofs_decompressqueue_work(&io->u.work);
> + }
> + }
> }
>
> static bool z_erofs_page_is_invalidated(struct page *page)
> @@ -1333,6 +1340,8 @@ static void z_erofs_readahead(struct readahead_control *rac)
> struct erofs_sb_info *const sbi = EROFS_I_SB(inode);
>
> unsigned int nr_pages = readahead_count(rac);
> + bool sync = (sbi->readahead_sync_decompress &&
> + nr_pages <= sbi->ctx.max_sync_decompress_pages);
> bool sync = (nr_pages <= sbi->ctx.max_sync_decompress_pages);
sorry for my mistake here, i will send v3 to fix this.
> struct z_erofs_decompress_frontend f = DECOMPRESS_FRONTEND_INIT(inode);
> struct page *page, *head = NULL;
prev parent reply other threads:[~2021-03-05 8:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-05 8:08 [PATCH v2 1/2] erofs: avoid memory allocation failure during rolling decompression Huang Jianan via Linux-erofs
2021-03-05 8:08 ` [PATCH v2 2/2] erofs: decompress in endio if possible Huang Jianan via Linux-erofs
2021-03-05 8:14 ` Huang Jianan via Linux-erofs [this message]
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=4c1defe3-b62d-5efe-be2d-9055f3b7df06@oppo.com \
--to=linux-erofs@lists.ozlabs.org \
--cc=guoweichao@oppo.com \
--cc=huangjianan@oppo.com \
--cc=linux-kernel@vger.kernel.org \
--cc=zhangshiming@oppo.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;
as well as URLs for NNTP newsgroup(s).