From nobody Mon May 29 03:21:05 2023 X-Original-To: dev-commits-src-branches@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 4QV15F6c9Nz4WnY0; Mon, 29 May 2023 03:21:05 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QV15F54C4z3j69; Mon, 29 May 2023 03:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685330465; 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=U+9IF/y0STOR3CwH0PC2IegKhBk3sCV9aSch9w1JMW4=; b=mvLUF6j0IU2abPjDCuUD+Bq7ZAp8rksFqU8VUAQHts30natQkztobQY/87qrpry/ud7k+t ZTzh56jp4gzpyNy5R6H4sfpbAeA96IaVPMhTWZQZATJubqATeOC3vRsb8DBLX5iLvrzz3i Uxoev/1yNbf3N/WTq3Nl1XVTJg2CvEtgUx9EA4MkRDmKSeUd+07zgsViTLlxvHR2WCeu/O d3pDZhrF0scAjZ4nrIt4Gze77WV+0reP7uM32mzlTMp7ZHy9484avOr6NW1IYgHHsfwK1S kRJMCTlRlSr2a4Q6TmPA6D2jPLk39/7Z3vZwut13KGD7ulxTeLQhyuJgQATKlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685330465; 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=U+9IF/y0STOR3CwH0PC2IegKhBk3sCV9aSch9w1JMW4=; b=p1cSaEZfmCnXCt08aqWsOcZCJK/hXTALLG19Zba3sGEMjgcPLlWOMdOhF86kJLZPnwEjE9 97ftZ7dA97mOTzxB64gXDKUTaHBsX4HZLYHhyFkbX6dkF6/F4HLFAgDzgPQQIwA11BGFNY ZVTeEIu96FnwhLcMBbYjaUJ5D3uuhgWtxir6/HaZE0As8CUgPjAhnqrFEvo8FMpj97Nu66 bxOdfZXKiaARBA17MrfyeeOVwcFpUSUnXQKGMa9LpSpwH1TD8EHvhEDyzCYzBnE5Y8cKTS N6lBhd+/2AGYSU0gI7ewtXFQaFGWQO6+qUNprCw5gn+B/ki/tzbf6i7Uq69zxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685330465; a=rsa-sha256; cv=none; b=tXveiOU8aNN2ZdQA7CYEC6aTg1aAhhw9D76cmtEUMCHN451PAP3kBa16tcLLhKViQ2QMwD VB2hiqa1ZXi4FosZbZMeUmaOMXR9I5zh34o6Kk0revdh/4zIcQE9cYtvwPhg4zZ0Q4sy79 Ow3T+8J9D5LCivtBDjTZefYhAXNqjIW9z8N7GDqCRZWpdsZwGxpc0P778hDaA5BnmsK9cR xWdi9UMuSbKCT9J+G2tJGVQ1fuLx6Tdjql+ml89zKG+VL78/+MwYBbgpuMQfc85JtHuyZM YZlt/6g937w4CQ2/AEmDvYGq24jFibZdcXBYuy+QFamiJZUkuNC1vqGmThh9GQ== 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 4QV15F3Yx8zwWV; Mon, 29 May 2023 03:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34T3L5Wx079814; Mon, 29 May 2023 03:21:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34T3L5ZM079813; Mon, 29 May 2023 03:21:05 GMT (envelope-from git) Date: Mon, 29 May 2023 03:21:05 GMT Message-Id: <202305290321.34T3L5ZM079813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5b45cd83c44e - stable/13 - libthr rtld locks: do not leak URWLOCK_READ_WAITERS into child List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/13 X-Git-Reftype: branch X-Git-Commit: 5b45cd83c44edb9386eed1155acd3c52f36bf12c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5b45cd83c44edb9386eed1155acd3c52f36bf12c commit 5b45cd83c44edb9386eed1155acd3c52f36bf12c Author: Konstantin Belousov AuthorDate: 2023-05-20 08:11:54 +0000 Commit: Konstantin Belousov CommitDate: 2023-05-29 03:20:42 +0000 libthr rtld locks: do not leak URWLOCK_READ_WAITERS into child PR: 271490 (cherry picked from commit 6f49eafb056cfa0703dfc97a731cabe4ed2596b8) --- lib/libthr/thread/thr_fork.c | 4 ++++ lib/libthr/thread/thr_private.h | 2 ++ lib/libthr/thread/thr_rtld.c | 11 +++++++++++ 3 files changed, 17 insertions(+) diff --git a/lib/libthr/thread/thr_fork.c b/lib/libthr/thread/thr_fork.c index 9861e93c427d..341afc2b06ec 100644 --- a/lib/libthr/thread/thr_fork.c +++ b/lib/libthr/thread/thr_fork.c @@ -78,6 +78,8 @@ __FBSDID("$FreeBSD$"); __weak_reference(_thr_atfork, _pthread_atfork); __weak_reference(_thr_atfork, pthread_atfork); +bool _thr_after_fork = false; + int _thr_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) @@ -243,7 +245,9 @@ thr_fork_impl(const struct thr_fork_args *a) _thr_signal_postfork_child(); if (was_threaded) { + _thr_after_fork = true; _rtld_atfork_post(rtld_locks); + _thr_after_fork = false; __thr_pshared_atfork_post(); } _thr_setthreaded(0); diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index 0e88c6711817..910de374accf 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -779,6 +779,8 @@ extern int _suspend_all_waiters __hidden; extern int _suspend_all_cycle __hidden; extern struct pthread *_single_thread __hidden; +extern bool _thr_after_fork __hidden; + /* * Function prototype definitions. */ diff --git a/lib/libthr/thread/thr_rtld.c b/lib/libthr/thread/thr_rtld.c index 1967ea14859d..fe4fb7ae0602 100644 --- a/lib/libthr/thread/thr_rtld.c +++ b/lib/libthr/thread/thr_rtld.c @@ -158,6 +158,17 @@ _thr_rtld_lock_release(void *lock) l = (struct rtld_lock *)lock; state = l->lock.rw_state; + if (__predict_false(_thr_after_fork)) { + /* + * After fork, only this thread is running, there is no + * waiters. Keeping waiters recorded in rwlock breaks + * wake logic. + */ + atomic_clear_int(&l->lock.rw_state, + URWLOCK_WRITE_WAITERS | URWLOCK_READ_WAITERS); + l->lock.rw_blocked_readers = 0; + l->lock.rw_blocked_writers = 0; + } if (_thr_rwlock_unlock(&l->lock) == 0) { if ((state & URWLOCK_WRITE_OWNER) == 0) curthread->rdlock_count--;