Skip to content

Commit 67dad93

Browse files
author
Alexandre Ghiti
committed
dashboard/config/linux/bits: enable arch specific configs for riscv
kexec, memory hotplug/remove and THP features depend on architecture specific code, so let's exercise this for riscv.
1 parent a2aacda commit 67dad93

File tree

2 files changed

+40
-14
lines changed

2 files changed

+40
-14
lines changed

dashboard/config/linux/bits/subsystems.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ config:
5151
- PROFILING
5252
- PERF_EVENTS
5353
- SMP
54-
- KEXEC: [-riscv]
55-
- HIBERNATION: [-riscv, -s390]
56-
- HIBERNATION_SNAPSHOT_DEV: [v5.10, -riscv, -s390]
54+
- KEXEC
55+
- HIBERNATION: [-s390]
56+
- HIBERNATION_SNAPSHOT_DEV: [v5.10, -s390]
5757
- PM_DEBUG: [-s390]
5858
- ACPI_DOCK: [-arm, -riscv, -s390]
5959
- ACPI_NFIT: [x86_64]
@@ -97,15 +97,15 @@ config:
9797
- BFQ_CGROUP_DEBUG
9898
- BINFMT_MISC
9999
- BINFMT_SCRIPT
100-
- MEMORY_HOTPLUG: [-arm, -riscv]
100+
- MEMORY_HOTPLUG: [-arm]
101101
# Replaced in "mm: add build-time option for hotplug memory default online type".
102-
- MEMORY_HOTPLUG_DEFAULT_ONLINE: [-arm, -riscv, -linux-next]
103-
- MHP_DEFAULT_ONLINE_TYPE_ONLINE_AUTO: [-arm, -riscv, linux-next]
104-
- MEMORY_HOTREMOVE: [-arm, -riscv]
102+
- MEMORY_HOTPLUG_DEFAULT_ONLINE: [-arm, -linux-next]
103+
- MHP_DEFAULT_ONLINE_TYPE_ONLINE_AUTO: [-arm, linux-next]
104+
- MEMORY_HOTREMOVE: [-arm]
105105
- ANON_VMA_NAME: [v5.17]
106106
- KSM
107-
- TRANSPARENT_HUGEPAGE: [-arm, -riscv]
108-
- TRANSPARENT_HUGEPAGE_MADVISE: [-arm, -riscv]
107+
- TRANSPARENT_HUGEPAGE: [-arm]
108+
- TRANSPARENT_HUGEPAGE_MADVISE: [-arm]
109109
- FRONTSWAP: [-v6.6]
110110
- CMA
111111
- MEM_SOFT_DIRTY: [x86_64]

dashboard/config/linux/upstream-riscv64-kasan.config

+31-5
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,10 @@ CONFIG_TRACEPOINTS=y
300300
# Kexec and crash features
301301
#
302302
CONFIG_VMCORE_INFO=y
303-
# CONFIG_KEXEC is not set
303+
CONFIG_KEXEC_CORE=y
304+
CONFIG_KEXEC=y
304305
# CONFIG_KEXEC_FILE is not set
306+
# CONFIG_CRASH_DUMP is not set
305307
# end of Kexec and crash features
306308
# end of General setup
307309

@@ -436,6 +438,7 @@ CONFIG_SCHED_HRTICK=y
436438
# CONFIG_RISCV_SBI_V01 is not set
437439
# CONFIG_RISCV_BOOT_SPINWAIT is not set
438440
CONFIG_ARCH_SUPPORTS_KEXEC=y
441+
CONFIG_ARCH_SELECTS_KEXEC=y
439442
CONFIG_ARCH_SUPPORTS_KEXEC_FILE=y
440443
CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY=y
441444
CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
@@ -471,7 +474,13 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
471474
CONFIG_SUSPEND=y
472475
CONFIG_SUSPEND_FREEZER=y
473476
# CONFIG_SUSPEND_SKIP_SYNC is not set
474-
# CONFIG_HIBERNATION is not set
477+
CONFIG_HIBERNATE_CALLBACKS=y
478+
CONFIG_HIBERNATION=y
479+
CONFIG_HIBERNATION_SNAPSHOT_DEV=y
480+
# CONFIG_HIBERNATION_COMP_LZO is not set
481+
CONFIG_HIBERNATION_COMP_LZ4=y
482+
CONFIG_HIBERNATION_DEF_COMP="lz4"
483+
CONFIG_PM_STD_PARTITION=""
475484
CONFIG_PM_SLEEP=y
476485
CONFIG_PM_SLEEP_SMP=y
477486
# CONFIG_PM_AUTOSLEEP is not set
@@ -491,6 +500,7 @@ CONFIG_PM_GENERIC_DOMAINS_OF=y
491500
CONFIG_CPU_PM=y
492501
# CONFIG_ENERGY_MODEL is not set
493502
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
503+
CONFIG_ARCH_HIBERNATION_HEADER=y
494504
CONFIG_ARCH_SUSPEND_POSSIBLE=y
495505
# end of Power management options
496506

