mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-09-24 10:17:21 +00:00
Merge pull request #511 from Jakob-Naucke/forward-s390x-packaging
[forward-port] packaging: s390x kernel config fragments
This commit is contained in:
Julio Montes
GitHub
@@ -1,6 +1,8 @@
|
||||
CONFIG_ARM64=y
|
||||
CONFIG_ARM64_4K_PAGES=y
|
||||
|
||||
CONFIG_PARAVIRT=y
|
||||
|
||||
# ARM servers are often multi-cores, following configs improve
|
||||
# the CPU scheduler's decision making.
|
||||
CONFIG_SCHED_MC=y
|
||||
@@ -41,3 +43,6 @@ CONFIG_ARM64_PMEM=y
|
||||
CONFIG_ARM64_RAS_EXTN=y
|
||||
CONFIG_ARM64_UAO=y
|
||||
# end of ARMv8.2 architectural feature
|
||||
|
||||
CONFIG_NO_HZ_FULL=y
|
||||
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
@@ -1,3 +1,5 @@
|
||||
# It brings PCI support to mach-virt based upon an idealised host controller.
|
||||
CONFIG_PCI_HOST_COMMON=y
|
||||
CONFIG_PCI_HOST_GENERIC=y
|
||||
|
||||
CONFIG_PCI_MSI_IRQ_DOMAIN=y
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
# !s390x
|
||||
|
||||
# enable ACPI support.
|
||||
# This could do with REVIEW
|
||||
# https://github.com/kata-containers/packaging/issues/483
|
||||
@@ -18,3 +20,5 @@ CONFIG_ACPI_CONTAINER=y
|
||||
CONFIG_ACPI_HOTPLUG_MEMORY=y
|
||||
CONFIG_ACPI_NFIT=y
|
||||
CONFIG_HAVE_ACPI_APEI=y
|
||||
CONFIG_HOTPLUG_PCI_ACPI=y
|
||||
CONFIG_PNPACPI=y
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
CONFIG_SECTION_MISMATCH_WARN_ONLY=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_PARAVIRT=y
|
||||
# Note, no nested VM support enabled here
|
||||
|
||||
# Turn off embedded mode, as it disabled 'too much', and we
|
||||
@@ -20,10 +19,9 @@ CONFIG_PRINTK_TIME=y
|
||||
CONFIG_UNIX98_PTYS=y
|
||||
CONFIG_FUTEX=y
|
||||
CONFIG_HIGH_RES_TIMERS=y
|
||||
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
|
||||
CONFIG_GENERIC_MSI_IRQ=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_NO_HZ=y
|
||||
CONFIG_NO_HZ_FULL=y
|
||||
CONFIG_POSIX_MQUEUE=y
|
||||
CONFIG_POSIX_TIMERS=y
|
||||
CONFIG_PROC_SYSCTL=y
|
||||
@@ -50,3 +48,11 @@ CONFIG_RANDOMIZE_BASE=y
|
||||
# Disable for now, as it upsets the entropy test, and we need to improve those: FIXME: see:
|
||||
# https://github.com/kata-containers/tests/issues/1543
|
||||
# RANDOM_TRUST_CPU=y
|
||||
|
||||
# CONFIG_CGROUP_PERF needs
|
||||
CONFIG_HAVE_PERF_EVENTS=y
|
||||
CONFIG_PERF_EVENTS=y
|
||||
|
||||
# CONFIG_BLK_DEV_LOOP needs
|
||||
CONFIG_BLOCK=y
|
||||
CONFIG_BLK_DEV=y
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
# !s390x
|
||||
|
||||
# Items to do with CPU frequency, power etc.
|
||||
|
||||
CONFIG_CPU_FREQ=y
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
# !s390x
|
||||
|
||||
# Enable DAX and NVDIMM support so we can map in our rootfs
|
||||
|
||||
# Need HOTREMOVE, or ZONE_DEVICE will not get enabled
|
||||
|
||||
@@ -5,8 +5,6 @@ CONFIG_HOTPLUG_CPU=y
|
||||
CONFIG_HOTPLUG_PCI=y
|
||||
CONFIG_HOTPLUG_PCI_PCIE=y
|
||||
CONFIG_PCIEPORTBUS=y
|
||||
CONFIG_HOTPLUG_PCI_ACPI=y
|
||||
CONFIG_PNPACPI=y
|
||||
|
||||
# Define hotplugs to be online immediately. Speeds things up, and makes things
|
||||
# work smoother on some arch's.
|
||||
|
||||
@@ -40,7 +40,6 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
|
||||
CONFIG_STP=y
|
||||
CONFIG_BRIDGE=y
|
||||
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
CONFIG_LLC=y
|
||||
CONFIG_NET_SCHED=y
|
||||
CONFIG_NET_SCH_CBQ=y
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
# !s390x
|
||||
|
||||
# This is required for booting from pmem
|
||||
CONFIG_VIRTIO_PMEM=y
|
||||
@@ -1,3 +1,4 @@
|
||||
# !s390x
|
||||
|
||||
# Let's enable stack protection checks, and strong checks
|
||||
# Estimated cost (detailed in the kernel config files)
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
# !s390x
|
||||
|
||||
# We need some sort of 'serial' for virtio-serial consoles - at the moment.
|
||||
# We might not need all of thse though...
|
||||
# FIXME - https://github.com/kata-containers/packaging/issues/483
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
# PCI support to get VIRTIO_PCI support
|
||||
CONFIG_PCI=y
|
||||
CONFIG_PCI_MSI=y
|
||||
CONFIG_PCI_MSI_IRQ_DOMAIN=y
|
||||
# To get to the VIRTIO_PCI, we need the VIRTIO_MENU enabled
|
||||
CONFIG_VIRTIO_MENU=y
|
||||
CONFIG_VIRTIO_PCI=y
|
||||
@@ -15,9 +14,6 @@ CONFIG_VIRTIO_PCI_LEGACY=y
|
||||
CONFIG_HW_RANDOM=y
|
||||
CONFIG_HW_RANDOM_VIRTIO=y
|
||||
|
||||
# This is required for booting from pmem
|
||||
CONFIG_VIRTIO_PMEM=y
|
||||
|
||||
# FIXME - are we moving away from/choosing between SCSI and BLK support?
|
||||
# https://github.com/kata-containers/packaging/issues/483
|
||||
CONFIG_SCSI=y
|
||||
|
||||
13
tools/packaging/kernel/configs/fragments/s390/base.conf
Normal file
13
tools/packaging/kernel/configs/fragments/s390/base.conf
Normal file
@@ -0,0 +1,13 @@
|
||||
CONFIG_S390=y
|
||||
CONFIG_S390_GUEST=y
|
||||
CONFIG_HW_RANDOM_S390=y
|
||||
CONFIG_S390_IOMMU=y
|
||||
# S/390x widly uses CCW devices
|
||||
CONFIG_CCW=y
|
||||
# Select default KVM options from arch/s390/kvm/Kconfig
|
||||
CONFIG_VIRTUALIZATION=y
|
||||
CONFIG_HAVE_KVM=y
|
||||
CONFIG_KVM=y
|
||||
|
||||
CONFIG_MODULES=y
|
||||
CONFIG_MODULE_SIG=y
|
||||
@@ -0,0 +1,8 @@
|
||||
# s390 character device drivers
|
||||
CONFIG_TN3270=y
|
||||
CONFIG_TN3270_TTY=y
|
||||
CONFIG_TN3270_FS=y
|
||||
CONFIG_TN3270_CONSOLE=y
|
||||
CONFIG_CCW_CONSOLE=y
|
||||
CONFIG_SCLP_TTY=y
|
||||
CONFIG_SCLP_CONSOLE=y
|
||||
32
tools/packaging/kernel/configs/fragments/s390/crypto.conf
Normal file
32
tools/packaging/kernel/configs/fragments/s390/crypto.conf
Normal file
@@ -0,0 +1,32 @@
|
||||
# Comments and options from https://github.com/torvalds/linux/blob/master/drivers/crypto/Kconfig
|
||||
|
||||
# Enable s390 architectural random number generation API
|
||||
CONFIG_ARCH_RANDOM=y
|
||||
|
||||
# Fallbacks for s390 specific implementation
|
||||
CONFIG_CRYPTO_CBC=y
|
||||
CONFIG_CRYPTO_CTR=y
|
||||
CONFIG_CRYPTO_ECB=y
|
||||
CONFIG_CRYPTO_XTS=y
|
||||
|
||||
# Enable HW for crypto
|
||||
CONFIG_CRYPTO_HW=y
|
||||
# Support for s390 cryptographic adapters
|
||||
CONFIG_ZCRYPT=y
|
||||
# Kernel API for protected key handling
|
||||
CONFIG_PKEY=y
|
||||
# s390 hardware accelerated implementation of the SHA-1 secure hash standard
|
||||
CONFIG_CRYPTO_SHA1_S390=y
|
||||
# s390 hardware accelerated implementation of the SHA256 secure hash standard
|
||||
CONFIG_CRYPTO_SHA256_S390=y
|
||||
# s390 hardware accelerated implementation of the SHA512 secure hash standard
|
||||
CONFIG_CRYPTO_SHA512_S390=y
|
||||
# s390 hardware accelerated implementation of the DES cipher algorithm (FIPS 46-2),
|
||||
# and Triple DES EDE (FIPS 46-3).
|
||||
CONFIG_CRYPTO_DES_S390=y
|
||||
# s390 hardware accelerated implementation of the AES cipher algorithms (FIPS-197)
|
||||
CONFIG_CRYPTO_AES_S390=y
|
||||
# s390 hardware accelerated implementation of the CRC algorithms
|
||||
CONFIG_CRYPTO_CRC32_S390=y
|
||||
# Pseudo random number generator device driver
|
||||
CONFIG_S390_PRNG=y
|
||||
@@ -0,0 +1,2 @@
|
||||
# Options needed by HAVE_EBPF_JIT
|
||||
CONFIG_PACK_STACK=y
|
||||
@@ -8,6 +8,8 @@ CONFIG_X86_VERBOSE_BOOTUP=y
|
||||
CONFIG_HYPERVISOR_GUEST=y
|
||||
CONFIG_KVM_GUEST=y
|
||||
|
||||
CONFIG_PARAVIRT=y
|
||||
|
||||
# Use the maximum number of CPUs supported by KVM (240)
|
||||
CONFIG_NR_CPUS=240
|
||||
|
||||
@@ -18,3 +20,6 @@ CONFIG_RETPOLINE=y
|
||||
# Boot directly into the uncompressed kernel
|
||||
# Reduce memory footprint
|
||||
CONFIG_PVH=y
|
||||
|
||||
CONFIG_NO_HZ_FULL=y
|
||||
CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
1
tools/packaging/kernel/configs/fragments/x86_64/pci.conf
Normal file
1
tools/packaging/kernel/configs/fragments/x86_64/pci.conf
Normal file
@@ -0,0 +1 @@
|
||||
CONFIG_PCI_MSI_IRQ_DOMAIN=y
|
||||
Reference in New Issue
Block a user