From nobody Thu Oct 08 20:44:11 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 4j12633xBtz4n2qf for ; Thu, 08 Oct 2026 20:44:11 +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 4j12631jcnz4cB2 for ; Thu, 08 Oct 2026 20:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492251; 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=CYudkcZGjgJxWaFkaOnNdO9xY92Fc0kk/r9UqlnVkXo=; b=bsWQQjW5w4atiNbkF5SKpWOD+F/0brsGAiCKyPRSOVh7XUlqrXVyj/ek2X+BGv9M9QN/QC atIulZPpc0LT5gVLPKTK54j9vOz1QhsXKvTSTTizAh5DKdmyqM+vDkX2nHi+me8Kh2RrQS OWiO1mGcsDlvAKK+TrojLKLmOW06j+zvJPerW0E7vYPBvWszIGtVLy9fonxw4bwFwztPav /V9fNVNDgSLgIau7GZU/WTq8ERrxOztiBin+XgMvV+mv/3b0Tn5m6U+VZsTiaTx7ta9ZPT WA7HmDcBZgyvTszHniCL0dlvfTKXZ+sktE97Unu+yABPlnCB+px1nz7+JwmlEg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791492251; b=o/MRVjiqqyk+57hHIxwIqVU8c5zKnshXR6OWTxPcoY+kZceIZ3rJh9KaLNYbEyYh5Qxfie gtFx14V6ro2CaP4j8+eLO3o7f2qX5WJU7JdLVoHIPTsg6bnHEsnCdUkg46oRQDwPquJMuj 55UaRZ+WbXST/bKS81v5rEuxmC4Nt+ml6fZ7JSHLHinJFX8tQvW92NpGMlCJPybGZBPHXo wlYRvIwRGgAyWBsx2FTH3vAt73hpgqftvHTQMdyWFcpD/cOIe21w2WdVL696jwcG1thS+k 2DKg/loZ+NNEbNLx/lld7w794YP/4WSKk61jkUWYSj9NA/rzU8H9/mlOJdXa1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492251; 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=CYudkcZGjgJxWaFkaOnNdO9xY92Fc0kk/r9UqlnVkXo=; b=Z+w9u4S9Ahl4FLM8iiDzgTjljCdjh+7ICsz85l0OJy8g1/A4yJKPflQQ5Y9knEjEVlFu6s A7LG1OouIhw/rJS1/Nr+5jiCdwGaCPo8cV1Sd42GDqYfj85MU8yVRDSiEmBnNxJFmMnai2 0yXWMeNtUxObEltnvWeN6uie0FdMTRE9sWxIvso50HW+oJIx06VcjW5pf4EecoUoXsC21T J5Ac2P013X2w4Ydp3djg6aLr63KakZtRu9h7sqEuXzNnZNg79bNrYoLZmYkeHioBmhNk2c W6K59Goey24zBvv8RosTzmJ4Wkktx4ahGJotQ6fBWiTOg2OCMiSyxW+cVsY4KQ== 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 4j12630XwPzwV0 for ; Thu, 08 Oct 2026 20:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 338c1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 20:44:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e5514ce9f1a9 - stable/15 - rangelock: Enable rl_q_owner tracking under INVARIANT_SUPPORT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: e5514ce9f1a94181e7db1392c47cd681a21acde1 Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 20:44:11 +0000 Message-Id: <6ac8009b.338c1.2265e427@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e5514ce9f1a94181e7db1392c47cd681a21acde1 commit e5514ce9f1a94181e7db1392c47cd681a21acde1 Author: John Baldwin AuthorDate: 2026-09-14 15:33:12 +0000 Commit: John Baldwin CommitDate: 2026-10-08 20:42:32 +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()") (cherry picked from commit bcd1e7a8caac9129cc08995f8ff81a0eef0529bc) --- 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