@@ -583,6 +593,7 @@ CONFIG_ACPI_THERMAL=y
583593
# CONFIG_ACPI_DEBUG is not set
584594
# CONFIG_ACPI_PCI_SLOT is not set
585595
# CONFIG_ACPI_CONTAINER is not set
596+
# CONFIG_ACPI_HOTPLUG_MEMORY is not set
586597
# CONFIG_ACPI_HED is not set
587598
CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
588599
CONFIG_ACPI_NHLT=y
@@ -653,6 +664,7 @@ CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
653664
CONFIG_HAVE_ARCH_HUGE_VMAP=y
654665
CONFIG_HAVE_ARCH_HUGE_VMALLOC=y
655666
CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
667+
CONFIG_ARCH_WANT_PMD_MKWRITE=y
656668
CONFIG_MODULES_USE_ELF_RELA=y
657669
CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
658670
CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
@@ -866,10 +878,15 @@ CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=y
866878
CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=y
867879
CONFIG_HAVE_GUP_FAST=y
868880
CONFIG_ARCH_KEEP_MEMBLOCK=y
881+
CONFIG_NUMA_KEEP_MEMINFO=y
869882
CONFIG_MEMORY_ISOLATION=y
870883
CONFIG_EXCLUSIVE_SYSTEM_RAM=y
871884
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
872-
# CONFIG_MEMORY_HOTPLUG is not set
885+
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
886+
CONFIG_MEMORY_HOTPLUG=y
887+
CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
888+
CONFIG_MEMORY_HOTREMOVE=y
889+
CONFIG_MHP_MEMMAP_ON_MEMORY=y
873890
CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
874891
CONFIG_SPLIT_PTE_PTLOCKS=y
875892
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
@@ -881,14 +898,20 @@ CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
881898
CONFIG_PAGE_REPORTING=y
882899
CONFIG_MIGRATION=y
883900
CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
901+
CONFIG_ARCH_ENABLE_THP_MIGRATION=y
884902
CONFIG_CONTIG_ALLOC=y
885903
CONFIG_PCP_BATCH_SCALE_MAX=5
886904
CONFIG_PHYS_ADDR_T_64BIT=y
887905
CONFIG_MMU_NOTIFIER=y
888906
CONFIG_KSM=y
889907
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
890908
CONFIG_ARCH_WANTS_THP_SWAP=y
891-
# CONFIG_TRANSPARENT_HUGEPAGE is not set
909+
CONFIG_TRANSPARENT_HUGEPAGE=y
910+
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
911+
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
912+
# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set
913+
CONFIG_THP_SWAP=y
914+
# CONFIG_READ_ONLY_THP_FOR_FS is not set
892915
CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
893916
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
894917
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
@@ -905,6 +928,7 @@ CONFIG_PAGE_IDLE_FLAG=y
905928
CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
906929
CONFIG_ARCH_HAS_PTE_DEVMAP=y
907930
CONFIG_ZONE_DMA32=y
931+
# CONFIG_ZONE_DEVICE is not set
908932
CONFIG_HMM_MIRROR=y
909933
CONFIG_VMAP_PFN=y
910934
CONFIG_VM_EVENT_COUNTERS=y
@@ -5970,6 +5994,7 @@ CONFIG_VIRTIO_PCI_LEGACY=y
59705994
CONFIG_VIRTIO_VDPA=y
59715995
# CONFIG_VIRTIO_PMEM is not set
59725996
CONFIG_VIRTIO_BALLOON=y
5997+
# CONFIG_VIRTIO_MEM is not set
59735998
CONFIG_VIRTIO_INPUT=y
59745999
CONFIG_VIRTIO_MMIO=y
59756000
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
@@ -7030,6 +7055,7 @@ CONFIG_OF_PMEM=y
70307055
CONFIG_NVDIMM_KEYS=y
70317056
# CONFIG_NVDIMM_SECURITY_TEST is not set
70327057
CONFIG_DAX=y
7058+
# CONFIG_DEV_DAX is not set
70337059
CONFIG_NVMEM=y
70347060
CONFIG_NVMEM_SYSFS=y
70357061
CONFIG_NVMEM_LAYOUTS=y
@@ -7551,7 +7577,7 @@ CONFIG_CRYPTO_CRC64_ROCKSOFT=y
75517577
# Compression
75527578
#
75537579
CONFIG_CRYPTO_DEFLATE=y
7554-
# CONFIG_CRYPTO_LZO is not set
7580+
CONFIG_CRYPTO_LZO=y
75557581
CONFIG_CRYPTO_842=y
75567582
CONFIG_CRYPTO_LZ4=y
75577583
CONFIG_CRYPTO_LZ4HC=y

0 commit comments

Comments
 (0)