mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-08-21 23:41:15 +00:00
resources: Update kernel config
In order to support nested virtualization and nested device passthrough from our CI tests, we need some extra kernel configuration options to be enabled. CONFIG_KVM and CONFIG_VIRTUALIZATION for nested virtualization. CONFIG_VFIO for nested device passthrough. CONFIG_VIRTIO_IOMMU and CONFIG_ACPI_IORT for virtio-iommu support. With all these new options applied, we can leverage virtio-iommu to attach some VFIO devices to it and pass them through a second layer of virtualization. Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
parent
8e018d6feb
commit
688ec0eb2d
@ -4,10 +4,10 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
# Compiler: gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0
|
# Compiler: gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0
|
||||||
#
|
#
|
||||||
CONFIG_CC_IS_GCC=y
|
CONFIG_CC_IS_GCC=y
|
||||||
CONFIG_GCC_VERSION=70400
|
CONFIG_GCC_VERSION=80300
|
||||||
CONFIG_CLANG_VERSION=0
|
CONFIG_CLANG_VERSION=0
|
||||||
CONFIG_CC_CAN_LINK=y
|
CONFIG_CC_CAN_LINK=y
|
||||||
CONFIG_CC_HAS_ASM_GOTO=y
|
CONFIG_CC_HAS_ASM_GOTO=y
|
||||||
@ -61,6 +61,7 @@ CONFIG_IRQ_DOMAIN=y
|
|||||||
CONFIG_IRQ_DOMAIN_HIERARCHY=y
|
CONFIG_IRQ_DOMAIN_HIERARCHY=y
|
||||||
CONFIG_GENERIC_MSI_IRQ=y
|
CONFIG_GENERIC_MSI_IRQ=y
|
||||||
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
|
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
|
||||||
|
CONFIG_IRQ_MSI_IOMMU=y
|
||||||
CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
|
CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
|
||||||
CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
|
CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
|
||||||
CONFIG_IRQ_FORCED_THREADING=y
|
CONFIG_IRQ_FORCED_THREADING=y
|
||||||
@ -485,6 +486,7 @@ CONFIG_HAVE_ACPI_APEI_NMI=y
|
|||||||
# CONFIG_DPTF_POWER is not set
|
# CONFIG_DPTF_POWER is not set
|
||||||
# CONFIG_PMIC_OPREGION is not set
|
# CONFIG_PMIC_OPREGION is not set
|
||||||
# CONFIG_ACPI_CONFIGFS is not set
|
# CONFIG_ACPI_CONFIGFS is not set
|
||||||
|
CONFIG_ACPI_IORT=y
|
||||||
CONFIG_X86_PM_TIMER=y
|
CONFIG_X86_PM_TIMER=y
|
||||||
# CONFIG_SFI is not set
|
# CONFIG_SFI is not set
|
||||||
|
|
||||||
@ -584,7 +586,25 @@ CONFIG_EFI_EARLYCON=y
|
|||||||
# end of Firmware Drivers
|
# end of Firmware Drivers
|
||||||
|
|
||||||
CONFIG_HAVE_KVM=y
|
CONFIG_HAVE_KVM=y
|
||||||
# CONFIG_VIRTUALIZATION is not set
|
CONFIG_HAVE_KVM_IRQCHIP=y
|
||||||
|
CONFIG_HAVE_KVM_IRQFD=y
|
||||||
|
CONFIG_HAVE_KVM_IRQ_ROUTING=y
|
||||||
|
CONFIG_HAVE_KVM_EVENTFD=y
|
||||||
|
CONFIG_KVM_MMIO=y
|
||||||
|
CONFIG_KVM_ASYNC_PF=y
|
||||||
|
CONFIG_HAVE_KVM_MSI=y
|
||||||
|
CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
|
||||||
|
CONFIG_KVM_VFIO=y
|
||||||
|
CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
|
||||||
|
CONFIG_HAVE_KVM_IRQ_BYPASS=y
|
||||||
|
CONFIG_HAVE_KVM_NO_POLL=y
|
||||||
|
CONFIG_VIRTUALIZATION=y
|
||||||
|
CONFIG_KVM=y
|
||||||
|
CONFIG_KVM_INTEL=y
|
||||||
|
# CONFIG_KVM_AMD is not set
|
||||||
|
# CONFIG_VHOST_NET is not set
|
||||||
|
# CONFIG_VHOST_VSOCK is not set
|
||||||
|
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# General architecture-dependent options
|
# General architecture-dependent options
|
||||||
@ -598,6 +618,7 @@ CONFIG_JUMP_LABEL=y
|
|||||||
# CONFIG_STATIC_KEYS_SELFTEST is not set
|
# CONFIG_STATIC_KEYS_SELFTEST is not set
|
||||||
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
|
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
|
||||||
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
|
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
|
||||||
|
CONFIG_USER_RETURN_NOTIFIER=y
|
||||||
CONFIG_HAVE_IOREMAP_PROT=y
|
CONFIG_HAVE_IOREMAP_PROT=y
|
||||||
CONFIG_HAVE_KPROBES=y
|
CONFIG_HAVE_KPROBES=y
|
||||||
CONFIG_HAVE_KRETPROBES=y
|
CONFIG_HAVE_KRETPROBES=y
|
||||||
@ -733,6 +754,7 @@ CONFIG_BLK_PM=y
|
|||||||
# CONFIG_IOSCHED_BFQ is not set
|
# CONFIG_IOSCHED_BFQ is not set
|
||||||
# end of IO Schedulers
|
# end of IO Schedulers
|
||||||
|
|
||||||
|
CONFIG_PREEMPT_NOTIFIERS=y
|
||||||
CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
|
CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
|
||||||
CONFIG_INLINE_READ_UNLOCK=y
|
CONFIG_INLINE_READ_UNLOCK=y
|
||||||
CONFIG_INLINE_READ_UNLOCK_IRQ=y
|
CONFIG_INLINE_READ_UNLOCK_IRQ=y
|
||||||
@ -789,6 +811,7 @@ CONFIG_CONTIG_ALLOC=y
|
|||||||
CONFIG_PHYS_ADDR_T_64BIT=y
|
CONFIG_PHYS_ADDR_T_64BIT=y
|
||||||
CONFIG_BOUNCE=y
|
CONFIG_BOUNCE=y
|
||||||
CONFIG_VIRT_TO_BUS=y
|
CONFIG_VIRT_TO_BUS=y
|
||||||
|
CONFIG_MMU_NOTIFIER=y
|
||||||
CONFIG_KSM=y
|
CONFIG_KSM=y
|
||||||
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
|
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
|
||||||
CONFIG_TRANSPARENT_HUGEPAGE=y
|
CONFIG_TRANSPARENT_HUGEPAGE=y
|
||||||
@ -1750,6 +1773,17 @@ CONFIG_UIO_DMEM_GENIRQ=y
|
|||||||
# CONFIG_UIO_NETX is not set
|
# CONFIG_UIO_NETX is not set
|
||||||
# CONFIG_UIO_PRUSS is not set
|
# CONFIG_UIO_PRUSS is not set
|
||||||
# CONFIG_UIO_MF624 is not set
|
# CONFIG_UIO_MF624 is not set
|
||||||
|
CONFIG_VFIO_IOMMU_TYPE1=y
|
||||||
|
CONFIG_VFIO_VIRQFD=y
|
||||||
|
CONFIG_VFIO=y
|
||||||
|
# CONFIG_VFIO_NOIOMMU is not set
|
||||||
|
CONFIG_VFIO_PCI=y
|
||||||
|
# CONFIG_VFIO_PCI_VGA is not set
|
||||||
|
CONFIG_VFIO_PCI_MMAP=y
|
||||||
|
CONFIG_VFIO_PCI_INTX=y
|
||||||
|
# CONFIG_VFIO_PCI_IGD is not set
|
||||||
|
# CONFIG_VFIO_MDEV is not set
|
||||||
|
CONFIG_IRQ_BYPASS_MANAGER=y
|
||||||
# CONFIG_VIRT_DRIVERS is not set
|
# CONFIG_VIRT_DRIVERS is not set
|
||||||
CONFIG_VIRTIO=y
|
CONFIG_VIRTIO=y
|
||||||
CONFIG_VIRTIO_MENU=y
|
CONFIG_VIRTIO_MENU=y
|
||||||
@ -1794,6 +1828,8 @@ CONFIG_CLKBLD_I8253=y
|
|||||||
CONFIG_MAILBOX=y
|
CONFIG_MAILBOX=y
|
||||||
CONFIG_PCC=y
|
CONFIG_PCC=y
|
||||||
# CONFIG_ALTERA_MBOX is not set
|
# CONFIG_ALTERA_MBOX is not set
|
||||||
|
CONFIG_IOMMU_IOVA=y
|
||||||
|
CONFIG_IOMMU_API=y
|
||||||
CONFIG_IOMMU_SUPPORT=y
|
CONFIG_IOMMU_SUPPORT=y
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -1802,9 +1838,12 @@ CONFIG_IOMMU_SUPPORT=y
|
|||||||
# end of Generic IOMMU Pagetable Support
|
# end of Generic IOMMU Pagetable Support
|
||||||
|
|
||||||
# CONFIG_IOMMU_DEBUGFS is not set
|
# CONFIG_IOMMU_DEBUGFS is not set
|
||||||
|
# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
|
||||||
|
CONFIG_IOMMU_DMA=y
|
||||||
# CONFIG_AMD_IOMMU is not set
|
# CONFIG_AMD_IOMMU is not set
|
||||||
# CONFIG_INTEL_IOMMU is not set
|
# CONFIG_INTEL_IOMMU is not set
|
||||||
# CONFIG_IRQ_REMAP is not set
|
# CONFIG_IRQ_REMAP is not set
|
||||||
|
CONFIG_VIRTIO_IOMMU=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Remoteproc drivers
|
# Remoteproc drivers
|
||||||
@ -2368,6 +2407,7 @@ CONFIG_ZLIB_DEFLATE=y
|
|||||||
CONFIG_LZO_COMPRESS=y
|
CONFIG_LZO_COMPRESS=y
|
||||||
CONFIG_LZO_DECOMPRESS=y
|
CONFIG_LZO_DECOMPRESS=y
|
||||||
# CONFIG_XZ_DEC is not set
|
# CONFIG_XZ_DEC is not set
|
||||||
|
CONFIG_INTERVAL_TREE=y
|
||||||
CONFIG_XARRAY_MULTI=y
|
CONFIG_XARRAY_MULTI=y
|
||||||
CONFIG_ASSOCIATIVE_ARRAY=y
|
CONFIG_ASSOCIATIVE_ARRAY=y
|
||||||
CONFIG_HAS_IOMEM=y
|
CONFIG_HAS_IOMEM=y
|
||||||
|
Loading…
Reference in New Issue
Block a user