From nobody Fri Apr 24 17:56:28 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 4g2LHd2Fbjz6ZxhT for ; Fri, 24 Apr 2026 17:56:29 +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 4g2LHc5rnXz3qkj for ; Fri, 24 Apr 2026 17:56:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777053388; 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=CeMKMUnPRMYgMAYPSSErSLu9ghmmeq+P08vwlx/gKYs=; b=sJcMbv2SoYzG8HrISeyBji0486xEy7SQ4NHrTstGp0imn0PMrav9iCpvY72j5pehbF+bbh KtAnNODYY55sjTsaVVXYdZpkKbuO/k6RO842eCgjWYP44tbrCzAoQYurkMEzh53+Hl+mA/ 4HUSvCRNHZhZtHfz7riPccFtHj45SQzKwxgobR5NzXpjfDgnKyVFzauWTmP/VM9mTLMkdJ gCb/hHL8lmz4xXGpTIOPkz1DPbMPQZj6iX8EEqP4g20oslAUYF0+POoOi5SDRFtsC8U3i9 AVlLyfHNjOwg2UwRPkAX4h/SRGUu8xAaOB4ob7o7gq7AuZbmuCwLh8u3dgkblw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777053388; a=rsa-sha256; cv=none; b=e8mQjvjZpFH1SSpG15bL+r1l3fCTsR5vcnWkWGEJaGiRawn25NICjY/iYeQGw7XUOetBYq ePiIKVSxaFM3XWxXrr3u4APXJNL/v/xFdKkFSiIOGLK+6iki6BqYtaUzgujcmTiTij3q7S P9/26fsh6OID+v87wmtjgs0TS+RyZyWfJEK7kP7ak2NN6vIMOvsckXWYS0XwLp6LM11I+P NCuhZlO+A+flyi+xKaBj4wClr+0apNwyXc+FQdIQj3yq3kH01TeviVCPRG9aUav1IKtl6o B5CV707jp69MrSHAT9R46X0HF0j/7rgs+qTmcPF+I6nzsu0BjAY9YBuo6U/9+w== 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=1777053388; 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=CeMKMUnPRMYgMAYPSSErSLu9ghmmeq+P08vwlx/gKYs=; b=DLk7w0z3r3nZ1YL/PMZfqFCWUTlUIKKWp0tC3XCbkl5QXd8idH+EjJLchTHPSaCyqmQeEb PsIHRV3PIzRqveibeQxxuTPLsNR9TA4S8m0sygCnQ7fm6Bvgr3aMd+PdPsP6INybZ+y5f0 fHBcsK5gn46eNH4mR16UNjEdhQkwnTGQZc5tGchyC/rWwx7KDfNYf2V/3hNtvn4dvmiKG+ l90GCF3OnistHGvz0qJjAGoNIw/D2jsNXAR3kaBBMeS4Xmbtlz5ZSQLBM+LfN7qK1vql9H 6ph2jCAT72Co0nsErPif8EY9QPaY/pkSFXTNqkcusXX9g0YYVBZq9LtXozSY8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2LHc59pjz1CZG for ; Fri, 24 Apr 2026 17:56:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d116 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 17:56:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a7cf142ba904 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: a7cf142ba9044c3b8f88b4a8ed7f5720bc39b90c Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 17:56:28 +0000 Message-Id: <69ebaecc.1d116.3dc1cb30@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a7cf142ba9044c3b8f88b4a8ed7f5720bc39b90c commit a7cf142ba9044c3b8f88b4a8ed7f5720bc39b90c Author: John Baldwin AuthorDate: 2026-03-30 13:38:54 +0000 Commit: John Baldwin CommitDate: 2026-04-24 17:49:14 +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 d5fee124703d..74987ad01d0d 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);