Unverified Commit 86294596 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3111 openeuler_defconfig: enable some mm new 

Merge Pull Request from: @ci-robot 
 
PR sync from: Kefeng Wang <wangkefeng.wang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/STFUTRAU2AO333BESDQPRAECPSZ46FS7/ 
Enable some new mm feature for openEuler OLK-6.6.

Kefeng Wang (2):
  x86: openeuler_defconfig: update from new feature
  arm64: openeuler_defconfig: update for new feature


-- 
2.27.0
 
https://gitee.com/openeuler/kernel/issues/I8KWJK 
 
Link:https://gitee.com/openeuler/kernel/pulls/3111

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 0580e9e0 f997bbf6

arch/arm64/configs/openeuler_defconfig

+43 −9
Original line number Diff line number Diff line
@@ -611,6 +611,7 @@ CONFIG_ARCH_SUPPORTS_ACPI=y 
CONFIG_ACPI=y

CONFIG_ACPI_GENERIC_GSI=y

CONFIG_ACPI_CCA_REQUIRED=y

CONFIG_ACPI_TABLE_LIB=y

# CONFIG_ACPI_DEBUGGER is not set

CONFIG_ACPI_SPCR_TABLE=y

# CONFIG_ACPI_FPDT is not set
@@ -1046,6 +1047,7 @@ CONFIG_COMPACTION=y 
CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1

CONFIG_PAGE_REPORTING=y

CONFIG_MIGRATION=y

CONFIG_DEVICE_MIGRATION=y

CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y

CONFIG_ARCH_ENABLE_THP_MIGRATION=y

CONFIG_CONTIG_ALLOC=y
@@ -1061,7 +1063,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y 
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y

# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set

CONFIG_THP_SWAP=y

# CONFIG_READ_ONLY_THP_FOR_FS is not set

CONFIG_READ_ONLY_THP_FOR_FS=y

CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y

CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y

CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -1081,8 +1083,10 @@ CONFIG_ARCH_HAS_PTE_DEVMAP=y 
CONFIG_ARCH_HAS_ZONE_DMA_SET=y

CONFIG_ZONE_DMA=y

CONFIG_ZONE_DMA32=y

# CONFIG_ZONE_DEVICE is not set

CONFIG_ZONE_DEVICE=y

CONFIG_HMM_MIRROR=y

CONFIG_GET_FREE_REGION=y

CONFIG_DEVICE_PRIVATE=y

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_PERCPU_STATS is not set

# CONFIG_GUP_TEST is not set
@@ -1093,7 +1097,9 @@ CONFIG_SECRETMEM=y 
# CONFIG_ANON_VMA_NAME is not set

CONFIG_USERFAULTFD=y

CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y

# CONFIG_LRU_GEN is not set

CONFIG_LRU_GEN=y

# CONFIG_LRU_GEN_ENABLED is not set

# CONFIG_LRU_GEN_STATS is not set

CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y

CONFIG_PER_VMA_LOCK=y

CONFIG_LOCK_MM_AND_FIND_VMA=y
@@ -1101,7 +1107,13 @@ CONFIG_LOCK_MM_AND_FIND_VMA=y 
#

# Data Access Monitoring

#

# CONFIG_DAMON is not set

CONFIG_DAMON=y

CONFIG_DAMON_VADDR=y

CONFIG_DAMON_PADDR=y

CONFIG_DAMON_SYSFS=y

# CONFIG_DAMON_DBGFS is not set

CONFIG_DAMON_RECLAIM=y

CONFIG_DAMON_LRU_SORT=y

# end of Data Access Monitoring

# end of Memory Management options
@@ -1869,10 +1881,12 @@ CONFIG_PCI_QUIRKS=y 
CONFIG_PCI_STUB=y

# CONFIG_PCI_PF_STUB is not set

CONFIG_PCI_ATS=y

CONFIG_PCI_DOE=y

CONFIG_PCI_ECAM=y

CONFIG_PCI_IOV=y

CONFIG_PCI_PRI=y

CONFIG_PCI_PASID=y

CONFIG_PCI_P2PDMA=y

CONFIG_PCI_LABEL=y

# CONFIG_PCI_DYNAMIC_OF_NODES is not set

# CONFIG_PCIE_BUS_TUNE_OFF is not set
@@ -1942,7 +1956,17 @@ CONFIG_PCI_HISI=y 
# CONFIG_PCI_SW_SWITCHTEC is not set

