From nobody Fri Jun 17 19:40:52 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 0B5B085D49F; Fri, 17 Jun 2022 19:40:54 +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 4LPqCT3TG9z3hbC; Fri, 17 Jun 2022 19:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494853; 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=++SMdmDgXkrauESpond6ESH+hjcFkpG6rRrSBGkBs6A=; b=GhCdfDhJHKPkRGprDaH8P70uOcMpAOxSHWGOflGjC2atBlQut3ttFny9DYEfnDX6NbF5IN LCyPQqe/ywbik80G9gh8u7d6nl89eS6AeWItYP7NvVCB0kf5+s7JRzsXCagaJ/4I+LdoBq FsT3JeqvXxOjYRB7CHL0Gw6LJVbBZgBfCbFKD0aTeqs0flCV0EZw438mYw93JCYKqlouDy dtLC56ZK3HMRgoZfuBGmMGsdBpelpE+Bw+rgGfPvNmiCuQvuJZtgkuJ3QoYZhVZPifR3h3 JaEYqSWFuqXhZu7VKvJGj0b1mehyAloA3YKPdhpRO3o/0etTwOTDqtSZqBNGCw== 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 DC72825C6E; Fri, 17 Jun 2022 19:40:52 +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 25HJeqKH027060; Fri, 17 Jun 2022 19:40:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJeqfg027059; Fri, 17 Jun 2022 19:40:52 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:52 GMT Message-Id: <202206171940.25HJeqfg027059@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: 3dfc1fc1b3bb - stable/13 - linux(4): To improve readability use FUTEX_UNOWNED instead of 0 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: 3dfc1fc1b3bbd35abd2a1642d81774a1cd425b85 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494853; 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=++SMdmDgXkrauESpond6ESH+hjcFkpG6rRrSBGkBs6A=; b=nhFRjk1nDXoI2Bipj2B+3U3EzUwsGaleQROu4Ce30Sct4kiW65TZsBgYRpM3SiEXETjM4b x140YTlCvVjDZ2Z8pIz4HUjph3spTfifR0e43JsAJi65xDqXnn04X2OdnIpu7sTXlFXz3I 3UQLSbLrCSDzyRkhvcPCiqRvNdittkBWTFbPYt7KsnIjwloa+JCrUdoRWctkTRFLMdjXFb q0+nUSPjKhi4rC/BD8ErpiuAKw/XmHViCl6rXMjsBDG+wLDa0Jb+8oDf2bLzVZe+EB/+/S XqllsTo2s5UXDXkedcAyln9R7SP3r+tuMMSzKHjo9wV+a3wZb32lgWogOMj+kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494853; a=rsa-sha256; cv=none; b=OUWlHlHx2rjfMvO9Ebn/x7OE5aHsuRs0W56fpxKvunolxBNH+5ngqJScxOZ3+rOHW+qK5d ysu+al61uOjoKRTXpnPW1KrD9jQaEnPCGeIN0gWgk4bLhcbpBdju/N0b7bxijqR4DzR79m ZWdY8J8ZJNOAUxyGbJiMU39NQrijYO1kwfoduJEXAYD/6bHKaYeXRikiZc7lhgQCBmRLQv fxUkPq8yFW5Z+USmqF9eZm5XxJHp00IDHGhsIc7V3cOT/mRwsnTG32zaqIQErE+71OX6gC iIl0SEt/FHBocfaS8Q7yh3Vb/mS456EMaXJxMvA4OTTP78DFfJDLO13eg6HPnQ== 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=3dfc1fc1b3bbd35abd2a1642d81774a1cd425b85 commit 3dfc1fc1b3bbd35abd2a1642d81774a1cd425b85 Author: Dmitry Chagin AuthorDate: 2022-05-19 18:42:38 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:27 +0000 linux(4): To improve readability use FUTEX_UNOWNED instead of 0 MFC after: 2 weeks (cherry picked from commit b04f5d18b5faad004a10f054d9c9072fcf31c29b) --- sys/compat/linux/linux_futex.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index 8bcdc378cf70..eb3ce3421465 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include #define FUTEX_SHARED 0x8 /* shared futex */ +#define FUTEX_UNOWNED 0 #define GET_SHARED(a) (a->flags & FUTEX_SHARED) ? AUTO_SHARE : THREAD_SHARE @@ -399,7 +400,7 @@ linux_futex_lock_pi(struct thread *td, bool try, struct linux_futex_args *args) umtxq_unlock(&uq->uq_key); for (;;) { /* Try uncontested case first. */ - rv = casueword32(args->uaddr, 0, &owner, em->em_tid); + rv = casueword32(args->uaddr, FUTEX_UNOWNED, &owner, em->em_tid); /* The acquire succeeded. */ if (rv == 0) { error = 0; @@ -414,7 +415,7 @@ linux_futex_lock_pi(struct thread *td, bool try, struct linux_futex_args *args) * Nobody owns it, but the acquire failed. This can happen * with ll/sc atomic. */ - if (owner == 0) { + if (owner == FUTEX_UNOWNED) { error = thread_check_susp(td, true); if (error != 0) break; @@ -441,7 +442,7 @@ linux_futex_lock_pi(struct thread *td, bool try, struct linux_futex_args *args) * Futex owner died, handle_futex_death() set the OWNER_DIED bit * and clear tid. Try to acquire it. */ - if ((owner & FUTEX_TID_MASK) == 0) { + if ((owner & FUTEX_TID_MASK) == FUTEX_UNOWNED) { old_owner = owner; owner = owner & (FUTEX_WAITERS | FUTEX_OWNER_DIED); owner |= em->em_tid; @@ -486,7 +487,7 @@ linux_futex_lock_pi(struct thread *td, bool try, struct linux_futex_args *args) * Linux does some checks of futex state, we return EINVAL, * as the user space can take care of this. */ - if ((owner & FUTEX_OWNER_DIED) != 0) { + if ((owner & FUTEX_OWNER_DIED) != FUTEX_UNOWNED) { error = EINVAL; break; } @@ -608,7 +609,7 @@ linux_futex_unlock_pi(struct thread *td, bool rb, struct linux_futex_args *args) if (count > 1) new_owner = FUTEX_WAITERS; else - new_owner = 0; + new_owner = FUTEX_UNOWNED; again: error = casueword32(args->uaddr, owner, &old, new_owner);