From nobody Wed Sep 04 20:29:47 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 4WzYy34nJvz5VKmr; Wed, 04 Sep 2024 20:29:47 +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 4WzYy333Qlz4JQn; Wed, 4 Sep 2024 20:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725481787; 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=KRWtDEiPH52NeRINSEEUeu1Ve0NpTvlsH2EFntNyK58=; b=qsoRuk/9rN0I3XFwfKWMcCuHJecpZ/Wu1TPMPzklf709hWmWZBelI6f66MDI1LYErMvGyg nD/ql5FclfsUhb9FMQvpsE0P4uyQmz+V3OqrFp3S4Bue4emWBc6nMwFfAQXy04a3gcjVaF OWlfbccI3zXESU8FULHhc6/EvpcW9sRL0Oin3HILTO4Y2Ij3Indiw8DWLk5DwNLIx6IzxF 6aZPJnfRGTz1JpXAahhmvM5eJ1QR9W+9zk7iE0sILISTEsBgU5CR/474uVHZQreIl91O75 8eJ8KZApjMry/PsKvt/J917gXQRFJyPrHROLGrCD+no/WPX0iIAG8nglXnruTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725481787; a=rsa-sha256; cv=none; b=DzbJRIC7J4DoqQVKw/sPweV09bIEmrNaVHD2UIY8xzlgILsPimf/oRubMa9Eb8j9Ron1qR PDlWsfxT/Jb+g0pxSsfAZ55ybu3nXfq1x36K47Xrm64dODkUshHasnVfxjATqP9GTpINqw kUXCiyGsoW4dzeCWjh9BLfC1naet5PDy8R93UwfFM5dRe83iGKkdNRqqHtfQRaUKf4sAEs h5F+VWi4fAEq8lMTx+SW0w4iI2Iq7dJiT3ZgANLFfGKNQsQmmtxn0JhGq4QY6ApnKtkrLO p7zUjTwH67L1VzhAHUFKRe2/FkyfI/dAMY0zuMxYgoHSLIM6ai4BhTUKhqPGTA== 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=1725481787; 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=KRWtDEiPH52NeRINSEEUeu1Ve0NpTvlsH2EFntNyK58=; b=q+df4Rvd6J1J2464FXfMd8OaKZ+PUpj2C0kpIkkhAq2VUvcSsowHi1K2M9p6ZG/K8CTgFi E63QIIeu6ZKXAEMi3Xtmbnjuqa+izM188kyP0f1aRapFKto6KBOstMLGdi2s4Dt4mWldNn //otWoN4Un+RrHxRMNlLSrUX6PhSR39O5d2l8Z8MQZ7HzULp6j74n12Hyuaj/ssC5RArBo R0t5S2IYtJBtdbb5feSXQGEnuZndxctyWm0rkannrsc5rwropy8NLWzi5Hf+MFSMjmc9Ec vNVfeMnB8Ow4Mf8kTzebh8E+zUkP3Zf+zbcy4vJr7LJivu8bi+vPJErjmC8Bdg== 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 4WzYy32KxKzfBB; Wed, 4 Sep 2024 20:29:47 +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 484KTlBU082794; Wed, 4 Sep 2024 20:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484KTlEl082791; Wed, 4 Sep 2024 20:29:47 GMT (envelope-from git) Date: Wed, 4 Sep 2024 20:29:47 GMT Message-Id: <202409042029.484KTlEl082791@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: 4c07dbe5b0de - releng/13.3 - 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/releng/13.3 X-Git-Reftype: branch X-Git-Commit: 4c07dbe5b0dedbd193953c313320dc65532770c6 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4c07dbe5b0dedbd193953c313320dc65532770c6 commit 4c07dbe5b0dedbd193953c313320dc65532770c6 Author: Olivier Certner AuthorDate: 2024-09-04 14:38:12 +0000 Commit: Ed Maste CommitDate: 2024-09-04 20:29:29 +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) (cherry picked from commit 5f49630fef5fd2358e8bc96d1b5a343d8225d5b5) Approved by: so --- 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 94050beee7dd..0ab5d16503ad 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -4289,8 +4289,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; @@ -4350,7 +4349,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); @@ -4390,14 +4389,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); @@ -4490,7 +4486,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);