# end of PCI switch controller drivers



# CONFIG_CXL_BUS is not set

CONFIG_CXL_BUS=m

CONFIG_CXL_PCI=m

# CONFIG_CXL_MEM_RAW_COMMANDS is not set

CONFIG_CXL_ACPI=m

CONFIG_CXL_PMEM=m

CONFIG_CXL_MEM=m

CONFIG_CXL_PORT=m

CONFIG_CXL_SUSPEND=y

CONFIG_CXL_REGION=y

# CONFIG_CXL_REGION_INVALIDATION_TEST is not set

CONFIG_CXL_PMU=m

# CONFIG_PCCARD is not set

# CONFIG_RAPIDIO is not set
@@ -1962,11 +1986,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
#

CONFIG_FW_LOADER=y

CONFIG_FW_LOADER_DEBUG=y

CONFIG_FW_LOADER_PAGED_BUF=y

CONFIG_FW_LOADER_SYSFS=y

CONFIG_EXTRA_FIRMWARE=""

# CONFIG_FW_LOADER_USER_HELPER is not set

# CONFIG_FW_LOADER_COMPRESS is not set

CONFIG_FW_CACHE=y

# CONFIG_FW_UPLOAD is not set

CONFIG_FW_UPLOAD=y

# end of Firmware loader



CONFIG_WANT_DEV_COREDUMP=y
@@ -2238,9 +2264,9 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y 
# CONFIG_ZRAM_DEF_COMP_LZO is not set

# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set

CONFIG_ZRAM_DEF_COMP="lzo-rle"

# CONFIG_ZRAM_WRITEBACK is not set

CONFIG_ZRAM_WRITEBACK=y

# CONFIG_ZRAM_MEMORY_TRACKING is not set

# CONFIG_ZRAM_MULTI_COMP is not set

CONFIG_ZRAM_MULTI_COMP=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_LOOP_MIN_COUNT=0

CONFIG_BLK_DEV_DRBD=m
@@ -6663,12 +6689,17 @@ CONFIG_BLK_DEV_PMEM=m 
CONFIG_ND_CLAIM=y

CONFIG_ND_BTT=m

CONFIG_BTT=y

CONFIG_ND_PFN=m

CONFIG_NVDIMM_PFN=y

CONFIG_NVDIMM_DAX=y

CONFIG_OF_PMEM=m

CONFIG_NVDIMM_KEYS=y

# CONFIG_NVDIMM_SECURITY_TEST is not set

CONFIG_DAX=y

CONFIG_DEV_DAX=m

CONFIG_DEV_DAX_PMEM=m

CONFIG_DEV_DAX_HMEM=m

CONFIG_DEV_DAX_CXL=m

CONFIG_DEV_DAX_HMEM_DEVICES=y

CONFIG_DEV_DAX_KMEM=m

CONFIG_NVMEM=y
@@ -6755,6 +6786,8 @@ CONFIG_BTRFS_FS_POSIX_ACL=y 
# CONFIG_NILFS2_FS is not set

# CONFIG_F2FS_FS is not set

# CONFIG_ZONEFS_FS is not set

CONFIG_FS_DAX=y

CONFIG_FS_DAX_PMD=y

CONFIG_FS_POSIX_ACL=y

CONFIG_EXPORTFS=y

CONFIG_EXPORTFS_BLOCK_OPS=y
@@ -6777,6 +6810,7 @@ CONFIG_AUTOFS_FS=y 
CONFIG_FUSE_FS=m

CONFIG_CUSE=m

CONFIG_VIRTIO_FS=m

CONFIG_FUSE_DAX=y

CONFIG_OVERLAY_FS=m

# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set

CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
@@ -7561,7 +7595,7 @@ CONFIG_DMA_CMA=y 
#

# Default contiguous memory area size:

#

CONFIG_CMA_SIZE_MBYTES=64

CONFIG_CMA_SIZE_MBYTES=0

CONFIG_CMA_SIZE_SEL_MBYTES=y

# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set

# CONFIG_CMA_SIZE_SEL_MIN is not set

arch/x86/configs/openeuler_defconfig

+29 −6
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ CONFIG_ACPI=y 
CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y

CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y

CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y

CONFIG_ACPI_TABLE_LIB=y

CONFIG_ACPI_DEBUGGER=y

