From 35bc9ac4fa3fa6e720e8f07e9e513c169db5ecd4 Mon Sep 17 00:00:00 2001 From: Jiajie Li Date: Tue, 28 Dec 2021 14:17:08 +0800 Subject: [PATCH] kernel_config/micro_vm: add CONFIG_HUGETLBFS option for aarch64 4.19 kernel Signed-off-by: Jiajie Li --- ...cro_vm-add-CONFIG_HUGETLBFS-option-f.patch | 385 ++++++++++++++++++ stratovirt.spec | 8 +- 2 files changed, 392 insertions(+), 1 deletion(-) create mode 100644 0011-kernel_config-micro_vm-add-CONFIG_HUGETLBFS-option-f.patch diff --git a/0011-kernel_config-micro_vm-add-CONFIG_HUGETLBFS-option-f.patch b/0011-kernel_config-micro_vm-add-CONFIG_HUGETLBFS-option-f.patch new file mode 100644 index 0000000..52148dc --- /dev/null +++ b/0011-kernel_config-micro_vm-add-CONFIG_HUGETLBFS-option-f.patch @@ -0,0 +1,385 @@ +From 1e8b280bba42ceba0e353c4dd3a85fe866973712 Mon Sep 17 00:00:00 2001 +From: Jiajie Li +Date: Tue, 28 Dec 2021 14:56:19 +0800 +Subject: [PATCH] kernel_config: add CONFIG_HUGETLBFS option for aarch64 4.19 + kernel + +--- + .../config_openeuler_4.19_aarch64 | 147 ++++++++++++++++-- + 1 file changed, 136 insertions(+), 11 deletions(-) + +diff --git a/docs/kernel_config/config_openeuler_4.19_aarch64 b/docs/kernel_config/config_openeuler_4.19_aarch64 +index 1ea2d36..51d1bb0 100644 +--- a/docs/kernel_config/config_openeuler_4.19_aarch64 ++++ b/docs/kernel_config/config_openeuler_4.19_aarch64 +@@ -1,17 +1,17 @@ + # + # Automatically generated file; DO NOT EDIT. +-# Linux/arm64 4.19.123 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 +-CONFIG_BUILDTIME_EXTABLE_SORT=y ++CONFIG_BUILDTIME_TABLE_SORT=y + CONFIG_THREAD_INFO_IN_TASK=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 +@@ -132,6 +133,7 @@ CONFIG_IPC_NS=y + CONFIG_USER_NS=y + CONFIG_PID_NS=y + CONFIG_NET_NS=y ++# CONFIG_SCHED_STEAL is not set + # CONFIG_CHECKPOINT_RESTORE is not set + CONFIG_SCHED_AUTOGROUP=y + # CONFIG_SYSFS_DEPRECATED is not set +@@ -148,9 +150,11 @@ 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 +@@ -169,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 +@@ -220,6 +225,7 @@ CONFIG_FIX_EARLYCON_MEM=y + CONFIG_PGTABLE_LEVELS=4 + CONFIG_ARCH_SUPPORTS_UPROBES=y + CONFIG_ARCH_PROC_KCORE_TEXT=y ++CONFIG_ARCH_HAS_CPU_RELAX=y + + # + # Platform selection +@@ -239,6 +245,7 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y + # CONFIG_ARCH_MEDIATEK is not set + # CONFIG_ARCH_MESON is not set + # CONFIG_ARCH_MVEBU is not set ++# CONFIG_ARCH_PHYTIUM is not set + # CONFIG_ARCH_QCOM is not set + # CONFIG_ARCH_REALTEK is not set + # CONFIG_ARCH_ROCKCHIP is not set +@@ -283,10 +290,10 @@ 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 +@@ -296,7 +303,10 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y + CONFIG_QCOM_QDF2400_ERRATUM_0065=y + CONFIG_SOCIONEXT_SYNQUACER_PREITS=y + CONFIG_HISILICON_ERRATUM_161600802=y ++CONFIG_HISILICON_ERRATUM_1980005=y + CONFIG_QCOM_FALKOR_ERRATUM_E1041=y ++CONFIG_HISILICON_ERRATUM_HIP08_RU_PREFETCH=y ++# CONFIG_HISILICON_HIP08_RU_PREFETCH_DEFAULT_OFF is not set + CONFIG_ARM64_4K_PAGES=y + # CONFIG_ARM64_16K_PAGES is not set + # CONFIG_ARM64_64K_PAGES is not set +@@ -310,6 +320,7 @@ 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 +@@ -338,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 + + # +@@ -357,6 +369,7 @@ CONFIG_ARM64_RAS_EXTN=y + CONFIG_ARM64_SVE=y + # CONFIG_ARM64_PSEUDO_NMI is not set + # CONFIG_RANDOMIZE_BASE is not set ++# CONFIG_ASCEND_FEATURES is not set + + # + # Boot options +@@ -366,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 +@@ -375,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 + # +@@ -455,11 +476,17 @@ CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y + CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y + CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y + CONFIG_HAVE_ARCH_HUGE_VMAP=y ++CONFIG_HAVE_ARCH_HUGE_VMALLOC=y + 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 +@@ -496,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 + + # +@@ -601,6 +629,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 + CONFIG_MEMORY_BALLOON=y + # CONFIG_COMPACTION is not set + CONFIG_PHYS_ADDR_T_64BIT=y ++CONFIG_MM_OWNER=y + # CONFIG_KSM is not set + CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 + CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +@@ -609,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 +@@ -619,6 +649,7 @@ CONFIG_GENERIC_EARLY_IOREMAP=y + # CONFIG_PERCPU_STATS is not set + # CONFIG_GUP_BENCHMARK is not set + CONFIG_ARCH_HAS_PTE_SPECIAL=y ++# CONFIG_PIN_MEMORY is not set + CONFIG_NET=y + CONFIG_NET_INGRESS=y + +@@ -628,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 +@@ -1364,6 +1396,7 @@ CONFIG_SERIAL_8250=y + CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y + # CONFIG_SERIAL_8250_FINTEK is not set + CONFIG_SERIAL_8250_CONSOLE=y ++CONFIG_SERIAL_8250_DMA=y + CONFIG_SERIAL_8250_NR_UARTS=1 + CONFIG_SERIAL_8250_RUNTIME_UARTS=1 + # CONFIG_SERIAL_8250_EXTENDED is not set +@@ -1508,8 +1541,94 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y + # CONFIG_ACCESSIBILITY is not set + # CONFIG_INFINIBAND is not set + CONFIG_EDAC_SUPPORT=y +-# CONFIG_RTC_CLASS is not set +-# CONFIG_DMADEVICES is not set ++CONFIG_RTC_LIB=y ++CONFIG_RTC_CLASS=y ++CONFIG_RTC_HCTOSYS=y ++CONFIG_RTC_HCTOSYS_DEVICE="rtc0" ++CONFIG_RTC_SYSTOHC=y ++CONFIG_RTC_SYSTOHC_DEVICE="rtc0" ++# CONFIG_RTC_DEBUG is not set ++CONFIG_RTC_NVMEM=y ++ ++# ++# RTC interfaces ++# ++CONFIG_RTC_INTF_SYSFS=y ++CONFIG_RTC_INTF_PROC=y ++CONFIG_RTC_INTF_DEV=y ++# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set ++# CONFIG_RTC_DRV_TEST is not set ++ ++# ++# I2C RTC drivers ++# ++ ++# ++# SPI RTC drivers ++# ++ ++# ++# SPI and I2C RTC drivers ++# ++ ++# ++# Platform RTC drivers ++# ++# CONFIG_RTC_DRV_DS1286 is not set ++# CONFIG_RTC_DRV_DS1511 is not set ++# CONFIG_RTC_DRV_DS1553 is not set ++# CONFIG_RTC_DRV_DS1685_FAMILY is not set ++# CONFIG_RTC_DRV_DS1742 is not set ++# CONFIG_RTC_DRV_DS2404 is not set ++# CONFIG_RTC_DRV_EFI is not set ++# CONFIG_RTC_DRV_STK17TA8 is not set ++# CONFIG_RTC_DRV_M48T86 is not set ++# CONFIG_RTC_DRV_M48T35 is not set ++# CONFIG_RTC_DRV_M48T59 is not set ++# CONFIG_RTC_DRV_MSM6242 is not set ++# CONFIG_RTC_DRV_BQ4802 is not set ++# CONFIG_RTC_DRV_RP5C01 is not set ++# CONFIG_RTC_DRV_V3020 is not set ++# CONFIG_RTC_DRV_ZYNQMP is not set ++ ++# ++# on-CPU RTC drivers ++# ++# CONFIG_RTC_DRV_PL030 is not set ++CONFIG_RTC_DRV_PL031=y ++# CONFIG_RTC_DRV_FTRTC010 is not set ++# CONFIG_RTC_DRV_SNVS is not set ++# CONFIG_RTC_DRV_R7301 is not set ++ ++# ++# HID Sensor RTC drivers ++# ++CONFIG_DMADEVICES=y ++# CONFIG_DMADEVICES_DEBUG is not set ++ ++# ++# DMA Devices ++# ++CONFIG_DMA_ENGINE=y ++CONFIG_DMA_OF=y ++# CONFIG_ALTERA_MSGDMA is not set ++# CONFIG_AMBA_PL08X is not set ++# CONFIG_DW_AXI_DMAC is not set ++# CONFIG_FSL_EDMA is not set ++# CONFIG_INTEL_IDMA64 is not set ++# CONFIG_MV_XOR_V2 is not set ++# CONFIG_PL330_DMA is not set ++# CONFIG_XILINX_DMA is not set ++# CONFIG_XILINX_ZYNQMP_DMA is not set ++# CONFIG_QCOM_HIDMA_MGMT is not set ++# CONFIG_QCOM_HIDMA is not set ++# CONFIG_DW_DMAC is not set ++ ++# ++# DMA Clients ++# ++# CONFIG_ASYNC_TX_DMA is not set ++# CONFIG_DMATEST is not set + + # + # DMABUF options +@@ -1598,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 +@@ -1645,7 +1763,7 @@ CONFIG_PARTITION_PERCPU=y + # CONFIG_ANDROID is not set + # CONFIG_LIBNVDIMM is not set + # CONFIG_DAX is not set +-# CONFIG_NVMEM is not set ++CONFIG_NVMEM=y + + # + # HW tracing support +@@ -1671,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 +@@ -1729,7 +1848,9 @@ CONFIG_SYSFS=y + CONFIG_TMPFS=y + CONFIG_TMPFS_POSIX_ACL=y + CONFIG_TMPFS_XATTR=y +-# CONFIG_HUGETLBFS is not set ++# CONFIG_TMPFS_INODE64 is not set ++CONFIG_HUGETLBFS=y ++CONFIG_HUGETLB_PAGE=y + CONFIG_MEMFD_CREATE=y + CONFIG_CONFIGFS_FS=y + # CONFIG_EFIVAR_FS is not set +@@ -1759,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 +@@ -1966,6 +2089,8 @@ CONFIG_OID_REGISTRY=y + CONFIG_UCS2_STRING=y + CONFIG_ARCH_HAS_SG_CHAIN=y + CONFIG_SBITMAP=y ++# CONFIG_ETMEM_SCAN is not set ++# CONFIG_ETMEM_SWAP is not set + # CONFIG_STRING_SELFTEST is not set + + # +-- +2.30.0 + + diff --git a/stratovirt.spec b/stratovirt.spec index 284d261..51ceeff 100644 --- a/stratovirt.spec +++ b/stratovirt.spec @@ -6,7 +6,7 @@ Name: stratovirt Version: 0.3.0 -Release: 4 +Release: 5 Summary: StratoVirt is an opensource VMM(Virtual Machine Manager) which aims to perform next generation virtualization. License: Mulan PSL v2 @@ -69,6 +69,12 @@ sed -i 's/rustflags = \[/rustflags = \["-Clink-arg=-lgcc", "-Clink-arg=-lfdt", / chmod 550 ${RPM_BUILD_ROOT}/usr/bin/stratovirt %changelog +* Tue Dec 28 2021 Jiajie Li - 0.3.0-5 +- Type:NA +- ID:NA +- SUG:NA +- DESC:change kernel config for aarch64 + * Wed Jun 16 2021 XuFei - 0.3.0-4 - Type:NA - ID:NA