Commit 514caf23 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jason Gunthorpe
Browse files

memremap: replace the altmap_valid field with a PGMAP_ALTMAP_VALID flag 



Add a flags field to struct dev_pagemap to replace the altmap_valid
boolean to be a little more extensible.  Also add a pgmap_altmap() helper
to find the optional altmap and clean up the code using the altmap using
it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Tested-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 80a72d0a

arch/powerpc/mm/mem.c

+1 −9
Original line number Diff line number Diff line
@@ -131,17 +131,9 @@ void __ref arch_remove_memory(int nid, u64 start, u64 size, 
{

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;

	struct page *page;

	struct page *page = pfn_to_page(start_pfn) + vmem_altmap_offset(altmap);

	int ret;



	/*

	 * If we have an altmap then we need to skip over any reserved PFNs

	 * when querying the zone.

	 */

	page = pfn_to_page(start_pfn);

	if (altmap)

		page += vmem_altmap_offset(altmap);



	__remove_pages(page_zone(page), start_pfn, nr_pages, altmap);



	/* Remove htab bolted mappings for this section of memory */

arch/x86/mm/init_64.c

+2 −6
Original line number Diff line number Diff line
@@ -1213,13 +1213,9 @@ void __ref arch_remove_memory(int nid, u64 start, u64 size, 
{

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;

	struct page *page = pfn_to_page(start_pfn);

	struct zone *zone;

	struct page *page = pfn_to_page(start_pfn) + vmem_altmap_offset(altmap);

	struct zone *zone = page_zone(page);



	/* With altmap the first mapped page is offset from @start */

	if (altmap)

		page += vmem_altmap_offset(altmap);

	zone = page_zone(page);

	__remove_pages(zone, start_pfn, nr_pages, altmap);

	kernel_physical_mapping_remove(start, start + size);

}

drivers/nvdimm/pfn_devs.c

+1 −2
Original line number Diff line number Diff line
@@ -622,7 +622,6 @@ static int __nvdimm_setup_pfn(struct nd_pfn *nd_pfn, struct dev_pagemap *pgmap) 
		if (offset < reserve)

			return -EINVAL;

		nd_pfn->npfns = le64_to_cpu(pfn_sb->npfns);

		pgmap->altmap_valid = false;

	} else if (nd_pfn->mode == PFN_MODE_PMEM) {

		nd_pfn->npfns = PFN_SECTION_ALIGN_UP((resource_size(res)

					- offset) / PAGE_SIZE);
@@ -634,7 +633,7 @@ static int __nvdimm_setup_pfn(struct nd_pfn *nd_pfn, struct dev_pagemap *pgmap) 
		memcpy(altmap, &__altmap, sizeof(*altmap));

		altmap->free = PHYS_PFN(offset - reserve);

		altmap->alloc = 0;

		pgmap->altmap_valid = true;

		pgmap->flags |= PGMAP_ALTMAP_VALID;

	} else

		return -ENXIO;

drivers/nvdimm/pmem.c

+0 −1
Original line number Diff line number Diff line
@@ -412,7 +412,6 @@ static int pmem_attach_disk(struct device *dev, 
		bb_res.start += pmem->data_offset;

	} else if (pmem_should_map_pages(dev)) {

		memcpy(&pmem->pgmap.res, &nsio->res, sizeof(pmem->pgmap.res));

		pmem->pgmap.altmap_valid = false;

		pmem->pgmap.type = MEMORY_DEVICE_FS_DAX;

		pmem->pgmap.ops = &fsdax_pagemap_ops;

		addr = devm_memremap_pages(dev, &pmem->pgmap);

include/linux/memremap.h

+11 −1
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ struct dev_pagemap_ops { 
	vm_fault_t (*migrate_to_ram)(struct vm_fault *vmf);

};



#define PGMAP_ALTMAP_VALID	(1 << 0)



/**

 * struct dev_pagemap - metadata for ZONE_DEVICE mappings

 * @altmap: pre-allocated/reserved memory for vmemmap allocations
@@ -96,19 +98,27 @@ struct dev_pagemap_ops { 
 * @dev: host device of the mapping for debug

 * @data: private data pointer for page_free()

 * @type: memory type: see MEMORY_* in memory_hotplug.h

 * @flags: PGMAP_* flags to specify defailed behavior

 * @ops: method table

 */

struct dev_pagemap {

	struct vmem_altmap altmap;

	bool altmap_valid;

	struct resource res;

	struct percpu_ref *ref;

	struct device *dev;

	enum memory_type type;

	unsigned int flags;

	u64 pci_p2pdma_bus_offset;

	const struct dev_pagemap_ops *ops;

};



static inline struct vmem_altmap *pgmap_altmap(struct dev_pagemap *pgmap)

{

	if (pgmap->flags & PGMAP_ALTMAP_VALID)

		return &pgmap->altmap;

	return NULL;

}



#ifdef CONFIG_ZONE_DEVICE

void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap);

void devm_memunmap_pages(struct device *dev, struct dev_pagemap *pgmap);

CRA Git | Maintained and supported by SUSTech CRA and CCSE