CONFIG_ACPI_DEBUGGER_USER=m

CONFIG_ACPI_SPCR_TABLE=y
@@ -1087,7 +1088,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y 
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y

# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set

CONFIG_THP_SWAP=y

# CONFIG_READ_ONLY_THP_FOR_FS is not set

CONFIG_READ_ONLY_THP_FOR_FS=y

CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y

CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y

CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -1123,7 +1124,9 @@ CONFIG_USERFAULTFD=y 
CONFIG_HAVE_ARCH_USERFAULTFD_WP=y

CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y

CONFIG_PTE_MARKER_UFFD_WP=y

# CONFIG_LRU_GEN is not set

CONFIG_LRU_GEN=y

# CONFIG_LRU_GEN_ENABLED is not set

# CONFIG_LRU_GEN_STATS is not set

CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y

CONFIG_PER_VMA_LOCK=y

CONFIG_LOCK_MM_AND_FIND_VMA=y
@@ -1131,7 +1134,13 @@ CONFIG_LOCK_MM_AND_FIND_VMA=y 
#

# Data Access Monitoring

#

# CONFIG_DAMON is not set

CONFIG_DAMON=y

CONFIG_DAMON_VADDR=y

CONFIG_DAMON_PADDR=y

CONFIG_DAMON_SYSFS=y

# CONFIG_DAMON_DBGFS is not set

CONFIG_DAMON_RECLAIM=y

CONFIG_DAMON_LRU_SORT=y

# end of Data Access Monitoring

# end of Memory Management options
@@ -1944,6 +1953,7 @@ CONFIG_PCI_QUIRKS=y 
CONFIG_PCI_STUB=y

CONFIG_PCI_PF_STUB=m

CONFIG_PCI_ATS=y

CONFIG_PCI_DOE=y

CONFIG_PCI_LOCKLESS_CONFIG=y

CONFIG_PCI_IOV=y

CONFIG_PCI_PRI=y
@@ -1995,7 +2005,17 @@ CONFIG_PCI_HYPERV_INTERFACE=m 
# CONFIG_PCI_SW_SWITCHTEC is not set

# end of PCI switch controller drivers



# CONFIG_CXL_BUS is not set

CONFIG_CXL_BUS=m

CONFIG_CXL_PCI=m

# CONFIG_CXL_MEM_RAW_COMMANDS is not set

CONFIG_CXL_ACPI=m

CONFIG_CXL_PMEM=m

CONFIG_CXL_MEM=m

CONFIG_CXL_PORT=m

CONFIG_CXL_SUSPEND=y

CONFIG_CXL_REGION=y

# CONFIG_CXL_REGION_INVALIDATION_TEST is not set

CONFIG_CXL_PMU=m

CONFIG_PCCARD=y

# CONFIG_PCMCIA is not set

CONFIG_CARDBUS=y
@@ -2027,11 +2047,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
#

CONFIG_FW_LOADER=y

CONFIG_FW_LOADER_DEBUG=y

CONFIG_FW_LOADER_PAGED_BUF=y

CONFIG_FW_LOADER_SYSFS=y

CONFIG_EXTRA_FIRMWARE=""

# CONFIG_FW_LOADER_USER_HELPER is not set

# CONFIG_FW_LOADER_COMPRESS is not set

CONFIG_FW_CACHE=y

# CONFIG_FW_UPLOAD is not set

CONFIG_FW_UPLOAD=y

# end of Firmware loader



CONFIG_WANT_DEV_COREDUMP=y
@@ -2260,7 +2282,7 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y 
CONFIG_ZRAM_DEF_COMP="lzo-rle"

CONFIG_ZRAM_WRITEBACK=y

# CONFIG_ZRAM_MEMORY_TRACKING is not set

# CONFIG_ZRAM_MULTI_COMP is not set

CONFIG_ZRAM_MULTI_COMP=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_LOOP_MIN_COUNT=0

# CONFIG_BLK_DEV_DRBD is not set
@@ -7893,6 +7915,7 @@ CONFIG_DAX=y 
CONFIG_DEV_DAX=m

CONFIG_DEV_DAX_PMEM=m

CONFIG_DEV_DAX_HMEM=m

CONFIG_DEV_DAX_CXL=m

CONFIG_DEV_DAX_HMEM_DEVICES=y

CONFIG_DEV_DAX_KMEM=m

CONFIG_NVMEM=y