git: 670bad029bb9 - main - pause fail point: affirm sleeping without a lock
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 19 Nov 2026 16:24:41 UTC
The branch main has been updated by rlibby:
URL: https://cgit.FreeBSD.org/src/commit/?id=670bad029bb9bcb3d522f6a16b9d8693b4c67f81
commit 670bad029bb9bcb3d522f6a16b9d8693b4c67f81
Author: Ryan Libby <rlibby@FreeBSD.org>
AuthorDate: 2026-11-19 16:13:17 +0000
Commit: Ryan Libby <rlibby@FreeBSD.org>
CommitDate: 2026-11-19 16:13:17 +0000
pause fail point: affirm sleeping without a lock
The previous patch to fail_point_pause removed a lock wrapping a sleep.
INVARIANTS assertions require we affirm we are deliberately sleeping
without a lock or timeout via the PNOLOCK flag.
Reported by: netchild
Reviewed by: netchild
Fixes: 331613ddd8a5 ("Pause failpoint: replace mtx_sleep with tsleep")
Differential Revision: https://reviews.freebsd.org/D61730
---
sys/kern/kern_fail.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/kern/kern_fail.c b/sys/kern/kern_fail.c
index 40b02040a504..8932cdec66d0 100644
--- a/sys/kern/kern_fail.c
+++ b/sys/kern/kern_fail.c
@@ -411,7 +411,7 @@ fail_point_pause(struct fail_point *fp, enum fail_point_return_code *pret)
if (fp->fp_pre_sleep_fn)
fp->fp_pre_sleep_fn(fp->fp_pre_sleep_arg);
- tsleep(FP_PAUSE_CHANNEL(fp), 0, "failpt", 0);
+ tsleep(FP_PAUSE_CHANNEL(fp), PNOLOCK, "failpt", 0);
if (fp->fp_post_sleep_fn)
fp->fp_post_sleep_fn(fp->fp_post_sleep_arg);