From nobody Wed Sep 04 16:05:13 2024 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 4WzS4n6Wynz5V9Gs; Wed, 04 Sep 2024 16:05:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzS4n5YqJz4bkY; Wed, 4 Sep 2024 16:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725465913; 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=XWq+VLG6wGrlYBVBPQutF9eS5eOuxXHSsDRIx17A6QI=; b=iMRJ0QaXCZGFuOLA4fHa57we1aFVsNs2XIa24Zc/L1tRHhy1HuNw2vrHjI2LUCFEyh+Jr+ 54A60jHo+4T8rCRdTTaJf6N6gayVaGdz+cGnFF8S8thE3UyzV6WfyxwOLudQJjUVr76TRq 2Alb/0/r3e82WYDtsNY+Sbg++HfrBKrLwEqGZB9VjFZEMSqj4+THYbch+rUqn5EnySOGcN eBt+DqUcZoxfKIHrOAypIwDRYwmEsJyVyHq3kt0jCnLUGwqAcCXo1Z45Aa0L1aBVv0Y1NB cnx3ymGJfsnK4PigNpbujhGHobt+iSwJvZcV9aZTsujCzhhvHmoPYIqDmXAhCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725465913; a=rsa-sha256; cv=none; b=NVGNzxC7HfaG2TAsCpEEDHFhYThEn2e2qxY9G086nQv+hyXdR/Hxf6CAqT2+CWLmrsIUE8 rpm1MN+WfvIcUE2wtwRtCJdLMIb2WLXsEfHSWw2MLRXO/Z+iFPPHAnTEoT4YEHftD2SsmY jNvreVW3ZJbSFsetx9N4JNMqw6H4vSey7KmJQnMytxG0grzj3d9MSAmwPElXPzpRFq3G2y wGM1J0eWRdb/2Ul4O8dANVHDowQ4zAOKqUjBFVfs6ap2hD7Ew/frSEflWaIJrzaNT5iP+7 KK1yCXXZUYQp6p5y+i2g2eBbnESvuCFAhQ09RRzGucy7MqlMg6Ug7iHc9tAKVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725465913; 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=XWq+VLG6wGrlYBVBPQutF9eS5eOuxXHSsDRIx17A6QI=; b=kRJJNY1rjwaRjdyCFw5WEnEMWNgFTEvN4wGf5B5/ZYLYkUuRkalKf0aWsJFjWnQkCbmwC9 4pZ2NFB0hwen+48LsvfzW8kIoSldklb1U34nNO/Uk+R9E36S42doOXtmij8NfjyWAJgYBV ObQnBM/uolFka4orRw7APy2WhuuI4/bETqc6GugS6OWYoduFdwmZDVHJOfsEpY4gpkfkTX VAD40PrYrJkNn7STCewm5h68rst44n1iKEt0ETKpMccJutLdgVA6UL4O0kvL55P5+D8PFs xJgqVeWW/pcoFQ5BbCAq10Vaqq0a3dQBFfSC6jrgViV8wX6u48LXS+yXDxdNzw== 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 4WzS4n59HDzXFM; Wed, 4 Sep 2024 16:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484G5Djj039452; Wed, 4 Sep 2024 16:05:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484G5Dec039449; Wed, 4 Sep 2024 16:05:13 GMT (envelope-from git) Date: Wed, 4 Sep 2024 16:05:13 GMT Message-Id: <202409041605.484G5Dec039449@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 5f49630fef5f - stable/13 - umtx: shm: Collapse USHMF_REG_LINKED and USHMF_OBJ_LINKED flags 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5f49630fef5fd2358e8bc96d1b5a343d8225d5b5 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5f49630fef5fd2358e8bc96d1b5a343d8225d5b5 commit 5f49630fef5fd2358e8bc96d1b5a343d8225d5b5 Author: Olivier Certner AuthorDate: 2024-09-04 14:38:12 +0000 Commit: Ed Maste CommitDate: 2024-09-04 16:02:34 +0000 umtx: shm: Collapse USHMF_REG_LINKED and USHMF_OBJ_LINKED flags ...into the only USHMF_LINKED, as they are always set or unset together. This is both to stop giving the impression that they can be set/unset independently, which they can't with the current code, and to make it clearer that an upcoming reference counting fix is correct. Reviewed by: kib Approved by: emaste (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46126 (cherry picked from commit dd83da532c36830a0c0aac624903849262ec6f68) (cherry picked from commit 2d4511bb81ed70d84ba6ed2ffb54e6a138653a63) --- sys/kern/kern_umtx.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index d8587c51e6fd..757e3c869683 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -4293,8 +4293,7 @@ __umtx_op_sem2_wake(struct thread *td, struct _umtx_op_args *uap, #define USHM_OBJ_UMTX(o) \ ((struct umtx_shm_obj_list *)(&(o)->umtx_data)) -#define USHMF_REG_LINKED 0x0001 -#define USHMF_OBJ_LINKED 0x0002 +#define USHMF_LINKED 0x0001 struct umtx_shm_reg { TAILQ_ENTRY(umtx_shm_reg) ushm_reg_link; LIST_ENTRY(umtx_shm_reg) ushm_obj_link; @@ -4354,7 +4353,7 @@ umtx_shm_find_reg_locked(const struct umtx_key *key) KASSERT(reg->ushm_key.type == TYPE_SHM, ("TYPE_USHM")); KASSERT(reg->ushm_refcnt > 0, ("reg %p refcnt 0 onlist", reg)); - KASSERT((reg->ushm_flags & USHMF_REG_LINKED) != 0, + KASSERT((reg->ushm_flags & USHMF_LINKED) != 0, ("reg %p not linked", reg)); reg->ushm_refcnt++; return (reg); @@ -4394,14 +4393,11 @@ umtx_shm_unref_reg_locked(struct umtx_shm_reg *reg, bool force) reg->ushm_refcnt--; res = reg->ushm_refcnt == 0; if (res || force) { - if ((reg->ushm_flags & USHMF_REG_LINKED) != 0) { + if ((reg->ushm_flags & USHMF_LINKED) != 0) { TAILQ_REMOVE(&umtx_shm_registry[reg->ushm_key.hash], reg, ushm_reg_link); - reg->ushm_flags &= ~USHMF_REG_LINKED; - } - if ((reg->ushm_flags & USHMF_OBJ_LINKED) != 0) { LIST_REMOVE(reg, ushm_obj_link); - reg->ushm_flags &= ~USHMF_OBJ_LINKED; + reg->ushm_flags &= ~USHMF_LINKED; } } return (res); @@ -4494,7 +4490,7 @@ umtx_shm_create_reg(struct thread *td, const struct umtx_key *key, TAILQ_INSERT_TAIL(&umtx_shm_registry[key->hash], reg, ushm_reg_link); LIST_INSERT_HEAD(USHM_OBJ_UMTX(key->info.shared.object), reg, ushm_obj_link); - reg->ushm_flags = USHMF_REG_LINKED | USHMF_OBJ_LINKED; + reg->ushm_flags = USHMF_LINKED; mtx_unlock(&umtx_shm_lock); *res = reg; return (0);