!57 kata_integration:enable x86 MICROCODE_AMD and CPU_SUP_AMD

From: @Vanient Reviewed-by: @flyflyflypeng, @duguhaotian Signed-off-by: @duguhaotian
kata_integration:enable x86 MICROCODE_AMD and CPU_SUP_AMD
2023-10-16 08:44:03 +00:00 · 2023-10-16 15:38:32 +08:00 · 2021-11-27 09:51:30 +00:00 · 2021-11-27 11:58:38 +08:00 · 2021-04-27 16:04:49 +08:00 · 2021-04-27 15:33:13 +08:00
9 changed files with 417 additions and 203 deletions
--- a/19
+++ b/19
@ -0,0 +1,19 @@
+#!/bin/bash
+
+if [[ -f ./patch_flag ]];then
+    echo "kata_integration patched!"
+    exit 0
+fi
+
+tar -zxvf kata_integration-*.tar.gz
+cat ./series.conf | while read line
+do
+    if [[ $line == '' || $line =~ ^\s*# ]]; then
+        continue
+    fi
+    echo "====patch $line======"
+    pwd
+    patch -p1 -F1 -s < ./patches/$line
+done
+
+touch ./patch_flag
--- a/kata-containers.spec
+++ b/kata-containers.spec
@ -1,131 +0,0 @@
-#needsrootforbuild
-%global debug_package %{nil}
-%global kernel_version 4.19.36
-
-%define VERSION v1.11.1
-%define RELEASE 4
-
-Name:           kata-containers
-Version:        %{VERSION}
-Release:        %{RELEASE}
-Summary:        Kata Container integration
-License:        Apache 2.0
-URL:            https://gitee.com/src-openeuler/kata_integration
-Source0:        kata_integration-v1.0.0.tar.gz
-Source1:        kata-runtime-%{version}.tar.gz
-Source2:        kata-agent-%{version}.tar.gz
-Source3:        kata-proxy-%{version}.tar.gz
-Source4:        kata-shim-%{version}.tar.gz
-Source5:        linux-%{kernel_version}.tar.gz
-
-BuildRoot:      %_topdir/BUILDROOT
-BuildRequires:  automake golang gcc bc glibc-devel glibc-static busybox glib2-devel glib2 ipvsadm conntrack-tools nfs-utils
-BuildRequires:  patch elfutils-libelf-devel openssl-devel bison flex
-
-%description
-This is core component of Kata Container, to make it work, you need a docker engine.
-
-%prep
-%setup -q -c -a 0 -n %{name}-%{version}
-%setup -q -c -a 1 -n %{name}-%{version}/runtime
-%setup -q -c -a 2 -n %{name}-%{version}/agent
-%setup -q -c -a 3 -n %{name}-%{version}/proxy
-%setup -q -c -a 4 -n %{name}-%{version}/shim
-%setup -q -c -a 5 -n kernel
-
-# extract the kata_integration.tar.gz file
-cd %{_builddir}/%{name}-%{version}
-tar -xzf kata_integration-v1.0.0.tar.gz
-
-# build kernel
-cd %{_builddir}/kernel
-mv kernel linux
-if ls patches.tar.* >/dev/null 2>&1;then
-    tar -xf patches.tar.*
-fi
-cd %{_builddir}/kernel/linux/
-%ifarch %{ix86} x86_64
-cp %{_builddir}/%{name}-%{version}/hack/config-kata-x86_64 ./.config
-%else
-cp %{_builddir}/%{name}-%{version}/hack/config-kata-arm64 ./.config
-%endif
-
-patch_list="%{_builddir}/kernel/series.conf"
-IFS=$'\n'
-for patch_name in `cat $patch_list`
-do
-        echo $patch_name
-	if  [ "${patch_name:0:1}"  != "#" ]; then
-                patch -p1 -F1 -s < %{_builddir}/kernel/${patch_name}
-                echo "add patch done : $patch_name"
-        fi
-done
-
-%build
-cd %{_builddir}/kernel/linux/
-make %{?_smp_mflags}
-
-cd %{_builddir}/%{name}-%{version}
-mkdir -p -m 750 build
-make runtime
-make proxy
-make shim
-%if 0%{?integrate_driver}
-    make initrd INTEGRATE_DRIVER=true
-%else
-    make initrd
-%endif
-
-%install
-mkdir -p -m 755  %{buildroot}/var/lib/kata
-%ifarch %{ix86} x86_64
-install -p -m 755 -D %{_builddir}/kernel/linux/arch/x86_64/boot/bzImage %{buildroot}/var/lib/kata/kernel
-%else
-install -p -m 755 -D %{_builddir}/kernel/linux/arch/arm64/boot/Image %{buildroot}/var/lib/kata/kernel
-%endif
-
-cd %{_builddir}/%{name}-%{version}
-mkdir -p -m 750  %{buildroot}/usr/bin
-install -p -m 750 ./build/kata-runtime ./build/kata-proxy ./build/kata-shim ./build/kata-netmon %{buildroot}/usr/bin/
-install -p -m 640 ./build/kata-containers-initrd.img %{buildroot}/var/lib/kata/
-mkdir -p -m 750 %{buildroot}/usr/share/defaults/kata-containers/
-install -p -m 640 -D ./runtime/cli/config/configuration-qemu.toml %{buildroot}/usr/share/defaults/kata-containers/configuration.toml
-
-%clean
-
-%files
-/usr/bin/kata-runtime
-/usr/bin/kata-proxy
-/usr/bin/kata-shim
-/usr/bin/kata-netmon
-/var/lib/kata/kernel
-/var/lib/kata/kata-containers-initrd.img
-/usr/share/defaults/kata-containers/configuration.toml
-
-%doc
-
-
-%changelog
-* Wed Sep 30 2020 yangfeiyu<yangfeiyu2@huawei.com> - 1.11.1-4
- Type:bugfix
- ID:NA
- SUG:restart
- DESC:kata-runtime retry inserting of CNI interface
-
-* Sun Sep 27 2020 LiangZhang<zhangliang5@Huawei.com> - 1.11.1-3
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix cmd params of direct use stratovirt binary
-
-* Thu Sep 20 2020 jiangpengf<jiangpengfei9@huawei.com> - 1.11.1-2
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix del-iface doesn't delete the tap interface in the host problem
-
-* Thu Aug 27 2020 jiangpengf<jiangpengfei9@huawei.com> - 1.11.1-1
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:update kata-containers version to v1.11.1-1
--- a/kata-integration.spec
+++ b/kata-integration.spec
@ -1,14 +1,14 @@
 %global debug_package %{nil}
 %define VERSION v1.0.0
-%define RELEASE 1
+%define RELEASE 5

 Name:           kata-integration
 Version:        %{VERSION}
 Release:        %{RELEASE}
 Summary:        Kata Container integration
 License:        Apache 2.0
-URL:            https://gitee.com/src-openeuler/kata_integration
-Source0:        %{name}-%{version}.tar.gz
+URL:            https://gitee.com/openeuler/kata_integration
+Source0:        https://gitee.com/openeuler/kata_integration/repository/archive/v1.0.0?format=tar.gz#/%{name}-%{version}.tar.gz

 BuildRoot:      %_topdir/BUILDROOT
 BuildRequires: automake gcc glibc-devel glibc-static patch 
@ -28,6 +28,30 @@ This is a usefult tool for building Kata Container components.
 %doc

 %changelog
+* Mon Oct 16 2023 xiadanni<xiadanni1@huawei.com> - 1.0.0-5
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:enable x86 MICROCODE_AMD and CPU_SUP_AMD
+
+* Sat Nov 27 2021 yangfeiyu <yangfeiyu2@huawei.com> - 1.0.0-4
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:build shimv2
+
+* Sat Sep 5 2020 jiangpengf<jiangpengfei9@huawei.com> - 1.0.0-3
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:update config-kata-x86_64
+
+* Sat Sep 5 2020 jiangpengf<jiangpengfei9@huawei.com> - 1.0.0-2
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:change Source format to URL
+
 * Wed Aug 26 2020 jiangpengf<jiangpengfei9@huawei.com> - 1.0.0-1
 - Type:enhancement
 - ID:NA
--- a/kata-micro-kernel.spec
+++ b/kata-micro-kernel.spec
@ -1,69 +0,0 @@
-%global debug_package %{nil}
-%global TarballVer 4.19.138
-
-%define VERSION 4.19.138
-%define RELEASE 1
-
-%define with_patch 0
-%define with_source 1
-
-Name:           kata-micro-kernel
-Version:        %{VERSION}
-Release:        %{RELEASE}
-Summary:        Micro Linux Kernel For Kata-containers
-License:        GPLv2
-URL:            http://www.kernel.org/
-Source0:        kernel.tar.gz
-Source1:        kata_integration-v1.0.0.tar.gz
-
-BuildRoot:      %_topdir/BUILDROOT
-BuildRequires:  patch bash perl automake make gcc binutils hostname bc openssl-devel glibc-devel glibc-static
-BuildRequires:  ncurses-devel elfutils-devel elfutils-libelf-devel elfutils binutils-devel bison flex
-
-%description
-This kernel is customed as kata-containers guest kernel, which is core of the kata-containers.
-
-%prep
-%setup -q -c -a 0 -n kernel
-%setup -q -c -a 1 -n kata_integration
-
-# extract the kata_integration.tar.gz file
-cd %{_builddir}/kata_integration
-tar -xzf kata_integration-v1.0.0.tar.gz
-
-# build kernel
-cd %{_builddir}/kernel
-mv kernel linux-%{version}
-cd %{_builddir}/kernel/linux-%{version}
-
-%ifarch %{ix86} x86_64
-cp %{_builddir}/kata_integration/hack/config-kata-x86_64 ./.config
-%else
-cp %{_builddir}/kata_integration/hack/config-kata-arm64 ./.config
-%endif
-
-%build
-cd %{_builddir}/kernel/linux-%{version}
-make %{?_smp_mflags}
-
-%install
-mkdir -p -m 755  %{buildroot}/var/lib/kata
-%ifarch %{ix86} x86_64
-install -p -m 755 -D %{_builddir}/kernel/linux-%{version}/arch/x86_64/boot/bzImage %{buildroot}/var/lib/kata/kernel
-%else
-install -p -m 755 -D %{_builddir}/kernel/linux-%{version}/arch/arm64/boot/Image %{buildroot}/var/lib/kata/kernel
-%endif
-
-%clean
-
-%files
-/var/lib/kata/kernel
-
-%doc
-
-%changelog
-* Thu Aug 27 2020 jiangpengfei<jiangpengfei9@huawei.com> - 4.19.138-1
- Type:enhancement
- ID:NA
- SUG:restart
- DESC:init kata-micro-kernel package
--- a/patches/0001-kata-containers-disable-netmon-by-default.patch
+++ b/patches/0001-kata-containers-disable-netmon-by-default.patch
@ -0,0 +1,35 @@
+From 553338441418935cfe76db0c90a8fa58f12cfa37 Mon Sep 17 00:00:00 2001
+From: holyfei <yangfeiyu20102011@163.com>
+Date: Sun, 1 Nov 2020 21:03:25 +0800
+Subject: [PATCH] kata-containers: disable netmon by default
+
+reason: disable netmon by default, user can modify the
+enable_netmon config to enable netmon components.
+
+Signed-off-by: holyfei <yangfeiyu20102011@163.com>
+---
+ scripts/make_default_configuration.sh | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/scripts/make_default_configuration.sh b/scripts/make_default_configuration.sh
+index 1cd5d61..c998c46 100755
+--- a/scripts/make_default_configuration.sh
+++ b/scripts/make_default_configuration.sh
+@@ -27,13 +27,12 @@ sed -i 's/^#enable_blk_mount/enable_blk_mount/' $KATA_CONFIG_PATH
+ sed -i 's#/usr/libexec/kata-containers/kata-proxy#/usr/bin/kata-proxy#' $KATA_CONFIG_PATH
+ sed -i 's#/usr/libexec/kata-containers/kata-shim#/usr/bin/kata-shim#' $KATA_CONFIG_PATH
+ sed -i 's#/usr/libexec/kata-containers/kata-netmon#/usr/bin/kata-netmon#' $KATA_CONFIG_PATH
+-sed -i 's/^#enable_netmon/enable_netmon/' $KATA_CONFIG_PATH
+ sed -i 's/^#disable_new_netns/disable_new_netns/' $KATA_CONFIG_PATH
+ sed -i 's/^#disable_vhost_net/disable_vhost_net/' $KATA_CONFIG_PATH
+ sed -i 's/^#block_device_cache_set/block_device_cache_set/' $KATA_CONFIG_PATH
+ sed -i 's/^#block_device_cache_direct/block_device_cache_direct/' $KATA_CONFIG_PATH
+ sed -i 's#path = \"/usr/bin/qemu-.*\"#path = \"/usr/bin/qemu-kvm\"#' $KATA_CONFIG_PATH
+-sed -i 's/^internetworking_model.*$/internetworking_model=\"bridged\"/' $KATA_CONFIG_PATH
+sed -i 's/^internetworking_model.*$/internetworking_model = \"none\"/' $KATA_CONFIG_PATH
+ 
+ if [ "$ARCH" == "aarch64" ];then
+     sed -i 's/^machine_type.*$/machine_type = \"virt\"/' $KATA_CONFIG_PATH
+-- 
+2.11.0
+
--- a/patches/0002-kata_integration-modify-kernel-config-x86.patch
+++ 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 <yangfeiyu20102011@163.com>
+Date: Thu, 8 Apr 2021 22:27:49 +0800
+Subject: [PATCH] kata_integration: modify kernel config x86
+
+Signed-off-by: holyfei <yangfeiyu20102011@163.com>
+---
+ 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
+
--- a/patches/0003-open-containerd-kata-shimv2-build-flag.patch
+++ b/patches/0003-open-containerd-kata-shimv2-build-flag.patch
@ -0,0 +1,40 @@
+From 6459848ee40762c9f28cb3ff4afad5b3b4e8c8e0 Mon Sep 17 00:00:00 2001
+From: gaohuatao <gaohuatao@huawei.com>
+Date: Wed, 28 Apr 2021 16:39:36 +0800
+Subject: [PATCH] open containerd kata shimv2 build flag
+
+reason: open containerd kata shimv2 build flag
+
+Signed-off-by: gaohuatao <gaohuatao@huawei.com>
+---
+ Makefile | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index f22fc80..beb46b6 100644
+--- a/Makefile
+++ b/Makefile
+@@ -35,6 +35,7 @@ runtime: agent
+ 	sh ./scripts/make_default_configuration.sh $(RUNTIME_PATH)
+ 	cp -f $(RUNTIME_PATH)/kata-runtime $(BUILD_PATH)/
+ 	cp -f $(RUNTIME_PATH)/kata-netmon $(BUILD_PATH)/
+	cp -f $(RUNTIME_PATH)/containerd-shim-kata-v2 $(BUILD_PATH)/
+ 
+ proxy:
+ 	cd proxy; sh apply-patches
+@@ -69,6 +70,7 @@ install:
+ 	install -p -m 750 $(BUILD_PATH)/kata-runtime /usr/bin/
+ 	install -p -m 750 $(BUILD_PATH)/kata-proxy /usr/bin/
+ 	install -p -m 750 $(BUILD_PATH)/kata-shim /usr/bin/
+	install -p -m 750 $(BUILD_PATH)/containerd-shim-kata-v2 /usr/bin/
+ 	install -p -m 640 -D $(RUNTIME_PATH)/cli/config/configuration-qemu.toml usr/share/defaults/kata-containers/configuration.toml
+ 
+ clean:
+@@ -78,3 +80,4 @@ clean:
+ 	rm -f $(BUILD_PATH)/busybox
+ 	rm -f $(BUILD_PATH)/kata-runtime
+ 	rm -f $(BUILD_PATH)/kata-agent
+	rm -f $(BUILD_PATH)/containerd-shim-kata-v2
+-- 
+2.20.1
+
--- a/patches/0004-kata_integration-enable-x86-MICROCODE_AMD-and-CPU_SU.patch
+++ b/patches/0004-kata_integration-enable-x86-MICROCODE_AMD-and-CPU_SU.patch
@ -0,0 +1,38 @@
+From 0408f8fd716b882931e7d0d8d4c6edc60159b35e Mon Sep 17 00:00:00 2001
+From: Vanient <xiadanni1@huawei.com>
+Date: Mon, 16 Oct 2023 11:14:41 +0800
+Subject: [PATCH] kata_integration:enable x86 MICROCODE_AMD and CPU_SUP_AMD
+
+Signed-off-by: Vanient <xiadanni1@huawei.com>
+---
+ hack/config-kata-x86_64 | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/hack/config-kata-x86_64 b/hack/config-kata-x86_64
+index 9e10073..fd12d86 100644
+--- a/hack/config-kata-x86_64
+++ b/hack/config-kata-x86_64
+@@ -304,7 +304,7 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=64
+ CONFIG_X86_DEBUGCTLMSR=y
+ CONFIG_PROCESSOR_SELECT=y
+ CONFIG_CPU_SUP_INTEL=y
+-# CONFIG_CPU_SUP_AMD is not set
+CONFIG_CPU_SUP_AMD=y
+ # CONFIG_CPU_SUP_HYGON is not set
+ # CONFIG_CPU_SUP_CENTAUR is not set
+ # CONFIG_CPU_SUP_ZHAOXIN is not set
+@@ -335,7 +335,10 @@ CONFIG_X86_16BIT=y
+ CONFIG_X86_ESPFIX64=y
+ CONFIG_X86_VSYSCALL_EMULATION=y
+ # CONFIG_I8K is not set
+-# CONFIG_MICROCODE is not set
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+ CONFIG_X86_MSR=y
+ CONFIG_X86_CPUID=y
+ # CONFIG_X86_5LEVEL is not set
+-- 
+2.27.0
+
--- a/series.conf
+++ b/series.conf
@ -0,0 +1,4 @@
+0001-kata-containers-disable-netmon-by-default.patch
+0002-kata_integration-modify-kernel-config-x86.patch
+0003-open-containerd-kata-shimv2-build-flag.patch
+0004-kata_integration-enable-x86-MICROCODE_AMD-and-CPU_SU.patch
Author	SHA1	Message	Date
openeuler-ci-bot	a2327c1a94	!57 kata_integration:enable x86 MICROCODE_AMD and CPU_SUP_AMD From: @Vanient Reviewed-by: @flyflyflypeng, @duguhaotian Signed-off-by: @duguhaotian	2023-10-16 08:44:03 +00:00
Vanient	fa042a4a1d	kata_integration:enable x86 MICROCODE_AMD and CPU_SUP_AMD Signed-off-by: Vanient <xiadanni1@huawei.com>	2023-10-16 15:38:32 +08:00
openeuler-ci-bot	04b6dd8d3d	!43 kata_integration: adapt for shimv2 From: @holyfei Reviewed-by: @flyflyflypeng,@duguhaotian Signed-off-by: @duguhaotian	2021-11-27 09:51:30 +00:00
holyfei	246e2a2194	kata_integration: build shimv2 Signed-off-by: holyfei <yangfeiyu20092010@163.com>	2021-11-27 11:58:38 +08:00
openeuler-ci-bot	709b93881f	!34 update config-kata-x86_64 From: @jackey_1024 Reviewed-by: @flyflyflypeng,@caihaomin Signed-off-by: @caihaomin	2021-04-27 16:04:49 +08:00
jikui	8b0bbbb728	kata_integration: update config-kata-x86_64 Signed-off-by: jikui <jikui2@huawei.com>	2021-04-27 15:33:13 +08:00
openeuler-ci-bot	91dc310b36	!24 sync patch from 20.03-LTS branch to revert kata-containers package split From: @holyfei Reviewed-by: @flyflyflypeng Signed-off-by: @flyflyflypeng	2020-11-09 19:59:46 +08:00
holyfei	0a1d8621a8	kata-containers: sync patch from 20.03-LTS branch reason: sync patch from 20.03-LTS branch to keep all kata components built in kata-containers OBS project. Signed-off-by: holyfei <yangfeiyu20102011@163.com>	2020-11-09 17:27:43 +08:00
openeuler-ci-bot	ed67959a31	!19 kata-containers: directly copy kata binary files instead of building them From: @holyfei Reviewed-by: @flyflyflypeng Signed-off-by: @flyflyflypeng	2020-10-09 17:36:16 +08:00
holyfei	14d9fa8a83	kata-containers: directly copy kata binary files instead of building them reason: directly copy kata binary files instead of building them Signed-off-by: yangfeiyu <yangfeiyu2@huawei.com>	2020-10-09 16:28:29 +08:00