From nobody Mon Mar 30 13:41:34 2026 X-Original-To: dev-commits-src-main@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 4fksq24Qrmz6WQGC for ; Mon, 30 Mar 2026 13:41:34 +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 4fksq223h1z3lF8 for ; Mon, 30 Mar 2026 13:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774878094; 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=mNt3WEPyCYyeSc2AS2/ybKmJ6XbcTpx68n2vulyrPgaykXA0LqKr/QDKQCMamqerfZUTdw VGk6h0mr5LQrsjPo2AOUFpm3DtGHuJ2pTx5SmkOylKBdW1MgfhsLKiEYEL9+oaJYwqBts8 gEc2e3BwlK17r8ej+38W4uERrxOsk3SqqQIM61+jKAQEUqoplB2zzzIjQsbTCjQf56jl+Y qDXoHQDrrSSmeeQm0jRwjQ+rvPx2p3gWNHVWByP196b93gYqGR452Ii7OzAC3p72Bksmal fIP7J1g4pYYxgSOBTa1Bkdv2OxbnyMXXNYYijkJpPES0vNJF/WO3faKjEAPASQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774878094; a=rsa-sha256; cv=none; b=XMO3vf/YA6wWBd5jNUNxzwuiyws7yZbgS2kIAgBK0CeDiKtMYkNditDV8b/AN/2dt/GfwH nGKM3ek/L6HpK/o/sHeQ2RGMGUpBxJqJSk19eeVCBcYQej1JmcbBimVGQnkLGBLMZizK/z MMNMQmNuRLP/4Py5NkPNf6R9MjJl1P7uV4ROgD6eQzz1Ron9+ni4Y1g5ACKfRgrD4xpGbs XdImCgiNr0Ac7NGUe4ilweKdCi757B69nEbfbOy9OaQyTk94Q9viRXRpdAlkj2700oAvHy dtqj3KcQpAjgnR1HqmOsxQTKR+FMNizCZVbQPdMXa1yg3JCNd5A8ViubVRhXqA== 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=1774878094; 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=nsjmCHVwLxisJGThSwcMu24yfeaHofvYbX4vn/S4RM36oV1Wy8rZ+fNgdJop4B/rJ2zmQL VxMzHWxEIkmOj/jiaLJlIiACFRb/t22vfkDBpTwidgag49SxlO4M5JHnXgRWxkvzMOmpJ0 SJWnjBx7T1A/j4CoLsok36y08CLSSt9qgRLYSmhaxoBID5uoHT+RTzfsM6pLHuYcowOKJs G3ItYJ9zXu/ZnilIG3xWZO6x5Q3z2FVQUWC00POSREov3spTi8G58WVuRzD1ZEMsp7HbNd O1qIqtWllRIordlcZzp5/ggomj9hPCfcc55a+fAGnKoGO3XmQO1pElLjZ7vdNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fksq213R7zls9 for ; Mon, 30 Mar 2026 13:41:34 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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);