From 7b49fa121babfc0f016b1eb8d1714e760f05373c Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 12 May 2020 09:02:07 +0200 Subject: [PATCH 01/10] kernel: fragments not supported on s390x Add !s390x tag to skip these group of fragments for s390x. Signed-off-by: Alice Frosi Signed-off-by: Jakob-Naucke --- tools/packaging/kernel/configs/fragments/common/acpi.conf | 2 ++ tools/packaging/kernel/configs/fragments/common/cpu.conf | 2 ++ tools/packaging/kernel/configs/fragments/common/dax.conf | 2 ++ tools/packaging/kernel/configs/fragments/common/security.conf | 1 + tools/packaging/kernel/configs/fragments/common/serial.conf | 2 ++ 5 files changed, 9 insertions(+) diff --git a/tools/packaging/kernel/configs/fragments/common/acpi.conf b/tools/packaging/kernel/configs/fragments/common/acpi.conf index e183d2435..1ee7cd329 100644 --- a/tools/packaging/kernel/configs/fragments/common/acpi.conf +++ b/tools/packaging/kernel/configs/fragments/common/acpi.conf @@ -1,3 +1,5 @@ +# !s390x + # enable ACPI support. # This could do with REVIEW # https://github.com/kata-containers/packaging/issues/483 diff --git a/tools/packaging/kernel/configs/fragments/common/cpu.conf b/tools/packaging/kernel/configs/fragments/common/cpu.conf index 04ff9f24d..8e6651df7 100644 --- a/tools/packaging/kernel/configs/fragments/common/cpu.conf +++ b/tools/packaging/kernel/configs/fragments/common/cpu.conf @@ -1,3 +1,5 @@ +# !s390x + # Items to do with CPU frequency, power etc. CONFIG_CPU_FREQ=y diff --git a/tools/packaging/kernel/configs/fragments/common/dax.conf b/tools/packaging/kernel/configs/fragments/common/dax.conf index 4d847def1..7f8824e13 100644 --- a/tools/packaging/kernel/configs/fragments/common/dax.conf +++ b/tools/packaging/kernel/configs/fragments/common/dax.conf @@ -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 diff --git a/tools/packaging/kernel/configs/fragments/common/security.conf b/tools/packaging/kernel/configs/fragments/common/security.conf index 6f3043503..cfe09c648 100644 --- a/tools/packaging/kernel/configs/fragments/common/security.conf +++ b/tools/packaging/kernel/configs/fragments/common/security.conf @@ -1,3 +1,4 @@ +# !s390x # Let's enable stack protection checks, and strong checks # Estimated cost (detailed in the kernel config files) diff --git a/tools/packaging/kernel/configs/fragments/common/serial.conf b/tools/packaging/kernel/configs/fragments/common/serial.conf index c663fe1c7..47d0baa56 100644 --- a/tools/packaging/kernel/configs/fragments/common/serial.conf +++ b/tools/packaging/kernel/configs/fragments/common/serial.conf @@ -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 From 08d046d994287cfe72f9942d8589dc48696ec82e Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 12 May 2020 09:08:33 +0200 Subject: [PATCH 02/10] kernel: config CONFIG_HAVE_NET_DSA The kernel config CONFIG_HAVE_NET_DSA is not supported on s390x. See https://github.com/torvalds/linux/blob/master/net/dsa/Kconfig#L4. Config moved to arch directory. Signed-off-by: Alice Frosi Signed-off-by: Jakob-Naucke --- tools/packaging/kernel/configs/fragments/arm64/network.conf | 1 + tools/packaging/kernel/configs/fragments/common/network.conf | 1 - tools/packaging/kernel/configs/fragments/x86_64/network.conf | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 tools/packaging/kernel/configs/fragments/arm64/network.conf create mode 100644 tools/packaging/kernel/configs/fragments/x86_64/network.conf diff --git a/tools/packaging/kernel/configs/fragments/arm64/network.conf b/tools/packaging/kernel/configs/fragments/arm64/network.conf new file mode 100644 index 000000000..4cd43867d --- /dev/null +++ b/tools/packaging/kernel/configs/fragments/arm64/network.conf @@ -0,0 +1 @@ +CONFIG_HAVE_NET_DSA=y diff --git a/tools/packaging/kernel/configs/fragments/common/network.conf b/tools/packaging/kernel/configs/fragments/common/network.conf index b8d49ae7c..7bdc3de7a 100644 --- a/tools/packaging/kernel/configs/fragments/common/network.conf +++ b/tools/packaging/kernel/configs/fragments/common/network.conf @@ -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 diff --git a/tools/packaging/kernel/configs/fragments/x86_64/network.conf b/tools/packaging/kernel/configs/fragments/x86_64/network.conf new file mode 100644 index 000000000..4cd43867d --- /dev/null +++ b/tools/packaging/kernel/configs/fragments/x86_64/network.conf @@ -0,0 +1 @@ +CONFIG_HAVE_NET_DSA=y From efe51b291ce9f7394a7e2e2c2230e38eb7d04d36 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 12 May 2020 09:13:22 +0200 Subject: [PATCH 03/10] kernel: fragment for pmem The option CONFIG_VIRTIO_PMEM is not supported on s390x. It requires nvdimm support. Signed-off-by: Alice Frosi Signed-off-by: Jakob-Naucke --- tools/packaging/kernel/configs/fragments/common/pmem.conf | 4 ++++ tools/packaging/kernel/configs/fragments/common/virtio.conf | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 tools/packaging/kernel/configs/fragments/common/pmem.conf diff --git a/tools/packaging/kernel/configs/fragments/common/pmem.conf b/tools/packaging/kernel/configs/fragments/common/pmem.conf new file mode 100644 index 000000000..97d8d2cc4 --- /dev/null +++ b/tools/packaging/kernel/configs/fragments/common/pmem.conf @@ -0,0 +1,4 @@ +# !s390x + +# This is required for booting from pmem +CONFIG_VIRTIO_PMEM=y diff --git a/tools/packaging/kernel/configs/fragments/common/virtio.conf b/tools/packaging/kernel/configs/fragments/common/virtio.conf index 592ef458b..0f033c90b 100644 --- a/tools/packaging/kernel/configs/fragments/common/virtio.conf +++ b/tools/packaging/kernel/configs/fragments/common/virtio.conf @@ -15,9 +15,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 From 7c85decc82fb71805490e4600be69d17f3269319 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 12 May 2020 09:23:58 +0200 Subject: [PATCH 04/10] kernel: config CONFIG_PCI_MSI_IRQ_DOMAIN For certain kernel version CONFIG_PCI_MSI_IRQ_DOMAIN is only supported on x86 and arm64. See https://github.com/torvalds/linux/blob/ 219d54332a09e8d8741c1e1982f5eae56099de85/drivers/pci/Kconfig#L55 Signed-off-by: Alice Frosi Signed-off-by: Jakob-Naucke --- tools/packaging/kernel/configs/fragments/arm64/pci.conf | 2 ++ tools/packaging/kernel/configs/fragments/common/virtio.conf | 1 - tools/packaging/kernel/configs/fragments/x86_64/pci.conf | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 tools/packaging/kernel/configs/fragments/x86_64/pci.conf diff --git a/tools/packaging/kernel/configs/fragments/arm64/pci.conf b/tools/packaging/kernel/configs/fragments/arm64/pci.conf index cc2077e12..603fdb32b 100644 --- a/tools/packaging/kernel/configs/fragments/arm64/pci.conf +++ b/tools/packaging/kernel/configs/fragments/arm64/pci.conf @@ -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 diff --git a/tools/packaging/kernel/configs/fragments/common/virtio.conf b/tools/packaging/kernel/configs/fragments/common/virtio.conf index 0f033c90b..8dea2f854 100644 --- a/tools/packaging/kernel/configs/fragments/common/virtio.conf +++ b/tools/packaging/kernel/configs/fragments/common/virtio.conf @@ -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 diff --git a/tools/packaging/kernel/configs/fragments/x86_64/pci.conf b/tools/packaging/kernel/configs/fragments/x86_64/pci.conf new file mode 100644 index 000000000..90bf4c7ca --- /dev/null +++ b/tools/packaging/kernel/configs/fragments/x86_64/pci.conf @@ -0,0 +1 @@ +CONFIG_PCI_MSI_IRQ_DOMAIN=y From 6dca74ba72ee71bb024d4fe39fa962d7078a2723 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 12 May 2020 09:28:30 +0200 Subject: [PATCH 05/10] kernel: moved acpi hotplug config Moved: --- CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_PNPACPI=y --- from hotplug to acpi. In this way, it is possible to skip these config if the acpi feature is not supported. Signed-off-by: Alice Frosi Signed-off-by: Jakob-Naucke --- tools/packaging/kernel/configs/fragments/common/acpi.conf | 2 ++ tools/packaging/kernel/configs/fragments/common/hotplug.conf | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/packaging/kernel/configs/fragments/common/acpi.conf b/tools/packaging/kernel/configs/fragments/common/acpi.conf index 1ee7cd329..02020df0c 100644 --- a/tools/packaging/kernel/configs/fragments/common/acpi.conf +++ b/tools/packaging/kernel/configs/fragments/common/acpi.conf @@ -20,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 diff --git a/tools/packaging/kernel/configs/fragments/common/hotplug.conf b/tools/packaging/kernel/configs/fragments/common/hotplug.conf index 342636aca..af84a24d7 100644 --- a/tools/packaging/kernel/configs/fragments/common/hotplug.conf +++ b/tools/packaging/kernel/configs/fragments/common/hotplug.conf @@ -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. From 62b45064d4f5cfdfe30bae8d5ab7fc7eafc770cc Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 12 May 2020 09:38:26 +0200 Subject: [PATCH 06/10] kernel: config CONFIG_NO_HZ_FULL Moved CONFIG_NO_HZ_FULL config to each arch base.conf. The config CONFIG_NO_HZ_FULL depends on CONFIG_HAVE_CONTEXT_TRACKING. See https://github.com/torvalds/linux/blob/ a811c1fa0a02c062555b54651065899437bacdbe/kernel/time/Kconfig#L96 The context tracking is not supported on s390x yet. See https://github.com/torvalds/linux/blob/ a811c1fa0a02c062555b54651065899437bacdbe/Documentation/features/time/ context-tracking/arch-support.txt#L27 Signed-off-by: Alice Frosi Signed-off-by: Jakob-Naucke --- tools/packaging/kernel/configs/fragments/arm64/base.conf | 2 ++ tools/packaging/kernel/configs/fragments/common/base.conf | 1 - tools/packaging/kernel/configs/fragments/x86_64/base.conf | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kernel/configs/fragments/arm64/base.conf b/tools/packaging/kernel/configs/fragments/arm64/base.conf index 5426377a9..b882ff3b3 100644 --- a/tools/packaging/kernel/configs/fragments/arm64/base.conf +++ b/tools/packaging/kernel/configs/fragments/arm64/base.conf @@ -41,3 +41,5 @@ CONFIG_ARM64_PMEM=y CONFIG_ARM64_RAS_EXTN=y CONFIG_ARM64_UAO=y # end of ARMv8.2 architectural feature + +CONFIG_NO_HZ_FULL=y diff --git a/tools/packaging/kernel/configs/fragments/common/base.conf b/tools/packaging/kernel/configs/fragments/common/base.conf index e19c30a5f..83fd607de 100644 --- a/tools/packaging/kernel/configs/fragments/common/base.conf +++ b/tools/packaging/kernel/configs/fragments/common/base.conf @@ -23,7 +23,6 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_MSI_IRQ_DOMAIN=y CONFIG_GENERIC_MSI_IRQ=y CONFIG_NO_HZ=y -CONFIG_NO_HZ_FULL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_TIMERS=y CONFIG_PROC_SYSCTL=y diff --git a/tools/packaging/kernel/configs/fragments/x86_64/base.conf b/tools/packaging/kernel/configs/fragments/x86_64/base.conf index 9b9cb94a3..19e15a787 100644 --- a/tools/packaging/kernel/configs/fragments/x86_64/base.conf +++ b/tools/packaging/kernel/configs/fragments/x86_64/base.conf @@ -18,3 +18,5 @@ CONFIG_RETPOLINE=y # Boot directly into the uncompressed kernel # Reduce memory footprint CONFIG_PVH=y + +CONFIG_NO_HZ_FULL=y From 454dd854328fe8a8d618c9b4559ddd4f0b84b0dc Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 12 May 2020 09:44:55 +0200 Subject: [PATCH 07/10] kernel: config CONFIG_ PARAVIRT Moved CONFIG_ PARAVIRT to each arch base.conf. CONFIG_ PARAVIRT only defined in x86, arm64, arm in arch/$arch/Kconfig. Signed-off-by: Alice Frosi Signed-off-by: Jakob-Naucke --- tools/packaging/kernel/configs/fragments/arm64/base.conf | 2 ++ tools/packaging/kernel/configs/fragments/common/base.conf | 1 - tools/packaging/kernel/configs/fragments/x86_64/base.conf | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kernel/configs/fragments/arm64/base.conf b/tools/packaging/kernel/configs/fragments/arm64/base.conf index b882ff3b3..c59b1df6c 100644 --- a/tools/packaging/kernel/configs/fragments/arm64/base.conf +++ b/tools/packaging/kernel/configs/fragments/arm64/base.conf @@ -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 diff --git a/tools/packaging/kernel/configs/fragments/common/base.conf b/tools/packaging/kernel/configs/fragments/common/base.conf index 83fd607de..0cc902cee 100644 --- a/tools/packaging/kernel/configs/fragments/common/base.conf +++ b/tools/packaging/kernel/configs/fragments/common/base.conf @@ -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 diff --git a/tools/packaging/kernel/configs/fragments/x86_64/base.conf b/tools/packaging/kernel/configs/fragments/x86_64/base.conf index 19e15a787..5db791f80 100644 --- a/tools/packaging/kernel/configs/fragments/x86_64/base.conf +++ b/tools/packaging/kernel/configs/fragments/x86_64/base.conf @@ -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 From b67325c3ace3704db403d8b37574e723c7a8a4f3 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 12 May 2020 12:36:26 +0200 Subject: [PATCH 08/10] kernel: add missing configs Some kernel configs need additional dependencies: - CONFIG_NO_HZ depends on CONFIG_GENERIC_CLOCKEVENTS - CONFIG_CGROUP_PERF depends on CONFIG_PERF_EVENTS CONFIG_HAVE_PERF_EVENTS - CONFIG_BLK_DEV_LOOP depends on CONFIG_BLK_DEV CONFIG_BLOCK Signed-off-by: Alice Frosi Signed-off-by: Jakob-Naucke --- .../packaging/kernel/configs/fragments/common/base.conf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/packaging/kernel/configs/fragments/common/base.conf b/tools/packaging/kernel/configs/fragments/common/base.conf index 0cc902cee..f4b5fb069 100644 --- a/tools/packaging/kernel/configs/fragments/common/base.conf +++ b/tools/packaging/kernel/configs/fragments/common/base.conf @@ -21,6 +21,7 @@ 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_POSIX_MQUEUE=y CONFIG_POSIX_TIMERS=y @@ -48,3 +49,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 From f13506163bc1a405fb141398493ffcad44f561b2 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 12 May 2020 12:44:28 +0200 Subject: [PATCH 09/10] kernel: config CONFIG_GENERIC_MSI_IRQ_DOMAIN Moved CONFIG_GENERIC_MSI_IRQ_DOMAIN in arch base.conf. The config is not selected for s390x Signed-off-by: Alice Frosi Signed-off-by: Jakob-Naucke --- tools/packaging/kernel/configs/fragments/arm64/base.conf | 1 + tools/packaging/kernel/configs/fragments/common/base.conf | 1 - tools/packaging/kernel/configs/fragments/x86_64/base.conf | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kernel/configs/fragments/arm64/base.conf b/tools/packaging/kernel/configs/fragments/arm64/base.conf index c59b1df6c..dfe51e29a 100644 --- a/tools/packaging/kernel/configs/fragments/arm64/base.conf +++ b/tools/packaging/kernel/configs/fragments/arm64/base.conf @@ -45,3 +45,4 @@ CONFIG_ARM64_UAO=y # end of ARMv8.2 architectural feature CONFIG_NO_HZ_FULL=y +CONFIG_GENERIC_MSI_IRQ_DOMAIN=y diff --git a/tools/packaging/kernel/configs/fragments/common/base.conf b/tools/packaging/kernel/configs/fragments/common/base.conf index f4b5fb069..af6432877 100644 --- a/tools/packaging/kernel/configs/fragments/common/base.conf +++ b/tools/packaging/kernel/configs/fragments/common/base.conf @@ -19,7 +19,6 @@ 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 diff --git a/tools/packaging/kernel/configs/fragments/x86_64/base.conf b/tools/packaging/kernel/configs/fragments/x86_64/base.conf index 5db791f80..e7a21dbef 100644 --- a/tools/packaging/kernel/configs/fragments/x86_64/base.conf +++ b/tools/packaging/kernel/configs/fragments/x86_64/base.conf @@ -22,3 +22,4 @@ CONFIG_RETPOLINE=y CONFIG_PVH=y CONFIG_NO_HZ_FULL=y +CONFIG_GENERIC_MSI_IRQ_DOMAIN=y From 9f1a3d15db8006cf4dc4dfa07518e48ba4a43f65 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 12 May 2020 12:55:10 +0200 Subject: [PATCH 10/10] kernel: add s390x fragment Support for s390x kernel fragments. Fixes: #1041 Signed-off-by: Alice Frosi Signed-off-by: Jakob-Naucke --- .../kernel/configs/fragments/s390/base.conf | 13 ++++++++ .../configs/fragments/s390/console.conf | 8 +++++ .../kernel/configs/fragments/s390/crypto.conf | 32 +++++++++++++++++++ .../configs/fragments/s390/network.conf | 2 ++ 4 files changed, 55 insertions(+) create mode 100644 tools/packaging/kernel/configs/fragments/s390/base.conf create mode 100644 tools/packaging/kernel/configs/fragments/s390/console.conf create mode 100644 tools/packaging/kernel/configs/fragments/s390/crypto.conf create mode 100644 tools/packaging/kernel/configs/fragments/s390/network.conf diff --git a/tools/packaging/kernel/configs/fragments/s390/base.conf b/tools/packaging/kernel/configs/fragments/s390/base.conf new file mode 100644 index 000000000..c0b10ef8a --- /dev/null +++ b/tools/packaging/kernel/configs/fragments/s390/base.conf @@ -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 diff --git a/tools/packaging/kernel/configs/fragments/s390/console.conf b/tools/packaging/kernel/configs/fragments/s390/console.conf new file mode 100644 index 000000000..2bc4db09b --- /dev/null +++ b/tools/packaging/kernel/configs/fragments/s390/console.conf @@ -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 diff --git a/tools/packaging/kernel/configs/fragments/s390/crypto.conf b/tools/packaging/kernel/configs/fragments/s390/crypto.conf new file mode 100644 index 000000000..448a5ee7e --- /dev/null +++ b/tools/packaging/kernel/configs/fragments/s390/crypto.conf @@ -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 diff --git a/tools/packaging/kernel/configs/fragments/s390/network.conf b/tools/packaging/kernel/configs/fragments/s390/network.conf new file mode 100644 index 000000000..f3f159705 --- /dev/null +++ b/tools/packaging/kernel/configs/fragments/s390/network.conf @@ -0,0 +1,2 @@ +# Options needed by HAVE_EBPF_JIT +CONFIG_PACK_STACK=y