From nobody Sat Apr 26 03:21:21 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 4Zkw3P5ZMkz5tXkL; Sat, 26 Apr 2025 03:21:21 +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 4Zkw3P28MZz3LCf; Sat, 26 Apr 2025 03:21:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745637681; 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=+ipyCANmoPMWHwOkGm2XICWeu70eijFvx5xJd5p7hG0=; b=G5un/PC+ljk0ZrWmVydV77lqEl6gSgyDAKOgC4kUTiaon/v8te+H0pjYYKCdvWKXM1SMxZ 4g84k+qRQ7/hIjoSZmyuvfiH1wQLJBKnoP2OiWY9EhQgzzCrIsXHsF2QHrm7pGH8B4PWgr Yqig0jbLyx0TJMqV/3qIQ0sf0ft1Nqbro0UpDL1p8UF5STDIAY2C71hoWTog6scl91S4iU 1DVZHgwqtoO/9khrOFca9eN3Wqmv+cNEGFSAivqktX6ZVjPeNO3kvSnjF/SWMy+NwabjHT 7mv7WP7O7ccdl9SDoV8rd2VEVzWj6+2b0LV1c3tg+HvZl3xnz7hJ1JkncQ5OPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745637681; a=rsa-sha256; cv=none; b=EAyEMYltqnlivN++R12msHvpnCZNhZCn6UM2fWtkT8qOvczu9OhrvLP0QIcZbG49PqC3C1 6PCrykDGvl76KgaLmVJEA/eXMY8xtFRbeWMo1AmqtHkJN9XUoqkfWE0zgIqqQHm17AamTE 5YBUhYDjWjn4yGCD3vjr4EzWm1NngVxtZeRPel/urXWJZ3Xx5G3ct/aIx5KqxIwo7oNjne imCqH9C1jgVLndlJawSjSmSd8DcCK85SECsyKiQw7E6b6c7vQeJBhVKJZWG8n8BFLd4Cb8 IjsvDF8Pb/TPZKQHxAqlpxUCxEMGdiLCxF+QLlidbOCg0oih8FADaFqx4ozljQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745637681; 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=+ipyCANmoPMWHwOkGm2XICWeu70eijFvx5xJd5p7hG0=; b=aSCS02t8L2ERmuULZJ4mbuFL7yjKH2fx53J3ACT7gtsDVGxG3BEnolG8QurYPlEuREsUSz o34Ch3MBwxCuAVqCFt97fiIE3ALnNLXc4U4nobSpa3pV0YynbNaOdiDy42oxK9BUByDDYq nYUbK2GC8ZR6tsNr04MTHCOzFYNogpZefyEW9Xf0cb6eeddJ5LKVWwS1guWEsl6YneMGxi oISzsKGjFLPeTxH+714T1I6/YertNVc87R1qeXA4Bo7HfTdep/rGWhz6u2rKJTJEe+9Vk8 s3SFdorhk9EDvxBSe3oBCCGM+erp4ztr6fIaHbff3WKzoL/DsR52EDhwHDfckA== 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 4Zkw3P1h91z12x7; Sat, 26 Apr 2025 03:21:21 +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 53Q3LLuH009865; Sat, 26 Apr 2025 03:21:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53Q3LLtK009862; Sat, 26 Apr 2025 03:21:21 GMT (envelope-from git) Date: Sat, 26 Apr 2025 03:21:21 GMT Message-Id: <202504260321.53Q3LLtK009862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 8b42f57eebde - stable/14 - time: switch to fences for siginfo_recvd 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8b42f57eebde72d463986bdcfddf8ee8ecadc561 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8b42f57eebde72d463986bdcfddf8ee8ecadc561 commit 8b42f57eebde72d463986bdcfddf8ee8ecadc561 Author: Kyle Evans AuthorDate: 2025-04-21 03:19:17 +0000 Commit: Kyle Evans CommitDate: 2025-04-26 03:19:49 +0000 time: switch to fences for siginfo_recvd This effectively reverts 6e824f3713011 ("time: siginfo_recvd needs to be marked volatile") because it was actually wrong. Switch to C11 signal fence, which provides a compiler barrier that will do the right thing. Reported by: kib Reviewed by: kib (slightly earlier version) (cherry picked from commit df1b0f580d3dc4dd165d84fbcc14d0eebd8ee2c4) --- usr.bin/time/time.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c index 8e45f1283317..f883db17a59e 100644 --- a/usr.bin/time/time.c +++ b/usr.bin/time/time.c @@ -52,6 +52,8 @@ static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 6/6/93"; #include #include #include +#include +#include #include #include #include @@ -137,7 +139,10 @@ main(int argc, char **argv) (void)signal(SIGINFO, siginfo); (void)siginterrupt(SIGINFO, 1); while (wait4(pid, &status, 0, &ru) != pid) { - if (siginfo_recvd) { + bool do_siginfo = siginfo_recvd != 0; + + atomic_signal_fence(memory_order_acquire); + if (do_siginfo) { siginfo_recvd = 0; if (clock_gettime(CLOCK_MONOTONIC, &after)) err(1, "clock_gettime"); @@ -308,4 +313,5 @@ siginfo(int sig __unused) { siginfo_recvd = 1; + atomic_signal_fence(memory_order_release); }