From nobody Sat Oct 4 16:44:48 2025 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 4cfBG840bQz69JfR; Sat, 04 Oct 2025 16:44:48 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cfBG820xRz3LNj; Sat, 04 Oct 2025 16:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759596288; 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=JTOuatFHYjrtXy/2a8/2CCR2lOfWn5c18NnLHsbs/98=; b=kzhFq5G2NTw83gxvNjpCOo8wjZGg+85oPQazbBqSrSkYSYFZyOicm1qKnLQfj5cj3w4IEM LztDRW/RuvuTFYTqBX3N85npZVv7fgr80xnVs2ztg65W1PIb1iKUCRtdpKkCN2MD2TZgxl nabwOvc926c7Ccmyd1HSbmbsjcDDl3lg+OByGClTsPmht3HLsdQN3PCBqsFBcKSd1lRItg ZA+cZP4ic0B+k8/wMZ3eK+wZbb0UKjhdriLH5M9AurIYLHB80NTzHMZ8vV+EQA/WJjxZP4 v5rtHqs7q/WdQbTsi6pMW1zhR31G9D05pQtGN3QKPFpXH1kPHLTm5+doIINXug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759596288; 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=JTOuatFHYjrtXy/2a8/2CCR2lOfWn5c18NnLHsbs/98=; b=qN7AYkmUGB+F7hOiyHlVPlZGdFBX9hXSmLMiOQ1c+YXcb0KrekBxI5aH/UoJJchDaiVE5u sLzF3Jb3qPBjIjkZ74n5Sp99sPopYDyNhCvxYyYH8cwMWG9WWjCpia+y50F8pWExWrV0a4 UZAUdCs9my4Iaa9wtIm9GZ3OwS6cLhJAtaWOz4OOe1VyH8D0MtLqRJH9cdfB7dSWNxKdBy uHOAIjyOrFVLvF6n3SjvB6WBHt8CEg28Fsvw+KWu6bHhVTexk/sQTp5OPPkGpq8aw77wSw USKERuGqzjcHn8572unWeoP146slZSJhuH5lXwHsY9EsmR5dfTxFBn3Sh/PyyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759596288; a=rsa-sha256; cv=none; b=O17Qh7Xsyke9BPgsn5dXrws9Mohpk7A8ViBdBVnkfThZyrcDurmOWnnC66pRHwdWbP5RSF +LsXV7lu+cMJGZ8LHs0BfLPzPh6KR1Tqa/0oBB3vapk2OT8jqAP6PrjLOUXe07aS+HyMOe nyKAW8eRuYxbYwWrKzDMCnLWAWqY5HxytlmU+JKD+xbt1yIrF1nOFH2M6LvguuGSOoinVV xsst1upMCakv8muiZFsM8pY2Zpr6kz7Q9qSighiinEDEmXyC0FT0Ovnfd3nCx+2YKxs1tw mwnZLgmStAolKmohjJr1T1UwUZ6yHS+AXl7XWB7hvVrYH3lpBCAT1dpF1z1UGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cfBG81d0xzq4k; Sat, 04 Oct 2025 16:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 594Gimje058538; Sat, 4 Oct 2025 16:44:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 594Gims4058535; Sat, 4 Oct 2025 16:44:48 GMT (envelope-from git) Date: Sat, 4 Oct 2025 16:44:48 GMT Message-Id: <202510041644.594Gims4058535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 8583840cfb92 - stable/13 - witness: Record the first acquired file and line for recursable locks 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8583840cfb925eeafac8eff171029a56f7c9c133 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8583840cfb925eeafac8eff171029a56f7c9c133 commit 8583840cfb925eeafac8eff171029a56f7c9c133 Author: Zhenlei Huang AuthorDate: 2025-09-17 16:48:54 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-04 16:43:28 +0000 witness: Record the first acquired file and line for recursable locks and the last acquired file and line to witness object. For recursable locks, unfortunately current implementation records only the recurse count and the last acquired file and line, but does not restore the previous acquired file and line on unlock. Hence it is possible to report false acquired file and line, and that may mislead developers and make the report by users a little harder to analyse. Since subsequent recurse locks do not affect how witness order check, record the first acquired file and line so that the logic is much clear. Reported by: bz Reviewed by: kib (previous version), markj See also: https://lists.freebsd.org/archives/freebsd-current/2025-June/007944.html MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D52496 (cherry picked from commit 2d85bc89294baa04daf509e81ec3880bff79cc10) (cherry picked from commit 3dc9f96a489cd53710af8205a1f3901c11b760a5) (cherry picked from commit 7838ad85fb1a75464e53525b4cdb064ca1e97a47) --- sys/kern/subr_witness.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index 5ee72e68ac26..91055b604a5c 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -1512,6 +1512,10 @@ witness_lock(struct lock_object *lock, int flags, const char *file, int line) else lock_list = PCPU_PTR(spinlocks); + /* Update per-witness last file and line acquire. */ + w->w_file = file; + w->w_line = line; + /* Check to see if we are recursing on a lock we already own. */ instance = find_instance(*lock_list, lock); if (instance != NULL) { @@ -1519,15 +1523,9 @@ witness_lock(struct lock_object *lock, int flags, const char *file, int line) CTR4(KTR_WITNESS, "%s: pid %d recursed on %s r=%d", __func__, td->td_proc->p_pid, lock->lo_name, instance->li_flags & LI_RECURSEMASK); - instance->li_file = file; - instance->li_line = line; return; } - /* Update per-witness last file and line acquire. */ - w->w_file = file; - w->w_line = line; - /* Find the next open lock instance in the list and fill it. */ lle = *lock_list; if (lle == NULL || lle->ll_count == LOCK_NCHILDREN) {