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

Commit 8b78c21d authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

x86, 64bit, mm: hibernate use generic mapping_init 



We should set mappings only for usable memory ranges under max_pfn
Otherwise causes same problem that is fixed by

	x86, mm: Only direct map addresses that are marked as E820_RAM

Make it only map range in pfn_mapped array.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1359058816-7615-34-git-send-email-yinghai@kernel.org


Cc: Pavel Machek <pavel@ucw.cz>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: linux-pm@vger.kernel.org
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 72212675

arch/x86/power/hibernate_64.c

+22 −44
Original line number Original line Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include <linux/gfp.h>

#include <linux/gfp.h>

#include <linux/smp.h>

#include <linux/smp.h>

#include <linux/suspend.h>

#include <linux/suspend.h>



#include <asm/init.h>

#include <asm/proto.h>

#include <asm/proto.h>

#include <asm/page.h>

#include <asm/page.h>

#include <asm/pgtable.h>

#include <asm/pgtable.h>
@@ -39,41 +41,21 @@ pgd_t *temp_level4_pgt; 




void *relocated_restore_code;

void *relocated_restore_code;





static int res_phys_pud_init(pud_t *pud, unsigned long address, unsigned long end)

static void *alloc_pgt_page(void *context)

{

{

	long i, j;

	return (void *)get_safe_page(GFP_ATOMIC);



	i = pud_index(address);

	pud = pud + i;

	for (; i < PTRS_PER_PUD; pud++, i++) {

		unsigned long paddr;

		pmd_t *pmd;



		paddr = address + i*PUD_SIZE;

		if (paddr >= end)

			break;



		pmd = (pmd_t *)get_safe_page(GFP_ATOMIC);

		if (!pmd)

			return -ENOMEM;

		set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE));

		for (j = 0; j < PTRS_PER_PMD; pmd++, j++, paddr += PMD_SIZE) {

			unsigned long pe;



			if (paddr >= end)

				break;

			pe = __PAGE_KERNEL_LARGE_EXEC | paddr;

			pe &= __supported_pte_mask;

			set_pmd(pmd, __pmd(pe));

		}

	}

	return 0;

}

}





static int set_up_temporary_mappings(void)

static int set_up_temporary_mappings(void)

{

{

	unsigned long start, end, next;

	struct x86_mapping_info info = {

	int error;

		.alloc_pgt_page	= alloc_pgt_page,

		.pmd_flag	= __PAGE_KERNEL_LARGE_EXEC,

		.kernel_mapping = true,

	};

	unsigned long mstart, mend;

	int result;

	int i;





	temp_level4_pgt = (pgd_t *)get_safe_page(GFP_ATOMIC);

	temp_level4_pgt = (pgd_t *)get_safe_page(GFP_ATOMIC);

	if (!temp_level4_pgt)

	if (!temp_level4_pgt)
@@ -84,21 +66,17 @@ static int set_up_temporary_mappings(void) 
		init_level4_pgt[pgd_index(__START_KERNEL_map)]);

		init_level4_pgt[pgd_index(__START_KERNEL_map)]);





	/* Set up the direct mapping from scratch */

	/* Set up the direct mapping from scratch */

	start = (unsigned long)pfn_to_kaddr(0);

	for (i = 0; i < nr_pfn_mapped; i++) {

	end = (unsigned long)pfn_to_kaddr(max_pfn);

		mstart = pfn_mapped[i].start << PAGE_SHIFT;

		mend   = pfn_mapped[i].end << PAGE_SHIFT;





	for (; start < end; start = next) {

		result = kernel_ident_mapping_init(&info, temp_level4_pgt,

		pud_t *pud = (pud_t *)get_safe_page(GFP_ATOMIC);

						   mstart, mend);

		if (!pud)



			return -ENOMEM;

		if (result)

		next = start + PGDIR_SIZE;

			return result;

		if (next > end)

			next = end;

		if ((error = res_phys_pud_init(pud, __pa(start), __pa(next))))

			return error;

		set_pgd(temp_level4_pgt + pgd_index(start),

			mk_kernel_pgd(__pa(pud)));

	}

	}



	return 0;

	return 0;

}

}