Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt workqueues" (f612b213) · Commits · 戴 / test

This reverts commit . Revert required hand-patching due to subsequent changes that were applied since commit . Requires: ("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>

drivers/md/dm-crypt.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -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";

Admin message