mirror of https://gitee.com/openkylin/linux.git
bfeb022f8f
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. Signed-off-by: Logan Gunthorpe <logang@deltatee.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: David Hildenbrand <david@redhat.com> Acked-by: Michal Hocko <mhocko@suse.com> Acked-by: Dan Williams <dan.j.williams@intel.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Eric Badger <ebadger@gigaio.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jason Gunthorpe <jgg@ziepe.ca> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Will Deacon <will@kernel.org> Link: http://lkml.kernel.org/r/20200306170846.9333-7-logang@deltatee.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| alignment.c | ||
| asids-debugfs.c | ||
| cache-debugfs.c | ||
| cache-j2.c | ||
| cache-sh2.c | ||
| cache-sh2a.c | ||
| cache-sh3.c | ||
| cache-sh4.c | ||
| cache-sh5.c | ||
| cache-sh7705.c | ||
| cache-shx3.c | ||
| cache.c | ||
| consistent.c | ||
| extable_32.c | ||
| extable_64.c | ||
| fault.c | ||
| flush-sh4.c | ||
| hugetlbpage.c | ||
| init.c | ||
| ioremap.c | ||
| ioremap_fixed.c | ||
| kmap.c | ||
| mmap.c | ||
| nommu.c | ||
| numa.c | ||
| pgtable.c | ||
| pmb.c | ||
| sram.c | ||
| tlb-debugfs.c | ||
| tlb-pteaex.c | ||
| tlb-sh3.c | ||
| tlb-sh4.c | ||
| tlb-sh5.c | ||
| tlb-urb.c | ||
| tlbex_32.c | ||
| tlbex_64.c | ||
| tlbflush_32.c | ||
| tlbflush_64.c | ||
| uncached.c | ||