From nobody Tue Aug 5 14:03:20 2025 X-Original-To: dev-commits-src-main@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 4bxFWX4K59z63GFd; Tue, 05 Aug 2025 14:03:20 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bxFWX1rnFz3FNd; Tue, 05 Aug 2025 14:03:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754402600; 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=iiBkN0H57knyVrEPpFOggWkCwBlZWR8VhDj9+UFFji0=; b=h1ke8Fo8MEIVxn+0Xg2ZK2RUA3WTNvcKoAFEowrvPjblnFD/WjDRFAL/SqHE7U1yYX4hQl /kv0V4TI+7G+Zz+qY2XwabvVkCDZYjJQo9yHE/7KL+bWA2KuI+G4jzcxx2AM9a+ZOpMPVo ATJF1UX3fIlhlSGFJvwcoyTH1rhhLszIV8wCbgrFjfvEcUGo4vyYtfILYf7kKcUY9zJY3G TeCmc6hdciiKPl/EufYzTR/kJ3fcoJXooEUdP5tJ3xajNQaR236gVHOwHK7JiX/NF4QkDG qZJ2RjId2fExlNMs0+LIbfu8v/JkvPfVVYyPZkZ2TGaMfk7CieidqSUsMAVGmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754402600; 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=iiBkN0H57knyVrEPpFOggWkCwBlZWR8VhDj9+UFFji0=; b=fXB1kSwR2D/qsgpkXjNO8oRIopUExC6KP1CK3EMyUQg3cLz6ShG4BmlVo7WgGJdB1VXNmP 02kauMGdEomnQ3gYn5l22ghEy3gAZunj2nB3oMXaryN6IbGsYCdnjhhy/lcyOb7Zvd2M2b jXnD+WieMbYBrAoUSiAsxcflpphWRNSA+tGHdZ4nlV0SbaMCv9mNvalV8q6sqBR6R0ighI uf/PvKKFTnybUvzVuPp+TxC+XZy0ZrTqwDdZ/hugCg6A38WfGgN62dcxRoUyM7F+agjlG0 xYs95OZccyeEB9/eDcSFl/AD3fH/tmG4UvB7+yplGm/bIHPqMnfsw6dg3UqtNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754402600; a=rsa-sha256; cv=none; b=OifyTJGVnhbg+wiNIXjfvPUiQsFPXqNF3mg/K4eSlbL7NIaC1vYoWdwatPZdawmMQiThu7 UG/GU1bdSTvn14REEEv8UyCZMGpgYMoF0hz0NjMEOHM89UhF0LIuSUXIsl5NnI5ehAjp9j 2RTw80BreQtvW5TAXXB03Tx2SlWtYiyRmBlDm6TcRzgDfV0SrsuoLtfy0h/4zSKf3nBDfl gFSKMiDhuKR+pRZirVnvVWJdgPQwd8IGCPhOqseZ/sbxCxkyS7G+58KCKNewXyQFKzpT8c 55XFfbzVNyJbC+uxyICTNarTPUJmgMtsPcbwiz+NyXYl9v1mqR98spssG4Byow== 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 4bxFWX1Dqdzf64; Tue, 05 Aug 2025 14:03:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 575E3KUC070708; Tue, 5 Aug 2025 14:03:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 575E3K3s070705; Tue, 5 Aug 2025 14:03:20 GMT (envelope-from git) Date: Tue, 5 Aug 2025 14:03:20 GMT Message-Id: <202508051403.575E3K3s070705@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 6374c45fbaf7 - main - bhyve: protect MMIO mapped BDSM register List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6374c45fbaf76d31b2090e5f93bb5c0f3d4883a5 Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=6374c45fbaf76d31b2090e5f93bb5c0f3d4883a5 commit 6374c45fbaf76d31b2090e5f93bb5c0f3d4883a5 Author: Corvin Köhne AuthorDate: 2024-01-08 14:05:56 +0000 Commit: Corvin Köhne CommitDate: 2025-08-05 14:02:09 +0000 bhyve: protect MMIO mapped BDSM register The Windows graphics driver reads the value of the BDSM register from MMIO space. This value makes no sense in our virtual environment because it's a host address. Therefore, we have to trap and emulate it. Reviewed by: jhb MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D45342 --- usr.sbin/bhyve/amd64/pci_gvt-d.c | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/usr.sbin/bhyve/amd64/pci_gvt-d.c b/usr.sbin/bhyve/amd64/pci_gvt-d.c index 630c5caf4b7b..0ea53689f2b2 100644 --- a/usr.sbin/bhyve/amd64/pci_gvt-d.c +++ b/usr.sbin/bhyve/amd64/pci_gvt-d.c @@ -39,10 +39,47 @@ #define PCIM_BDSM_GSM_ALIGNMENT \ 0x00100000 /* Graphics Stolen Memory is 1 MB aligned */ +#define BDSM_GEN11_MMIO_ADDRESS 0x1080C0 + #define GVT_D_MAP_GSM 0 #define GVT_D_MAP_OPREGION 1 #define GVT_D_MAP_VBT 2 +static uint64_t +gvt_d_dsmbase_read(struct pci_devinst *pi, int baridx __unused, uint64_t offset, + int size) +{ + switch (size) { + case 1: + return (pci_get_cfgdata8(pi, PCIR_BDSM_GEN11 + offset)); + case 2: + return (pci_get_cfgdata16(pi, PCIR_BDSM_GEN11 + offset)); + case 4: + return (pci_get_cfgdata32(pi, PCIR_BDSM_GEN11 + offset)); + default: + return (UINT64_MAX); + } +} + +static void +gvt_d_dsmbase_write(struct pci_devinst *pi, int baridx __unused, + uint64_t offset, int size, uint64_t val) +{ + switch (size) { + case 1: + pci_set_cfgdata8(pi, PCIR_BDSM_GEN11 + offset, val); + break; + case 2: + pci_set_cfgdata16(pi, PCIR_BDSM_GEN11 + offset, val); + break; + case 4: + pci_set_cfgdata32(pi, PCIR_BDSM_GEN11 + offset, val); + break; + default: + break; + } +} + static int set_bdsm_gen3(struct pci_devinst *const pi, vm_paddr_t bdsm_gpa) { @@ -85,6 +122,14 @@ set_bdsm_gen11(struct pci_devinst *const pi, vm_paddr_t bdsm_gpa) return (error); } + /* Protect the BDSM register in MMIO space. */ + error = passthru_set_bar_handler(sc, 0, BDSM_GEN11_MMIO_ADDRESS, sizeof(uint64_t), + gvt_d_dsmbase_read, gvt_d_dsmbase_write); + if (error) { + warnx("%s: Failed to setup handler for BDSM mirror!\n", __func__); + return (error); + } + return (0); }