From nobody Mon Feb 06 22:48:45 2023 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 4P9hJF6nbPz3nX3M; Mon, 6 Feb 2023 22:48:45 +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 4P9hJF6DTmz4KyH; Mon, 6 Feb 2023 22:48:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675723725; 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=krAyndUCVOmRq4oF+TOhXfxmlDhkoqwr/cwFekNlI2I=; b=OP4qxXTUyEjYwaomiXbop3i5J2BRpdl9h43gxutvyG4ANxufYpN3hQn8HYsTkPd1zwH/66 MDnHDq6TFWJ3WKJsmXvUZk5zFNpCF3nlIey0eZ17sRtcc1mfFtwLOBBQCZHbzZKj7sKgrp /+EjLOyWM0ju5V/r2tN+hvEUWIu2bRqUBGaD0MoSp8n6DDh3pAmC9qJqZLGkY0UQbph4OE xVuc2lK5gQtgfwuNvmQf7hSrLnX/kOVH7/XTGLFiQDcW3fCtYm/barWKwWm3gZs9OPOQNX g5QmCaUfF1SilN6WQtEY6i8UIPbbmP7oocXycdxqanckjI0kNPCmVMy2XcFBQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675723725; 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=krAyndUCVOmRq4oF+TOhXfxmlDhkoqwr/cwFekNlI2I=; b=hDQdJrNkF61bpUI4WA8ke9Yk7q9FnJzUsfrgCQ++2R9oGvtXZ60aCVARN91FMZuwTy+Akh KWgEz86swVYSzqBB9LeuNhbmTLt230DZN7qOT2fAFEYpglRPcA989cXwMWcRxZWoWlWqz2 2g9mLVyhoLK+LfM8pF01o377dU5oM/hn0ZWeftAsSiFh+OxG0WApm8ELF1Y+R4c6XsCdh4 1a+guxOuO9Hg/ds1TWsLJBkulFH+w6j0xD6UC3AEnyXbY99cRL3YCAHc50DKll2cLqeCeb fUT/lbVP7mTkn80ZPeSAIT5JFT9TYs1s0XZgmIkYeao/S1YgCpP/y/ph2ESYig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675723725; a=rsa-sha256; cv=none; b=T60T17XHR92HrYHVYLHP57tvA8Y65eH7u1hF4Haur36afvRRRt+wPQ7O9wEpN09g5xpXrK Z7B14IKU5Cb+arohLRW8CBW3+n9c9k0qA+hefNKiWlncCjZqT0H679RuR4y/mY1RvEyJIi r4EOJTlB+Bq/u4kn73DoVgwPQ7PTK5B5FRCeNSqK/75UUUdg6FEHqipeU01Qh7en3T6sAC /JYjepolOoTOPe9jmXppu+C+qybT8vdHIpDifJfC+e0NGbNtTmvFsTtSaMBEOo88XJhesA 9xDGTFdy54Mvlac7iIUmvg7eK3BAuvKKpPct5RMXa7ru3iggq8QGMV+Ukt+T7A== 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 4P9hJF5BS2zt8m; Mon, 6 Feb 2023 22:48:45 +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 316MmjOH094343; Mon, 6 Feb 2023 22:48:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316MmjDK094342; Mon, 6 Feb 2023 22:48:45 GMT (envelope-from git) Date: Mon, 6 Feb 2023 22:48:45 GMT Message-Id: <202302062248.316MmjDK094342@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: 7aaa7dad32ca - stable/13 - vtd: Increase DRHD_MAX_UNITS 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 7aaa7dad32ca350e972d7c4688e39c50d818b45b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=7aaa7dad32ca350e972d7c4688e39c50d818b45b commit 7aaa7dad32ca350e972d7c4688e39c50d818b45b Author: Eric Joyner AuthorDate: 2023-01-30 21:34:03 +0000 Commit: Eric Joyner CommitDate: 2023-02-06 22:48:19 +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 8f06dc823364..c3af7779a7ca 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];