From nobody Thu Oct 29 17:44:40 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 4jFs7L1Jdjz6xNjC for ; Thu, 29 Oct 2026 17:44:46 +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 4jFs7K68Xtz3FvM for ; Thu, 29 Oct 2026 17:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793295885; 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=4bpjgmwGzmWx5kmGBG9tKVYU2gyLxmvUU6g7Akj89mA=; b=DbctYoFqe+U3EEGeCjMOIaGK5WiW8Zw0hU50/rhcMSNSeyyDHmryNq2NwpTDRnWiSS3Y6E RZa7bL7C9qOIQkG0/qbsh21B4sVYVYJrZLWgua+cr+WmeefxgTZ5roXPCCCsPJOpP8YAsr yU8UfB/G8F3XzzAywvYUmFg4GWJbjEuKky4fBXNft2M/gPVy9uoUlfayETGGdXsgOZoUEJ whLhah4AekEtrxGDKb6haoobS9n2rGt5Hhi46MlM7LOCm3K7Fqd1R8LX/QvevPdxf7iFfo 2A4z5nM7a4HU4fAE6ONehEbw9fRoiA1WUeGtbna1XaSXWBS60EZ1/XcCQaP52w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793295885; b=eCiJ9HK4EDZ6Fsaflvu4NXBg2oA+sYBbToeGm7dsG8Sv6KbqOccrUGKlLsbrSTmYRxNb9K P4D3atfD7trVp83q/SfEo7OazYTeb7zoMiHne+ePqRJwVhpGs0+Ec0Gi5edrYnsuJzquOR ZgzX6A1wHJYePBaNQJ167qSic6RXFBQQnEvgQUuCXfChnMtOaj6PeYGxlG5k6O5fz4N9xe 8LoqDjeBnI58VrUvFsMTf8/O+M2zhObBVrh78Zz/S+GcCMw8dXUgg4VA04uNl8tFrBGmF2 myrAbLcEvLLtgsFvsqcpfeaeQ8AY5H1bAXxTBZJfWAhhgC08U9LSWMHnFfmpVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793295885; 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=4bpjgmwGzmWx5kmGBG9tKVYU2gyLxmvUU6g7Akj89mA=; b=HCUsUIopi51hS4xVsTW0PwHetKaT02roG2OcIVfT3T1bYMrWT+CBipTegUCNpxmLBHk7B2 S1yojQDSGGPPL1o4BcdkosDDjCWMLmJONA4ACU15VhEQdM93gjyRlA7qcSPkES0kz83tlO eSSmeAunwKlUZs1Z8BfvWbVrgRPMylGH4zXNNB27VB9tNJw5mJk/te26fOfKNXGYzu95uF Q8tyo2XP3BZ6milGofQpFyTa/HLxvoyCQXOxaPMtEE9eyMSIa4rWeHvJsBD5ffogELWFx/ IxhE2epWSYcPT/Y+J0rwzgzaME4UNUctQsxlJYnCVASCH4xVWqIHMsMu05Io4Q== 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 4jFs7K5Sfnzqqm for ; Thu, 29 Oct 2026 17:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e33b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 17:44:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 8e3a6d7f5aaf - main - libthr: Deduplicate some rwlock code 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: 8e3a6d7f5aaf64c98fcd8896858492dc6b5b7fdb Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 17:44:40 +0000 Message-Id: <6ae38608.3e33b.29d4f824@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=8e3a6d7f5aaf64c98fcd8896858492dc6b5b7fdb commit 8e3a6d7f5aaf64c98fcd8896858492dc6b5b7fdb Author: ShengYi Hung AuthorDate: 2026-10-21 06:14:25 +0000 Commit: ShengYi Hung CommitDate: 2026-10-29 17:44:15 +0000 libthr: Deduplicate some rwlock code 1. abstime calculation 2. rdlock flags judgement Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D60958 --- 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 (;;) {