From 12bfda2863859098fa6b7d549d63b3aec0f3b173 Mon Sep 17 00:00:00 2001 From: holyfei Date: Thu, 22 Jul 2021 20:28:46 +0800 Subject: [PATCH] kata-containers: modify kernel config reason: modify kernel config Signed-off-by: holyfei --- kata-integration.spec | 8 +- ...integration-modify-kernel-config-x86.patch | 254 ++++++++++++++++++ series.conf | 1 + 3 files changed, 262 insertions(+), 1 deletion(-) create mode 100644 patches/0002-kata_integration-modify-kernel-config-x86.patch diff --git a/kata-integration.spec b/kata-integration.spec index 469b493..7ef47ea 100644 --- a/kata-integration.spec +++ b/kata-integration.spec @@ -1,6 +1,6 @@ %global debug_package %{nil} %define VERSION v1.0.0 -%define RELEASE 2 +%define RELEASE 3 Name: kata-integration Version: %{VERSION} @@ -28,6 +28,12 @@ This is a usefult tool for building Kata Container components. %doc %changelog +* Thu Jul 22 2021 yangfeiyu - 1.0.0-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:modify kernel config + * Sat Sep 5 2020 jiangpengf - 1.0.0-2 - Type:enhancement - ID:NA diff --git a/patches/0002-kata_integration-modify-kernel-config-x86.patch b/patches/0002-kata_integration-modify-kernel-config-x86.patch new file mode 100644 index 0000000..abffe75 --- /dev/null +++ b/patches/0002-kata_integration-modify-kernel-config-x86.patch @@ -0,0 +1,254 @@ +From 69189c4ea0a35ccc178d886a776953bb5e7255f4 Mon Sep 17 00:00:00 2001 +From: holyfei +Date: Thu, 8 Apr 2021 22:27:49 +0800 +Subject: [PATCH] kata_integration: modify kernel config x86 + +Signed-off-by: holyfei +--- + hack/config-kata-x86_64 | 78 +++++++++++++++-------------------------- + 1 file changed, 28 insertions(+), 50 deletions(-) + +diff --git a/hack/config-kata-x86_64 b/hack/config-kata-x86_64 +index 452f903..9e10073 100644 +--- a/hack/config-kata-x86_64 ++++ b/hack/config-kata-x86_64 +@@ -1,13 +1,15 @@ + # + # Automatically generated file; DO NOT EDIT. +-# Linux/x86 4.19.36 Kernel Configuration ++# Linux/x86 4.19.90 Kernel Configuration + # + + # ++# Compiler: gcc_old (GCC) 7.3.0 + # + CONFIG_CC_IS_GCC=y +-CONFIG_GCC_VERSION=80201 ++CONFIG_GCC_VERSION=70300 + CONFIG_CLANG_VERSION=0 ++CONFIG_CC_HAS_ASM_GOTO=y + CONFIG_IRQ_WORK=y + CONFIG_BUILDTIME_EXTABLE_SORT=y + CONFIG_THREAD_INFO_IN_TASK=y +@@ -42,6 +44,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y + # CONFIG_USELIB is not set + # CONFIG_AUDIT is not set + CONFIG_HAVE_ARCH_AUDITSYSCALL=y ++# CONFIG_KTASK is not set + + # + # IRQ subsystem +@@ -162,7 +165,7 @@ CONFIG_RD_GZIP=y + # CONFIG_RD_LZO is not set + # CONFIG_RD_LZ4 is not set + CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +-# CONFIG_CC_OPTIMIZE_FOR_SIZE=y ++# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set + CONFIG_SYSCTL=y + CONFIG_ANON_INODES=y + CONFIG_SYSCTL_EXCEPTION_TRACE=y +@@ -217,8 +220,6 @@ CONFIG_SLAB=y + CONFIG_SLAB_MERGE_DEFAULT=y + # CONFIG_SLAB_FREELIST_RANDOM is not set + # CONFIG_PROFILING is not set +-# CONFIG_SMART_POLLING is not set +-# CONFIG_CRASHKERNEL_AUTO_MEM is not set + CONFIG_64BIT=y + CONFIG_X86_64=y + CONFIG_X86=y +@@ -304,7 +305,9 @@ CONFIG_X86_DEBUGCTLMSR=y + CONFIG_PROCESSOR_SELECT=y + CONFIG_CPU_SUP_INTEL=y + # CONFIG_CPU_SUP_AMD is not set ++# CONFIG_CPU_SUP_HYGON is not set + # CONFIG_CPU_SUP_CENTAUR is not set ++# CONFIG_CPU_SUP_ZHAOXIN is not set + CONFIG_HPET_TIMER=y + CONFIG_HPET_EMULATE_RTC=y + # CONFIG_DMI is not set +@@ -339,6 +342,7 @@ CONFIG_X86_CPUID=y + CONFIG_X86_DIRECT_GBPAGES=y + CONFIG_ARCH_HAS_MEM_ENCRYPT=y + CONFIG_NUMA=y ++CONFIG_NUMA_AWARE_SPINLOCKS=y + CONFIG_AMD_NUMA=y + CONFIG_X86_64_ACPI_NUMA=y + CONFIG_NODES_SPAN_OTHER_NODES=y +@@ -360,9 +364,12 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 + # CONFIG_X86_PAT is not set + CONFIG_ARCH_RANDOM=y + CONFIG_X86_SMAP=y +-CONFIG_X86_INTEL_UMIP=y ++CONFIG_X86_UMIP=y + # CONFIG_X86_INTEL_MPX is not set + CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y ++CONFIG_X86_INTEL_TSX_MODE_OFF=y ++# CONFIG_X86_INTEL_TSX_MODE_ON is not set ++# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set + # CONFIG_EFI is not set + CONFIG_SECCOMP=y + # CONFIG_HZ_100 is not set +@@ -386,6 +393,7 @@ CONFIG_LEGACY_VSYSCALL_EMULATE=y + # CONFIG_CMDLINE_BOOL is not set + CONFIG_MODIFY_LDT_SYSCALL=y + CONFIG_HAVE_LIVEPATCH_FTRACE=y ++CONFIG_HAVE_LIVEPATCH_WO_FTRACE=y + + # + # Enable Livepatch +@@ -510,7 +518,6 @@ CONFIG_PCIEASPM_DEFAULT=y + # CONFIG_PCIEASPM_PERFORMANCE is not set + # CONFIG_PCIE_DPC is not set + # CONFIG_PCIE_PTM is not set +-CONFIG_PCI_BUS_ADDR_T_64BIT=y + CONFIG_PCI_MSI=y + CONFIG_PCI_MSI_IRQ_DOMAIN=y + CONFIG_PCI_QUIRKS=y +@@ -573,7 +580,7 @@ CONFIG_HAVE_GENERIC_GUP=y + CONFIG_FIRMWARE_MEMMAP=y + # CONFIG_DELL_RBU is not set + # CONFIG_DCDBAS is not set +-# CONFIG_ISCSI_IBFT_FIND is not set ++# CONFIG_ISCSI_IBFT is not set + # CONFIG_FW_CFG_SYSFS is not set + # CONFIG_GOOGLE_FIRMWARE is not set + +@@ -748,7 +755,6 @@ CONFIG_ARCH_USE_QUEUED_RWLOCKS=y + CONFIG_QUEUED_RWLOCKS=y + CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y + CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y +-# CONFIG_ENABLE_BALANCE_SCHEDULE is not set + CONFIG_FREEZER=y + + # +@@ -801,7 +807,6 @@ CONFIG_SHRINK_PAGECACHE=y + # CONFIG_ZBUD is not set + # CONFIG_ZSMALLOC is not set + CONFIG_GENERIC_EARLY_IOREMAP=y +-# CONFIG_HOTREPLACE is not set + # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set + # CONFIG_IDLE_PAGE_TRACKING is not set + CONFIG_ARCH_HAS_ZONE_DEVICE=y +@@ -1646,6 +1651,8 @@ CONFIG_NET_VENDOR_CORTINA=y + # CONFIG_NET_VENDOR_EMULEX is not set + CONFIG_NET_VENDOR_EZCHIP=y + # CONFIG_NET_VENDOR_HP is not set ++CONFIG_NET_VENDOR_HUAWEI=y ++# CONFIG_BMA is not set + # CONFIG_NET_VENDOR_I825XX is not set + CONFIG_NET_VENDOR_INTEL=y + # CONFIG_E100 is not set +@@ -1660,6 +1667,7 @@ CONFIG_I40E=y + CONFIG_I40EVF=y + # CONFIG_ICE is not set + # CONFIG_FM10K is not set ++# CONFIG_NET_VENDOR_NETSWIFT is not set + # CONFIG_JME is not set + # CONFIG_NET_VENDOR_MARVELL is not set + CONFIG_NET_VENDOR_MELLANOX=y +@@ -2236,6 +2244,10 @@ CONFIG_IOMMU_SUPPORT=y + # + # Generic IOMMU Pagetable Support + # ++ ++# ++# Generic PASID table support ++# + # CONFIG_IOMMU_DEBUGFS is not set + # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set + CONFIG_IOMMU_IOVA=y +@@ -2246,6 +2258,7 @@ CONFIG_INTEL_IOMMU=y + CONFIG_INTEL_IOMMU_DEFAULT_ON=y + CONFIG_INTEL_IOMMU_FLOPPY_WA=y + CONFIG_IRQ_REMAP=y ++# CONFIG_SMMU_BYPASS_DEV is not set + + # + # Remoteproc drivers +@@ -2415,7 +2428,6 @@ CONFIG_OVERLAY_FS_METACOPY=y + # + # CONFIG_MSDOS_FS is not set + # CONFIG_VFAT_FS is not set +-# CONFIG_NTFS_FS is not set + + # + # Pseudo filesystems +@@ -2430,6 +2442,7 @@ CONFIG_SYSFS=y + CONFIG_TMPFS=y + CONFIG_TMPFS_POSIX_ACL=y + CONFIG_TMPFS_XATTR=y ++# CONFIG_TMPFS_INODE64 is not set + CONFIG_HUGETLBFS=y + CONFIG_HUGETLB_PAGE=y + CONFIG_MEMFD_CREATE=y +@@ -2766,6 +2779,7 @@ CONFIG_CRC32_SLICEBY8=y + # CONFIG_CRC7 is not set + CONFIG_LIBCRC32C=y + CONFIG_CRC8=y ++CONFIG_XXHASH=y + # CONFIG_RANDOM32_SELFTEST is not set + CONFIG_ZLIB_INFLATE=y + CONFIG_XZ_DEC=y +@@ -2804,6 +2818,8 @@ CONFIG_ARCH_HAS_SG_CHAIN=y + CONFIG_ARCH_HAS_PMEM_API=y + CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y + CONFIG_SBITMAP=y ++# CONFIG_ETMEM_SCAN is not set ++# CONFIG_ETMEM_SWAP is not set + # CONFIG_STRING_SELFTEST is not set + + # +@@ -2965,6 +2981,7 @@ CONFIG_RUNTIME_TESTING_MENU=y + # CONFIG_TEST_UDELAY is not set + # CONFIG_TEST_STATIC_KEYS is not set + # CONFIG_TEST_KMOD is not set ++# CONFIG_TEST_FREE_PAGES is not set + # CONFIG_MEMTEST is not set + # CONFIG_BUG_ON_DATA_CORRUPTION is not set + # CONFIG_SAMPLES is not set +@@ -3002,42 +3019,3 @@ CONFIG_X86_DEBUG_FPU=y + # CONFIG_UNWINDER_ORC is not set + CONFIG_UNWINDER_FRAME_POINTER=y + # CONFIG_UNWINDER_GUESS is not set +- +-# +-# EulerOS +-# +-# CONFIG_EULEROS_SYSMONITOR is not set +-CONFIG_EULEROS_RESERVE_KBOX_MEMORY=y +-CONFIG_EULEROS_REDIRECT_PRINTK_BUF=y +-# CONFIG_EULEROS_KBOX_ADD_PRINTK_NOTIFIER is not set +-# CONFIG_EULEROS_MEMSTAT is not set +-# CONFIG_EULEROS_KERNEL_FAULT_NOTIFIER_CHAIN is not set +-# CONFIG_EULEROS_REBOOT_NOTIFIER_CHAIN is not set +-# CONFIG_EULEROS_KBOX_WATCHDOG_NOTIFIER_LIST is not set +-# CONFIG_EULEROS_KBOX_SMP_IPI_CALLBACK is not set +-CONFIG_EULEROS_FS_EXCEPTION_NOTIFY=y +-# CONFIG_EULEROS_WATCHDOG_ENHANCE_FEATRUE is not set +-# CONFIG_EULEROS_CRASH_KEXEC_NOTIFIER is not set +-# CONFIG_EULEROS_SPINLOCK_DEBUG is not set +-# CONFIG_EULEROS_ADD_TOUCHDOG_FOR_PL011_CONSOLE is not set +-# CONFIG_EULEROS_DEL_TOUCHDOG_FOR_SERIAL8250_CONSOLE is not set +-# CONFIG_EULEROS_DUMP is not set +-# CONFIG_EULEROS_DEBUG_PANIC is not set +-# CONFIG_EULEROS_DEBUG_OOM is not set +-CONFIG_EULEROS_RESERVED_MEMORY=y +-# CONFIG_EULEROS_CPU_FREQ_GOV_ONDEMAND is not set +-# CONFIG_EULEROS_TASK_TRACE is not set +-# CONFIG_EULEROS_LWT is not set +-# CONFIG_EULEROS_EVMM_TLB is not set +-# CONFIG_EULEROS_EVMM_TLB_MOD is not set +-# CONFIG_EULEROS_ATLAS_500_MINID is not set +-# CONFIG_EULEROS_CPU_STAT_AND_IRQ is not set +-CONFIG_EULEROS_SOFTIRQ_DELAY=y +-CONFIG_EULEROS_FORBID_HOTKEY_REBOOT=y +-CONFIG_EULEROS_DYNAMIC_SD_MAX_RETRIES=y +-CONFIG_EULEROS_ROOTFS_RATIO=y +-CONFIG_EULEROS_AFFINITY_HINT_MODIFICATION_NOTIFY=y +-CONFIG_EULEROS_IPVLAN_INFO_PRINT=y +-CONFIG_EULEROS_USE_IDLE_NO_CSTATES=y +-CONFIG_EULEROS_SUPPORT_1822_ROCE_TOE_MODE=y +-CONFIG_EULEROS_QUIRK_FIX_SAS_BAR6=y +-- +2.23.0 + diff --git a/series.conf b/series.conf index d31db34..d811654 100644 --- a/series.conf +++ b/series.conf @@ -1 +1,2 @@ 0001-kata-containers-disable-netmon-by-default.patch +0002-kata_integration-modify-kernel-config-x86.patch -- Gitee