From nobody Mon Feb 6 22:52:26 2023 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 4P9hNV25Smz3nXjl; Mon, 6 Feb 2023 22:52:26 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9hNV1fkSz4LcF; Mon, 6 Feb 2023 22:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675723946; 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=cjRzmGIPs80Hhl7wydGYKdVG1ch/hPGnLM9vdYdJ4Ug=; b=g9lWSVqwaN8AG5gxyQl2I9U8ZYkW9pycW/kF/Ww+lXskae9HGW7fekuJ+zAfCVXG/4U3Y4 Ws7YsoUWU3dPyP8uzs1HVYUQaHA1pLubWrWq/dKYM+wSIO5WRel6soSSPK1xOI1awN74CK 3UM4v3k1gfqYnK3xP34Q4Gu1IpPu0bG1KRnLrzjhWHnq160HNNtYeBzHw0BEyCD5sMQvl2 RHYlXlmktS1wtEDZoI1BJ/bX/rPUoeVPaequDaPiixZaNdLgYO2IchFFiKILgUQUXUhysq HNulyu06I5YbkPLtY9HFeVufRRjY5hcnszPMtr+2MM7jMJ27CjoyAX/VjsD0Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675723946; 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=cjRzmGIPs80Hhl7wydGYKdVG1ch/hPGnLM9vdYdJ4Ug=; b=k9yO4usSHaDuwyqYfajEgMcPow9fwTLS7crI7vR67Mt/IfZDWt6P34BFrGm8vaU5wVbFzj mYUcCRhXQDmlQQt+DZGW5EhqY0WLXrINmEbsuIQ8FeB8kS4jOaSt/FdTqaGTv4ep14sDgA 2vRE7e0TnofeV+2OBuIVZRkEW6Zhc6AqMF4CPsLuwMsRyux94frvtxfP9RGOioMM0SLiYc 7vh/oKZ6BHEKOn+Zk51UP8Du4+qMo1PCnX+5Ke3RBh3r72r17+uOBRAsHhISotzCa55mGi /EL8eaJS5+49SerQI5vElvDOE0MpiblekP7lRjzNFSdmjXK080+sldY4RrpQsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675723946; a=rsa-sha256; cv=none; b=mB39sITSCJ5c2E8gl8yDlEVAHRi3IWhzIBkW/EPDSGuz37Q3w3zkYl5qKwTVPXFia/2yWl bA/eYJ3ZOFvMP+SqCwLrzCRdMVi3Ty30B2HZX6/OaKdNOnUckAeo8hkyX1myQzXkTlLFrI CMZQ6A2aYEYocXuj5A80CnlAaoTzAXPA045UsSGVOtCZwXheMbPVbnlJgOlv30iZcg6xW9 gzPeP8mNuXEh67IfnY8xl+R2x2MDFbSmvYEBEx9AP8cIPNzPtZPsHrt6YMmgOLFnhEjHwW AHTg92WJGRf9LMjgTiLxpYjo5Jzjx/fLOZ99X7CZaKcolO58T4m/fueykUIJLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P9hNV0jDVzsgM; Mon, 6 Feb 2023 22:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 316MqQ6T007652; Mon, 6 Feb 2023 22:52:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316MqQuQ007651; Mon, 6 Feb 2023 22:52:26 GMT (envelope-from git) Date: Mon, 6 Feb 2023 22:52:26 GMT Message-Id: <202302062252.316MqQuQ007651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: b4e0be6df772 - stable/12 - vtd: Increase DRHD_MAX_UNITS 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b4e0be6df772a3bd5f235e2a840ff4fdbe57e2d1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=b4e0be6df772a3bd5f235e2a840ff4fdbe57e2d1 commit b4e0be6df772a3bd5f235e2a840ff4fdbe57e2d1 Author: Eric Joyner AuthorDate: 2023-01-30 21:34:03 +0000 Commit: Eric Joyner CommitDate: 2023-02-06 22:52:10 +0000 vtd: Increase DRHD_MAX_UNITS Observed on a couple Ice Lake-SP platforms (Intel Coyote Pass, Dell R750), there are more than 8 DRHD sections enumerated in the DMAR ACPI section. Since the previous limit was 8, this resulted in some of these not being parsed by vtd when the iommu is initialized; in this case when PCI devices are being passthru'd to a bhyve VM. This omission later causes a kernel panic later in initialization when devices could not be found in a valid DRHD scope because the DHRD containing the device's scope was not added to vtd. Signed-off-by: Eric Joyner PR: 268486 Sponsored by: Intel Corporation Reviewed by: rew@, corvink@ Differential Revision: https://reviews.freebsd.org/D38285 (cherry picked from commit 53545967642d850eee4f2dd9fa27cae52ae981b9) --- sys/amd64/vmm/intel/vtd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/intel/vtd.c b/sys/amd64/vmm/intel/vtd.c index 489e7c179f2d..de5676b908d1 100644 --- a/sys/amd64/vmm/intel/vtd.c +++ b/sys/amd64/vmm/intel/vtd.c @@ -117,7 +117,7 @@ struct domain { static SLIST_HEAD(, domain) domhead; -#define DRHD_MAX_UNITS 8 +#define DRHD_MAX_UNITS 16 static ACPI_DMAR_HARDWARE_UNIT *drhds[DRHD_MAX_UNITS]; static int drhd_num; static struct vtdmap *vtdmaps[DRHD_MAX_UNITS];