On Tue, Nov 26 2019 at 5:41am -0500,
gregkh@xxxxxxxxxxxxxxxxxxx <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> The patch below does not apply to the 4.19-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@xxxxxxxxxxxxxxx>.
>
> thanks,
>
> greg k-h
>
I assume you didn't first pull in the prereq commit detailed in the
commit header with:
Requires: ed0302e83098d ("dm crypt: make workqueue names device-specific")
?
Because this worked for me:
git cherry-pick ed0302e83098d
git cherry-pick f612b2132db529feac4f965f28a1b9258ea7c22b
> ------------------ original commit in Linus's tree ------------------
>
> From f612b2132db529feac4f965f28a1b9258ea7c22b Mon Sep 17 00:00:00 2001
> From: Mike Snitzer <snitzer@xxxxxxxxxx>
> Date: Wed, 20 Nov 2019 17:27:39 -0500
> Subject: [PATCH] Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt
> workqueues"
>
> This reverts commit a1b89132dc4f61071bdeaab92ea958e0953380a1.
>
> Revert required hand-patching due to subsequent changes that were
> applied since commit a1b89132dc4f61071bdeaab92ea958e0953380a1.
>
> Requires: ed0302e83098d ("dm crypt: make workqueue names device-specific")
> Cc: stable@xxxxxxxxxxxxxxx
> Bug: https://bugzilla.kernel.org/show_bug.cgi?id=199857
> Reported-by: Vito Caputo <vcaputo@xxxxxxxxxxx>
> Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
>
> diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
> index f87f6495652f..eb9782fc93fe 100644
> --- a/drivers/md/dm-crypt.c
> +++ b/drivers/md/dm-crypt.c
> @@ -2700,21 +2700,18 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
> }
>
> ret = -ENOMEM;
> - cc->io_queue = alloc_workqueue("kcryptd_io/%s",
> - WQ_HIGHPRI | WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM,
> - 1, devname);
> + cc->io_queue = alloc_workqueue("kcryptd_io/%s", WQ_MEM_RECLAIM, 1, devname);
> if (!cc->io_queue) {
> ti->error = "Couldn't create kcryptd io queue";
> goto bad;
> }
>
> if (test_bit(DM_CRYPT_SAME_CPU, &cc->flags))
> - cc->crypt_queue = alloc_workqueue("kcryptd/%s",
> - WQ_HIGHPRI | WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM,
> + cc->crypt_queue = alloc_workqueue("kcryptd/%s", WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM,
> 1, devname);
> else
> cc->crypt_queue = alloc_workqueue("kcryptd/%s",
> - WQ_HIGHPRI | WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM | WQ_UNBOUND,
> + WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM | WQ_UNBOUND,
> num_online_cpus(), devname);
> if (!cc->crypt_queue) {
> ti->error = "Couldn't create kcryptd queue";
>
