Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cbfb51d authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Greg Kroah-Hartman
Browse files

powerpc/mm/dax: Fix the condition when checking if altmap vmemap can cross-boundary 



[ Upstream commit c8eebc4a99f15280654f23e914e746c40a516e50 ]

Without this fix, the last subsection vmemmap can end up in memory even if
the namespace is created with -M mem and has sufficient space in the altmap
area.

Fixes: cf387d96 ("libnvdimm/altmap: Track namespace boundaries in altmap")
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Tested-by: default avatarSachin Sant &lt;sachinp@linux.ibm.com <mailto:sachinp@linux.ibm.com&gt;>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230616110826.344417-6-aneesh.kumar@linux.ibm.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent aa3932eb

arch/powerpc/mm/init_64.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static bool altmap_cross_boundary(struct vmem_altmap *altmap, unsigned long star 
	unsigned long nr_pfn = page_size / sizeof(struct page);

	unsigned long start_pfn = page_to_pfn((struct page *)start);



	if ((start_pfn + nr_pfn) > altmap->end_pfn)

	if ((start_pfn + nr_pfn - 1) > altmap->end_pfn)

		return true;



	if (start_pfn < altmap->base_pfn)