From nobody Tue Nov 17 01:09:39 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 4jT68M6qR8z71Pws for ; Tue, 17 Nov 2026 01:09:39 +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 4jT68M5FGRz3CH8 for ; Tue, 17 Nov 2026 01:09:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794877779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ixG9pX9liqC7mrtCWSnxqeat8po08Zw4fCk+Njfjk1U=; b=dPnzpFpQxPcA0KDG91rYDp30GXZ8kKmMvnYJyyYMMK6E/x5/yh7jOKEnT5/qgLFkodsg83 0xMLFw9U0Rkh3by4KLaLGSYc0PnUJDrcBdjOVLxHOIdd1z2fe5kxd+OT6isgNtAVuIC2fC B6Pq2xRLslAKtFbbMy/SLWGRl6gVTqkS86J3mtR5/t0B5RXPcCWF1HnNenMlWRG8MbzPX2 90x0xh5TB1N8uxRruoELqlZfbgnqLUmtuTxcKizG1Ahzo2+BpZ4PKw68BqAYQU7Fzz6WyT bl/79holGrPuDaTDUpBWvyLA6U9j4fHY/CUpDiWLprZh3Fqs2bJLStjNakG+MA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794877779; b=J0etGYMqHoBX1Ch8IjCMQ/jQHZQnr2kg5tWXSoanGZ1Oul686T7CDGB5C5KVx02VRoJ3oZ Mzovh/EYhNn5TjEE2V4JrNjQRDaV716wY+IkxMRhw3VAG5EHDsxHIeNGP2jos/pjW/CI+z X9fzktZaOS4KxDIKl1KDH02rm1OU1iTFHa3drwqhIQ8znd249hegl1nCmL0rinVBnszC6z AENG7uGt2FdptzES0QMP3cH++BB907AoT6kFFRKnp/4s2yIAU0uwY7+/SlyeoLpi4wIQwU 0f1aZUjf0wIXXKES2L8yF3EFzVd022STOtaX7713Wt3jV72QApPAwYiW9zOXvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794877779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ixG9pX9liqC7mrtCWSnxqeat8po08Zw4fCk+Njfjk1U=; b=Y+q4llBV1Xw51tROLOsO28AvYSS5exQDFCcksP19eItOdTMRh8i8WF4iQsZSxNOuWpCQfn L/qZn2r5CwYlnvnIZxAt2FghcerkfvLutZVJ1Mwv0k3kp64dbvXAAFLeBUUNdDPtKGdHw+ eH/MNB7FuMNLKP/QikUEIw8F5Kb/piiZmp3ifUrsA8Xhpz4SeihpM4hsSKxt+FDHV9brew ksD+co1W2AQ/43tzEjRctgAg7M0tAeVczjYwS/QrZg7MKbxmvtJaj3HqmIE5jNFERYVh8X z+GAptr9rEMJgiqEoIFd+qL/NshxmRACS14pu6pShTXlOkC9YJ0hhJdNwSX1QQ== 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 4jT68M47d4zJTM for ; Tue, 17 Nov 2026 01:09:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fa6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 01:09:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: ShengYi Hung From: Konstantin Belousov Subject: git: 037821c42bee - stable/15 - libthr: Deduplicate some rwlock code List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 037821c42bee82008f98dd87348ee0993486c2d9 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 01:09:39 +0000 Message-Id: <6afba953.1fa6.32e0cd7b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=037821c42bee82008f98dd87348ee0993486c2d9 commit 037821c42bee82008f98dd87348ee0993486c2d9 Author: ShengYi Hung AuthorDate: 2026-10-21 06:14:25 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-17 00:24:58 +0000 libthr: Deduplicate some rwlock code (cherry picked from commit 8e3a6d7f5aaf64c98fcd8896858492dc6b5b7fdb) --- lib/libthr/thread/thr_rwlock.c | 67 ++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/lib/libthr/thread/thr_rwlock.c b/lib/libthr/thread/thr_rwlock.c index 084181ba922a..5fd1e1dcb14a 100644 --- a/lib/libthr/thread/thr_rwlock.c +++ b/lib/libthr/thread/thr_rwlock.c @@ -166,18 +166,9 @@ _thr_rwlock_init(pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr) } static int -rwlock_rdlock_common(pthread_rwlock_t *rwlock, const struct timespec *abstime) +rdlock_flags(struct pthread *curthread) { - struct pthread *curthread = _get_curthread(); - pthread_rwlock_t prwlock; - int flags; - int ret; - - ret = check_and_init_rwlock(rwlock, &prwlock); - if (ret != 0) - return (ret); - - if (curthread->rdlock_count) { + if (curthread->rdlock_count != 0) { /* * To avoid having to track all the rdlocks held by * a thread or all of the threads that hold a rdlock, @@ -190,10 +181,31 @@ rwlock_rdlock_common(pthread_rwlock_t *rwlock, const struct timespec *abstime) * when it already has one or more rdlocks avoids the * deadlock. I hope the reader can follow that logic ;-) */ - flags = URWLOCK_PREFER_READER; - } else { - flags = 0; + return (URWLOCK_PREFER_READER); } + return (0); +} + +static bool +abstime_invalid(const struct timespec *abstime) +{ + return (abstime != NULL && + (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)); +} + +static int +rwlock_rdlock_common(pthread_rwlock_t *rwlock, const struct timespec *abstime) +{ + struct pthread *curthread = _get_curthread(); + pthread_rwlock_t prwlock; + int flags; + int ret; + + ret = check_and_init_rwlock(rwlock, &prwlock); + if (ret != 0) + return (ret); + + flags = rdlock_flags(curthread); /* * POSIX said the validity of the abstimeout parameter need @@ -205,8 +217,7 @@ rwlock_rdlock_common(pthread_rwlock_t *rwlock, const struct timespec *abstime) return (ret); } - if (__predict_false(abstime && - (abstime->tv_nsec >= 1000000000 || abstime->tv_nsec < 0))) + if (__predict_false(abstime_invalid(abstime))) return (EINVAL); for (;;) { @@ -246,7 +257,6 @@ _Tthr_rwlock_tryrdlock(pthread_rwlock_t *rwlock) { struct pthread *curthread; pthread_rwlock_t prwlock; - int flags; int ret; _thr_check_init(); @@ -255,25 +265,7 @@ _Tthr_rwlock_tryrdlock(pthread_rwlock_t *rwlock) return (ret); curthread = _get_curthread(); - if (curthread->rdlock_count) { - /* - * To avoid having to track all the rdlocks held by - * a thread or all of the threads that hold a rdlock, - * we keep a simple count of all the rdlocks held by - * a thread. If a thread holds any rdlocks it is - * possible that it is attempting to take a recursive - * rdlock. If there are blocked writers and precedence - * is given to them, then that would result in the thread - * deadlocking. So allowing a thread to take the rdlock - * when it already has one or more rdlocks avoids the - * deadlock. I hope the reader can follow that logic ;-) - */ - flags = URWLOCK_PREFER_READER; - } else { - flags = 0; - } - - ret = _thr_rwlock_tryrdlock(&prwlock->lock, flags); + ret = _thr_rwlock_tryrdlock(&prwlock->lock, rdlock_flags(curthread)); if (ret == 0) curthread->rdlock_count++; return (ret); @@ -319,8 +311,7 @@ rwlock_wrlock_common(pthread_rwlock_t *rwlock, const struct timespec *abstime) return (ret); } - if (__predict_false(abstime && - (abstime->tv_nsec >= 1000000000 || abstime->tv_nsec < 0))) + if (__predict_false(abstime_invalid(abstime))) return (EINVAL); for (;;) {