mm/sparsemem: prepare for sub-section ranges

Prepare the memory hot-{add,remove} paths for handling sub-section ranges by plumbing the starting page frame and number of pages being handled through arch_{add,remove}_memory() to sparse_{add,remove}_one_section(). This is simply plumbing, small cleanups, and some identifier renames. No intended functional changes.

Dan Williams committed 7 years ago

Commit 7ea62161 parent 46d945a3 files · +81 −54Browse files

Unified · Split

3 files

include/linux/memory_hotplug.h +3 −2
mm/memory_hotplug.c +71 −43
mm/sparse.c +7 −9

include/linux/memory_hotplug.h+3−2

 extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,
 		unsigned long nr_pages, struct vmem_altmap *altmap);
 extern bool is_memblock_offlined(struct memory_block *mem);
-extern int sparse_add_one_section(int nid, unsigned long start_pfn,
+extern int sparse_add_section(int nid, unsigned long pfn,
-				  struct vmem_altmap *altmap);
+		unsigned long nr_pages, struct vmem_altmap *altmap);
 extern void sparse_remove_one_section(struct mem_section *ms,
+		unsigned long pfn, unsigned long nr_pages,
 		unsigned long map_offset, struct vmem_altmap *altmap);
 extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map,
 					  unsigned long pnum);

mm/memory_hotplug.c+71−43

 }
 #endif /* CONFIG_HAVE_BOOTMEM_INFO_NODE */
-static int __meminit __add_section(int nid, unsigned long phys_start_pfn,
+static int __meminit __add_section(int nid, unsigned long pfn,
-				   struct vmem_altmap *altmap)
+		unsigned long nr_pages,	struct vmem_altmap *altmap)
 {
 	int ret;
-	if (pfn_valid(phys_start_pfn))
+	if (pfn_valid(pfn))
 		return -EEXIST;
-	ret = sparse_add_one_section(nid, phys_start_pfn, altmap);
+	ret = sparse_add_section(nid, pfn, nr_pages, altmap);
 	return ret < 0 ? ret : 0;
 }
+static int check_pfn_span(unsigned long pfn, unsigned long nr_pages,
+		const char *reason)
+{
+	/*
+	 * Disallow all operations smaller than a sub-section and only
+	 * allow operations smaller than a section for
+	 * SPARSEMEM_VMEMMAP. Note that check_hotplug_memory_range()
+	 * enforces a larger memory_block_size_bytes() granularity for
+	 * memory that will be marked online, so this check should only
+	 * fire for direct arch_{add,remove}_memory() users outside of
+	 * add_memory_resource().
+	 */
+	unsigned long min_align;
+	if (IS_ENABLED(CONFIG_SPARSEMEM_VMEMMAP))
+		min_align = PAGES_PER_SUBSECTION;
+	else
+		min_align = PAGES_PER_SECTION;
+	if (!IS_ALIGNED(pfn, min_align)
+			|| !IS_ALIGNED(nr_pages, min_align)) {
+		WARN(1, "Misaligned __%s_pages start: %#lx end: #%lx\n",
+				reason, pfn, pfn + nr_pages - 1);
+		return -EINVAL;
+	}
+	return 0;
+}
 /*
  * Reasonably generic function for adding memory.  It is
  * expected that archs that support memory hotplug will
  * call this function after deciding the zone to which to
  * add the new pages.
  */
