Commit b7b3c01b authored Oct 13, 2020 by Dan Williams Committed by Linus Torvalds Oct 13, 2020

mm/memremap_pages: support multiple ranges per invocation



In support of device-dax growing the ability to front physically
dis-contiguous ranges of memory, update devm_memremap_pages() to track
multiple ranges with a single reference counter and devm instance.

Convert all [devm_]memremap_pages() users to specify the number of ranges
they are mapping in their 'struct dev_pagemap' instance.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Paul Mackerras <paulus@ozlabs.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: "Jérôme Glisse" <jglisse@redhat.co
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brice Goglin <Brice.Goglin@inria.fr>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Hulk Robot <hulkci@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jason Gunthorpe <jgg@mellanox.com>
Cc: Jason Yan <yanaijie@huawei.com>
Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: "Jérôme Glisse" <jglisse@redhat.com>
Cc: Jia He <justin.he@arm.com>
Cc: Joao Martins <joao.m.martins@oracle.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: kernel test robot <lkp@intel.com>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Wei Yang <richard.weiyang@linux.alibaba.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lkml.kernel.org/r/159643103789.4062302.18426128170217903785.stgit@dwillia2-desk3.amr.corp.intel.com
Link: https://lkml.kernel.org/r/160106116293.30709.13350662794915396198.stgit@dwillia2-desk3.amr.corp.intel.com


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent a4574f63

arch/powerpc/kvm/book3s_hv_uvmem.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1172,6 +1172,7 @@ int kvmppc_uvmem_init(void)
		kvmppc_uvmem_pgmap.type = MEMORY_DEVICE_PRIVATE;
		kvmppc_uvmem_pgmap.range.start = res->start;
		kvmppc_uvmem_pgmap.range.end = res->end;
		kvmppc_uvmem_pgmap.nr_range = 1;
		kvmppc_uvmem_pgmap.ops = &kvmppc_uvmem_ops;
		/* just one global instance: */
		kvmppc_uvmem_pgmap.owner = &kvmppc_uvmem_pgmap;

drivers/dax/device.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -417,6 +417,7 @@ int dev_dax_probe(struct dev_dax *dev_dax)
		if (!pgmap)
		return -ENOMEM;
		pgmap->range = *range;
		pgmap->nr_range = 1;
		}
		pgmap->type = MEMORY_DEVICE_GENERIC;
		addr = devm_memremap_pages(dev, pgmap);

drivers/gpu/drm/nouveau/nouveau_dmem.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -251,6 +251,7 @@ nouveau_dmem_chunk_alloc(struct nouveau_drm drm, struct page *ppage)
		chunk->pagemap.type = MEMORY_DEVICE_PRIVATE;
		chunk->pagemap.range.start = res->start;
		chunk->pagemap.range.end = res->end;
		chunk->pagemap.nr_range = 1;
		chunk->pagemap.ops = &nouveau_dmem_pagemap_ops;
		chunk->pagemap.owner = drm->dev;

drivers/nvdimm/pfn_devs.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -693,6 +693,7 @@ static int __nvdimm_setup_pfn(struct nd_pfn nd_pfn, struct dev_pagemap pgmap)
		.start = nsio->res.start + start_pad,
		.end = nsio->res.end - end_trunc,
		};
		pgmap->nr_range = 1;
		if (nd_pfn->mode == PFN_MODE_RAM) {
		if (offset < reserve)
		return -EINVAL;

drivers/nvdimm/pmem.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -441,6 +441,7 @@ static int pmem_attach_disk(struct device *dev,
		} else if (pmem_should_map_pages(dev)) {
		pmem->pgmap.range.start = res->start;
		pmem->pgmap.range.end = res->end;
		pmem->pgmap.nr_range = 1;
		pmem->pgmap.type = MEMORY_DEVICE_FS_DAX;
		pmem->pgmap.ops = &fsdax_pagemap_ops;
		addr = devm_memremap_pages(dev, &pmem->pgmap);

Admin message