From nobody Fri Apr 24 19:54:21 2026 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 4g2Nvk5XzTz6b8wb for ; Fri, 24 Apr 2026 19:54:26 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2Nvk4vCxz3NGx for ; Fri, 24 Apr 2026 19:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777060466; 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=b2pItBXdU2QhMg1RaMDX+ULnzXjAh0fbFDZm6Ymf1+U=; b=JoEN00/nbrGBQPy1DIHq6SmW2Fas/b3+H+MSETEwtFlzudTDMh8MSRJ10hwgcRLOOXcV4e biu6l4MY7XIX0ZdmZCMMfkj7Ysj/uBtxVRDEv0iuYrGIPqhhH8XtnEc2eVqBdOmgOybr5N bxEurKMlOwQjqU9+NTFG2SMg88lt7o6k3Q7+4l1rvvVVkBWDp2uUpsNSvPomZxEqjcFO8y P8Rwi57g/jto0eCIGQKjt2yDjtohqPB1+EieWouUnmwMYpOJjWhHJ9f9d4FbnjYBQdocd/ jDURbxiHZGsMgZVe3ySbwRRcg/YZOZ9RZykPpPTl2f/vQZnQLSsB+OmUT9yZJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777060466; a=rsa-sha256; cv=none; b=wRHVnyS8cfks0BnpLw4Wvr9sNluVIXYp8W/4dZV5KJY9tEt1WFFedBn/Q/r3WePRxcdn3t c+i67p3z7QWBRNtaqC1TgKO3ZVbd5MwN3qdE1kr4AQCIemNa1l0JT9ujutyMLd3WC/YGbQ GUj9zeD3p36ODwJFtCegD0h+9Ykn/B/DFU0S1l3Lkxq3U91FFuNOFRxf5k6oYaVn0IgrMS Eaf+9yR+q2XzCnLG05hzRG6RwJ9Zup9B6y28aR/Ws3acTBy8zWI6IN+WalCM+mkhnLbeFU NjnXQsWk0VL0rOHM7nC/DUynnGhOguB8gqISQSSY95doXV5/TBIaCN+pdHfvOw== 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=1777060466; 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=b2pItBXdU2QhMg1RaMDX+ULnzXjAh0fbFDZm6Ymf1+U=; b=uABk8ghwiSAFpwDSKKPSz96BB5p+lBGb/OuWg42+YZUQN/15xfA1Wito737wfYIr9TmJxl SkPhTDHLxDYG7qwg6T6cdzY1fdVKrFZhOyIvRajCcdryM9Bjk6xiqxqjQdIeQdLFtH1yyh UK05L/0WozgMIsF6ZbiXui9ltUaETXKH+CIYZIYjPwtqh8gpmAqIj925g/QLoyh//R9/FD p540ti4XcmuWhAaUzDwGKy21meM76Ly+964uuSiLJX96dhcl5vTZ76ptHK+QE/6yQJnhnd BptSSZGF3GbDTg3DbHwisz3xvBrtf1f8fc39S8JnMro+M4sQjy9BuUZ0vgpXdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2Nvk3tqNz1Fkn for ; Fri, 24 Apr 2026 19:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32932 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 19:54:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 50c4b12485fe - stable/14 - acpi_apm: Narrow scope of ACPI_LOCK 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 50c4b12485fe1364148c2496ac18946779143ab6 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 19:54:21 +0000 Message-Id: <69ebca6d.32932.3bc99d80@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=50c4b12485fe1364148c2496ac18946779143ab6 commit 50c4b12485fe1364148c2496ac18946779143ab6 Author: John Baldwin AuthorDate: 2026-03-30 13:38:54 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:48:36 +0000 acpi_apm: Narrow scope of ACPI_LOCK This lock doesn't need to be held across seldrain/knlist_destroy. It is also redundant (and a bug) to hold it across knlist_add and knlist_remove since it is the mutex for the knlist. PR: 293901 Reported by: Jiaming Zhang Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55994 (cherry picked from commit cc2715cf1f864345ab175db691d4e152d5fb84af) --- sys/x86/acpica/acpi_apm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/x86/acpica/acpi_apm.c b/sys/x86/acpica/acpi_apm.c index b602047d7bca..7f527af20b41 100644 --- a/sys/x86/acpica/acpi_apm.c +++ b/sys/x86/acpica/acpi_apm.c @@ -243,9 +243,9 @@ apmdtor(void *data) /* Remove this clone's data from the list and free it. */ ACPI_LOCK(acpi); STAILQ_REMOVE(&acpi_sc->apm_cdevs, clone, apm_clone_data, entries); + ACPI_UNLOCK(acpi); seldrain(&clone->sel_read); knlist_destroy(&clone->sel_read.si_note); - ACPI_UNLOCK(acpi); free(clone, M_APMDEV); } @@ -407,11 +407,9 @@ apmkqfilter(struct cdev *dev, struct knote *kn) struct apm_clone_data *clone; devfs_get_cdevpriv((void **)&clone); - ACPI_LOCK(acpi); kn->kn_hook = clone; kn->kn_fop = &apm_readfiltops; knlist_add(&clone->sel_read.si_note, kn, 0); - ACPI_UNLOCK(acpi); return (0); } @@ -420,10 +418,8 @@ apmreadfiltdetach(struct knote *kn) { struct apm_clone_data *clone; - ACPI_LOCK(acpi); clone = kn->kn_hook; knlist_remove(&clone->sel_read.si_note, kn, 0); - ACPI_UNLOCK(acpi); } static int @@ -432,8 +428,8 @@ apmreadfilt(struct knote *kn, long hint) struct apm_clone_data *clone; int sleeping; - ACPI_LOCK(acpi); clone = kn->kn_hook; + ACPI_LOCK(acpi); sleeping = clone->acpi_sc->acpi_next_sstate ? 1 : 0; ACPI_UNLOCK(acpi); return (sleeping);