From nobody Mon Sep 14 15:34:31 2026 X-Original-To: dev-commits-src-main@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 4hk8Mr1XZmz6rGmy for ; Mon, 14 Sep 2026 15:34:32 +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 4hk8Mr131sz4mHm for ; Mon, 14 Sep 2026 15:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789400072; 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=Ql2+udXoYb8N4qqejVNnzIo+Q+Lxza/pM9KE8cOoItU=; b=TcrgT8cVlk3MOrjTxypEEHU/hkYHfNp5V9tWzEctFu4xkBqyeO+OwdE85q/H3DKrPD4SOZ CMt0sXED6q7L9qh6zHQJjFEl6hObq/yhmfKWq1sO57ZPYc7LmPjtEfY2PveBOd5p8FZ9cN m+UnBvdlrDj8Rf7Z08dCrLCmdRcS1fsoZFtUsGwxof5ggjOCVtcDBJjkggDc/maZL5/q9K /RtlVYnqDyUWW41bT6gTE95OovJPtLU/U3LMrklBsGGS+VS5ZZKvtQ9r+hnMB8f4mo0COs cC1dn2tqs9gBa6iMdvtHgbIY2tTdAbAnP1WUWYgAoOJ+Lomjj9waW2aq3yw05A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789400072; b=lMMzQdbCzfKkkLJ1ZFjyV5uMGoAk12JFboz2tpbUfe0wUk28G+g/sib9VmupEoifrTXXte SFG/EnEM5xWnx9Tfvr++bdi1AeIxQwWjOIJkMcAI8NEJb24Y8MZsSJmGdHrTThlS+L6XRl RjWkhMiIgLoy+pk941gbxELYbOgVYanKVHdQFyl7S/WlglMWuhsYKeJ3auBaC+Zg1dqS5t ndDjPZQd5xp7u2KVGPV/NrYSh441L4sABnoy8SA/QyeHnANvqH2Wf6YI0P+dDBL9CxnnzM GqBv2exz6oKYnllr1PirPVHGQfyU/jWLbt7Gx0FDxRG4Op9ESHsxOHO1XYBapQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789400072; 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=Ql2+udXoYb8N4qqejVNnzIo+Q+Lxza/pM9KE8cOoItU=; b=yCsuy+6qWCMYvJ/MU1+CO++HTU1So8sNGai+AimC7iBPLHqvo4+AJgkow6gA4LD4V/MIUg GOtDBrbjgKdzKY3XYOC6E9YKBmXF/KX23AGDWZwT75XBtLOlQIgox9sZk6PbLX/s+273ER 1cF1Lo4ijvKsOb2NHriZy4G3yqCLkiUc5pejfsrnSJDv07W+RcJYaznnCRpp+UagrtIKF7 mylSpKJrRB0jn0G2ROxBY3yxFp4dTfjpuFksz3CcS6wgNb6rI8CLYf0SL4LogEnVdkp20d OIztnKYCcjR4nswwFz07G5tDCi0uaD+KhHIZ7Cy4vVrJyoPb90jGo95UKOBIGw== 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 4hk8Mq6xcVzJgn for ; Mon, 14 Sep 2026 15:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38ae7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 14 Sep 2026 15:34:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: bcd1e7a8caac - main - rangelock: Enable rl_q_owner tracking under INVARIANT_SUPPORT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcd1e7a8caac9129cc08995f8ff81a0eef0529bc Auto-Submitted: auto-generated Date: Mon, 14 Sep 2026 15:34:31 +0000 Message-Id: <6aa81407.38ae7.d4c57be@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd1e7a8caac9129cc08995f8ff81a0eef0529bc commit bcd1e7a8caac9129cc08995f8ff81a0eef0529bc Author: John Baldwin AuthorDate: 2026-09-14 15:33:12 +0000 Commit: John Baldwin CommitDate: 2026-09-14 15:33:12 +0000 rangelock: Enable rl_q_owner tracking under INVARIANT_SUPPORT This fixes the build for kernels with INVARIANT_SUPPORT but without INVARIANTS. Fixes: 2e376cca379b ("rangelock: Reimplement _rangelock_cookie_assert()") --- sys/kern/kern_rangelock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_rangelock.c b/sys/kern/kern_rangelock.c index 659f055507f6..92b1b52fd632 100644 --- a/sys/kern/kern_rangelock.c +++ b/sys/kern/kern_rangelock.c @@ -288,7 +288,7 @@ struct rl_q_entry { struct rl_q_entry *rl_q_free; off_t rl_q_start, rl_q_end; int rl_q_flags; -#ifdef INVARIANTS +#ifdef INVARIANT_SUPPORT struct thread *rl_q_owner; #endif }; @@ -320,7 +320,7 @@ rlqentry_alloc(vm_ooffset_t start, vm_ooffset_t end, int flags) e->rl_q_start = start; e->rl_q_end = end; e->rl_q_flags = flags; -#ifdef INVARIANTS +#ifdef INVARIANT_SUPPORT e->rl_q_owner = curthread; #endif return (e); @@ -497,7 +497,7 @@ again: if (rl_e_is_marked(next)) { next = rl_e_unmark(next); if (rl_q_cas(prev, cur, next)) { -#ifdef INVARIANTS +#ifdef INVARIANT_SUPPORT cur->rl_q_owner = NULL; #endif cur->rl_q_free = free; @@ -669,7 +669,7 @@ again: if (rl_e_is_marked(next)) { next = rl_e_unmark(next); if (rl_q_cas(prev, cur, next)) { -#ifdef INVARIANTS +#ifdef INVARIANT_SUPPORT cur->rl_q_owner = NULL; #endif cur->rl_q_free = *free; @@ -898,7 +898,7 @@ DB_SHOW_COMMAND(rangelock, db_show_rangelock) "flags %x next %p", e, rl_e_is_marked(e), rl_e_is_marked(x->rl_q_next), x->rl_q_start, x->rl_q_end, x->rl_q_flags, x->rl_q_next); -#ifdef INVARIANTS +#ifdef INVARIANT_SUPPORT db_printf(" owner %p (%d)", x->rl_q_owner, x->rl_q_owner != NULL ? x->rl_q_owner->td_tid : -1); #endif