From 7860b024169851c29f8078c801b3b335d6bc2b82 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Thu, 19 Mar 2020 16:14:15 -0700 Subject: [PATCH 1/4] arm64: defconfig: Enable memory hotplug configs on genericarmv8-64 Enable the memory hotplug and hotremove configs for the genericarmv8-64 configuration. Change-Id: I80ac4cd226a42a36a8dbecab7af99783f0875c27 Signed-off-by: Isaac J. Manjarres --- arch/arm64/configs/vendor/genericarmv8-64_defconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm64/configs/vendor/genericarmv8-64_defconfig b/arch/arm64/configs/vendor/genericarmv8-64_defconfig index 827a48c87bf8..348053615078 100644 --- a/arch/arm64/configs/vendor/genericarmv8-64_defconfig +++ b/arch/arm64/configs/vendor/genericarmv8-64_defconfig @@ -13,7 +13,6 @@ CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -CONFIG_NUMA_BALANCING=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y CONFIG_BLK_CGROUP=y @@ -30,13 +29,11 @@ CONFIG_KALLSYMS_ALL=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y -# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set CONFIG_PROFILING=y CONFIG_ARCH_QCOM=y CONFIG_ARCH_QTI_VM=y CONFIG_ARM64_VA_BITS_48=y CONFIG_SCHED_MC=y -CONFIG_NUMA=y CONFIG_SECCOMP=y CONFIG_CRASH_DUMP=y CONFIG_XEN=y @@ -73,6 +70,10 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_SIG=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_MEMORY_HOTPLUG=y +CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y +CONFIG_MEMORY_HOTPLUG_MOVABLE_NODE=y +CONFIG_MEMORY_HOTREMOVE=y CONFIG_KSM=y CONFIG_MEMORY_FAILURE=y CONFIG_TRANSPARENT_HUGEPAGE=y From a56415770659bddab064f3cb972bf5b025dac709 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Thu, 19 Mar 2020 17:10:17 -0700 Subject: [PATCH 2/4] arm64: defconfig: Enable memory configs on genericarmv8-64 Enable CONFIG_VM_EVENT_COUNT_CLEAN_PAGE_RECLAIM and CONFIG_BALANCE_ANON_FILE_RECLAIM on genericarmv8-64. Change-Id: I9810575dcabd14a2e39c2e08d502e3213877ed69 Signed-off-by: Isaac J. Manjarres --- arch/arm64/configs/vendor/genericarmv8-64_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/configs/vendor/genericarmv8-64_defconfig b/arch/arm64/configs/vendor/genericarmv8-64_defconfig index 348053615078..d023c8813b3f 100644 --- a/arch/arm64/configs/vendor/genericarmv8-64_defconfig +++ b/arch/arm64/configs/vendor/genericarmv8-64_defconfig @@ -26,6 +26,7 @@ CONFIG_USER_NS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_BLK_DEV_INITRD=y CONFIG_KALLSYMS_ALL=y +CONFIG_VM_EVENT_COUNT_CLEAN_PAGE_RECLAIM=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y @@ -80,6 +81,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_CMA_DIRECT_UTILIZATION=y CONFIG_CMA_PCP_LISTS=y CONFIG_ZSMALLOC=y +CONFIG_BALANCE_ANON_FILE_RECLAIM=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y From 2125fba9bd017076d5887da7505e82e0bd086195 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Thu, 19 Mar 2020 17:14:49 -0700 Subject: [PATCH 3/4] soc: qcom: kconfig: Relax QCOM_MEM_BUF dependencies The mem-buf driver doesn't strictly depend on the secure buffer functionality. For example, it can still be functional in environments where it is used purely for requesting memory from other VMs. Thus, remove the dependency. Change-Id: Ie4e39c00473509ee3552e6da849c633ccfab21ce Signed-off-by: Isaac J. Manjarres --- drivers/soc/qcom/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 66dcb51a4652..ead8df5343ae 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -59,7 +59,7 @@ config OVERRIDE_MEMORY_LIMIT config QCOM_MEM_BUF bool "Qualcomm Technologies, Inc. Memory Buffer Sharing Driver" - depends on HH_MSGQ && HH_RM_DRV && ION_MSM_HEAPS && QCOM_SECURE_BUFFER + depends on HH_MSGQ && HH_RM_DRV && ION_MSM_HEAPS help Add support for lending memory from one virtual machine to another. This driver communicates with the hypervisor, as well as other From 1ae017a0bf39dc3a85e984c22575eb5990a2d383 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Thu, 19 Mar 2020 17:47:25 -0700 Subject: [PATCH 4/4] arm64: defconfig: Enable QCOM_MEM_BUF on genericarmv8-64 Enable the mem-buf driver on the genericarmv8-64 configuration. Change-Id: I566dcdd02e5ff36e92f8291bda8294e4ce80f850 Signed-off-by: Isaac J. Manjarres --- arch/arm64/configs/vendor/genericarmv8-64_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/vendor/genericarmv8-64_defconfig b/arch/arm64/configs/vendor/genericarmv8-64_defconfig index d023c8813b3f..8587dca4ce91 100644 --- a/arch/arm64/configs/vendor/genericarmv8-64_defconfig +++ b/arch/arm64/configs/vendor/genericarmv8-64_defconfig @@ -347,6 +347,7 @@ CONFIG_CLK_QORIQ=y CONFIG_COMMON_CLK_XGENE=y CONFIG_REMOTEPROC=y CONFIG_SOC_BRCMSTB=y +CONFIG_QCOM_MEM_BUF=y CONFIG_SOC_TI=y CONFIG_EXTCON_USB_GPIO=y CONFIG_EXTCON_USBC_CROS_EC=y