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.

2 files changed, 40 insertions, 14 deletions

diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index 3344f78a5..c1964fa20 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -51,9 +51,9 @@ config:
  - PROFILING
  - PERF_EVENTS
  - SMP
- - KEXEC: [-riscv]
- - HIBERNATION: [-riscv, -s390]
- - HIBERNATION_SNAPSHOT_DEV: [v5.10, -riscv, -s390]
+ - KEXEC
+ - HIBERNATION: [-s390]
+ - HIBERNATION_SNAPSHOT_DEV: [v5.10, -s390]
  - PM_DEBUG: [-s390]
  - ACPI_DOCK: [-arm, -riscv, -s390]
  - ACPI_NFIT: [x86_64]
@@ -97,15 +97,15 @@ config:
  - BFQ_CGROUP_DEBUG
  - BINFMT_MISC
  - BINFMT_SCRIPT
- - MEMORY_HOTPLUG: [-arm, -riscv]
+ - MEMORY_HOTPLUG: [-arm]
  # Replaced in "mm: add build-time option for hotplug memory default online type".
- - MEMORY_HOTPLUG_DEFAULT_ONLINE: [-arm, -riscv, -linux-next]
- - MHP_DEFAULT_ONLINE_TYPE_ONLINE_AUTO: [-arm, -riscv, linux-next]
- - MEMORY_HOTREMOVE: [-arm, -riscv]
+ - MEMORY_HOTPLUG_DEFAULT_ONLINE: [-arm, -linux-next]
+ - MHP_DEFAULT_ONLINE_TYPE_ONLINE_AUTO: [-arm, linux-next]
+ - MEMORY_HOTREMOVE: [-arm]
  - ANON_VMA_NAME: [v5.17]
  - KSM
- - TRANSPARENT_HUGEPAGE: [-arm, -riscv]
- - TRANSPARENT_HUGEPAGE_MADVISE: [-arm, -riscv]
+ - TRANSPARENT_HUGEPAGE: [-arm]
+ - TRANSPARENT_HUGEPAGE_MADVISE: [-arm]
  - FRONTSWAP: [-v6.6]
  - CMA
  - MEM_SOFT_DIRTY: [x86_64]
diff --git a/dashboard/config/linux/upstream-riscv64-kasan.config b/dashboard/config/linux/upstream-riscv64-kasan.config
index 046ce4862..55e30169d 100644
--- a/dashboard/config/linux/upstream-riscv64-kasan.config
+++ b/dashboard/config/linux/upstream-riscv64-kasan.config
@@ -300,8 +300,10 @@ CONFIG_TRACEPOINTS=y
 # Kexec and crash features
 #
 CONFIG_VMCORE_INFO=y
-# CONFIG_KEXEC is not set
+CONFIG_KEXEC_CORE=y
+CONFIG_KEXEC=y
 # CONFIG_KEXEC_FILE is not set
+# CONFIG_CRASH_DUMP is not set
 # end of Kexec and crash features
 # end of General setup
 
@@ -436,6 +438,7 @@ CONFIG_SCHED_HRTICK=y
 # CONFIG_RISCV_SBI_V01 is not set
 # CONFIG_RISCV_BOOT_SPINWAIT is not set
 CONFIG_ARCH_SUPPORTS_KEXEC=y
+CONFIG_ARCH_SELECTS_KEXEC=y
 CONFIG_ARCH_SUPPORTS_KEXEC_FILE=y
 CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY=y
 CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
@@ -471,7 +474,13 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_SUSPEND_SKIP_SYNC is not set
-# CONFIG_HIBERNATION is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+# CONFIG_HIBERNATION_COMP_LZO is not set
+CONFIG_HIBERNATION_COMP_LZ4=y
+CONFIG_HIBERNATION_DEF_COMP="lz4"
+CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_AUTOSLEEP is not set
@@ -491,6 +500,7 @@ CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_CPU_PM=y
 # CONFIG_ENERGY_MODEL is not set
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_HIBERNATION_HEADER=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # end of Power management options
 
@@ -583,6 +593,7 @@ CONFIG_ACPI_THERMAL=y
 # CONFIG_ACPI_DEBUG is not set
 # CONFIG_ACPI_PCI_SLOT is not set
 # CONFIG_ACPI_CONTAINER is not set
+# CONFIG_ACPI_HOTPLUG_MEMORY is not set
 # CONFIG_ACPI_HED is not set
 CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
 CONFIG_ACPI_NHLT=y
@@ -653,6 +664,7 @@ CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_HUGE_VMALLOC=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_PMD_MKWRITE=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
 CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
@@ -866,10 +878,15 @@ CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=y
 CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=y
 CONFIG_HAVE_GUP_FAST=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_NUMA_KEEP_MEMINFO=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_MHP_MEMMAP_ON_MEMORY=y
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
 CONFIG_SPLIT_PTE_PTLOCKS=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
@@ -881,6 +898,7 @@ CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
 CONFIG_PAGE_REPORTING=y
 CONFIG_MIGRATION=y
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
 CONFIG_PCP_BATCH_SCALE_MAX=5
 CONFIG_PHYS_ADDR_T_64BIT=y
@@ -888,7 +906,12 @@ CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_WANTS_THP_SWAP=y
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set
+CONFIG_THP_SWAP=y
+# CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
@@ -905,6 +928,7 @@ CONFIG_PAGE_IDLE_FLAG=y
 CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DMA32=y
+# CONFIG_ZONE_DEVICE is not set
 CONFIG_HMM_MIRROR=y
 CONFIG_VMAP_PFN=y
 CONFIG_VM_EVENT_COUNTERS=y
@@ -5970,6 +5994,7 @@ CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VIRTIO_VDPA=y
 # CONFIG_VIRTIO_PMEM is not set
 CONFIG_VIRTIO_BALLOON=y
+# CONFIG_VIRTIO_MEM is not set
 CONFIG_VIRTIO_INPUT=y
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
@@ -7030,6 +7055,7 @@ CONFIG_OF_PMEM=y
 CONFIG_NVDIMM_KEYS=y
 # CONFIG_NVDIMM_SECURITY_TEST is not set
 CONFIG_DAX=y
+# CONFIG_DEV_DAX is not set
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM_LAYOUTS=y
@@ -7551,7 +7577,7 @@ CONFIG_CRYPTO_CRC64_ROCKSOFT=y
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=y
-# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_LZ4=y
 CONFIG_CRYPTO_LZ4HC=y