Skip to content

Commit c636fa7

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 9212019 commit c636fa7

File tree

2 files changed

+42
-13
lines changed

2 files changed

+42
-13
lines changed

dashboard/config/linux/bits/subsystems.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ config:
5050
- PROFILING
5151
- PERF_EVENTS
5252
- SMP
53-
- KEXEC: [-riscv]
54-
- HIBERNATION: [-riscv, -s390]
55-
- HIBERNATION_SNAPSHOT_DEV: [v5.10, -riscv, -s390]
53+
- KEXEC
54+
- HIBERNATION: [-s390]
55+
- HIBERNATION_SNAPSHOT_DEV: [v5.10, -s390]
5656
- PM_DEBUG: [-s390]
5757
- ACPI_DOCK: [-arm, -riscv, -s390]
5858
- ACPI_NFIT: [x86_64]
@@ -96,13 +96,13 @@ config:
9696
- BFQ_CGROUP_DEBUG
9797
- BINFMT_MISC
9898
- BINFMT_SCRIPT
99-
- MEMORY_HOTPLUG: [-arm, -riscv]
100-
- MEMORY_HOTPLUG_DEFAULT_ONLINE: [-arm, -riscv]
101-
- MEMORY_HOTREMOVE: [-arm, -riscv]
99+
- MEMORY_HOTPLUG: [-arm]
100+
- MEMORY_HOTPLUG_DEFAULT_ONLINE: [-arm]
101+
- MEMORY_HOTREMOVE: [-arm]
102102
- ANON_VMA_NAME: [v5.17]
103103
- KSM
104-
- TRANSPARENT_HUGEPAGE: [-arm, -riscv]
105-
- TRANSPARENT_HUGEPAGE_MADVISE: [-arm, -riscv]
104+
- TRANSPARENT_HUGEPAGE: [-arm]
105+
- TRANSPARENT_HUGEPAGE_MADVISE: [-arm]
106106
- FRONTSWAP: [-v6.6]
107107
- CMA
108108
- MEM_SOFT_DIRTY: [x86_64]

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

+34-5
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,10 @@ CONFIG_TRACEPOINTS=y
290290
# Kexec and crash features
291291
#
292292
CONFIG_VMCORE_INFO=y
293-
# CONFIG_KEXEC is not set
293+
CONFIG_KEXEC_CORE=y
294+
CONFIG_KEXEC=y
294295
# CONFIG_KEXEC_FILE is not set
296+
# CONFIG_CRASH_DUMP is not set
295297
# end of Kexec and crash features
296298
# end of General setup
297299

@@ -418,6 +420,7 @@ CONFIG_SCHED_HRTICK=y
418420
# CONFIG_RISCV_SBI_V01 is not set
419421
# CONFIG_RISCV_BOOT_SPINWAIT is not set
420422
CONFIG_ARCH_SUPPORTS_KEXEC=y
423+
CONFIG_ARCH_SELECTS_KEXEC=y
421424
CONFIG_ARCH_SUPPORTS_KEXEC_FILE=y
422425
CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY=y
423426
CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
@@ -452,7 +455,13 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
452455
CONFIG_SUSPEND=y
453456
CONFIG_SUSPEND_FREEZER=y
454457
# CONFIG_SUSPEND_SKIP_SYNC is not set
455-
# CONFIG_HIBERNATION is not set
458+
CONFIG_HIBERNATE_CALLBACKS=y
459+
CONFIG_HIBERNATION=y
460+
CONFIG_HIBERNATION_SNAPSHOT_DEV=y
461+
# CONFIG_HIBERNATION_COMP_LZO is not set
462+
CONFIG_HIBERNATION_COMP_LZ4=y
463+
CONFIG_HIBERNATION_DEF_COMP="lz4"
464+
CONFIG_PM_STD_PARTITION=""
456465
CONFIG_PM_SLEEP=y
457466
CONFIG_PM_SLEEP_SMP=y
458467
# CONFIG_PM_AUTOSLEEP is not set
@@ -472,6 +481,7 @@ CONFIG_PM_GENERIC_DOMAINS_OF=y
472481
CONFIG_CPU_PM=y
473482
# CONFIG_ENERGY_MODEL is not set
474483
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
484+
CONFIG_ARCH_HIBERNATION_HEADER=y
475485
CONFIG_ARCH_SUSPEND_POSSIBLE=y
476486
# end of Power management options
477487

