From nobody Mon May 09 18:17:06 2022 X-Original-To: dev-commits-src-main@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 EE6A31ADF5E5; Mon, 9 May 2022 18:17:06 +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 4KxqBp6LVtz3J8q; Mon, 9 May 2022 18:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652120226; 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=OSTfLm+0SDqGwimxkibIw0pV93PBXtu8JMkZhlRaYh0=; b=rfrvbMlrm04ArKZToMU+OaeXvmESr/qNAxOXOPVLQBeEJoHA6O9XYab3SpUhY7+7qhDr0L r1TcZeg2TwNduYTlURORX5gVorSjJoQTOw1QYpcax3wFR+gW5qcp1ldxPiYgkF+xnHbaxr 0Dzz/eA4P1sycPzLoBUKRUlWpVVRDpub4MxTT87CsXBRGrWTE04fSZyCxpK4AxgqTkqTnR KCCM/CxiXjjLSdWw7n9rNDGFoIrvJDfuLfa05+YrHY32iDFGHqtXON7HPz2EnfEQ/HvkmS gy3gp2ZS5BKmdc+spmbyIrawg2e/pqF2GXk48bfSksFJa56SDagn7jPN4MfMEw== 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 B5E9215D7E; Mon, 9 May 2022 18:17:06 +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 249IH6hS090442; Mon, 9 May 2022 18:17:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249IH6Nv090441; Mon, 9 May 2022 18:17:06 GMT (envelope-from git) Date: Mon, 9 May 2022 18:17:06 GMT Message-Id: <202205091817.249IH6Nv090441@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: 5eec19c8eb0e - main - linux(4): The futex_wait operation should restart. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 5eec19c8eb0e1afafd7290325c61611c9a13b621 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652120226; 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=OSTfLm+0SDqGwimxkibIw0pV93PBXtu8JMkZhlRaYh0=; b=dfeRKvX/LMnQ8zwRFwKYO9Jr9NE+iSH0CeCR5avgdpLY9BDZi8scV+hg4uYVjn4nfuqM8n t8ddFrtnKuZVEuQz6asyIvSpp6Eg2kPHjXexOSW+NZmAmLP96RizMnmxGVaLcZWISijyAS WpkPrZMJ9nU68kdACZtIvRGFT5EsJ997Loj5v7OxXe3rW27skc7xor7Yv+S4Xrruytm9bd f5YTr20gIDlUkHjsdjUHbT1LebWVR+cEmfepHet6dha6pOEqxx/NLle5bfDmz8sYECzkdF 9IdObF0wjyG6PTq3pgksiOa2LErQFmAqa5z7zOfOMTzQNzyfZxuKvKz+rqWHYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652120226; a=rsa-sha256; cv=none; b=buJwdr4vae2l1hpFfxvG5Quxdmk/Uo8Y1BtCqOvu+srp6rHIIXb6vVmaGtTkjI6bZZK7rL vUE/QUa6mNMLHhzAIzyf2xmPtNOu644nqc6rgE8VjqjA0kKQAaxk9brdJlFV3Z4/BHXo7E WOwGZ2CWJisqvXZhu9u9UEh6pNWKzT+mz46G6R6Pfylev5Yqn6ZsU31UTNEOV05tAEFWio bXgHMMEpErcV/boXYRThMr3IkZSSxvpevCBR/+V6brDVyk+E+6bS/+oxZlK8yvuC3nrajd PciMTCbDJYwZobMPTj+/+NOh+6jp3BquadNxyF75NVrytxo6dYRQ40p7SP//iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=5eec19c8eb0e1afafd7290325c61611c9a13b621 commit 5eec19c8eb0e1afafd7290325c61611c9a13b621 Author: Dmitry Chagin AuthorDate: 2022-05-09 18:08:59 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-09 18:08:59 +0000 linux(4): The futex_wait operation should restart. It's ok from the futex_wait perspective as umtxq_sleep method uses absolute sleep timeout. MFC after: 2 weeks --- sys/compat/linux/linux_futex.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index 5591b4fc3234..1b4ef9e8efe8 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -779,8 +779,6 @@ 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); }