From 32be55aa8a2abd70172f21c9c018ab7605d3f39b Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 30 Aug 2023 16:41:57 +0000 Subject: [PATCH] packaging: kernel: Enable VIRTIO_IOMMU on x86_64 Cloud Hypervisor exposes a VIRTIO_IOMMU device to the VM when IOMMU support is enabled. We need to add it to the whitelist because dragonball uses kernel v5.10 which restricted VIRTIO_IOMMU to ARM64 only. Signed-off-by: Jeremi Piotrowski (cherry picked from commit 1b02f89e4f9c9e0afe012da99135d097029ad312) Conflicts: tools/packaging/kernel/kata_config_version --- tools/packaging/kernel/configs/fragments/whitelist.conf | 1 + tools/packaging/kernel/configs/fragments/x86_64/vfio.conf | 1 + tools/packaging/kernel/kata_config_version | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kernel/configs/fragments/whitelist.conf b/tools/packaging/kernel/configs/fragments/whitelist.conf index d6e04444f..a6396a582 100644 --- a/tools/packaging/kernel/configs/fragments/whitelist.conf +++ b/tools/packaging/kernel/configs/fragments/whitelist.conf @@ -18,3 +18,4 @@ CONFIG_ARM64_UAO CONFIG_VFIO_MDEV_DEVICE CONFIG_SPECULATION_MITIGATIONS CONFIG_X86_SGX +CONFIG_VIRTIO_IOMMU diff --git a/tools/packaging/kernel/configs/fragments/x86_64/vfio.conf b/tools/packaging/kernel/configs/fragments/x86_64/vfio.conf index 09a4bf02f..e052e10e6 100644 --- a/tools/packaging/kernel/configs/fragments/x86_64/vfio.conf +++ b/tools/packaging/kernel/configs/fragments/x86_64/vfio.conf @@ -1,3 +1,4 @@ # x86 specific items we need in order to handle vfio_mode=vfio devices CONFIG_INTEL_IOMMU=y CONFIG_IRQ_REMAP=y +CONFIG_VIRTIO_IOMMU=y diff --git a/tools/packaging/kernel/kata_config_version b/tools/packaging/kernel/kata_config_version index 194b81caa..9b252fd09 100644 --- a/tools/packaging/kernel/kata_config_version +++ b/tools/packaging/kernel/kata_config_version @@ -1 +1 @@ -112 +113