-int __ref __add_pages(int nid, unsigned long phys_start_pfn,
+int __ref __add_pages(int nid, unsigned long pfn, unsigned long nr_pages,
-		unsigned long nr_pages, struct mhp_restrictions *restrictions)
+		struct mhp_restrictions *restrictions)
 {
 	unsigned long i;
-	int err = 0;
+	int start_sec, end_sec, err;
-	int start_sec, end_sec;
 	struct vmem_altmap *altmap = restrictions->altmap;
-	/* during initialize mem_map, align hot-added range to section */
-	start_sec = pfn_to_section_nr(phys_start_pfn);
-	end_sec = pfn_to_section_nr(phys_start_pfn + nr_pages - 1);
 	if (altmap) {
 		/*
 		 * Validate altmap is within bounds of the total request
 		 */
-		if (altmap->base_pfn != phys_start_pfn
+		if (altmap->base_pfn != pfn
 				|| vmem_altmap_offset(altmap) > nr_pages) {
 			pr_warn_once("memory add fail, invalid altmap\n");
-			err = -EINVAL;
+			return -EINVAL;
-			goto out;
 		}
 		altmap->alloc = 0;
 	}
+	err = check_pfn_span(pfn, nr_pages, "add");
+	if (err)
+		return err;
+	start_sec = pfn_to_section_nr(pfn);
+	end_sec = pfn_to_section_nr(pfn + nr_pages - 1);
 	for (i = start_sec; i <= end_sec; i++) {
-		err = __add_section(nid, section_nr_to_pfn(i), altmap);
+		unsigned long pfns;
+		pfns = min(nr_pages, PAGES_PER_SECTION
+				- (pfn & ~PAGE_SECTION_MASK));
+		err = __add_section(nid, pfn, pfns, altmap);
+		pfn += pfns;
+		nr_pages -= pfns;
 		/*
 		 * EEXIST is finally dealt with by ioresource collision
 		cond_resched();
 	}
 	vmemmap_populate_print_last();
-out:
 	return err;
 }
 	pgdat->node_spanned_pages = 0;
 }
-static void __remove_zone(struct zone *zone, unsigned long start_pfn)
+static void __remove_zone(struct zone *zone, unsigned long start_pfn,
+		unsigned long nr_pages)
 {
 	struct pglist_data *pgdat = zone->zone_pgdat;
-	int nr_pages = PAGES_PER_SECTION;
 	unsigned long flags;
 	pgdat_resize_lock(zone->zone_pgdat, &flags);
 	pgdat_resize_unlock(zone->zone_pgdat, &flags);
 }
-static void __remove_section(struct zone *zone, struct mem_section *ms,
+static void __remove_section(struct zone *zone, unsigned long pfn,
-			     unsigned long map_offset,
+		unsigned long nr_pages, unsigned long map_offset,
-			     struct vmem_altmap *altmap)
+		struct vmem_altmap *altmap)
 {
-	unsigned long start_pfn;
+	struct mem_section *ms = __nr_to_section(pfn_to_section_nr(pfn));
-	int scn_nr;
 	if (WARN_ON_ONCE(!valid_section(ms)))
 		return;
-	scn_nr = __section_nr(ms);
+	__remove_zone(zone, pfn, nr_pages);
-	start_pfn = section_nr_to_pfn((unsigned long)scn_nr);
+	sparse_remove_one_section(ms, pfn, nr_pages, map_offset, altmap);
-	__remove_zone(zone, start_pfn);
-	sparse_remove_one_section(ms, map_offset, altmap);
 }
 /**
  * __remove_pages() - remove sections of pages from a zone
  * @zone: zone from which pages need to be removed
- * @phys_start_pfn: starting pageframe (must be aligned to start of a section)
+ * @pfn: starting pageframe (must be aligned to start of a section)
  * @nr_pages: number of pages to remove (must be multiple of section size)
  * @altmap: alternative device page map or %NULL if default memmap is used
  *
  * sure that pages are marked reserved and zones are adjust properly by
  * calling offline_pages().
  */
-void __remove_pages(struct zone *zone, unsigned long phys_start_pfn,
+void __remove_pages(struct zone *zone, unsigned long pfn,
 		    unsigned long nr_pages, struct vmem_altmap *altmap)
 {
-	unsigned long i;
 	unsigned long map_offset = 0;
-	int sections_to_remove;
+	int i, start_sec, end_sec;
 	map_offset = vmem_altmap_offset(altmap);
 	clear_zone_contiguous(zone);
-	/*
+	if (check_pfn_span(pfn, nr_pages, "remove"))
-	 * We can only remove entire sections
+		return;
-	 */
-	BUG_ON(phys_start_pfn & ~PAGE_SECTION_MASK);
-	BUG_ON(nr_pages % PAGES_PER_SECTION);
-	sections_to_remove = nr_pages / PAGES_PER_SECTION;
+	start_sec = pfn_to_section_nr(pfn);
-	for (i = 0; i < sections_to_remove; i++) {
+	end_sec = pfn_to_section_nr(pfn + nr_pages - 1);
-		unsigned long pfn = phys_start_pfn + i*PAGES_PER_SECTION;
+	for (i = start_sec; i <= end_sec; i++) {
+		unsigned long pfns;
 		cond_resched();
-		__remove_section(zone, __pfn_to_section(pfn), map_offset,
+		pfns = min(nr_pages, PAGES_PER_SECTION
-				 altmap);
+				- (pfn & ~PAGE_SECTION_MASK));
+		__remove_section(zone, pfn, pfns, map_offset, altmap);
+		pfn += pfns;
+		nr_pages -= pfns;
 		map_offset = 0;
 	}

mm/sparse.c+7−9

  * * -EEXIST	- Section has been present.
  * * -ENOMEM	- Out of memory.
  */
-int __meminit sparse_add_one_section(int nid, unsigned long start_pfn,
+int __meminit sparse_add_section(int nid, unsigned long start_pfn,
-				     struct vmem_altmap *altmap)
+		unsigned long nr_pages, struct vmem_altmap *altmap)
 {
 	unsigned long section_nr = pfn_to_section_nr(start_pfn);
 	struct mem_section_usage *usage;
 		free_map_bootmem(memmap);
 }
-void sparse_remove_one_section(struct mem_section *ms, unsigned long map_offset,
+void sparse_remove_one_section(struct mem_section *ms, unsigned long pfn,
-			       struct vmem_altmap *altmap)
+		unsigned long nr_pages, unsigned long map_offset,
+		struct vmem_altmap *altmap)
 {
 	struct page *memmap = NULL;
 	struct mem_section_usage *usage = NULL;
 		ms->usage = NULL;
 	}
-	clear_hwpoisoned_pages(memmap + map_offset,
+	clear_hwpoisoned_pages(memmap + map_offset, nr_pages - map_offset);
-			PAGES_PER_SECTION - map_offset);
+	free_section_usage(ms, memmap, usage, pfn, nr_pages, altmap);
-	free_section_usage(ms, memmap, usage,
-			section_nr_to_pfn(__section_nr(ms)),
-			PAGES_PER_SECTION, altmap);
 }
 #endif /* CONFIG_MEMORY_HOTPLUG */