From nobody Sun Jun 11 09:53:55 2023 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 4Qf9BX1Wksz4ZBYR; Sun, 11 Jun 2023 09:53:56 +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 4Qf9BX15JPz45KS; Sun, 11 Jun 2023 09:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686477236; 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=4E+9tg1Yy0KzQ+S3i+cnf5UfXMFh5hrHgF+W9G4jKrU=; b=F5D8/CwdBUhadmERMKh4dt74ZQxWbNvqELx8d/YZQgpLvmfFNfkvZDapgNyIa6Aw6mdONm EsLnzFR+NHIAXZVZdypSJG3SchoQ/sNeBzZHjglgH2CqeDAYJO6AmWDTeaAaZjwEhcPGNO IWjlFYcOVSbyNOMKNbaK8E5wOx8u9k2W2IU5FqOwr/JAP0TCrIDiA4Mj/E0tPhn2sRtORP kSa9PzQZ/P44AjnxG+G4aU3uzfFvOYh0AAEizZuqs9Y6+l+BXZq6PYlATQ6FENuqx/BUkt 4I3XBV43YrYp9hkxRiuZlvOu1xkaaiPFNl0EBfrzTJPmrxv5sHmlOQoWtzK7QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686477236; 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=4E+9tg1Yy0KzQ+S3i+cnf5UfXMFh5hrHgF+W9G4jKrU=; b=ZuIsAk6bnQDmadQCcVLs/5vVd+No54B9T2s64n0Gmiyx2vpyLIgWFM9BiSomiqwR9v5JNy FCL3xyAaCNVjyaOcrTo8F0u/uxvJXPlVvwswxfwcbq/4X7Ur1xVVVB4+iFmt0j5GfLR/7g D5BUS4C3Je3xIcKi6+xT0efjr1zK64sT+5J8xo4sUGjJd88Oo6fXLpudZBcLAf8DUhDAU8 KCS7bJfjouHppl5WfsL9f4NI0uLVcNCh8X+xaahVouSlsVLkM4eqNLCvhduATL6Sb8gk2K 27r1ih5d3aFtRKrn+77sYodQgWR2eEHwm/Q8TZ6Ua+q14Zy1ZoxVPpETnR6+bA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686477236; a=rsa-sha256; cv=none; b=VMNRTyIJXtm6YkYwnBNPiiXiBcGxS4Omd6HuxjcxUl5UPCO7IcpbHIChB57CCzJfrkeSul toC+dk3shlv42+Bjok8UTNVB8CrSf/A8OjXCRWThABnQRY3boRj4EeXeI+q2PoUlBZ8l+n bWI/6wvhpS1pc8jBS7jE1oStU5qxNPKaDQNoYamgLbtyyMNJvBjNmy6Lz5p8kzdc4Y/DVs mlLf6HWMGy79/ohDlMKB7gVFDZPzcEmH25f/WG6qZye4t4QZKp4jPpR6KDAyadp1WqFIN4 MhJSP9gj0qMjMncuYxAZCSp0XJ5e46xxEhAeMpYfgBCrnjpsJzZcRc+qiCBbow== 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 4Qf9BX08HLztsQ; Sun, 11 Jun 2023 09:53:56 +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 35B9rtig031184; Sun, 11 Jun 2023 09:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35B9rtCh031183; Sun, 11 Jun 2023 09:53:55 GMT (envelope-from git) Date: Sun, 11 Jun 2023 09:53:55 GMT Message-Id: <202306110953.35B9rtCh031183@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 486459056822 - main - Revert "linux(4): The futex_wait operation should restart." 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 486459056822f080b1ae24600a4c6a7d8ff6f7d6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=486459056822f080b1ae24600a4c6a7d8ff6f7d6 commit 486459056822f080b1ae24600a4c6a7d8ff6f7d6 Author: Dmitry Chagin AuthorDate: 2023-06-11 09:47:27 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-11 09:47:27 +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. --- 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 8aaf81bdf950..9cc41b8d72f5 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); }