Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 7eb2ac54 authored by Huang Jianan's avatar Huang Jianan Committed by Michael Bestas
Browse files

UPSTREAM: erofs: use workqueue decompression for atomic contexts only 

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.

Link: https://lore.kernel.org/r/20210317035448.13921-2-huangjianan@oppo.com


Reviewed-by: default avatarGao Xiang <hsiangkao@redhat.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarHuang Jianan <huangjianan@oppo.com>
Signed-off-by: default avatarGuo Weichao <guoweichao@oppo.com>
Signed-off-by: default avatarGao Xiang <hsiangkao@redhat.com>

Bug: 190585249
Change-Id: I369268e398ce8b16362ace2e6a03a5061caebd90
(cherry picked from commit 648f2de053a882c87c05f0060f47d3b11841fdbe)
Signed-off-by: default avatarHuang Jianan <huangjianan@oppo.com>
parent cdb254fa

fs/erofs/zdata.c

+8 −1
Original line number Diff line number Diff line
@@ -709,6 +709,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)

{
@@ -723,8 +724,14 @@ static void z_erofs_decompress_kickoff(struct z_erofs_decompressqueue *io, 
		return;

	}



	if (!atomic_add_return(bios, &io->pending_bios))

	if (atomic_add_return(bios, &io->pending_bios))

		return;

	/* Use workqueue decompression for atomic contexts only */

	if (in_atomic() || irqs_disabled()) {

		queue_work(z_erofs_workqueue, &io->u.work);

		return;

	}

	z_erofs_decompressqueue_work(&io->u.work);

}



static bool z_erofs_page_is_invalidated(struct page *page)