From 97de9cfcb0b25b95878e2eaaf3652a2faa8dd8f4 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Mon, 14 Nov 2022 17:58:23 +0100
Subject: dashboard/config/linux: disable VFIO_CONTAINER

As suggested by Jason Gunthorpe here:
https://github.com/google/syzkaller/pull/3521#discussion_r1021644055
---
 dashboard/config/linux/bits/subsystems.yml            | 3 ++-
 dashboard/config/linux/upstream-apparmor-kasan.config | 5 ++---
 dashboard/config/linux/upstream-selinux-kasan.config  | 5 ++---
 dashboard/config/linux/upstream-smack-kasan.config    | 5 ++---
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index 0685191f0..528b5698f 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -418,7 +418,8 @@ config:
  - DMA_CMA
  - VFIO: [-arm, -riscv]
  - VFIO_PCI: [-arm, -riscv]
- - VFIO_CONTAINER: [linux-next, -arm, -riscv]
+ # This should not be turned on, it will disable some VFIO coverage.
+ - VFIO_CONTAINER: n
  - VIRTIO_PCI
  - VIRTIO_VDPA: [v5.7]
  - VIRTIO_BALLOON
diff --git a/dashboard/config/linux/upstream-apparmor-kasan.config b/dashboard/config/linux/upstream-apparmor-kasan.config
index d45cd8000..1ddb95a38 100644
--- a/dashboard/config/linux/upstream-apparmor-kasan.config
+++ b/dashboard/config/linux/upstream-apparmor-kasan.config
@@ -6792,9 +6792,7 @@ CONFIG_DMABUF_HEAPS_CMA=y
 # CONFIG_PANEL is not set
 # CONFIG_UIO is not set
 CONFIG_VFIO=y
-CONFIG_VFIO_CONTAINER=y
-CONFIG_VFIO_IOMMU_TYPE1=y
-# CONFIG_VFIO_NOIOMMU is not set
+# CONFIG_VFIO_CONTAINER is not set
 CONFIG_VFIO_VIRQFD=y
 CONFIG_VFIO_PCI_CORE=y
 CONFIG_VFIO_PCI_MMAP=y
@@ -7116,6 +7114,7 @@ CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y
 CONFIG_IOMMUFD=y
+# CONFIG_IOMMUFD_VFIO_CONTAINER is not set
 CONFIG_IOMMUFD_TEST=y
 # CONFIG_IRQ_REMAP is not set
 # CONFIG_VIRTIO_IOMMU is not set
diff --git a/dashboard/config/linux/upstream-selinux-kasan.config b/dashboard/config/linux/upstream-selinux-kasan.config
index 0a997379c..0c8c586ac 100644
--- a/dashboard/config/linux/upstream-selinux-kasan.config
+++ b/dashboard/config/linux/upstream-selinux-kasan.config
@@ -6786,9 +6786,7 @@ CONFIG_DMABUF_HEAPS_CMA=y
 # CONFIG_PANEL is not set
 # CONFIG_UIO is not set
 CONFIG_VFIO=y
-CONFIG_VFIO_CONTAINER=y
-CONFIG_VFIO_IOMMU_TYPE1=y
-# CONFIG_VFIO_NOIOMMU is not set
+# CONFIG_VFIO_CONTAINER is not set
 CONFIG_VFIO_VIRQFD=y
 CONFIG_VFIO_PCI_CORE=y
 CONFIG_VFIO_PCI_MMAP=y
@@ -7110,6 +7108,7 @@ CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y
 CONFIG_IOMMUFD=y
+# CONFIG_IOMMUFD_VFIO_CONTAINER is not set
 CONFIG_IOMMUFD_TEST=y
 # CONFIG_IRQ_REMAP is not set
 # CONFIG_VIRTIO_IOMMU is not set
diff --git a/dashboard/config/linux/upstream-smack-kasan.config b/dashboard/config/linux/upstream-smack-kasan.config
index d8cd7f951..75a760418 100644
--- a/dashboard/config/linux/upstream-smack-kasan.config
+++ b/dashboard/config/linux/upstream-smack-kasan.config
@@ -6787,9 +6787,7 @@ CONFIG_DMABUF_HEAPS_CMA=y
 # CONFIG_PANEL is not set
 # CONFIG_UIO is not set
 CONFIG_VFIO=y
-CONFIG_VFIO_CONTAINER=y
-CONFIG_VFIO_IOMMU_TYPE1=y
-# CONFIG_VFIO_NOIOMMU is not set
+# CONFIG_VFIO_CONTAINER is not set
 CONFIG_VFIO_VIRQFD=y
 CONFIG_VFIO_PCI_CORE=y
 CONFIG_VFIO_PCI_MMAP=y
@@ -7111,6 +7109,7 @@ CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y
 CONFIG_IOMMUFD=y
+# CONFIG_IOMMUFD_VFIO_CONTAINER is not set
 CONFIG_IOMMUFD_TEST=y
 # CONFIG_IRQ_REMAP is not set
 # CONFIG_VIRTIO_IOMMU is not set
-- 
cgit mrf-deployment