mm-memory_hotplug-add-pgprot_t-to-mhp_params.patch removed from -mm tree
The patch titled
Subject: mm/memory_hotplug: add pgprot_t to mhp_params
has been removed from the -mm tree. Its filename was
mm-memory_hotplug-add-pgprot_t-to-mhp_params.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Logan Gunthorpe <[email protected]>
Subject: mm/memory_hotplug: add pgprot_t to mhp_params
devm_memremap_pages() is currently used by the PCI P2PDMA code to create struct page mappings for IO memory. At present, these mappings are created with PAGE_KERNEL which implies setting the PAT bits to be WB. However, on x86, an mtrr register will typically override this and force the cache type to be UC-. In the case firmware doesn't set this register it is effectively WB and will typically result in a machine check exception when it's accessed.
Other arches are not currently likely to function correctly seeing they don't have any MTRR registers to fall back on.
To solve this, provide a way to specify the pgprot value explicitly to arch_add_memory().
Of the arches that support MEMORY_HOTPLUG: x86_64, and arm64 need a simple change to pass the pgprot_t down to their respective functions which set up the page tables. For x86_32, set the page tables explicitly using _set_memory_prot() (seeing they are already mapped). For ia64, s390 and sh, reject anything but PAGE_KERNEL settings -- this should be fine, for now, seeing these architectures don't support ZONE_DEVICE.
A check in __add_pages() is also added to ensure the pgprot parameter was set for all arches.
---
arch/arm64/mm/mmu.c | 3 ++- arch/ia64/mm/init.c | 3 +++ arch/powerpc/mm/mem.c | 3 ++- arch/s390/mm/init.c | 3 +++ arch/sh/mm/init.c | 3 +++ arch/x86/mm/init_32.c | 12 ++++++++++++ arch/x86/mm/init_64.c | 2 +- include/linux/memory_hotplug.h | 3 +++ mm/memory_hotplug.c | 5 ++++- mm/memremap.c | 6 +++--- 10 files changed, 36 insertions(+), 7 deletions(-)
arch/arm64/mm/mmu.c renamed from arch/arm64/mm/mmu.c~mm-memory_hotplug-add-pgprot_t-to-mhp_params +2 -1
@@ -1382,7 +1382,8 @@ int arch_add_memory(int nid, u64 start, flags =NO_BLOCK_MAPPINGS |NO_CONT_MAPPINGS ;__create_pgd_mapping (swapper_pg_dir, start,__phys_to_virt (start), - size,PAGE_KERNEL , __pgd_pgtable_alloc, flags); + size, params->pgprot, __pgd_pgtable_alloc, + flags);memblock_clear_nomap (start, size);
arch/ia64/mm/init.c renamed from arch/ia64/mm/init.c~mm-memory_hotplug-add-pgprot_t-to-mhp_params +3 -0
@@ -676,6 +676,9 @@ int arch_add_memory(int nid, u64 start,unsigned long nr_pages = size >>PAGE_SHIFT ;int ret; +if (WARN_ON_ONCE (params->pgprot.pgprot !=PAGE_KERNEL .pgprot)) +return -EINVAL ; + ret =__add_pages (nid, start_pfn, nr_pages, params);if (ret) printk("%s: Problem encountered in __add_pages() as ret=%d\n",
arch/powerpc/mm/mem.c renamed from arch/powerpc/mm/mem.c~mm-memory_hotplug-add-pgprot_t-to-mhp_params +2 -1
@@ -132,7 +132,8 @@ int __ref arch_add_memory(int nid, u64 sresize_hpt_for_hotplug (memblock_phys_mem_size ()); start = (unsigned long )__va (start); - rc =create_section_mapping (start, start + size, nid,PAGE_KERNEL ); + rc =create_section_mapping (start, start + size, nid, + params->pgprot);if (rc) {pr_warn ("Unable to create mapping for hot added memory 0x%llx..0x%llx: %d\n" , start, start + size, rc);
arch/s390/mm/init.c renamed from arch/s390/mm/init.c~mm-memory_hotplug-add-pgprot_t-to-mhp_params +3 -0
@@ -277,6 +277,9 @@ int arch_add_memory(int nid, u64 start,if (WARN_ON_ONCE (params->altmap))return -EINVAL ; +if (WARN_ON_ONCE (params->pgprot.pgprot !=PAGE_KERNEL .pgprot)) +return -EINVAL ; + rc =vmem_add_mapping (start, size);if (rc)return rc;
arch/sh/mm/init.c renamed from arch/sh/mm/init.c~mm-memory_hotplug-add-pgprot_t-to-mhp_params +3 -0
@@ -412,6 +412,9 @@ int arch_add_memory(int nid, u64 start,unsigned long nr_pages = size >>PAGE_SHIFT ;int ret; + if (WARN_ON_ONCE(params->pgprot.pgprot != PAGE_KERNEL.pgprot) +return -EINVAL ; +/* We only have ZONE_NORMAL, so this is easy.. */ ret =__add_pages (nid, start_pfn, nr_pages, params);if (unlikely (ret))
arch/x86/mm/init_32.c renamed from arch/x86/mm/init_32.c~mm-memory_hotplug-add-pgprot_t-to-mhp_params +12 -0
@@ -824,6 +824,18 @@ int arch_add_memory(int nid, u64 start, {unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ; +int ret; + +/* +* The page tables were already mapped at boot so if the caller +* requests a different mapping type then we must change all the +* pages with __set_memory_prot(). +*/ +if (params->pgprot.pgprot !=PAGE_KERNEL .pgprot) { + ret =__set_memory_prot (start, nr_pages, params->pgprot); +if (ret) +return ret; + }return __add_pages (nid, start_pfn, nr_pages, params); }
arch/x86/mm/init_64.c renamed from arch/x86/mm/init_64.c~mm-memory_hotplug-add-pgprot_t-to-mhp_params +1 -1
@@ -867,7 +867,7 @@ int arch_add_memory(int nid, u64 start,unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ; -init_memory_mapping (start, start + size,PAGE_KERNEL ); +init_memory_mapping (start, start + size, params->pgprot);return add_pages (nid, start_pfn, nr_pages, params); }
include/linux/memory_hotplug.h renamed from include/linux/memory_hotplug.h~mm-memory_hotplug-add-pgprot_t-to-mhp_params +3 -0
@@ -60,9 +60,12 @@ enum {/* * Extended parameters for memory hotplug: * altmap: alternative allocator for memmap array (optional) +* pgprot: page protection flags to apply to newly created page tables +* (required) */ struct mhp_params {struct vmem_altmap *altmap; +pgprot_t pgprot; };/*
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-memory_hotplug-add-pgprot_t-to-mhp_params +4 -1
@@ -311,6 +311,9 @@ int __ref __add_pages(int nid, unsignedint err;struct vmem_altmap *altmap = params->altmap; +if (WARN_ON_ONCE (!params->pgprot.pgprot)) +return -EINVAL ; + err =check_hotplug_memory_addressable (pfn, nr_pages);if (err)return err;
@@ -1002,7 +1005,7 @@ static int online_memory_block(struct me*/ int __ref add_memory_resource (int nid,struct resource *res) { -struct mhp_params params = {}; +struct mhp_params params = { .pgprot =PAGE_KERNEL };u64 start, size;bool new_node = false;int ret;
mm/memremap.c renamed from mm/memremap.c~mm-memory_hotplug-add-pgprot_t-to-mhp_params +3 -3
@@ -189,8 +189,8 @@ void *memremap_pages(struct dev_pagemap* We do not want any optional features only our own memmap */ .altmap = pgmap_altmap(pgmap), + .pgprot = PAGE_KERNEL, }; -pgprot_t pgprot =PAGE_KERNEL ;int error, is_ram;bool need_devmap_managed = true;
@@ -282,8 +282,8 @@ void *memremap_pages(struct dev_pagemapif (nid <0 ) nid =numa_mem_id (); - error =track_pfn_remap (NULL , &pgprot,PHYS_PFN (res->start),0 , -resource_size (res)); + error =track_pfn_remap (NULL , ¶ms.pgprot,PHYS_PFN (res->start), +0 ,resource_size (res));if (error) goto err_pfn_remap;
_
Patches currently in -mm which might be from [email protected] are