@@ -561,6 +571,7 @@ CONFIG_ACPI_THERMAL=y
561571
# CONFIG_ACPI_DEBUG is not set
562572
# CONFIG_ACPI_PCI_SLOT is not set
563573
# CONFIG_ACPI_CONTAINER is not set
574+
# CONFIG_ACPI_HOTPLUG_MEMORY is not set
564575
# CONFIG_ACPI_HED is not set
565576
CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
566577
CONFIG_ACPI_NHLT=y
@@ -630,6 +641,7 @@ CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
630641
CONFIG_HAVE_ARCH_HUGE_VMAP=y
631642
CONFIG_HAVE_ARCH_HUGE_VMALLOC=y
632643
CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
644+
CONFIG_ARCH_WANT_PMD_MKWRITE=y
633645
CONFIG_MODULES_USE_ELF_RELA=y
634646
CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
635647
CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
@@ -842,10 +854,15 @@ CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=y
842854
CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=y
843855
CONFIG_HAVE_GUP_FAST=y
844856
CONFIG_ARCH_KEEP_MEMBLOCK=y
857+
CONFIG_NUMA_KEEP_MEMINFO=y
845858
CONFIG_MEMORY_ISOLATION=y
846859
CONFIG_EXCLUSIVE_SYSTEM_RAM=y
847860
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
848-
# CONFIG_MEMORY_HOTPLUG is not set
861+
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
862+
CONFIG_MEMORY_HOTPLUG=y
863+
CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
864+
CONFIG_MEMORY_HOTREMOVE=y
865+
CONFIG_MHP_MEMMAP_ON_MEMORY=y
849866
CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
850867
CONFIG_SPLIT_PTLOCK_CPUS=4
851868
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
@@ -856,14 +873,20 @@ CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
856873
CONFIG_PAGE_REPORTING=y
857874
CONFIG_MIGRATION=y
858875
CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
876+
CONFIG_ARCH_ENABLE_THP_MIGRATION=y
859877
CONFIG_CONTIG_ALLOC=y
860878
CONFIG_PCP_BATCH_SCALE_MAX=5
861879
CONFIG_PHYS_ADDR_T_64BIT=y
862880
CONFIG_MMU_NOTIFIER=y
863881
CONFIG_KSM=y
864882
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
865883
CONFIG_ARCH_WANTS_THP_SWAP=y
866-
# CONFIG_TRANSPARENT_HUGEPAGE is not set
884+
CONFIG_TRANSPARENT_HUGEPAGE=y
885+
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
886+
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
887+
# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set
888+
CONFIG_THP_SWAP=y
889+
# CONFIG_READ_ONLY_THP_FOR_FS is not set
867890
CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
868891
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
869892
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
@@ -880,6 +903,7 @@ CONFIG_PAGE_IDLE_FLAG=y
880903
CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
881904
CONFIG_ARCH_HAS_PTE_DEVMAP=y
882905
CONFIG_ZONE_DMA32=y
906+
# CONFIG_ZONE_DEVICE is not set
883907
CONFIG_HMM_MIRROR=y
884908
CONFIG_VM_EVENT_COUNTERS=y
885909
CONFIG_PERCPU_STATS=y
@@ -1995,7 +2019,9 @@ CONFIG_BLK_DEV_NULL_BLK_FAULT_INJECTION=y
19952019
CONFIG_CDROM=y
19962020
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
19972021
CONFIG_ZRAM=y
2022+
# CONFIG_ZRAM_DEF_COMP_LZORLE is not set
19982023
# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
2024+
# CONFIG_ZRAM_DEF_COMP_LZO is not set
19992025
# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
20002026
CONFIG_ZRAM_DEF_COMP_842=y
20012027
CONFIG_ZRAM_DEF_COMP="842"
@@ -5885,6 +5911,7 @@ CONFIG_VIRTIO_PCI_LEGACY=y
58855911
CONFIG_VIRTIO_VDPA=y
58865912
# CONFIG_VIRTIO_PMEM is not set
58875913
CONFIG_VIRTIO_BALLOON=y
5914+
# CONFIG_VIRTIO_MEM is not set
58885915
CONFIG_VIRTIO_INPUT=y
58895916
CONFIG_VIRTIO_MMIO=y
58905917
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
@@ -6918,6 +6945,7 @@ CONFIG_OF_PMEM=y
69186945
CONFIG_NVDIMM_KEYS=y
69196946
# CONFIG_NVDIMM_SECURITY_TEST is not set
69206947
CONFIG_DAX=y
6948+
# CONFIG_DEV_DAX is not set
69216949
CONFIG_NVMEM=y
69226950
CONFIG_NVMEM_SYSFS=y
69236951
CONFIG_NVMEM_LAYOUTS=y
@@ -7434,7 +7462,7 @@ CONFIG_CRYPTO_CRC64_ROCKSOFT=y
74347462
# Compression
74357463
#
74367464
CONFIG_CRYPTO_DEFLATE=y
7437-
# CONFIG_CRYPTO_LZO is not set
7465+
CONFIG_CRYPTO_LZO=y
74387466
CONFIG_CRYPTO_842=y
74397467
CONFIG_CRYPTO_LZ4=y
74407468
CONFIG_CRYPTO_LZ4HC=y
@@ -7582,6 +7610,7 @@ CONFIG_842_COMPRESS=y
75827610
CONFIG_842_DECOMPRESS=y
75837611
CONFIG_ZLIB_INFLATE=y
75847612
CONFIG_ZLIB_DEFLATE=y
7613+
CONFIG_LZO_COMPRESS=y
75857614
CONFIG_LZO_DECOMPRESS=y
75867615
CONFIG_LZ4_COMPRESS=y
75877616
CONFIG_LZ4HC_COMPRESS=y

0 commit comments

Comments
 (0)