tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

dm-verity: fix up various workqueue-related comments

Replace obsolete mentions of "tasklets" with "softirq context", and
"workqueue" with "kworker".

This reflects the fact that the implementation of the
"try_verify_in_tasklet" dm-verity option now accesses softirq context
using either the BH workqueue API or inline execution, not the tasklet
API. The old names conflated the API with the intended execution
context, so they became outdated when the APIs changed.

Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>

authored by

Eric Biggers and committed by
Mikulas Patocka c84e21a8 17c0e160

+10 -10
+10 -10
drivers/md/dm-verity-target.c
··· 254 254 data = dm_bufio_get(v->bufio, hash_block, &buf); 255 255 if (IS_ERR_OR_NULL(data)) { 256 256 /* 257 - * In tasklet and the hash was not in the bufio cache. 258 - * Return early and resume execution from a work-queue 259 - * to read the hash from disk. 257 + * In softirq and the hash was not in the bufio cache. 258 + * Return early and resume execution from a kworker to 259 + * read the hash from disk. 260 260 */ 261 261 return -EAGAIN; 262 262 } ··· 303 303 else if (static_branch_unlikely(&use_bh_wq_enabled) && io->in_bh) { 304 304 /* 305 305 * Error handling code (FEC included) cannot be run in a 306 - * tasklet since it may sleep, so fallback to work-queue. 306 + * softirq since it may sleep, so fallback to a kworker. 307 307 */ 308 308 r = -EAGAIN; 309 309 goto release_ret_r; ··· 425 425 426 426 if (static_branch_unlikely(&use_bh_wq_enabled) && io->in_bh) { 427 427 /* 428 - * Error handling code (FEC included) cannot be run in the 429 - * BH workqueue, so fallback to a standard workqueue. 428 + * Error handling code (FEC included) cannot be run in a 429 + * softirq since it may sleep, so fallback to a kworker. 430 430 */ 431 431 return -EAGAIN; 432 432 } ··· 519 519 520 520 if (static_branch_unlikely(&use_bh_wq_enabled) && io->in_bh) { 521 521 /* 522 - * Copy the iterator in case we need to restart 523 - * verification in a work-queue. 522 + * Copy the iterator in case we need to restart verification in 523 + * a kworker. 524 524 */ 525 525 iter_copy = io->iter; 526 526 iter = &iter_copy; ··· 657 657 io->in_bh = true; 658 658 err = verity_verify_io(io); 659 659 if (err == -EAGAIN || err == -ENOMEM) { 660 - /* fallback to retrying with work-queue */ 660 + /* fallback to retrying in a kworker */ 661 661 INIT_WORK(&io->work, verity_work); 662 662 queue_work(io->v->verify_wq, &io->work); 663 663 return; ··· 1644 1644 * reducing wait times when reading from a dm-verity device. 1645 1645 * 1646 1646 * Also as required for the "try_verify_in_tasklet" feature: WQ_HIGHPRI 1647 - * allows verify_wq to preempt softirq since verification in BH workqueue 1647 + * allows verify_wq to preempt softirq since verification in softirq 1648 1648 * will fall-back to using it for error handling (or if the bufio cache 1649 1649 * doesn't have required hashes). 1650 1650 */