From nobody Fri Jun 17 19:40:10 2022 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 07D2285CB40; Fri, 17 Jun 2022 19:40:12 +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 4LPqBg06sQz3hRw; Fri, 17 Jun 2022 19:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494811; 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=l+X1CuUYzMbpE7+wCsj4BjvBmxOcaIAFeCUMJlui90Y=; b=JcH67CaZ13Ztnc/GQWVdOohUCj0tIZutONY+PtCMe5X1pwguh2JzGZeRiL1lJmZNLBmDuH 4A48pqBXc40Vxr2xGnTIdnN/VSorEwtBWbPT2F3suqkpn3fdKB/cEh7pMOS0udDgcrGSiD GjS+aaDJziOkUk6/B83ew6EOyBmFQDw6RKadNJULLHTLwfpNm0uW6V3j4fXhzxFFgFtgKv dfQ3Dz0AN5fHnDAFQLW2D0QXfYeK6Prq5tiwko8BqzP84qN1u5fuAsAYKxL1/hW74XXMP1 vidvvlWJpg+sbWihhDRYRbLwA/ShpcvikTm5FC4ZfbN8J8wO9u02NBkH4UBwBw== 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 5F21F25D96; Fri, 17 Jun 2022 19:40:10 +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 25HJeAUV020355; Fri, 17 Jun 2022 19:40:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJeAvw020353; Fri, 17 Jun 2022 19:40:10 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:10 GMT Message-Id: <202206171940.25HJeAvw020353@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: 9ba35540f44c - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 9ba35540f44ca87d15084a67e50c8b99d86254f8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494811; 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=l+X1CuUYzMbpE7+wCsj4BjvBmxOcaIAFeCUMJlui90Y=; b=H8caZA3pg6uJtaE6xIOGO157PBsk+yQPtrua5KTwNao8rQUPL0PO3sJzHJ91uC9EKpqVGs bqY9WM0rpYD8d4FiIkhYjaaq/dWP0QZWjhFibUL+fprEL0FsoITpYG621K0aLVaEsh9Aqr PM8KpbcVFGrKJ6NbOkQ+AOMxJnHOiz7J/uAVEUQ5HiveS/cOVXXmlsFzFt+j24cp3q6Yij /wJIvhoYDIwfrXJy907VwWzjCMxlBJj6h42xLNHIsCUiyuGFuB4e+UuUruorp4DBy1r2hU MqgTYwPLioMtfuvIqa/ikZFs8ilppwiT+o0YUWQ1trqM0t1H7bk4AJyf9sneCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494811; a=rsa-sha256; cv=none; b=aWHwCnSTstkxbfZhoveQ4RipVL4EThIuNT6NgcZVvc/JorT3OBeiKqfr9LOgUUc9Vd40Y0 +8XZLP1xs8Xsa3aXiSCddixAeADM8o2x4Zhx/ic61Z3agVbdEeFyo6LQRtwXqSPQPeG+qc ADBuQLr3l+ncKCz49LN9aTGNirDr6O/VKSZtqnC//0aMeKFZdD596gCVMlpfPRMvc8rgw+ lcZDP1VGkfuwi9acE2eYpPHNes011SPBfsKUNYLDjCj9VJGDBV1MVV1FhWIOLfNLjoxc+q Sp8GJPUo/mT7z+yt0Ov2hVPJq5GEdDAQG/G8rIMtOApTZmjEbNc5pouJNBQtmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=9ba35540f44ca87d15084a67e50c8b99d86254f8 commit 9ba35540f44ca87d15084a67e50c8b99d86254f8 Author: Dmitry Chagin AuthorDate: 2022-05-09 18:08:59 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:01 +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 (cherry picked from commit 5eec19c8eb0e1afafd7290325c61611c9a13b621) --- 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); }