Commit 56993b4e authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Linus Torvalds
Browse files

mm/sparsemem: enable vmem_altmap support in vmemmap_alloc_block_buf() 



There are many instances where vmemap allocation is often switched between
regular memory and device memory just based on whether altmap is available
or not.  vmemmap_alloc_block_buf() is used in various platforms to
allocate vmemmap mappings.  Lets also enable it to handle altmap based
device memory allocation along with existing regular memory allocations.
This will help in avoiding the altmap based allocation switch in many
places.  To summarize there are two different methods to call
vmemmap_alloc_block_buf().

vmemmap_alloc_block_buf(size, node, NULL)   /* Allocate from system RAM */
vmemmap_alloc_block_buf(size, node, altmap) /* Allocate from altmap */

This converts altmap_alloc_block_buf() into a static function, drops it's
entry from the header and updates Documentation/vm/memory-model.rst.

Suggested-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Tested-by: default avatarJia He <justin.he@arm.com>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Will Deacon <will@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Hsin-Yi Wang <hsinyi@chromium.org>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Steve Capper <steve.capper@arm.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Yu Zhao <yuzhao@google.com>
Link: http://lkml.kernel.org/r/1594004178-8861-3-git-send-email-anshuman.khandual@arm.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1d9cfee7

Documentation/vm/memory-model.rst

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ for persistent memory devices in pre-allocated storage on those 
devices. This storage is represented with :c:type:`struct vmem_altmap`

that is eventually passed to vmemmap_populate() through a long chain

of function calls. The vmemmap_populate() implementation may use the

`vmem_altmap` along with :c:func:`altmap_alloc_block_buf` helper to

`vmem_altmap` along with :c:func:`vmemmap_alloc_block_buf` helper to

allocate memory map on the persistent memory device.



ZONE_DEVICE

arch/arm64/mm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1102,7 +1102,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, 
		if (pmd_none(READ_ONCE(*pmdp))) {

			void *p = NULL;



			p = vmemmap_alloc_block_buf(PMD_SIZE, node);

			p = vmemmap_alloc_block_buf(PMD_SIZE, node, NULL);

			if (!p)

				return -ENOMEM;

arch/powerpc/mm/init_64.c

+2 −2
Original line number Diff line number Diff line
@@ -225,12 +225,12 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, 
		 * fall back to system memory if the altmap allocation fail.

		 */

		if (altmap && !altmap_cross_boundary(altmap, start, page_size)) {

			p = altmap_alloc_block_buf(page_size, altmap);

			p = vmemmap_alloc_block_buf(page_size, node, altmap);

			if (!p)

				pr_debug("altmap block allocation failed, falling back to system memory");

		}

		if (!p)

			p = vmemmap_alloc_block_buf(page_size, node);

			p = vmemmap_alloc_block_buf(page_size, node, NULL);

		if (!p)

			return -ENOMEM;

arch/x86/mm/init_64.c

+1 −4
Original line number Diff line number Diff line
@@ -1515,10 +1515,7 @@ static int __meminit vmemmap_populate_hugepages(unsigned long start, 
		if (pmd_none(*pmd)) {

			void *p;



			if (altmap)

				p = altmap_alloc_block_buf(PMD_SIZE, altmap);

			else

				p = vmemmap_alloc_block_buf(PMD_SIZE, node);

			p = vmemmap_alloc_block_buf(PMD_SIZE, node, altmap);

			if (p) {

				pte_t entry;

include/linux/mm.h

+2 −2
Original line number Diff line number Diff line
@@ -2982,8 +2982,8 @@ pte_t *vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node, 
			    struct vmem_altmap *altmap);

void *vmemmap_alloc_block(unsigned long size, int node);

struct vmem_altmap;

void *vmemmap_alloc_block_buf(unsigned long size, int node);

void *altmap_alloc_block_buf(unsigned long size, struct vmem_altmap *altmap);

void *vmemmap_alloc_block_buf(unsigned long size, int node,

			      struct vmem_altmap *altmap);

void vmemmap_verify(pte_t *, int, unsigned long, unsigned long);

int vmemmap_populate_basepages(unsigned long start, unsigned long end,

			       int node, struct vmem_altmap *altmap);

CRA Git | Maintained and supported by SUSTech CRA and CCSE