diff --git a/script/config/microvm_image/kernel_config_4.19_aarch64 b/script/config/microvm_image/kernel_config_4.19_aarch64 old mode 100644 new mode 100755 index 0736417835c3be6db26598b9c8d9ba7d64e749e4..51d1bb04edf75cd7f03a12f4fea8f655034c8833 --- a/script/config/microvm_image/kernel_config_4.19_aarch64 +++ b/script/config/microvm_image/kernel_config_4.19_aarch64 @@ -1,13 +1,13 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.19.195 Kernel Configuration +# Linux/arm64 4.19.90 Kernel Configuration # # -# Compiler: gcc (GCC) 9.3.1 +# Compiler: gcc (GCC) 7.3.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=90301 +CONFIG_GCC_VERSION=70300 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y @@ -119,6 +119,7 @@ CONFIG_CFS_BANDWIDTH=y CONFIG_CGROUP_PIDS=y # CONFIG_CGROUP_RDMA is not set CONFIG_CGROUP_FREEZER=y +# CONFIG_CGROUP_HUGETLB is not set CONFIG_CPUSETS=y # CONFIG_PROC_PID_CPUSET is not set CONFIG_CGROUP_DEVICE=y @@ -145,14 +146,15 @@ CONFIG_RD_GZIP=y # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set # CONFIG_RD_LZ4 is not set -CONFIG_INITRAMFS_FILE_METADATA="" CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y +CONFIG_HAVE_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_BPF=y # CONFIG_EXPERT is not set +CONFIG_UID16=y CONFIG_MULTIUSER=y CONFIG_SYSFS_SYSCALL=y CONFIG_FHANDLE=y @@ -171,6 +173,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y +CONFIG_IO_URING=y CONFIG_ADVISE_SYSCALLS=y CONFIG_MEMBARRIER=y CONFIG_KALLSYMS=y @@ -282,16 +285,15 @@ CONFIG_HAVE_LIVEPATCH_WO_FTRACE=y # # ARM errata workarounds via the alternatives framework # -CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y CONFIG_ARM64_ERRATUM_826319=y CONFIG_ARM64_ERRATUM_827319=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_832075=y +CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_843419=y CONFIG_ARM64_ERRATUM_1024718=y CONFIG_ARM64_ERRATUM_1463225=y -CONFIG_ARM64_ERRATUM_1542419=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y # CONFIG_CAVIUM_ERRATUM_27456 is not set @@ -339,7 +341,6 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_SECCOMP=y CONFIG_PARAVIRT=y -# CONFIG_PARAVIRT_SPINLOCKS is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set # CONFIG_CRASH_DUMP is not set # CONFIG_XEN is not set @@ -348,6 +349,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDEN_EL2_VECTORS=y CONFIG_ARM64_SSBD=y +# CONFIG_ARMV8_DEPRECATED is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set # @@ -364,32 +366,6 @@ CONFIG_ARM64_VHE=y CONFIG_ARM64_UAO=y # CONFIG_ARM64_PMEM is not set CONFIG_ARM64_RAS_EXTN=y -CONFIG_ARM64_CNP=y - -# -# ARMv8.3 architectural features -# -CONFIG_ARM64_PTR_AUTH=y -CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y -CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y -CONFIG_AS_HAS_PAC=y -CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y - -# -# ARMv8.4 architectural features -# -CONFIG_AS_HAS_ARMV8_4=y -CONFIG_ARM64_TLB_RANGE=y - -# -# ARMv8.5 architectural features -# -CONFIG_ARCH_RANDOM=y - -# -# ARMv8.5 architectural features -# -CONFIG_ARM64_E0PD=y CONFIG_ARM64_SVE=y # CONFIG_ARM64_PSEUDO_NMI is not set # CONFIG_RANDOMIZE_BASE is not set @@ -403,7 +379,10 @@ CONFIG_CMDLINE="" CONFIG_EFI_STUB=y CONFIG_EFI=y # CONFIG_DMI is not set -# CONFIG_COMPAT is not set +CONFIG_COMPAT=y +CONFIG_AARCH32_EL0=y +# CONFIG_ARM64_ILP32 is not set +CONFIG_SYSVIPC_COMPAT=y # # Power management options @@ -412,6 +391,11 @@ CONFIG_EFI=y # CONFIG_PM is not set CONFIG_ARCH_SUSPEND_POSSIBLE=y +# +# TLB options +# +# CONFIG_ARM64_TLBI_IPI is not set + # # CPU Power Management # @@ -477,6 +461,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y @@ -496,13 +481,18 @@ CONFIG_MODULES_USE_ELF_RELA=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_ARCH_MMAP_RND_BITS=18 +CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y +CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_COMPAT_OLD_SIGACTION=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_HAVE_ARCH_VMAP_STACK=y # CONFIG_VMAP_STACK is not set CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y -CONFIG_HAVE_ARCH_COMPILER_H=y +CONFIG_REFCOUNT_FULL=y CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y # @@ -525,7 +515,6 @@ CONFIG_BLK_DEV_BSG=y # CONFIG_BLK_CMDLINE_PARSER is not set # CONFIG_BLK_WBT is not set # CONFIG_BLK_CGROUP_IOLATENCY is not set -# CONFIG_BLK_CGROUP_IOCOST is not set # CONFIG_BLK_SED_OPAL is not set # @@ -534,6 +523,7 @@ CONFIG_BLK_DEV_BSG=y # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y CONFIG_EFI_PARTITION=y +CONFIG_BLOCK_COMPAT=y CONFIG_BLK_MQ_VIRTIO=y # @@ -648,6 +638,7 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y # CONFIG_CLEANCACHE is not set # CONFIG_FRONTSWAP is not set # CONFIG_SHRINK_PAGECACHE is not set +CONFIG_MEMCG_QOS=y # CONFIG_CMA is not set # CONFIG_ZPOOL is not set # CONFIG_ZBUD is not set @@ -668,6 +659,7 @@ CONFIG_NET_INGRESS=y CONFIG_PACKET=y # CONFIG_PACKET_DIAG is not set CONFIG_UNIX=y +CONFIG_UNIX_SCM=y # CONFIG_UNIX_DIAG is not set # CONFIG_TLS is not set CONFIG_XFRM=y @@ -1725,7 +1717,6 @@ CONFIG_ARM_ARCH_TIMER=y # Xilinx SoC drivers # # CONFIG_XILINX_VCU is not set -CONFIG_SOC_HISILICON_LBC=y # CONFIG_PM_DEVFREQ is not set # CONFIG_EXTCON is not set # CONFIG_MEMORY is not set @@ -1763,7 +1754,6 @@ CONFIG_PARTITION_PERCPU=y # CONFIG_ARM_CCN is not set # CONFIG_ARM_PMU is not set # CONFIG_ARM_DSU_PMU is not set -# CONFIG_HISI_PMU is not set # CONFIG_ARM_SPE_PMU is not set # CONFIG_RAS is not set @@ -1799,6 +1789,7 @@ CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_ENCRYPTION is not set # CONFIG_EXT4_DEBUG is not set +# CONFIG_EXT4_PARALLEL_DIO_READ is not set CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y @@ -1858,7 +1849,8 @@ CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set -# CONFIG_HUGETLBFS is not set +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y CONFIG_MEMFD_CREATE=y CONFIG_CONFIGFS_FS=y # CONFIG_EFIVAR_FS is not set @@ -1888,11 +1880,13 @@ CONFIG_SUNRPC_GSS=y # CONFIG_AFS_FS is not set # CONFIG_NLS is not set # CONFIG_DLM is not set +CONFIG_IO_WQ=y # # Security options # CONFIG_KEYS=y +CONFIG_KEYS_COMPAT=y # CONFIG_PERSISTENT_KEYRINGS is not set # CONFIG_BIG_KEYS is not set # CONFIG_ENCRYPTED_KEYS is not set @@ -2038,7 +2032,6 @@ CONFIG_CRYPTO_DEFLATE=y # Certificates for signature checking # # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set -# CONFIG_PGP_PRELOAD_PUBLIC_KEYS is not set # # Library routines @@ -2146,10 +2139,6 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y # # Debug Lockups and Hangs # - -# -# ARM64 NMI watchdog configuration -# # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 CONFIG_PANIC_TIMEOUT=0 @@ -2178,7 +2167,6 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set -# CONFIG_ITRACE is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_RUNTIME_TESTING_MENU is not set # CONFIG_MEMTEST is not set diff --git a/script/config/microvm_image/kernel_config_5.10_aarch64 b/script/config/microvm_image/kernel_config_5.10_aarch64 index 48f99dac6694d158031cc56da5171f290f8c1f31..0660b940f35464edb0034cc1ad3a9e6528f82dbb 100644 --- a/script/config/microvm_image/kernel_config_5.10_aarch64 +++ b/script/config/microvm_image/kernel_config_5.10_aarch64 @@ -2,15 +2,16 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm64 5.10.0 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 7.3.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.1" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70300 -CONFIG_LD_VERSION=233010000 +CONFIG_GCC_VERSION=100301 +CONFIG_LD_VERSION=236010000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_INLINE=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -50,7 +51,6 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_GENERIC_IRQ_IPI=y CONFIG_GENERIC_MSI_IRQ=y CONFIG_GENERIC_MSI_IRQ_DOMAIN=y -CONFIG_IRQ_MSI_IOMMU=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y @@ -137,6 +137,7 @@ CONFIG_CFS_BANDWIDTH=y CONFIG_CGROUP_PIDS=y # CONFIG_CGROUP_RDMA is not set CONFIG_CGROUP_FREEZER=y +# CONFIG_CGROUP_HUGETLB is not set CONFIG_CPUSETS=y # CONFIG_PROC_PID_CPUSET is not set CONFIG_CGROUP_DEVICE=y @@ -276,7 +277,6 @@ CONFIG_ARCH_HAS_CPU_RELAX=y # CONFIG_ARCH_MESON is not set # CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_MXC is not set -# CONFIG_ARCH_PHYTIUM is not set # CONFIG_ARCH_QCOM is not set # CONFIG_ARCH_REALTEK is not set # CONFIG_ARCH_RENESAS is not set @@ -297,13 +297,6 @@ CONFIG_ARCH_HAS_CPU_RELAX=y # CONFIG_ARCH_ZYNQMP is not set # end of Platform selection -CONFIG_HAVE_LIVEPATCH_WO_FTRACE=y - -# -# Enable Livepatch -# -# end of Enable Livepatch - # # Kernel Features # @@ -339,8 +332,6 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_QDF2400_ERRATUM_0065=y CONFIG_QCOM_FALKOR_ERRATUM_E1041=y CONFIG_SOCIONEXT_SYNQUACER_PREITS=y -CONFIG_HISILICON_ERRATUM_HIP08_RU_PREFETCH=y -# CONFIG_HISILICON_HIP08_RU_PREFETCH_DEFAULT_OFF is not set # end of ARM errata workarounds via the alternatives framework # CONFIG_ARM64_4K_PAGES is not set @@ -359,8 +350,8 @@ CONFIG_SCHED_MC=y CONFIG_SCHED_SMT=y CONFIG_NR_CPUS=255 CONFIG_HOTPLUG_CPU=y -# CONFIG_ARM64_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_NUMA is not set +CONFIG_HOLES_IN_ZONE=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set @@ -411,8 +402,10 @@ CONFIG_ARM64_CNP=y # ARMv8.3 architectural features # CONFIG_ARM64_PTR_AUTH=y +CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y CONFIG_AS_HAS_PAC=y +CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y # end of ARMv8.3 architectural features # @@ -427,21 +420,17 @@ CONFIG_ARM64_TLB_RANGE=y # ARMv8.5 architectural features # # CONFIG_ARM64_BTI is not set +CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y CONFIG_ARM64_E0PD=y CONFIG_ARCH_RANDOM=y CONFIG_ARM64_AS_HAS_MTE=y # end of ARMv8.5 architectural features -# -# ARMv8.6 architectural features -# -CONFIG_ARM64_TWED=y -# end of ARMv8.6 architectural features - CONFIG_ARM64_SVE=y # CONFIG_ARM64_PSEUDO_NMI is not set CONFIG_RELOCATABLE=y # CONFIG_RANDOMIZE_BASE is not set +CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y # end of Kernel Features # @@ -554,14 +543,12 @@ CONFIG_HAVE_ARCH_SECCOMP=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP=y CONFIG_SECCOMP_FILTER=y -# CONFIG_SECCOMP_CACHE_DEBUG is not set CONFIG_HAVE_ARCH_STACKLEAK=y CONFIG_HAVE_STACKPROTECTOR=y # CONFIG_STACKPROTECTOR is not set CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_MOVE_PUD=y CONFIG_HAVE_MOVE_PMD=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARCH_HUGE_VMAP=y @@ -717,11 +704,11 @@ CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_HAVE_FAST_GUP=y -CONFIG_HOLES_IN_ZONE=y CONFIG_ARCH_KEEP_MEMBLOCK=y -CONFIG_MEMORY_ISOLATION=y -CONFIG_MEMORY_HOTPLUG=y +CONFIG_MEMORY_ISOLATION=y +CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTPLUG_SPARSE=y +# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MEMORY_BALLOON=y # CONFIG_COMPACTION is not set @@ -736,9 +723,6 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y # CONFIG_TRANSPARENT_HUGEPAGE is not set # CONFIG_CLEANCACHE is not set # CONFIG_FRONTSWAP is not set -CONFIG_MEMCG_QOS=y -# CONFIG_ETMEM_SCAN is not set -# CONFIG_ETMEM_SWAP is not set # CONFIG_CMA is not set # CONFIG_ZPOOL is not set # CONFIG_ZBUD is not set @@ -1295,6 +1279,7 @@ CONFIG_OF_IRQ=y CONFIG_OF_NET=y CONFIG_OF_RESERVED_MEM=y # CONFIG_OF_OVERLAY is not set +# CONFIG_OF_CONFIGFS is not set # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set @@ -1311,7 +1296,6 @@ CONFIG_VIRTIO_BLK=y # NVME Support # # CONFIG_NVME_FC is not set -# CONFIG_NVME_TCP is not set # CONFIG_NVME_TARGET is not set # end of NVME Support @@ -1340,7 +1324,6 @@ CONFIG_VIRTIO_BLK=y # Altera FPGA firmware download module (requires I2C) # # CONFIG_ECHO is not set -# CONFIG_UACCE is not set # end of Misc devices # @@ -1476,6 +1459,9 @@ CONFIG_INPUT=y # # Character devices # +# CONFIG_BRCM_CHAR_DRIVERS is not set +CONFIG_BCM2835_DEVGPIOMEM=y +# CONFIG_RPIVID_MEM is not set CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y @@ -1814,23 +1800,7 @@ CONFIG_ARM_ARCH_TIMER=y # end of Clock Source drivers # CONFIG_MAILBOX is not set -CONFIG_IOMMU_IOVA=y -CONFIG_IOMMU_API=y -CONFIG_IOMMU_SUPPORT=y - -# -# Generic IOMMU Pagetable Support -# -# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set -# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set -# end of Generic IOMMU Pagetable Support - -# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set -CONFIG_OF_IOMMU=y -CONFIG_IOMMU_DMA=y -# CONFIG_ARM_SMMU is not set -# CONFIG_ARM_SMMU_V3 is not set -# CONFIG_VIRTIO_IOMMU is not set +# CONFIG_IOMMU_SUPPORT is not set # # Remoteproc drivers @@ -1863,6 +1833,7 @@ CONFIG_IOMMU_DMA=y # # Broadcom SoC drivers # +# CONFIG_OPENEULER_RASPBERRYPI is not set # CONFIG_SOC_BRCMSTB is not set # end of Broadcom SoC drivers @@ -1954,6 +1925,7 @@ CONFIG_PARTITION_PERCPU=y # CONFIG_DAX is not set CONFIG_NVMEM=y # CONFIG_NVMEM_SYSFS is not set +# CONFIG_NVMEM_RMEM is not set # # HW tracing support @@ -2052,7 +2024,8 @@ CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set -# CONFIG_HUGETLBFS is not set +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y @@ -2153,7 +2126,6 @@ CONFIG_CRYPTO_ACOMP2=y # CONFIG_CRYPTO_RSA is not set # CONFIG_CRYPTO_DH is not set # CONFIG_CRYPTO_ECDH is not set -# CONFIG_CRYPTO_ECDSA is not set # CONFIG_CRYPTO_ECRDSA is not set # CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_CURVE25519 is not set @@ -2319,13 +2291,11 @@ CONFIG_GENERIC_ALLOCATOR=y CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_DMA=y -CONFIG_DMA_OPS=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_DMA_DECLARE_COHERENT=y CONFIG_ARCH_HAS_SETUP_DMA_OPS=y -CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y @@ -2351,6 +2321,8 @@ CONFIG_FONT_8x16=y CONFIG_FONT_AUTOSELECT=y CONFIG_ARCH_STACKWALK=y CONFIG_SBITMAP=y +# CONFIG_ETMEM_SCAN is not set +# CONFIG_ETMEM_SWAP is not set # CONFIG_STRING_SELFTEST is not set # end of Library routines @@ -2414,6 +2386,8 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y +# CONFIG_KASAN is not set # end of Memory Debugging # @@ -2463,6 +2437,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y diff --git a/script/setup_env.sh b/script/setup_env.sh index 1cd78ec59c854fcfb858fb37c2dabd2a5f28edee..33b64d77c8d29bd97b41506126c858fbbc39b490 100644 --- a/script/setup_env.sh +++ b/script/setup_env.sh @@ -42,7 +42,8 @@ export VM_IMAGE_NAME="${RELEASE_VERSION_DIR}-${ARCH}.qcow2" export RASPI_IMAGE_NAME="${RELEASE_VERSION_DIR}-raspi-${ARCH}.img" export MICROVM_IMAGE_NAME="${RELEASE_VERSION_DIR}-stratovirt-${ARCH}.img" export MICROVM_KERNEL_NAME="vmlinux.bin" -export STDANDARD_VM_KERNEL_NAME="std-vmlinux" +export STDANDARD_VM_KERNEL_NAME_X86="std-vmlinuz" +export STDANDARD_VM_KERNEL_NAME_AARCH64="std-vmlinux.bin" export PRODUCTS=${OS_NAME} diff --git a/script/step/make_microvm_image.sh b/script/step/make_microvm_image.sh index 27830517c284b24e80f8a1351db968ce6b06d352..877ede7f4206e48ffd009e8b3b8cfe5a9a027efd 100644 --- a/script/step/make_microvm_image.sh +++ b/script/step/make_microvm_image.sh @@ -50,7 +50,14 @@ prepare_kernel(){ fi kernel_file=${img_dir}/${MICROVM_KERNEL_NAME} - std_kernel_file=${img_dir}/${STDANDARD_VM_KERNEL_NAME} + if [ ${arch} == "x86_64" ]; then + std_kernel_file=${img_dir}/${STDANDARD_VM_KERNEL_NAME_X86} + elif [ ${arch} == "aarch64" ]; then + std_kernel_file=${img_dir}/${STDANDARD_VM_KERNEL_NAME_AARCH64} + else + LOG "${arch} is not supported yet." + return 0 + fi LOG "prepare vmlinux kernel begin..." yum clean all -c "${yum_conf}" @@ -166,12 +173,10 @@ make_standard_kernel(){ kernel_config="kernel_config_${kernel_main_version}_${arch}" cp ${standard_vm_dir}/${kernel_config} .config if [ ${arch} == "x86_64" ]; then - std_kernel_file=${std_kernel_file}z make ARCH=x86_64 make bzImage mv arch/x86/boot/bzImage ${std_kernel_file} elif [ ${arch} == "aarch64" ]; then - std_kernel_file=${std_kernel_file}.bin make ARCH=arm64 objcopy -O binary vmlinux ${std_kernel_file} else