From 3f9b65389e24ed9c2d681178a7eefe216fca7bc4 Mon Sep 17 00:00:00 2001 From: Siina Mashek Date: Wed, 2 Dec 2020 19:59:21 +0200 Subject: [PATCH] gpu passthrough fully working --- package.use/gpu-passthrough | 12 ++ ...verride_for_missing_acs_capabilities.patch | 123 ++++++++++++++++++ sets/gpu-passthrough | 8 +- 3 files changed, 137 insertions(+), 6 deletions(-) create mode 100644 package.use/gpu-passthrough create mode 100644 patches/sys-kernel/gentoo-sources-5.9.11/override_for_missing_acs_capabilities.patch diff --git a/package.use/gpu-passthrough b/package.use/gpu-passthrough new file mode 100644 index 0000000..4f42a1d --- /dev/null +++ b/package.use/gpu-passthrough @@ -0,0 +1,12 @@ +app-emulation/qemu spice usbredir +app-emulation/virt-manager gtk +# required by app-emulation/virt-manager-2.2.1-r3::gentoo[gtk] +# required by @gpu-passthrough +# required by @selected +# required by @world (argument) +>=net-misc/spice-gtk-0.37-r2 usbredir gtk3 +# required by app-emulation/libvirt-6.8.0-r1::gentoo[virt-network] +# required by app-emulation/libvirt-glib-3.0.0::gentoo +# required by app-emulation/virt-manager-2.2.1-r3::gentoo +# required by @gpu-passthrough (argument) +>=net-dns/dnsmasq-2.82 script diff --git a/patches/sys-kernel/gentoo-sources-5.9.11/override_for_missing_acs_capabilities.patch b/patches/sys-kernel/gentoo-sources-5.9.11/override_for_missing_acs_capabilities.patch new file mode 100644 index 0000000..eff795d --- /dev/null +++ b/patches/sys-kernel/gentoo-sources-5.9.11/override_for_missing_acs_capabilities.patch @@ -0,0 +1,123 @@ +--- a/drivers/pci/quirks.c 2020-05-12 20:48:40.153152132 +0300 ++++ b/drivers/pci/quirks.c 2020-05-13 15:59:18.477619314 +0300 +@@ -4695,6 +4695,111 @@ + PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF); + } + ++/* ++* PCIe ACS Override ++*/ ++static bool acs_on_downstream; ++static bool acs_on_multifunction; ++ ++#define NUM_ACS_IDS 16 ++struct acs_on_id { ++ unsigned short vendor; ++ unsigned short device; ++}; ++static struct acs_on_id acs_on_ids[NUM_ACS_IDS]; ++static u8 max_acs_id; ++ ++static __init int pcie_acs_override_setup(char *p) ++{ ++ if (!p) ++ return -EINVAL; ++ ++ while (*p) { ++ if (!strncmp(p, "downstream", 10)) ++ acs_on_downstream = true; ++ if (!strncmp(p, "multifunction", 13)) ++ acs_on_multifunction = true; ++ if (!strncmp(p, "id:", 3)) { ++ char opt[5]; ++ int ret; ++ long val; ++ ++ if (max_acs_id >= NUM_ACS_IDS - 1) { ++ pr_warn("Out of PCIe ACS override slots (%d)\n", ++ NUM_ACS_IDS); ++ goto next; ++ } ++ ++ p += 3; ++ snprintf(opt, 5, "%s", p); ++ ret = kstrtol(opt, 16, &val); ++ if (ret) { ++ pr_warn("PCIe ACS ID parse error %d\n", ret); ++ goto next; ++ } ++ acs_on_ids[max_acs_id].vendor = val; ++ ++ p += strcspn(p, ":"); ++ if (*p != ':') { ++ pr_warn("PCIe ACS invalid ID\n"); ++ goto next; ++ } ++ ++ p++; ++ snprintf(opt, 5, "%s", p); ++ ret = kstrtol(opt, 16, &val); ++ if (ret) { ++ pr_warn("PCIe ACS ID parse error %d\n", ret); ++ goto next; ++ } ++ acs_on_ids[max_acs_id].device = val; ++ max_acs_id++; ++ } ++next: ++ p += strcspn(p, ","); ++ if (*p == ',') ++ p++; ++ } ++ ++ if (acs_on_downstream || acs_on_multifunction || max_acs_id) ++ pr_warn("Warning: PCIe ACS overrides enabled; This may allow non-IOMMU protected peer-to-peer DMA\n"); ++ ++ return 0; ++} ++ ++early_param("pcie_acs_override", pcie_acs_override_setup); ++ ++static int pcie_acs_overrides(struct pci_dev *dev, u16 acs_flags) ++{ ++ int i; ++ ++ /* Never override ACS for legacy devices or devices with ACS caps */ ++ if (!pci_is_pcie(dev) || ++ pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ACS)) ++ return -ENOTTY; ++ ++ for (i = 0; i < max_acs_id; i++) ++ if (acs_on_ids[i].vendor == dev->vendor && ++ acs_on_ids[i].device == dev->device) ++ return 1; ++ ++ switch (pci_pcie_type(dev)) { ++ case PCI_EXP_TYPE_DOWNSTREAM: ++ case PCI_EXP_TYPE_ROOT_PORT: ++ if (acs_on_downstream) ++ return 1; ++ break; ++ case PCI_EXP_TYPE_ENDPOINT: ++ case PCI_EXP_TYPE_UPSTREAM: ++ case PCI_EXP_TYPE_LEG_END: ++ case PCI_EXP_TYPE_RC_END: ++ if (acs_on_multifunction && dev->multifunction) ++ return 1; ++ } ++ ++ return -ENOTTY; ++} ++ + static const struct pci_dev_acs_enabled { + u16 vendor; + u16 device; +@@ -4797,6 +4902,8 @@ + { PCI_VENDOR_ID_ZHAOXIN, 0x9083, pci_quirk_mf_endpoint_acs }, + /* Zhaoxin Root/Downstream Ports */ + { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs }, ++ /* IOMMU ACS override patch */ ++ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides }, + { 0 } + }; + diff --git a/sets/gpu-passthrough b/sets/gpu-passthrough index 484fca6..33cbf62 100644 --- a/sets/gpu-passthrough +++ b/sets/gpu-passthrough @@ -1,14 +1,10 @@ # Libvirt & Qemu app-emulation/libvirt -app-emulation/qemu -app-emulation/virt-manager +app-emulation/qemu spice +app-emulation/virt-manager gtk sys-firmware/edk2-ovmf # Looking Glass app-emulation/spice-protocol dev-libs/nettle gmp -#dev-util/cmake -#media-libs/glu -#media-libs/libsdl2 media-libs/sdl2-ttf -#sys-devel/binutils