summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/bash.nix19
-rw-r--r--dist/acso.patch152
-rw-r--r--dist/disable-pat-check.patch51
-rw-r--r--modules/amdgpu.nix3
-rw-r--r--modules/core/global.nix2
-rw-r--r--modules/virtualization.nix15
6 files changed, 238 insertions, 4 deletions
diff --git a/config/bash.nix b/config/bash.nix
index 56adf63..e8eaccf 100644
--- a/config/bash.nix
+++ b/config/bash.nix
@@ -2,7 +2,24 @@
programs.bash = {
enable = true;
initExtra= ''
- export PS1="\[\e[38;5;243m\]\h \[\e[38;5;254m\]\w \[\033[0m\]> "
+ function timer_start {
+ timer=$\{timer:-$SECONDS}
+ }
+
+ function timer_stop {
+ timer_show=$(($SECONDS - $timer))
+ unset timer
+ }
+
+ trap 'timer_start' DEBUG
+
+ if [ "$PROMPT_COMMAND" == "" ]; then
+ PROMPT_COMMAND="timer_stop"
+ else
+ PROMPT_COMMAND="$PROMPT_COMMAND; timer_stop"
+ fi
+ export PS1='\[\e[38;5;243m\]($\{timer_show}s) \h \[\e[38;5;254m\]\w \[\033[0m\]> '
+
bind "set completion-ignore-case on"
if [[ -n "$IN_NIX_SHELL" ]]; then
diff --git a/dist/acso.patch b/dist/acso.patch
new file mode 100644
index 0000000..07c454c
--- /dev/null
+++ b/dist/acso.patch
@@ -0,0 +1,152 @@
+From 6d05bc1343b9ecce154f551ee09c15e0e9db70bb Mon Sep 17 00:00:00 2001
+From: xiota <>
+Date: Wed, 13 Mar 2024 02:36:37 +0000
+Subject: [PATCH 1/2] add-acs-overrides
+
+---
+ .../admin-guide/kernel-parameters.txt | 8 ++
+ drivers/pci/quirks.c | 102 ++++++++++++++++++
+ 2 files changed, 110 insertions(+)
+
+diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
+index 31b3a2568..b8ab436d1 100644
+--- a/Documentation/admin-guide/kernel-parameters.txt
++++ b/Documentation/admin-guide/kernel-parameters.txt
+@@ -4370,6 +4370,14 @@
+ nomsi [MSI] If the PCI_MSI kernel config parameter is
+ enabled, this kernel boot option can be used to
+ disable the use of MSI interrupts system-wide.
++ pci_acs_override [PCIE] Override missing PCIe ACS support for:
++ downstream
++ All downstream ports - full ACS capabilities
++ multifunction
++ Add multifunction devices - multifunction ACS subset
++ id:nnnn:nnnn
++ Specific device - full ACS capabilities
++ Specified as vid:did (vendor/device ID) in hex
+ noioapicquirk [APIC] Disable all boot interrupt quirks.
+ Safety option to keep boot IRQs enabled. This
+ should never be necessary.
+diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
+index d797df6e5..9b41773bf 100644
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -4996,6 +4996,106 @@ static int pci_quirk_wangxun_nic_acs(struct pci_dev *dev, u16 acs_flags)
+ return false;
+ }
+
++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;
+@@ -5143,6 +5243,8 @@ static const struct pci_dev_acs_enabled {
+ { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
+ /* Wangxun nics */
+ { PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs },
++ /* allow acs for any */
++ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
+ { 0 }
+ };
+
+--
+2.44.0
+
diff --git a/dist/disable-pat-check.patch b/dist/disable-pat-check.patch
new file mode 100644
index 0000000..f3d3877
--- /dev/null
+++ b/dist/disable-pat-check.patch
@@ -0,0 +1,51 @@
+--- a/arch/x86/mm/pat/memtype_interval.c
++++ b/arch/x86/mm/pat/memtype_interval.c
+@@ -33,6 +33,16 @@
+ * memtype_lock protects the rbtree.
+ */
+
++int skip_pat_enable = 0;
++
++static int __init skip_pat_check(char *str)
++{
++ skip_pat_enable = 1;
++ pr_info("Disabled PAT check type (experimental)\n");
++ return 0;
++}
++early_param("skippatcheck", skip_pat_check);
++
+ static inline u64 interval_start(struct memtype *entry)
+ {
+ return entry->start;
+@@ -86,19 +96,22 @@
+ if (entry_match == NULL)
+ goto success;
+
+- if (entry_match->type != found_type && newtype == NULL)
+- goto failure;
+-
+- dprintk("Overlap at 0x%Lx-0x%Lx\n", entry_match->start, entry_match->end);
+- found_type = entry_match->type;
+-
+- entry_match = interval_iter_next(entry_match, start, end-1);
+- while (entry_match) {
+- if (entry_match->type != found_type)
++ if (!skip_pat_enable) {
++ if (entry_match->type != found_type && newtype == NULL)
+ goto failure;
+
++ dprintk("Overlap at 0x%Lx-0x%Lx\n", entry_match->start, entry_match->end);
++ found_type = entry_match->type;
++
+ entry_match = interval_iter_next(entry_match, start, end-1);
++ while (entry_match) {
++ if (entry_match->type != found_type)
++ goto failure;
++
++ entry_match = interval_iter_next(entry_match, start, end-1);
++ }
+ }
++
+ success:
+ if (newtype)
+ *newtype = found_type;
diff --git a/modules/amdgpu.nix b/modules/amdgpu.nix
index 0dc6f61..fe7f898 100644
--- a/modules/amdgpu.nix
+++ b/modules/amdgpu.nix
@@ -23,7 +23,4 @@
systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
];
-
- boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
- boot.kernelParams = [ "pcie_acs_override=downstream,multifunction" ];
}
diff --git a/modules/core/global.nix b/modules/core/global.nix
index 5b32baa..6fd97bb 100644
--- a/modules/core/global.nix
+++ b/modules/core/global.nix
@@ -11,6 +11,8 @@ in {
nixPath = [ "nixpkgs=${nix_path}" ];
};
+ boot.kernelPackages = pkgs.linuxPackages_latest;
+
systemd.tmpfiles.rules = [
"L+ ${nix_path} - - - - ${pkgs.path}"
];
diff --git a/modules/virtualization.nix b/modules/virtualization.nix
index e0d9b88..caf9046 100644
--- a/modules/virtualization.nix
+++ b/modules/virtualization.nix
@@ -71,4 +71,19 @@
systemctl set-property --runtime -- init.scope AllowedCPUs=""
'')
];
+
+ boot.kernelPatches = [
+ {
+ # https://github.com/Kinsteen/win10-gpu-passthrough/blob/main/pat_patch.diff
+ name = "disable-pat-check";
+ patch = ../dist/disable-pat-check.patch;
+ }
+ {
+ # https://aur.archlinux.org/cgit/aur.git/tree/1001-6.8.0-add-acs-overrides.patch?h=linux-vfio
+ name = "acso";
+ patch = ../dist/acso.patch;
+ }
+ ];
+
+ boot.kernelParams = [ "skippatcheck" "pcie_acs_override=downstream,multifunction" ];
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 18:35:51 +0000