From nobody Mon Sep 07 15:07:54 2026 X-Original-To: dev-commits-src-branches@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 4hdr6M1KzNz6rYXl for ; Mon, 07 Sep 2026 15:07:55 +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 4hdr6M08Ftz47JV for ; Mon, 07 Sep 2026 15:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788793675; 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=NRfliNPw1hC1koYBXHO0+QRZgUv1uYPzPn1U6owgQzs=; b=LKqDig0jmZN4xujCyOJ2ZjaPid8+ceixGRMbkM/j+FR/3xBNmSw6XrFQmB+wBQ+ZBHhjUY 7zcLcVBxIuvLIgkqa7PKidJNUmiH8oSz0VLmxBgsGAuPPL0QaWd4eUu5y01PiiQqJuNeVD +6MVLVvz/3NkauMzID3NqcblMGnW8RNYkrkdcyuK9laoTBIbnc5L6sD9J6dOoZckX2+hqn i6aH1JSeqfLZkbfaDPH6sRXmf/nsUaldnDSI+WSZj7I+m3S3rPaDaht6QgiHFQ59cWuBQx 43bZI2d4N12ej1AN/LyHN1GTBcLipBhWDoGTYVSGNNFs9EEjdIRJpNTz3YuK8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788793675; a=rsa-sha256; cv=none; b=seIFYdudCFWq+Db9pjtGn2GGl5L43m8yAocHtZ4oq6J8dDOEHeC51+1ZjbX5CHJR6v8oc8 sI51CDa6/lAW6OegZuKOHIq2CWU5IWQvZ8zWnVXTtcXB4O435oZJ3/v5c5ReEIW7hWNkZq UKpl5w+F90i5u1EyBa/oAt6VqtIXfgTYFKRAjAJb6VJQeJs1ncGnijvW6YMphXmZfzcOSU IPro8PNBn1ve8L8G3ceysgzJOsHhsoCm5LqoiVYiuTFVr15aTrLuuSsssgVj2ZaIEI5u4U wMWnw0vFLoVxOoociXhNqP/xmcf6/J5x8G0QsdwRmn2nNfKTQnKEscfSQRQ3Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788793675; 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=NRfliNPw1hC1koYBXHO0+QRZgUv1uYPzPn1U6owgQzs=; b=iK/r6LNrFXRBazT1YIyqTbY9l7Ytk9/H7XYISzSEhRdmHMfw//3PBMKEJPwDUAGoqMy8Pa q1pQAW30B5gaH6HLHIWvTgcLRI3Jk0FJKqSeM65wH9SDtSWwYOIFhn1uJVZPgW6gOVovyU Wk96vgmyPJBuKURt23ww/CiUBCUY1xwfia6dQsYTtdfApt1HHqVYsyUTeZCo/bVVvgpPaU xH/WLjqc9VC+MMI0wJai9NA02lbM4z7PI1PX7sy4MIelXTv39r/dn/CdwmJ11Gqh2+Sbv2 2V6y+iAuSb5Ugzhb//kaUICNpW8UengvK+B933WnVBj4fTryrO+TeIQ5SePBeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hdr6L5wLGz7fs for ; Mon, 07 Sep 2026 15:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d769 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 07 Sep 2026 15:07:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6a80c0eabf43 - stable/15 - rangelock: Reimplement _rangelock_cookie_assert() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6a80c0eabf4395acd8568e5548095389df4c1cae Auto-Submitted: auto-generated Date: Mon, 07 Sep 2026 15:07:54 +0000 Message-Id: <6a9ed34a.3d769.1447fa6e@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6a80c0eabf4395acd8568e5548095389df4c1cae commit 6a80c0eabf4395acd8568e5548095389df4c1cae Author: Mark Johnston AuthorDate: 2026-08-27 19:47:44 +0000 Commit: Mark Johnston CommitDate: 2026-09-07 12:59:27 +0000 rangelock: Reimplement _rangelock_cookie_assert() After rangelocks were reimplemented, _rangelock_cookie_assert() became a stub. Re-provide an implementation. Reviewed by: kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59222 (cherry picked from commit 2e376cca379b744ce24c849aced684bf770c0f75) --- sys/kern/kern_rangelock.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ sys/kern/uipc_shm.c | 6 +++--- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_rangelock.c b/sys/kern/kern_rangelock.c index cd66bff62608..a2b6829c0107 100644 --- a/sys/kern/kern_rangelock.c +++ b/sys/kern/kern_rangelock.c @@ -813,6 +813,58 @@ rangelock_may_recurse(struct rangelock *lock) void _rangelock_cookie_assert(void *cookie, int what, const char *file, int line) { + struct rl_q_entry *entry; + struct thread *td; + uintptr_t c; + + c = (uintptr_t)cookie; + switch (what) { + case RCA_LOCKED: + if (c == RL_RET_CHEAT_RLOCKED || c == RL_RET_CHEAT_WLOCKED) + break; + entry = cookie; + if ((entry->rl_q_flags & RL_LOCK_TYPE_MASK) == 0) + panic("rangelock not held (%#x) @ %s:%d\n", + entry->rl_q_flags, file, line); + td = entry->rl_q_owner; + if (td != curthread) + panic("rangelock held by thread %d @ %s:%d\n", + td != NULL ? td->td_tid : -1, file, line); + break; + case RCA_RLOCKED: + if (c == RL_RET_CHEAT_RLOCKED) + break; + if (c == RL_RET_CHEAT_WLOCKED) + panic("rangelock not rlocked (%#lx) @ %s:%d\n", + c, file, line); + entry = cookie; + if ((entry->rl_q_flags & RL_LOCK_TYPE_MASK) != RL_LOCK_READ) + panic("rangelock not rlocked (%#x) @ %s:%d\n", + entry->rl_q_flags, file, line); + td = entry->rl_q_owner; + if (td != curthread) + panic("rangelock held by thread %d @ %s:%d\n", + td != NULL ? td->td_tid : -1, file, line); + break; + case RCA_WLOCKED: + if (c == RL_RET_CHEAT_WLOCKED) + break; + if (c == RL_RET_CHEAT_RLOCKED) + panic("rangelock not wlocked (%#lx) @ %s:%d\n", + c, file, line); + entry = cookie; + if ((entry->rl_q_flags & RL_LOCK_TYPE_MASK) != RL_LOCK_WRITE) + panic("rangelock not wlocked (%#x) @ %s:%d\n", + entry->rl_q_flags, file, line); + td = entry->rl_q_owner; + if (td != curthread) + panic("rangelock held by thread %d @ %s:%d\n", + td != NULL ? td->td_tid : -1, file, line); + break; + default: + panic("rangelock cookie assert type %d @ %s:%d\n", + what, file, line); + } } #endif /* INVARIANT_SUPPORT */ diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 067a628fdab0..b77731f8188b 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -742,7 +742,7 @@ shm_dotruncate_locked(struct shmfd *shmfd, off_t length, void *rl_cookie) KASSERT(length >= 0, ("shm_dotruncate: length < 0")); object = shmfd->shm_object; VM_OBJECT_ASSERT_WLOCKED(object); - rangelock_cookie_assert(rl_cookie, RA_WLOCKED); + rangelock_cookie_assert(rl_cookie, RCA_WLOCKED); if (length == shmfd->shm_size) return (0); nobjsize = OFF_TO_IDX(length + PAGE_MASK); @@ -807,7 +807,7 @@ shm_dotruncate_largepage(struct shmfd *shmfd, off_t length, void *rl_cookie) KASSERT(length >= 0, ("shm_dotruncate_largepage: length < 0")); object = shmfd->shm_object; VM_OBJECT_ASSERT_WLOCKED(object); - rangelock_cookie_assert(rl_cookie, RA_WLOCKED); + rangelock_cookie_assert(rl_cookie, RCA_WLOCKED); oldobjsz = object->size; newobjsz = OFF_TO_IDX(length); @@ -1584,7 +1584,7 @@ shm_mmap_large(struct shmfd *shmfd, vm_map_t map, vm_offset_t *addr, int docow, error, rv, try; bool curmap; - rangelock_cookie_assert(rl_cookie, RA_LOCKED); + rangelock_cookie_assert(rl_cookie, RCA_LOCKED); if (shmfd->shm_lp_psind == 0) return (EINVAL);