From nobody Tue Jan 27 20:29:07 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 4f0xnv3hLWz6QNv7 for ; Tue, 27 Jan 2026 20:29:07 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0xnv332zz3Z9L for ; Tue, 27 Jan 2026 20:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769545747; 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=2Cvv0S9XnSsy9fhX6MQ2jOwL90+8mlw7DfxDDLCDEIk=; b=w8lxp8reushAmSrpi7hlEZM3WqYfz0ADHIn6wQDq9XZAS5y82Pb8bVDdJSJQ8s/i58SKSq DJGEkOv48h/s1a6UgKVy7HJeADR+VsRaoY74PQKrofO15dT1ZW6U59DVt0LZAxEYaY2Tlu ZoWUsEkcuoc6uTVrmA7HHeQhXgsaQFxD9Dpp5uVhpQDc4BP3EAR3YV8gB4ncaDfULbVPHE z8rzdYUeb41UmsZ5Ux+yqDXjIkciOTPZkOFy/iAKlLkdnVJaD4FJljZIHXcS0MPm+L5rzJ SQfFqW8sLks70qObKbKSLiMTfm3gceYloPYoKyLafTAZ/+plhGgA9z2km1WieA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769545747; 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=2Cvv0S9XnSsy9fhX6MQ2jOwL90+8mlw7DfxDDLCDEIk=; b=wuy5xiAT7fqU3pzM7zsBmb2VoE14B75milBUyk3KJjkuUcRL/qqtwShXNFOS+m1I9RA6r8 D0ZhenkxLLChVLY4xWPiw07zqpb+rzi9mfX/ecgS/AS64LVwnnNQcRN+cX+WVD7l9BeSCf WGHNodTkDthHzU29EmgPvoXPoTqPgxRXwV8BMKxcrElTNK5xm8lcIfek2R5m2H+BYmVit5 yZ8IsCg/j16APtkKyvAxCW4wW08so1aF3yB/jH5+qHpL79jc04SnsiKhqv+d2fAWKbMz6b /8GeAeOFJXLSz1wByZyVetHSdwPP69uUU7KbXpwbO7Cm8sFUh9jiBXWsJwY+NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769545747; a=rsa-sha256; cv=none; b=MHIvUMxUTZ0xLoGnlt21qmMKmky5ca1Of082VZKja3jYf2AVQr6vIoLq4qkujMjb5b2uA5 KugtXOJPSnsZD/Zmg34VHW8KZoFeQmJoJanS8DlXq+l59dBlFm+oXY3B7sIYgp0QW6E4e3 9/9XEMJcX6oWHHHLDwE2BIn4maTMZXrGh70LhO69D5ddoFcTr8SDYq7pLEtYq55xuimK49 +sBNSQltfSm1tQpzf8ZIe2K1lCiuPwjkJXGdgZt+6jlRPyw7r0+XcNUSuBSXXCbAxi8W5m kCQ2Q8GmC+7TcVdCDvwJ3UxfdDchLLFlBggbyvyteeiHat1UfD4SauRmyTbP9Q== 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 4f0xnv2Yflz5mS for ; Tue, 27 Jan 2026 20:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 324bc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 20:29:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jonathan T. Looney Subject: git: 37d86e948775 - main - witness: mark relationships defined in order_lists[] 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jtl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37d86e9487754b8541cd4418a4c42999bbb2761f Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 20:29:07 +0000 Message-Id: <69792013.324bc.646f9d4d@gitrepo.freebsd.org> The branch main has been updated by jtl: URL: https://cgit.FreeBSD.org/src/commit/?id=37d86e9487754b8541cd4418a4c42999bbb2761f commit 37d86e9487754b8541cd4418a4c42999bbb2761f Author: Jonathan T. Looney AuthorDate: 2026-01-27 02:11:10 +0000 Commit: Jonathan T. Looney CommitDate: 2026-01-27 20:27:51 +0000 witness: mark relationships defined in order_lists[] Mark the lock relationships defined in order_lists[] and use that information to print better messages when a LOR violates one of these relationships. Suggested by: markj Reviewed by: kib, markj MFC after: 1 month Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D54903 --- sys/kern/subr_witness.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index a332d6bace2a..7437a7e238f0 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -168,7 +168,7 @@ #define WITNESS_RELATED_MASK (WITNESS_ANCESTOR_MASK | WITNESS_DESCENDANT_MASK) #define WITNESS_REVERSAL 0x10 /* A lock order reversal has been observed. */ #define WITNESS_RESERVED1 0x20 /* Unused flag, reserved. */ -#define WITNESS_RESERVED2 0x40 /* Unused flag, reserved. */ +#define WITNESS_ORDER_LISTS 0x40 /* Relationship set in order_lists[]. */ #define WITNESS_LOCK_ORDER_KNOWN 0x80 /* This lock order is known. */ /* Descendant to ancestor flags */ @@ -858,6 +858,10 @@ witness_startup(void *mem) continue; w1->w_file = "order list"; itismychild(w, w1); + w_rmatrix[w->w_index][w1->w_index] |= + WITNESS_ORDER_LISTS; + w_rmatrix[w1->w_index][w->w_index] |= + WITNESS_ORDER_LISTS; w = w1; } } @@ -1273,6 +1277,7 @@ sbuf_print_verbose_witness_stacks(struct verbose_tracker *t) { struct witness_lock_order_data *data; int i; + bool hardcoded; for (i = 0; i < (2 * t->pair_count); i += 2) { mtx_lock_spin(&w_mtx); @@ -1294,18 +1299,20 @@ sbuf_print_verbose_witness_stacks(struct verbose_tracker *t) data = witness_lock_order_get(&t->t_w1, &t->t_w2); if (data != NULL) stack_copy(&data->wlod_stack, &t->t_stack); + hardcoded = (w_rmatrix[t->pairs[i]][t->pairs[i + 1]] & + WITNESS_ORDER_LISTS) == WITNESS_ORDER_LISTS; mtx_unlock_spin(&w_mtx); sbuf_printf(t->sb, - "Lock order \"%s\"(%s) -> \"%s\"(%s) first seen at:\n", + "%slock order \"%s\"(%s) -> \"%s\"(%s) first seen at:\n", + hardcoded ? "hardcoded " : "", t->t_w1.w_name, t->t_w1.w_class->lc_name, t->t_w2.w_name, t->t_w2.w_class->lc_name); if (data != NULL) stack_sbuf_print_flags(t->sb, &t->t_stack, t->alloc_flags, STACK_SBUF_FMT_LONG); else - sbuf_printf(t->sb, - "(No stack trace--hardcoded relationship?)\n"); + sbuf_printf(t->sb, "(No stack trace)\n"); sbuf_putc(t->sb, '\n'); } }