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

Commit e97c4ed9 authored by Tim Murray's avatar Tim Murray Committed by Dmitry Shmidt
Browse files

ANDROID: dm-crypt: run in a WQ_HIGHPRI workqueue 



(cherry pick from commit ad3ac5180979e5dd1f84e4a807f76fb9fb19f814)

Running dm-crypt in a standard workqueue results in IO competing for CPU
time with standard user apps, which can lead to pipeline bubbles and
seriously degraded performance. Move to a WQ_HIGHPRI workqueue to
protect against that.

Signed-off-by: default avatarTim Murray <timmurray@google.com>
Bug: 25392275
Change-Id: I2828587c754a7c2cafdd78b3323b9896cb8cd4e7
parent 79619726

drivers/md/dm-crypt.c

+11 −3
Original line number Original line Diff line number Diff line
@@ -1863,16 +1863,24 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
	}

	}





	ret = -ENOMEM;

	ret = -ENOMEM;

	cc->io_queue = alloc_workqueue("kcryptd_io", WQ_MEM_RECLAIM, 1);

	cc->io_queue = alloc_workqueue("kcryptd_io",

				       WQ_HIGHPRI |

				       WQ_MEM_RECLAIM,

				       1);

	if (!cc->io_queue) {

	if (!cc->io_queue) {

		ti->error = "Couldn't create kcryptd io queue";

		ti->error = "Couldn't create kcryptd io queue";

		goto bad;

		goto bad;

	}

	}





	if (test_bit(DM_CRYPT_SAME_CPU, &cc->flags))

	if (test_bit(DM_CRYPT_SAME_CPU, &cc->flags))

		cc->crypt_queue = alloc_workqueue("kcryptd", WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM, 1);

		cc->crypt_queue = alloc_workqueue("kcryptd",

						  WQ_HIGHPRI |

						  WQ_MEM_RECLAIM, 1);

	else

	else

		cc->crypt_queue = alloc_workqueue("kcryptd", WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM | WQ_UNBOUND,

		cc->crypt_queue = alloc_workqueue("kcryptd",

						  WQ_HIGHPRI |

						  WQ_MEM_RECLAIM |

						  WQ_UNBOUND,

						  num_online_cpus());

						  num_online_cpus());

	if (!cc->crypt_queue) {

	if (!cc->crypt_queue) {

		ti->error = "Couldn't create kcryptd queue";

		ti->error = "Couldn't create kcryptd queue";