git: 2cc3f14701c9 - main - rms: tidy up

From: Mateusz Guzik <mjg_at_FreeBSD.org>
Date: Sun, 22 Nov 2026 06:14:23 UTC
The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=2cc3f14701c9309d18f24069d2b1bea6f3bb3df8

commit 2cc3f14701c9309d18f24069d2b1bea6f3bb3df8
Author:     Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2026-11-22 06:12:57 +0000
Commit:     Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2026-11-22 06:14:18 +0000

    rms: tidy up
    
    No functional changes.
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 sys/kern/kern_rmlock.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/sys/kern/kern_rmlock.c b/sys/kern/kern_rmlock.c
index fb75c0c0ba49..50ed9fec9fdd 100644
--- a/sys/kern/kern_rmlock.c
+++ b/sys/kern/kern_rmlock.c
@@ -893,7 +893,7 @@ struct rmslock_pcpu {
 	int readers;
 };
 
-_Static_assert(sizeof(struct rmslock_pcpu) == 8, "bad size");
+_Static_assert(sizeof(struct rmslock_pcpu) == 8, "allocations are backed by pcpu_zone_8");
 
 /*
  * Internal routines
@@ -1211,6 +1211,7 @@ rms_wlock(struct rmslock *rms)
 	MPASS(atomic_load_ptr(&rms->owner) != curthread);
 
 	mtx_lock(&rms->mtx);
+	MPASS(rms->writers >= 0);
 	rms->writers++;
 	if (rms->writers > 1) {
 		msleep(&rms->owner, &rms->mtx, PRI_MAX_KERN,
@@ -1219,21 +1220,19 @@ rms_wlock(struct rmslock *rms)
 		KASSERT(rms->owner == RMS_TRANSIENT,
 		    ("%s: unexpected owner value %p\n", __func__,
 		    rms->owner));
-		goto out_grab;
-	}
+	} else {
+		KASSERT(rms->owner == RMS_NOOWNER,
+		    ("%s: unexpected owner value %p\n", __func__, rms->owner));
 
-	KASSERT(rms->owner == RMS_NOOWNER,
-	    ("%s: unexpected owner value %p\n", __func__, rms->owner));
+		rms_block_readers(rms);
+		rms_assert_no_pcpu_readers(rms);
 
-	rms_block_readers(rms);
-	rms_assert_no_pcpu_readers(rms);
-
-	if (rms->readers > 0) {
-		msleep(&rms->writers, &rms->mtx, PRI_MAX_KERN,
-		    mtx_name(&rms->mtx), 0);
+		if (rms->readers > 0) {
+			msleep(&rms->writers, &rms->mtx, PRI_MAX_KERN,
+			    mtx_name(&rms->mtx), 0);
+		}
 	}
 
-out_grab:
 	rms->owner = curthread;
 	rms_assert_no_pcpu_readers(rms);
 	mtx_unlock(&rms->mtx);