From nobody Fri Apr 24 19:54:21 2026 X-Original-To: dev-commits-src-branches@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 4g2Nvd4tTHz6b8Sh for ; Fri, 24 Apr 2026 19:54:21 +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 4g2Nvd48PHz3NGZ for ; Fri, 24 Apr 2026 19:54:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777060461; 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=P1sqFrwJ76Yfo8FOjCF5oLSX2iTrY76oOWIP6SOKWZCQAcZQjWMjChc7jPuTzN/VYrQ8fp XkosINHurGukszY3Gs8r9njXNVkD8tVB1axpT4JxhY71uSho1mnfwD8yQ/FZq6+RBMJIVz b5WWeOuq8vP/7JXAdWJDhHcbir8p7iiMbiAKgnLOvyqvE1+VjXfynj+CtnG0BdvEvLFLWo AcnCWk0cexLM7OBlirVzKXu8DEN7b0gSLRw/prNDmwPcUn9PLinYAk59ib9CazzbAurU1a zpjH55v7JLA5EQztlsRQffIKdRXGo7Tto2kljMGnUJtE4+qA1oSEGEaBu/eBXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777060461; a=rsa-sha256; cv=none; b=aCfVm+AfhKYhC9gqGG094kHHjyq7WDdeSyAqeQy6pYRV7yCstwi6DZMPKvnzm3Cp9gHEpc bkcDnxpEarQ5AckUONU+Mes+myaApjpIYr4pHrlShAjkYGvs7N0e8vUhFSTBAfoQnJ7FKn l/OQB7p5q7r4tI6LOn9HgEVuZHXGI6JbNS6cLrVL4BSOqS/q6A/JYS3yWlYdIjypmkYrMV aFYek0oem2XRCd0MqMZbSPYd2mGofqdaOFHDAr/Xouf3Qx1XozT3VueN2w/z5pl6Y87lDu lT5pcYCoxhR4Zl/NgAI7YaSVfbXkCMoqlhmNeZlZfgNI0pF28/WtvBxptReRFA== 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=1777060461; 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=Ww/kdco2PFoEJjcfls3eRTeFvVIb1ExGyGpbHVwjB3A4Fdcvr6Kp2TveXULm4BUBw1771Z AVp9xh9PWNNveensbmIYCeEENOexXgh8Vq5zPwdUkGrB2qlujQ+PP6YjoXPOwucuut3iOg VOnUUo1CfuLJZgEJHT4PLIDbBdIIR4zdMv14Da9yXvyjoS48/sY3LRGWDl4FzvAaERmMY9 f6hlfpDb4+Tu15IK0OE+IzJTE2UC4+kMOPRSPYznDZeC3pJHKZpEDQXiYUU4uDj9vcxbV0 EJRQ/90C/kQk4A2IN+G4vNFqdpJKGNFb5GYUi+ZaAv9yELDsrlZS6HEYHO6+jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2Nvd3Bm3z1GfD for ; Fri, 24 Apr 2026 19:54:21 +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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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);