From nobody Tue Nov 03 06:51:57 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 4jJfPt6m9cz6y83J for ; Tue, 03 Nov 2026 06:52:02 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jJfPt65YTz3G93 for ; Tue, 03 Nov 2026 06:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793688722; 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=uhMsCvfw7QDzQOr1x5yPQgv39RouhskNj6EcYn5WFHs=; b=IFOY7ffhbJfapDKZQNQ4pEdXN+NMN1TbrCdF+NThf1olQsSySzlc+24Dhc9KExYSIacT/+ SQpz5IyItbPtpdqHHaUCAGZC+/66lsk8Io2mbGE4B7tsCnqL3qHWVOung1/ZrPIL3f3o+T zn+0Oa2Y0CMj0S4wNPsjN3T5K7Ec8jLw0lF1uVZMPKUvwEOitzYzDb7+Svk6BwGKqmqOzY 9iuhcoh1apaGKH5rQisCKW2ThvZZZnSM8TlWfDa1RfdVNa1GPRIKzTiqg5zhhHnvdLZH+F kDOsocS7y27DYkqm1puJD0eO3gmp8y6PYfxjX0SoKS6vAMaoNAtoRiDQTJ8biA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793688722; b=UwWyrhH6QNkMzsQuM5foRL0nn3Wxk/E5uIOK7f/CC0oLXH2jhD2RdY1vrVMN52YCFPcAnP cKLVEZKNBMSpDvNbuToBogR5sjRUpU7TPWfraw9M7tVjggF8zZMrYNAMq+V5FEQmPG4nK8 /pdK0R4xXDoC4C+cz37UPaL42fSGyFBYciPR58kZvPwep7jSi+ms+U1K+krhIPvGBd12eD JlrAF/NUX9xmiMA5BNvpxxdjbsv4wLsIeNN18Emop4g7E/OlQgjnikUVIQtMuSI4MEtMAK zo/8HnqCWaC9pfbcrdKzyaTdokAt0f8XH9xwLbfjSv4M2W4/mRrWNonklm3o+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793688722; 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=uhMsCvfw7QDzQOr1x5yPQgv39RouhskNj6EcYn5WFHs=; b=xI0q2hf8zcAv78894DX5HKFwK5WTBK4pw4/EICInr4DnZuYverc1SehkndpmHjZPyFbuKF +QXjauEPXDC3yuI6kYKNX5STNqQhEOxKbWIV+RSxx9mHEZegtUKle3hyQj83u6RIQH+8o8 PaiTFv+AqZoX4ZiIXjSX8+NIPM9tP+cD7hvyydr3biHnMwoRbGACfomjpO8FGI0xNRLjPN qbap2lc416orA1xfvb1vxkQkiqIYN8UJL/2qCYBVB9SNGK7CyMPhANSC1aDMgr97TgL6aZ 7+pRJo4upZlwLrd4Vc2Y5Aj+gBsyvavKU1GJAmU+ezUXwHmMlL+FoKoZ5q3IQQ== 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 4jJfPt5mqqz1L0c for ; Tue, 03 Nov 2026 06:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 369b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 06:51:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 6071292d39ab - main - libthr: Return EDEADLK if it is held by ourself List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6071292d39ab1b571b7e6b6858c4b59b652784d7 Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 06:51:57 +0000 Message-Id: <6ae9848d.369b6.7a053fd3@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=6071292d39ab1b571b7e6b6858c4b59b652784d7 commit 6071292d39ab1b571b7e6b6858c4b59b652784d7 Author: ShengYi Hung AuthorDate: 2026-10-21 06:09:00 +0000 Commit: ShengYi Hung CommitDate: 2026-11-03 06:51:49 +0000 libthr: Return EDEADLK if it is held by ourself Reviewed by: kib, markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D60959 --- lib/libthr/thread/thr_rwlock.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/libthr/thread/thr_rwlock.c b/lib/libthr/thread/thr_rwlock.c index 5fd1e1dcb14a..8bc22814f45b 100644 --- a/lib/libthr/thread/thr_rwlock.c +++ b/lib/libthr/thread/thr_rwlock.c @@ -217,6 +217,9 @@ rwlock_rdlock_common(pthread_rwlock_t *rwlock, const struct timespec *abstime) return (ret); } + if (__predict_false(prwlock->owner == TID(curthread))) + return (EDEADLK); + if (__predict_false(abstime_invalid(abstime))) return (EINVAL); @@ -311,6 +314,9 @@ rwlock_wrlock_common(pthread_rwlock_t *rwlock, const struct timespec *abstime) return (ret); } + if (__predict_false(prwlock->owner == TID(curthread))) + return (EDEADLK); + if (__predict_false(abstime_invalid(abstime))) return (EINVAL);