From nobody Thu Jun 29 08:20:52 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 4QsBGr73yRz4knqh; Thu, 29 Jun 2023 08:20:52 +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 4QsBGr4c8Rz3wP5; Thu, 29 Jun 2023 08:20:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026852; 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=DYSGYTjp/MzZHcCKo851KJZmweJ7W1boPYi3b8D9IFg=; b=HHA0vaz/uO45WbbVl2hERt545Ew0EUvLkzf2OM8InkqvALVh/+h218ALDIhVHIFlf7OlBY qmgVkj2QvWrWFeQ8bxla1qGQjjxM+RJZlrbDDzcOtSrVpKOc786O/DY+Ard7COUbKF2R4W gTdFR9rZj0aloNL9PiUkYheB8VqnXLUncqlGWuyKFjDnv5nRQREYC/SzR9yJHwcGgPJkP0 fK0BR3kokN5W2BPMFJ52UFUVwpr1DH4ytg3LLf8k3Cl1Ys0Emd+NZRRxIELFh7mBtl4CeL UX+OtwuZmfrBH5C9gyLaJ6d22iAgzUGco9ZX6CAGMP90jaIgtm1stxbFzrXbfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026852; 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=DYSGYTjp/MzZHcCKo851KJZmweJ7W1boPYi3b8D9IFg=; b=apDV8Pnbe3KmSA4ccCNbQNX2Cxmd4QrtBS55/CN1i88HOwfqiSp1tcBvzxv4zE9r4ZtD0U g8+xgcKG+tp7n2qfbAWu7JbcPTVMUT1beXyHU06yzwVg4YgXhCMIWp2Qw+jPQy/FKCxajr TD/TOjt7As3cTLhjwAANCWu/PyZdEmB9d3ILLzEcN7wJwquSob4LbkFZ0FagCmGWrh3dWE om8nM5v3Ex8unEoBjYcC08AQnCUcaF3dmvi10axvpW28ZFTkDq4xgdodEz1si5wdA3fjKz /FqFzyypvApxs5VZr61uhMdizBXUtYCiSkPQzNa2a5obDPxL7sLH3kOpGr35jQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688026852; a=rsa-sha256; cv=none; b=Z1Q+TiVq2irvPSYcrtYLA02GQzizqKZQCJQiNM2LexNPo759wh7Fuvln0/22eCcgKY7HQU Y0JCTcefSo1qVwcybNc/yYFpJVwavg7w8UIcMMTQa9LniCBYe8wwD6b9OrtRa2xrNgUQgi ZtHjpQTEHhzh3Yw7ZPfYLQWNxd6brPRoEnqWTFLRKD4xALy5RpWfoUA+A4Vvx1SXiDW8AL s3zAiQrZVaeqIHP/DM3RtNRV/AMbe6iXOMz6qr3XJimUw5ptUHqePdnxHB0ObgYrACWaXS m1z4hFh7cbTUMptXA6MgTU/R1rxOR65QiqelDkWU/w6HJfPE3R+Layr+i73BqQ== 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 4QsBGr3kJVz17gx; Thu, 29 Jun 2023 08:20:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35T8KqTD085822; Thu, 29 Jun 2023 08:20:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T8KqkE085820; Thu, 29 Jun 2023 08:20:52 GMT (envelope-from git) Date: Thu, 29 Jun 2023 08:20:52 GMT Message-Id: <202306290820.35T8KqkE085820@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 4a1f66b81f24 - stable/13 - Revert "linux(4): The futex_wait operation should restart." 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4a1f66b81f24c4ae0207e2898eba145299609308 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4a1f66b81f24c4ae0207e2898eba145299609308 commit 4a1f66b81f24c4ae0207e2898eba145299609308 Author: Dmitry Chagin AuthorDate: 2023-06-11 09:47:27 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-29 08:16:03 +0000 Revert "linux(4): The futex_wait operation should restart." This reverts commit 5eec19c8eb0e1afafd7290325c61611c9a13b621 due to its wrong. Linux interrupts futex syscall on signal and return EINTR. (cherry picked from commit 486459056822f080b1ae24600a4c6a7d8ff6f7d6) --- sys/compat/linux/linux_futex.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index 74f89e3d49fb..d265b015b799 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -786,6 +786,8 @@ linux_futex_wait(struct thread *td, struct linux_futex_args *args) } umtxq_unlock(&uq->uq_key); umtx_key_release(&uq->uq_key); + if (error == ERESTART) + error = EINTR; return (error); }