From nobody Thu Sep 10 05:48:08 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 4hgRYB1Rmqz6rQH8 for ; Thu, 10 Sep 2026 05:48:14 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hgRY95YSsz4lQn for ; Thu, 10 Sep 2026 05:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789019293; 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=iXHFREVBw89N7Zlsm1HO6F20EK9FqwKPOPtX3b+u37U=; b=l8rN7URESn/xPmu7ejkRFJagi0ttRdgmJxJT8y0xQV8IKLGplllD2jZxGQR7GdG3XIQr1p EtECrqEYEambsmvKx1jTv+34qoTGu+HwzzhxBChVTUOHnRXm5bF9z8LQnJfJ4x/V4y5qjl pA1XbrKsNe4IRYSeWGd8wsKCq/dFfuCPPjzPOkUDSE40vhoZCGDVJDXJB1XPQt2Ssz4wlG XsnSALXEIM2q8mlU38pln5zIOf7riIAQ+hHi366vBFx8cjApe/9Df7DWwqdxxMIvC5QCpl w3zGJBChKgOM7gXXrIU/o+I8mlRSx7wwTH/m9DCWgVkNk0xzHXTHHC8nNXD9jw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789019293; b=UXfgz0Vz7d0yUUC3etHu/eMGiKU+ElvWeC1CiJZRJcwLU0c4+2osET6uE/09y8RZ6xFld6 /+O0d+L/fToatpnoq2v4E6e5ABS3nKCnQ3JdxB6zOJF7kKm988gVRaJuwAQL+b64eafzer cY6AhgnEk5KekHq4l3sOQ0Jfft6sCq+j5OeSD+vmsCXnRosK/FQTOKBz6gZA/fI94AuQ/q Yj1ghDL9a46LixpJJJZfD6b2dS5UOtpd1AGINfR9iqhTzVxk00gUVxz5zHxiCNl1IifezP 8SSak7oIYgcZb3qLIQL9q521AokZK6QkfJyndzYjNP0mX1KGpjAbL9i2AZ5xxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789019293; 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=iXHFREVBw89N7Zlsm1HO6F20EK9FqwKPOPtX3b+u37U=; b=dJ5hFvW7XZapiKgO7AwO8YVfS2qIqaqulUcRm95ETN9snutljLaoH3Yegs0x0/ylqmOy90 KgbVly3CJFglGafmyQfUcDiP3zwsSCcKdorUKU/RDWcog8rJlUxIyc4hm86D4Vu0RXsTrK Z2AgNiR6WFnZ/0I+cYw4XMgSCVG2taYvusQ9EsJx7jZJnX2bEq95pTfHGqvDCQ3cdre1nc bIn9V1X6sd3RyequZZpLQ/gwK3zuWa9DXpNOI29dVpSe3zjQ1Rs+jsFJHDCoL96ft9wo6N 5n27THrVt0WeR4WgSJb9j6EL8n/EFqWT5JCl9sYHmRpxLryOxM3VrajrsL46Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hgRY94d65z1SSq for ; Thu, 10 Sep 2026 05:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c57f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 10 Sep 2026 05:48:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 9b348b17001a - stable/15 - acpi_pci: Do not match SR-IOV VFs to ACPI devices 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9b348b17001aa20ba5d20bfc530a34721aaaef0e Auto-Submitted: auto-generated Date: Thu, 10 Sep 2026 05:48:08 +0000 Message-Id: <6aa24498.3c57f.1f94730e@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=9b348b17001aa20ba5d20bfc530a34721aaaef0e commit 9b348b17001aa20ba5d20bfc530a34721aaaef0e Author: Kevin Bowling AuthorDate: 2026-08-18 02:39:41 +0000 Commit: Kevin Bowling CommitDate: 2026-09-10 04:03:25 +0000 acpi_pci: Do not match SR-IOV VFs to ACPI devices SR-IOV VFs are instantiated dynamically from their PF rather than enumerated from ACPI. A VF's runtime slot and function can match an unrelated _ADR below the bridge. acpi_pci_save_handle() stores that handle in the VF's devinfo before acpi_pci_update_device() runs. If the handle is already bound to another device_t whose parent is not acpi0, acpi_pci_update_device() panics under INVARIANTS. Without INVARIANTS, the VF retains the unrelated handle, so subsequent ACPI lookups, including NUMA and power-management operations, can act on the wrong namespace node. Skip ACPI namespace matching for VFs. Reviewed by: jhb Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59061 (cherry picked from commit 8b74806161a188103666387013cdd93fb3f5dc07) --- sys/dev/acpica/acpi_pci.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c index 1912350bbc48..0ff938cfd6b8 100644 --- a/sys/dev/acpica/acpi_pci.c +++ b/sys/dev/acpica/acpi_pci.c @@ -338,6 +338,18 @@ acpi_pci_save_handle(ACPI_HANDLE handle, UINT32 level, void *context, void acpi_pci_child_added(device_t dev, device_t child) { + struct acpi_pci_devinfo *dinfo; + + dinfo = device_get_ivars(child); + + /* + * VFs are instantiated dynamically from their PF rather than enumerated + * from ACPI. A VF's runtime slot and function can match an unrelated + * _ADR below the bridge, causing the ACPI handle for that device to be + * attached to the VF. + */ + if ((dinfo->ap_dinfo.cfg.flags & PCICFG_VF) != 0) + return; /* * PCI devices are added via the bus scan in the normal PCI