From nobody Tue Jan 31 21:58:08 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 4P5zSc3YkQz3cQFc; Tue, 31 Jan 2023 21:58:08 +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 4P5zSc2xFtz3qWW; Tue, 31 Jan 2023 21:58:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675202288; 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=F+FHjfkwBmK3uf3aoG6mfPT/ASsUfUlHiQk1xLgWddw=; b=ocLtP87cCGpoaU5btJZRoqJbwy8VbAm19utrq+N22UcFtnj0+Nz5j/IAlfiCxgWlnPkJFT gxkXj27u4PlyC03zvD13qkogU87al/Akwvz5cf+Vv9vO5gz/6Bo35zJQilahKYsKrjmsGg 92hQvx1EAxIQCcqVcqyQqASoZqkacy8sIvFeLF6WZF4vOkfyj2KPAvJxNGUlvWU7TfLlwo GcEpwcQGtv4Cg3LWnCzXh6k4yl8N6xJFwntsT0Uh+hWMGFwMGj+bODidINeoGLOGbHEANO hrDT298ocXxQ/L/0C5JKcmAtcOinyqfhSNR/HP02GY9V3rq+JznW8mGIa6rirg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675202288; 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=F+FHjfkwBmK3uf3aoG6mfPT/ASsUfUlHiQk1xLgWddw=; b=o/BrWF0IkjNeKyEGluZux1h2y/m38ij2nqrTMBDG0rAJn2omPzyIbc+hfmzEg/CHYu+RL6 TrPV/PgsqUsVxhX3oU35ZTPgEQ03V4mBeQ92MRTPzHQcBGs/9IsuwC5NXlzAmZC5gBN1Km f3nx056H7gms6kD11mYj/igKIhzXemtNKmJGGI8M/GlmKaZmun1RnjfmUQGnkIVg1d4d0c Rb3knFE1QWc7LLinYAg3XBqX5EG8f/fmnb2WoPu9fMbhoJ6urLVJLhI+Dy2cwbsqbBbe/i R1u7u8cXycFQiiOz/YwiB3p6Vg6nCKiDokeLc83sdtHgG88Ez3H+aKfvP4qnUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675202288; a=rsa-sha256; cv=none; b=RF6lq1GP780j1NFO/JafEVjm8zF4Wwhnp+TIrSJJQFjCtegzkMCMLAeVnqvC8WYS0zBmMh cD6B6K4YCXr0cyfzbZh+JONDpJgS8+1lJ510uAazSlsjEldrKOZe0pfWs1KpvnvusIF5zm T8duhlfoL7xUu4EAtJznoSShl+xbHdsbHE7YBYNW8lvkoikyyPYYelz9IMy0W6CzKfA60x oIuf/KUkiAAo9FQyK7DHe2MBTxA/Y3Sl8sClVy/9UK5P1pwbq7ebFZPuM9r9HkSl/1IcSA v5lTaviYrlAax7+3oyrD4M//S+eFOQ+4dNiTJanIHAYqZjfPyBRoP5LLyezG6g== 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 4P5zSc1zNjz14gV; Tue, 31 Jan 2023 21:58:08 +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 30VLw8es081546; Tue, 31 Jan 2023 21:58:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30VLw8vx081545; Tue, 31 Jan 2023 21:58:08 GMT (envelope-from git) Date: Tue, 31 Jan 2023 21:58:08 GMT Message-Id: <202301312158.30VLw8vx081545@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric Joyner Subject: git: 53545967642d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 53545967642d850eee4f2dd9fa27cae52ae981b9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=53545967642d850eee4f2dd9fa27cae52ae981b9 commit 53545967642d850eee4f2dd9fa27cae52ae981b9 Author: Eric Joyner AuthorDate: 2023-01-30 21:34:03 +0000 Commit: Eric Joyner CommitDate: 2023-01-31 21:57:42 +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@ MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D38285 --- 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 21e81223f6ee..b860e4de3817 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];