[PATCH OLK-5.10 v2] arm64: Revert feature: Add memmap parameter and register pmem - Kernel

27 Dec 2021

euleros inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I4O31I?from=project-issue
CVE: NA
The reserve memory of PMEM conflicts with
"add memmap interface to reserved memory for mremap syscall usage",
need to rollback, resubmit after adaptation.
Feature related commit：
1.PMEM function commit:94dc364f5eda10f49449ba573dc3322e1ea92280
2.PMEM feature config commit: 36d7a831e15ceb84e937122c87d01c14242dc377
Signed-off-by: Zhuling zhuling8@huawei.com
---
 arch/arm64/Kconfig                     | 21 --------
 arch/arm64/configs/openeuler_defconfig |  3 --
 arch/arm64/kernel/Makefile             |  1 -
 arch/arm64/kernel/pmem.c               | 35 -------------
 arch/arm64/kernel/setup.c              | 10 ----
 arch/arm64/mm/init.c                   | 94 ----------------------------------
 drivers/nvdimm/Kconfig                 |  5 --
 drivers/nvdimm/Makefile                |  1 -
 8 files changed, 170 deletions(-)
 delete mode 100644 arch/arm64/kernel/pmem.c

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index df90a6e..2df4b31 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1321,27 +1321,6 @@ config RODATA_FULL_DEFAULT_ENABLED
      This requires the linear region to be mapped down to pages,
      which may adversely affect performance in some cases.
-config ARM64_PMEM_RESERVE
-	bool "Reserve memory for persistent storage"
-	default n
-	help
-	  Use memmap=nn[KMG]!ss[KMG](memmap=100K!0x1a0000000) reserve
-	  memory for persistent storage.
-
-	  Say y here to enable this feature.
-
-config ARM64_PMEM_LEGACY_DEVICE
-	bool "Create persistent storage"
-	depends on BLK_DEV
-	depends on LIBNVDIMM
-	select ARM64_PMEM_RESERVE
-	help
-	  Use reserved memory for persistent storage when the kernel
-	  restart or update. the data in PMEM will not be lost and
-	  can be loaded faster.
-
-	  Say y if unsure.
-
 config ARM64_SW_TTBR0_PAN
    bool "Emulate Privileged Access Never using TTBR0_EL1 switching"
    help
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig
index 17bc875..b5fc851 100644
--- a/arch/arm64/configs/openeuler_defconfig
+++ b/arch/arm64/configs/openeuler_defconfig
@@ -416,8 +416,6 @@ CONFIG_ARM64_CPU_PARK=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
-CONFIG_ARM64_PMEM_RESERVE=y
-CONFIG_ARM64_PMEM_LEGACY_DEVICE=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
 CONFIG_ARM64_ILP32=y
@@ -6026,7 +6024,6 @@ CONFIG_ND_BTT=m
 CONFIG_BTT=y
 CONFIG_OF_PMEM=m
 CONFIG_NVDIMM_KEYS=y
-CONFIG_PMEM_LEGACY=m
 CONFIG_DAX_DRIVER=y
 CONFIG_DAX=y
 CONFIG_DEV_DAX=m
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index f615325..169d90f 100644
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@ -68,7 +68,6 @@ obj-$(CONFIG_ARM64_PTR_AUTH)		+= pointer_auth.o
 obj-$(CONFIG_SHADOW_CALL_STACK)		+= scs.o
 obj-$(CONFIG_ARM64_MTE)			+= mte.o
 obj-$(CONFIG_MPAM)			+= mpam/
-obj-$(CONFIG_ARM64_PMEM_LEGACY_DEVICE)   += pmem.o
obj-y					+= vdso/ probes/
 obj-$(CONFIG_COMPAT_VDSO)		+= vdso32/
diff --git a/arch/arm64/kernel/pmem.c b/arch/arm64/kernel/pmem.c
deleted file mode 100644
index 16eaf70..0000000
--- a/arch/arm64/kernel/pmem.c
+++ /dev/null
@@ -1,35 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright(c) 2021 Huawei Technologies Co., Ltd
- *
- * Derived from x86 and arm64 implement PMEM.
- */
-#include <linux/platform_device.h>
-#include <linux/init.h>
-#include <linux/ioport.h>
-#include <linux/module.h>
-
-static int found(struct resource *res, void *data)
-{
-	return 1;
-}
-
-static int __init register_e820_pmem(void)
-{
-	struct platform_device *pdev;
-	int rc;
-
-	rc = walk_iomem_res_desc(IORES_DESC_PERSISTENT_MEMORY_LEGACY,
-				 IORESOURCE_MEM, 0, -1, NULL, found);
-	if (rc <= 0)
-		return 0;
-
-	/*
-	 * See drivers/nvdimm/e820.c for the implementation, this is
-	 * simply here to trigger the module to load on demand.
-	 */
-	pdev = platform_device_alloc("e820_pmem", -1);
-
-	return platform_device_add(pdev);
-}
-device_initcall(register_e820_pmem);
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 88ec495..7cd0425 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -70,10 +70,6 @@ static int __init arm64_enable_cpu0_hotplug(char *str)
 __setup("arm64_cpu0_hotplug", arm64_enable_cpu0_hotplug);
 #endif
-#ifdef CONFIG_ARM64_PMEM_RESERVE
-extern struct resource pmem_res;
-#endif
-
 phys_addr_t __fdt_pointer __initdata;
