From nobody Mon Oct 12 20:47:49 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4j3V0V5Wyhz6vR67 for ; Mon, 12 Oct 2026 20:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j3V0V3pv1z3FQD for ; Mon, 12 Oct 2026 20:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791838074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5oFeaLiS6ZZ6LwAVNvDkr4fLgDXpYY7CMr2uSRP0V9E=; b=snUF6dAeP4bE/Ms6RDWnSY8bEbMmOy4ee8dt0niC3wGYDHBFE+O62FIzsnLpZ+ISa07iqt bGzJ6L8JXuytRQZ8nr0ZmCy/vVBse4m0hBEq5JdNQyVDpRgdmJ4aWzUCYO3fWBWuPxZlA1 XFOMWYxpYg9z8lzoYeuqu/2iJlGWtA/AE5OLebnJ/kZze21G5TVq9nv1/fjWboXtMaY5aW V73tvbGiQbNzXQi3beKNWNvbWGVaVPsdjU+uo22MtrGM7h6Lh6tzhzeL3DwioU5/cwKSdZ xkBY/D4Kf8LnK4lnWa9woFpyO7KXJ7eoSJCYWyE9hb8dUWtcO9WYWAZ3Bxb/mA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791838074; b=i7YoDYKxvPoHCnNIvJuTf+1KWX5MVwnaaA61lK33bIVMmhIJvyA4K73n1+Mii6I501b6Jn 742tqzeBkB18muSalLHCOGUR2YBiW0nDrybnmUlngH4zjjs9OCxQkTct8s0xJHxcnkrpuI DGzwJqRAJcO5h1MOEz597y9VHKf9UMb0a4JJ9muIItYpFN4dZp5nPOE+CN3NCEEI3AbhCO Ee54ssyIH04Rtu5fUSzP1YwXw2oXy1AflUrSEwfVOa7TqwwP0FNCRmOG4EyOiWFTdsixjd DXXVj9ej5ZjQBcP49rnUXP5kXYxO7Uz6HKo6LCOWeZOBS33Fv3QlLPIFnEeF2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791838074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5oFeaLiS6ZZ6LwAVNvDkr4fLgDXpYY7CMr2uSRP0V9E=; b=rR2LXGHXRsrBlzSPfw2yfdCC2JiPIsM78ViJS7M7Kl+GnxXJ1oWeaWR+oz/vGF1paQQe8D reptztVk1EB1oFiwc0U711CelFH2u1GWYPsuwL7qQePZTeG6Ty18A/CivNpuCXGnqa2omI 1hW/dDlyP5CwLGncAlP1rbtJLZ9JQXSI/M6XKFClBhR3qni3je65Ue/PVCwm2lBctSPDoI auSOZYqe1cG83VInHp1xzrerGuNde9HzNWvUMXAzkTB5KhqaL49RniviWO6jYahlra8Ogx Nk/tLMJnfPHsYCpRlVbdpeG2aMS7aaufEFpNmPFiD3JWHVfoiDTJg25tefkKcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j3V0V2HFbzktm for ; Mon, 12 Oct 2026 20:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45852 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Oct 2026 20:47:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: 2b911d947b5c - main - rms: Order a writer's stores before its readers see it leave List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b911d947b5c1157a495454123ea972a18e4743d Auto-Submitted: auto-generated Date: Mon, 12 Oct 2026 20:47:49 +0000 Message-Id: <6acd4775.45852.2de51abd@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=2b911d947b5c1157a495454123ea972a18e4743d commit 2b911d947b5c1157a495454123ea972a18e4743d Author: R. Christian McDonald AuthorDate: 2026-10-12 20:44:32 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-12 20:45:29 +0000 rms: Order a writer's stores before its readers see it leave Readers check rms->writers without a fence, and rms_wunlock() drops it with a plain store. rms_wlock() interrupts every CPU before the first writer blocks readers, but nothing orders them when the last writer leaves: on a weakly ordered CPU a reader can see the count reach zero and still read what the writer replaced, such as callbacks of a module unloaded under the lock. Fence every CPU before the last writer drops the count: rename rms_wlock_switch() to rms_block_readers() and add rms_unblock_readers(), a wrapper for cpus_fence_seq_cst(). Readers stay fence-free; the cost lands on the rare unlock. Reviewed by: mjg Discussed with: kib Fixes: 1f162fef76a0 ("Add read-mostly sleepable locks") MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60658 --- sys/kern/kern_rmlock.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_rmlock.c b/sys/kern/kern_rmlock.c index 7206572ffc02..fb75c0c0ba49 100644 --- a/sys/kern/kern_rmlock.c +++ b/sys/kern/kern_rmlock.c @@ -875,7 +875,9 @@ db_show_rm(const struct lock_object *lock) * * Neither rms_rlock nor rms_runlock use thread fences. Instead interrupt * fences are inserted to ensure ordering with the code executed in the IPI - * handler. + * handler. Writers interrupt all CPUs both to block readers and to unblock + * them, so a reader that sees no writer also sees what the last writer + * stored. * * No attempt is made to track which CPUs read locked at least once, * consequently write locking sends IPIs to all of them. This will become a @@ -1171,7 +1173,7 @@ rms_assert_no_pcpu_readers(struct rmslock *rms) #endif static void -rms_wlock_switch(struct rmslock *rms) +rms_block_readers(struct rmslock *rms) { struct rmslock_ipi rmsipi; @@ -1188,6 +1190,19 @@ rms_wlock_switch(struct rmslock *rms) &rmsipi.srcra); } +/* + * Order the writer's stores before the count readers check without a fence. + */ +static void +rms_unblock_readers(struct rmslock *rms) +{ + + MPASS(rms->readers == 0); + MPASS(rms->writers == 1); + + cpus_fence_seq_cst(); +} + void rms_wlock(struct rmslock *rms) { @@ -1210,7 +1225,7 @@ rms_wlock(struct rmslock *rms) KASSERT(rms->owner == RMS_NOOWNER, ("%s: unexpected owner value %p\n", __func__, rms->owner)); - rms_wlock_switch(rms); + rms_block_readers(rms); rms_assert_no_pcpu_readers(rms); if (rms->readers > 0) { @@ -1235,6 +1250,8 @@ rms_wunlock(struct rmslock *rms) ("%s: unexpected owner value %p\n", __func__, rms->owner)); MPASS(rms->writers >= 1); MPASS(rms->readers == 0); + if (rms->writers == 1) + rms_unblock_readers(rms); rms->writers--; if (rms->writers > 0) { wakeup_one(&rms->owner);