* FAILED: patch "[PATCH] Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt" failed to apply to 4.19-stable tree
@ 2019-11-26 10:41 gregkh
2019-11-26 17:05 ` Mike Snitzer
0 siblings, 1 reply; 4+ messages in thread
From: gregkh @ 2019-11-26 10:41 UTC (permalink / raw)
To: snitzer, vcaputo; +Cc: stable
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@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From f612b2132db529feac4f965f28a1b9258ea7c22b Mon Sep 17 00:00:00 2001
From: Mike Snitzer <snitzer@redhat.com>
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@vger.kernel.org
Bug: https://bugzilla.kernel.org/show_bug.cgi?id=199857
Reported-by: Vito Caputo <vcaputo@pengaru.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
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";
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: FAILED: patch "[PATCH] Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt" failed to apply to 4.19-stable tree
2019-11-26 10:41 FAILED: patch "[PATCH] Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt" failed to apply to 4.19-stable tree gregkh
@ 2019-11-26 17:05 ` Mike Snitzer
2019-11-26 17:28 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Mike Snitzer @ 2019-11-26 17:05 UTC (permalink / raw)
To: gregkh; +Cc: vcaputo, stable
On Tue, Nov 26 2019 at 5:41am -0500,
gregkh@linuxfoundation.org <gregkh@linuxfoundation.org> 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@vger.kernel.org>.
>
> 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@redhat.com>
> 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@vger.kernel.org
> Bug: https://bugzilla.kernel.org/show_bug.cgi?id=199857
> Reported-by: Vito Caputo <vcaputo@pengaru.com>
> Signed-off-by: Mike Snitzer <snitzer@redhat.com>
>
> 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";
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: FAILED: patch "[PATCH] Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt" failed to apply to 4.19-stable tree
2019-11-26 17:05 ` Mike Snitzer
@ 2019-11-26 17:28 ` Greg KH
2019-11-26 18:15 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2019-11-26 17:28 UTC (permalink / raw)
To: Mike Snitzer; +Cc: vcaputo, stable
On Tue, Nov 26, 2019 at 12:05:50PM -0500, Mike Snitzer wrote:
> On Tue, Nov 26 2019 at 5:41am -0500,
> gregkh@linuxfoundation.org <gregkh@linuxfoundation.org> 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@vger.kernel.org>.
> >
> > 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
Oops, missed that, will go try that now, sorry for the noise...
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: FAILED: patch "[PATCH] Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt" failed to apply to 4.19-stable tree
2019-11-26 17:28 ` Greg KH
@ 2019-11-26 18:15 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2019-11-26 18:15 UTC (permalink / raw)
To: Mike Snitzer; +Cc: vcaputo, stable
On Tue, Nov 26, 2019 at 06:28:29PM +0100, Greg KH wrote:
> On Tue, Nov 26, 2019 at 12:05:50PM -0500, Mike Snitzer wrote:
> > On Tue, Nov 26 2019 at 5:41am -0500,
> > gregkh@linuxfoundation.org <gregkh@linuxfoundation.org> 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@vger.kernel.org>.
> > >
> > > 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
>
> Oops, missed that, will go try that now, sorry for the noise...
Nope, that did not work, the build breaks on both 4.14.y and 4.19.y:
drivers/md/dm-crypt.c: In function ‘crypt_ctr’:
drivers/md/dm-crypt.c:2674:24: error: implicit declaration of function ‘dm_table_device_name’; did you mean ‘dm_device_name’? [-Werror=implicit-function-declaration]
2674 | const char *devname = dm_table_device_name(ti->table);
| ^~~~~~~~~~~~~~~~~~~~
| dm_device_name
So we need working backports for 4.14.y and 4.19.y please. I'm going to
go drop these patches from those queues now.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-11-26 18:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-26 10:41 FAILED: patch "[PATCH] Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt" failed to apply to 4.19-stable tree gregkh
2019-11-26 17:05 ` Mike Snitzer
2019-11-26 17:28 ` Greg KH
2019-11-26 18:15 ` Greg KH
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).