From nobody Thu Sep 10 05:53:41 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 4hgRgT21Hsz6rQww for ; Thu, 10 Sep 2026 05:53:41 +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 4hgRgT1RT3z4nZr for ; Thu, 10 Sep 2026 05:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789019621; 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=lB8PlPossb002ukq2jnaGnq6wPiuFrQGSQtTOpu9vaw=; b=iCEweEBmPOXj8kMQc3Tkua7annA2xLUgxHIsl8HDVuzAuCoh7Yd2TDYrgLO9I+HQolQyeX 90Kefoz8ma5zHukmPPxocl2G3Fycti13fDdC78CfsRGo+Kb+p1dqdIFWYuAvh8RoSwvYNq bVJ4/dqSTzQ90ngnOofxYHlpDkVrnn+3orERc3pa6fB8VjGVGQmUxwkng9GZhXqvfXRgUK CEzsdW+OcL8PODtRU0yoXoY3optOZFmuPZ/VrNofv+sbAYOyRzgdvEsPz6Dt0rCTSn7c0o P57YvuKlsKN4H6kInxG8occQmsPpivcEUpUOjpT76TCI5p9omM5A0U8s/H7VOA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789019621; b=CirSPBFPjLv5w6FuEYSZxbCm/2U87RtzIyOsW1ygBaUuE3mAn+toFH1Xqj0hdJDCHJa2bC +hhvhYae02FqzUUp9DGlP936d7TbuUiC4hylKNedyo/l6JiwNn3GlfxYLU5+DDxX2BDP1J KIruVetzPTVtJZBaxymRSnveoAi+ZjDxGhUwkKfN9tdWm9CTQCEZ11OQN3Y9JbC1F1bC6p tuPFwepmvfjMHTBRakcF/NovjsIjhu4ljSQTYQtjpFYdZPNC4+HV09FYjKp/prug1CzBLG Q59+Y8UIRXFXTYvkTNM/7SNNsIC/WTNUrwC2lHC2cWF73rR75/WcxjdoSjYAGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789019621; 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=lB8PlPossb002ukq2jnaGnq6wPiuFrQGSQtTOpu9vaw=; b=k8i2tPIz9JWlaECvN3va/tFcOpwR77TXkGSY1MD1KtqUUOvOh7JjynmCXwA/Y0xxELSqVG yve4Zy88kqrsVRfqeYltdWYbQ5pTklkGwYSqsA7I+hyHQcR5uFUC61GFhEX8aGZIBUacIf TxQ2xkjzIbrMhH+AqWT8JfuhLiPLDkNBxu5dZ3CEtemqWGpSV6ln1PY4I6xYKmVJOpxhW4 d1Q53tBIcfG26Yl2otrUHt5uwE6D+MMLHjGfwa5F31qWX0N6xNX4XXhmqq4FSedmJIP73l 9QWcAsPtKhv3eGm9AIvq77l5Nc3cZLAwDncB3CPVVR7fIJd3mj50dtHPzZNcgA== 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 4hgRgT0VvhzDlh for ; Thu, 10 Sep 2026 05:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e0cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 10 Sep 2026 05:53:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 197e0e35161c - stable/14 - acpi_pci: Do not match SR-IOV VFs to ACPI devices 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 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/14 X-Git-Reftype: branch X-Git-Commit: 197e0e35161c2c8516158d75ff3022518e74c494 Auto-Submitted: auto-generated Date: Thu, 10 Sep 2026 05:53:41 +0000 Message-Id: <6aa245e5.3e0cf.720de2dc@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=197e0e35161c2c8516158d75ff3022518e74c494 commit 197e0e35161c2c8516158d75ff3022518e74c494 Author: Kevin Bowling AuthorDate: 2026-08-18 02:39:41 +0000 Commit: Kevin Bowling CommitDate: 2026-09-10 05:48:51 +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 646295f9eecc..acbfbe4c1dd4 100644 --- a/sys/dev/acpica/acpi_pci.c +++ b/sys/dev/acpica/acpi_pci.c @@ -340,6 +340,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