/*
@@ -288,12 +284,6 @@ static void __init request_standard_resources(void)
    		request_resource(res, &pin_memory_resource);
 #endif
    }
-
-#ifdef CONFIG_ARM64_PMEM_RESERVE
-	if (pmem_res.end && pmem_res.start)
-		request_resource(&iomem_resource, &pmem_res);
-#endif
-
 }
static int __init reserve_memblock_reserved_regions(void)
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 3b9401e..e8d4461 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -55,7 +55,6 @@
  */
 s64 memstart_addr __ro_after_init = -1;
 EXPORT_SYMBOL(memstart_addr);
-phys_addr_t start_at, mem_size;
#ifdef CONFIG_PIN_MEMORY
 struct resource pin_memory_resource = {
@@ -112,18 +111,6 @@ static void __init reserve_pin_memory_res(void)
  */
 phys_addr_t arm64_dma_phys_limit __ro_after_init;
-static unsigned long long pmem_size, pmem_start;
-
-#ifdef CONFIG_ARM64_PMEM_RESERVE
-struct resource pmem_res = {
-	.name = "Persistent Memory (legacy)",
-	.start = 0,
-	.end = 0,
-	.flags = IORESOURCE_MEM,
-	.desc = IORES_DESC_PERSISTENT_MEMORY_LEGACY
-};
-#endif
-
 #ifndef CONFIG_KEXEC_CORE
 static void __init reserve_crashkernel(void)
 {
@@ -417,83 +404,6 @@ static int __init reserve_park_mem(void)
 }
 #endif
-static bool __init is_mem_valid(unsigned long long mem_size, unsigned long long mem_start)
-{
-	if (!memblock_is_region_memory(mem_start, mem_size)) {
-		pr_warn("cannot reserve mem: region is not memory!\n");
-		return false;
-	}
-
-	if (memblock_is_region_reserved(mem_start, mem_size)) {
-		pr_warn("cannot reserve mem: region overlaps reserved memory!\n");
-		return false;
-	}
-
-	if (!IS_ALIGNED(mem_start, SZ_2M)) {
-		pr_warn("cannot reserve mem: base address is not 2MB aligned!\n");
-		return false;
-	}
-
-	return true;
-}
-
-static int __init parse_memmap_one(char *p)
-{
-	char *oldp;
-
-	if (!p)
-		return -EINVAL;
-
-	oldp = p;
-	mem_size = memparse(p, &p);
-	if (p == oldp)
-		return -EINVAL;
-
-	if (!mem_size)
-		return -EINVAL;
-
-	mem_size = PAGE_ALIGN(mem_size);
-
-	if (*p == '!') {
-		start_at = memparse(p+1, &p);
-
-		pmem_start = start_at;
-		pmem_size = mem_size;
-	} else
-		pr_info("Unrecognized memmap option, please check the parameter.\n");
-
-	return *p == '\0' ? 0 : -EINVAL;
-}
-
-static int __init parse_memmap_opt(char *str)
-{
-	while (str) {
-		char *k = strchr(str, ',');
-
-		if (k)
-			*k++ = 0;
-		parse_memmap_one(str);
-		str = k;
-	}
-
-	return 0;
-}
-early_param("memmap", parse_memmap_opt);
-
-#ifdef CONFIG_ARM64_PMEM_RESERVE
-static void __init reserve_pmem(void)
-{
-	if (!is_mem_valid(mem_size, start_at))
-		return;
-
-	memblock_remove(pmem_start, pmem_size);
-	pr_info("pmem reserved: 0x%016llx - 0x%016llx (%lld MB)\n",
-		pmem_start, pmem_start + pmem_size, pmem_size >> 20);
-	pmem_res.start = pmem_start;
-	pmem_res.end = pmem_start + pmem_size - 1;
-}
-#endif
-
 void __init arm64_memblock_init(void)
 {
    const s64 linear_region_size = BIT(vabits_actual - 1);
@@ -668,10 +578,6 @@ void __init bootmem_init(void)
    reserve_quick_kexec();
 #endif
-#ifdef CONFIG_ARM64_PMEM_RESERVE
-	reserve_pmem();
-#endif
-
    reserve_pin_memory_res();
memblock_dump_all();
diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig
index ce4de75..b7d1eb3 100644
--- a/drivers/nvdimm/Kconfig
+++ b/drivers/nvdimm/Kconfig
@@ -132,8 +132,3 @@ config NVDIMM_TEST_BUILD
      infrastructure.
endif
-
-config PMEM_LEGACY
-	tristate "Pmem_legacy"
-	select X86_PMEM_LEGACY if X86
-	select ARM64_PMEM_LEGACY_DEVICE if ARM64
diff --git a/drivers/nvdimm/Makefile b/drivers/nvdimm/Makefile
index 6f8dc92..0407753 100644
--- a/drivers/nvdimm/Makefile
+++ b/drivers/nvdimm/Makefile
@@ -3,7 +3,6 @@ obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o
 obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o
 obj-$(CONFIG_ND_BTT) += nd_btt.o
 obj-$(CONFIG_ND_BLK) += nd_blk.o
-obj-$(CONFIG_PMEM_LEGACY) += nd_e820.o
 obj-$(CONFIG_OF_PMEM) += of_pmem.o
 obj-$(CONFIG_VIRTIO_PMEM) += virtio_pmem.o nd_virtio.o
-- 
2.9.5

    