From nobody Mon Mar 30 13:41:34 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 4fksq804XTz6WQNl for ; Mon, 30 Mar 2026 13:41:40 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fksq74PPCz3lQ0 for ; Mon, 30 Mar 2026 13:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774878099; 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=6FH/xQnVaF5MkwlUqWWi93xxwGqF78wCGetBs9JAKBA=; b=LuBo6IivkxZEbiYw0v1au/xWF3PzpaxKf9G+G5e9XbQ05eBcCrQZ5GJ/BS9L5pn4qi1cnZ uLl2mKNLuoUx5qtOHhIOIz/K1xKbkjrKdE4/lCkRFuED9VvAQe2aTXhGwrvh+pEVwjfq7y nXpdDid6gAXvFkJCx6UB+A3g7fsPTXQqh+xRjtbV7tJPtkMTQOlLyjf371sN35e9pIEBqv 64lVDT+91eiv/WNOOyWdmDv4oRz/ICfFZrQWWpH4p+UWeUceOitIqrqTEMXPoErGklsrBA jYbMpp6yP11o2V9LZSraKqHVE8nkVB4T+GeSQesc6MeBjV2xYwGwoznFDXoiFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774878099; a=rsa-sha256; cv=none; b=xzhRoOkkE5EvkgLam3EF0vAVy5Fnm5QSfuqGR4cQlX1EfEBrjzLfQnwewEy99HxHTME+In 9t36t1TVDSQ4i2gJw5rA7l1sa+KcZGRqawjgHnvys1Sc3F4khuUSMGXxzegRVnGxwxSte7 QHn1dTJcI/zLQoPMuXzCdNIi7nJk3UVeTJTkrBUm+i5UfdfLgCgsbui3GjS+v6CNSVM/ea G6g7NGo9UljVf6PHVxwQHNd1ZJZrUhq4XmFeM5XPEk4DkWoOiipckKmK3Xc8cnjcPJL/hc CrEpqv+UfLdLS7l/wnxk2nFGroUVkKjJtO448p6x3CB6TbQrFd2hUwTsWTmjJA== 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=1774878099; 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=6FH/xQnVaF5MkwlUqWWi93xxwGqF78wCGetBs9JAKBA=; b=LjYJMMvygKRYZ1foBKkHCAut57N0NMAhcc2DMkm57z86oZCl8NiThFRfSEslZOd6oY4jTi CKHhvvaXu0CHFy5/yasO1NTsOGZgtNzQOOsnZsWerh56OP2SjrWHifHWskh3Dk+Hn3aOdr Vec4cWNk12cn+nXsQ9Wu84/+69PZ3c/1V9l2sRYPSSn9IY7if5PChst45/vBGF2IZ4bE6q FZZR+E4hWuUbFLZsPknWzRMCMnrcaEJe85PYqkmPV1ACv73w87WltLednMABGZiFvWOmGl 5b8m3p9rqr+AO7d1sBZxSzvyUDBkrEGxlc9kz/rMWpA6aALRLA0BCBgAdHIHdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fksq73JDhzlfS for ; Mon, 30 Mar 2026 13:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 245f6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 30 Mar 2026 13:41:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: cc2715cf1f86 - main - 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/main X-Git-Reftype: branch X-Git-Commit: cc2715cf1f864345ab175db691d4e152d5fb84af Auto-Submitted: auto-generated Date: Mon, 30 Mar 2026 13:41:34 +0000 Message-Id: <69ca7d8e.245f6.17fbbc14@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cc2715cf1f864345ab175db691d4e152d5fb84af commit cc2715cf1f864345ab175db691d4e152d5fb84af Author: John Baldwin AuthorDate: 2026-03-30 13:38:54 +0000 Commit: John Baldwin CommitDate: 2026-03-30 13:41:06 +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 --- 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 919f76949dd4..71e2573d5fde 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); } @@ -408,11 +408,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); } @@ -421,10 +419,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 @@ -433,8 +429,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_stype != POWER_STYPE_AWAKE; ACPI_UNLOCK(acpi); return (sleeping);