From nobody Sat Jan 4 03:57: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 4YQ6993mSHz5j8lg; Sat, 04 Jan 2025 03:57:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YQ6990zqkz4qdS; Sat, 4 Jan 2025 03:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963069; 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=sBw/IrN/9zrrexLcSaStc1BORcQk7+YmZ4Pf+vamjkM=; b=UoqAkbm+PUSfS/NVo6S4hS/9NPuXNmWlA1HxKW1Yu3JeR9IlN9QtU1o9ogx6qYqKBrzAca TNxHW8Vh644mmW+BPR+xLqBbRRkKsqeb2pmDMK+F8PJVxAV1w6P9EHqBl2vk9NG0yvPJoI BSpEFkhYGghUZMHsIthsqAteBp5NYzwFp6mtnyPSlG9oPGsx3iAMa3vJCXQHfha1u79XXN dOb6UyQm2D7M7c66npUzQvKI92fG6zyOroJDrCeofOLjGSCiRwaJ2//EQ5Q9xcm+NMZ0An 6wMJtUTHIb5mpHuHZ5LqR/ofK62fbkv1aMhOOELVs0laurvM2UMtwelXOI0yBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735963069; 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=sBw/IrN/9zrrexLcSaStc1BORcQk7+YmZ4Pf+vamjkM=; b=iVYla3HHNpfk4uLEuoXqMN+0Xp+5NB3VNHcWfEo4jCSonUBGw59BbGOg0qOYYhSY/FAMsS esYwC9gMEMFGAyVqyv7vyhHkzqse2RMTbS2rfTyvYb5meN4I+6vLzs1UUENfVuY6Ddjgt1 7u4mEXE91173SyLk8SuMNzC3yV65wTeBQ+A/zhf+so6IdCg6E5lzuzzCmvbkX+8v9DuFap vBQZMTW9tHAPlowmgn7gRAWKl7Gw1YNSJ8lWMukuFv5zn4h9vB5Hh2UNR16eJaqZESXQSV UuSmk2zbNq7JxM7blkZvjcg8yqgPQu8r227/kxoHoFCLSu9m+LaHMf2GlnRHWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735963069; a=rsa-sha256; cv=none; b=FvSejCYnuaA/1MRbAo/R2koiHji+1AgBCMKkYPuashwjePhcy6I7YhvEHr6190HyvFngvv ShyYWEPZG7/FJUr0vnDU3STj/rVgX18nxc0HgdAzNMv+QVG+uJcWFgdQJ+Scx4zKt+gmmq A8hdMZq65R4dbyfje615CraEBsP/2xKJUt5sacMOt4Nm3Epryk8rARsyB6NGMCToqFjDBG 57wbnAcF7A695Nhxhuh1axzqj0usZub8Q4U0z7Oq/P/KAM1qJztu0XFtggCIPSvr/CP+f8 Th2ReYfPgw0Jm+SnnA27Dk8Qmi70KzysxkFjAa+J3IdGKKUQJ4NXZJs/NZmN4A== 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 4YQ6982tHTzcmW; Sat, 04 Jan 2025 03:57: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 5043vmJF028375; Sat, 4 Jan 2025 03:57:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5043vmh6028372; Sat, 4 Jan 2025 03:57:48 GMT (envelope-from git) Date: Sat, 4 Jan 2025 03:57:48 GMT Message-Id: <202501040357.5043vmh6028372@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: 2f645d539c60 - stable/14 - pthread_setcancelstate(3): make it async-signal-safe 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2f645d539c6003601c5a09c156869a6c6334ec4c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2f645d539c6003601c5a09c156869a6c6334ec4c commit 2f645d539c6003601c5a09c156869a6c6334ec4c Author: Konstantin Belousov AuthorDate: 2024-12-23 06:42:15 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-04 03:57:24 +0000 pthread_setcancelstate(3): make it async-signal-safe (cherry picked from commit 030f48f78f96e0cdb30c960e1a11e5ae01d0eee8) --- lib/libthr/thread/thr_cancel.c | 12 ++++++------ share/man/man3/pthread_testcancel.3 | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index 7622e306f937..4189a2640d14 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -83,22 +83,22 @@ int _thr_setcancelstate(int state, int *oldstate) { struct pthread *curthread = _get_curthread(); - int oldval; + int oldval, val; - oldval = curthread->cancel_enable; switch (state) { case PTHREAD_CANCEL_DISABLE: - curthread->cancel_enable = 0; + val = 0; break; case PTHREAD_CANCEL_ENABLE: - curthread->cancel_enable = 1; - if (curthread->cancel_async) - testcancel(curthread); + val = 1; break; default: return (EINVAL); } + oldval = atomic_swap_int(&curthread->cancel_enable, val); + if (state == PTHREAD_CANCEL_ENABLE && curthread->cancel_async) + testcancel(curthread); if (oldstate != NULL) { *oldstate = oldval ? PTHREAD_CANCEL_ENABLE : PTHREAD_CANCEL_DISABLE; diff --git a/share/man/man3/pthread_testcancel.3 b/share/man/man3/pthread_testcancel.3 index 2d2bb06c48e2..c74cdcfe943b 100644 --- a/share/man/man3/pthread_testcancel.3 +++ b/share/man/man3/pthread_testcancel.3 @@ -34,6 +34,7 @@ are .Dv PTHREAD_CANCEL_ENABLE and .Dv PTHREAD_CANCEL_DISABLE . +The function is async-signal-safe. .Pp The .Fn pthread_setcanceltype @@ -248,6 +249,11 @@ function conforms to .St -p1003.1-96 . The standard allows implementations to make many more functions cancellation points. +.Pp +The +.Fn pthread_setcancelstate +function is async-signal-safe as required by +.St -p1003.1-2024 . .Sh AUTHORS This manual page was written by .An David Leonard Aq Mt d@openbsd.org