Commit 86c65a78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  vmlinux.lds: fix .data..init_task output section (fix popwerpc boot)
  powerpc: Fix erroneous lmb->memblock conversions
  powerpc/mm: Add some debug output when hash insertion fails
  powerpc/mm: Fix bugs in huge page hashing
  powerpc/mm: Move around testing of _PAGE_PRESENT in hash code
  powerpc/mm: Handle hypervisor pte insert failure in __hash_page_huge
  powerpc/kexec: Fix boundary case for book-e kexec memory limits
parents 20a52d4f 7ffb65f8

arch/powerpc/include/asm/kexec.h

+3 −3
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 
 * On FSL-BookE we setup a 1:1 mapping which covers the first 2GiB of memory

 * and therefore we can only deal with memory within this range

 */

#define KEXEC_SOURCE_MEMORY_LIMIT	(2 * 1024 * 1024 * 1024UL)

#define KEXEC_DESTINATION_MEMORY_LIMIT	(2 * 1024 * 1024 * 1024UL)

#define KEXEC_CONTROL_MEMORY_LIMIT	(2 * 1024 * 1024 * 1024UL)

#define KEXEC_SOURCE_MEMORY_LIMIT	(2 * 1024 * 1024 * 1024UL - 1)

#define KEXEC_DESTINATION_MEMORY_LIMIT	(2 * 1024 * 1024 * 1024UL - 1)

#define KEXEC_CONTROL_MEMORY_LIMIT	(2 * 1024 * 1024 * 1024UL - 1)



#else

arch/powerpc/include/asm/mmu-hash64.h

+3 −1
Original line number Diff line number Diff line
@@ -250,7 +250,9 @@ extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap) 
int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid,

		     pte_t *ptep, unsigned long trap, int local, int ssize,

		     unsigned int shift, unsigned int mmu_psize);



extern void hash_failure_debug(unsigned long ea, unsigned long access,

			       unsigned long vsid, unsigned long trap,

			       int ssize, int psize, unsigned long pte);

extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend,

			     unsigned long pstart, unsigned long prot,

			     int psize, int ssize);

arch/powerpc/kernel/prom.c

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ static int __init early_init_dt_scan_drconf_memory(unsigned long node) 
	u64 base, size, memblock_size;

	unsigned int is_kexec_kdump = 0, rngs;



	ls = of_get_flat_dt_prop(node, "ibm,memblock-size", &l);

	ls = of_get_flat_dt_prop(node, "ibm,lmb-size", &l);

	if (ls == NULL || l < dt_root_size_cells * sizeof(__be32))

		return 0;

	memblock_size = dt_mem_next_cell(dt_root_size_cells, &ls);

arch/powerpc/mm/hash_low_64.S

+0 −9
Original line number Diff line number Diff line
@@ -68,9 +68,6 @@ _GLOBAL(__hash_page_4K) 
	std	r8,STK_PARM(r8)(r1)

	std	r9,STK_PARM(r9)(r1)

	

	/* Add _PAGE_PRESENT to access */

	ori	r4,r4,_PAGE_PRESENT



	/* Save non-volatile registers.

	 * r31 will hold "old PTE"

	 * r30 is "new PTE"
@@ -347,9 +344,6 @@ _GLOBAL(__hash_page_4K) 
	std	r8,STK_PARM(r8)(r1)

	std	r9,STK_PARM(r9)(r1)



	/* Add _PAGE_PRESENT to access */

	ori	r4,r4,_PAGE_PRESENT



	/* Save non-volatile registers.

	 * r31 will hold "old PTE"

	 * r30 is "new PTE"
@@ -687,9 +681,6 @@ _GLOBAL(__hash_page_64K) 
	std	r8,STK_PARM(r8)(r1)

	std	r9,STK_PARM(r9)(r1)



	/* Add _PAGE_PRESENT to access */

	ori	r4,r4,_PAGE_PRESENT



	/* Save non-volatile registers.

	 * r31 will hold "old PTE"

	 * r30 is "new PTE"

arch/powerpc/mm/hash_utils_64.c

+40 −13
Original line number Diff line number Diff line
@@ -871,6 +871,18 @@ static inline int subpage_protection(struct mm_struct *mm, unsigned long ea) 
}

#endif



void hash_failure_debug(unsigned long ea, unsigned long access,

			unsigned long vsid, unsigned long trap,

			int ssize, int psize, unsigned long pte)

{

	if (!printk_ratelimit())

		return;

	pr_info("mm: Hashing failure ! EA=0x%lx access=0x%lx current=%s\n",

		ea, access, current->comm);

	pr_info("    trap=0x%lx vsid=0x%lx ssize=%d psize=%d pte=0x%lx\n",

		trap, vsid, ssize, psize, pte);

}



/* Result code is:

 *  0 - handled

 *  1 - normal page fault
@@ -955,6 +967,17 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap) 
		return 1;

	}



	/* Add _PAGE_PRESENT to the required access perm */

	access |= _PAGE_PRESENT;



	/* Pre-check access permissions (will be re-checked atomically

	 * in __hash_page_XX but this pre-check is a fast path

	 */

	if (access & ~pte_val(*ptep)) {

		DBG_LOW(" no access !\n");

		return 1;

	}



#ifdef CONFIG_HUGETLB_PAGE

	if (hugeshift)

		return __hash_page_huge(ea, access, vsid, ptep, trap, local,
@@ -967,14 +990,6 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap) 
	DBG_LOW(" i-pte: %016lx %016lx\n", pte_val(*ptep),

		pte_val(*(ptep + PTRS_PER_PTE)));

#endif

	/* Pre-check access permissions (will be re-checked atomically

	 * in __hash_page_XX but this pre-check is a fast path

	 */

	if (access & ~pte_val(*ptep)) {

		DBG_LOW(" no access !\n");

		return 1;

	}



	/* Do actual hashing */

#ifdef CONFIG_PPC_64K_PAGES

	/* If _PAGE_4K_PFN is set, make sure this is a 4k segment */
@@ -1033,6 +1048,12 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap) 
					    local, ssize, spp);

	}



	/* Dump some info in case of hash insertion failure, they should

	 * never happen so it is really useful to know if/when they do

	 */

	if (rc == -1)

		hash_failure_debug(ea, access, vsid, trap, ssize, psize,

				   pte_val(*ptep));

#ifndef CONFIG_PPC_64K_PAGES

	DBG_LOW(" o-pte: %016lx\n", pte_val(*ptep));

#else
@@ -1051,8 +1072,7 @@ void hash_preload(struct mm_struct *mm, unsigned long ea, 
	void *pgdir;

	pte_t *ptep;

	unsigned long flags;

	int local = 0;

	int ssize;

	int rc, ssize, local = 0;



	BUG_ON(REGION_ID(ea) != USER_REGION_ID);
@@ -1098,12 +1118,19 @@ void hash_preload(struct mm_struct *mm, unsigned long ea, 
	/* Hash it in */

#ifdef CONFIG_PPC_HAS_HASH_64K

	if (mm->context.user_psize == MMU_PAGE_64K)

		__hash_page_64K(ea, access, vsid, ptep, trap, local, ssize);

		rc = __hash_page_64K(ea, access, vsid, ptep, trap, local, ssize);

	else

#endif /* CONFIG_PPC_HAS_HASH_64K */

		__hash_page_4K(ea, access, vsid, ptep, trap, local, ssize,

		rc = __hash_page_4K(ea, access, vsid, ptep, trap, local, ssize,

				    subpage_protection(pgdir, ea));



	/* Dump some info in case of hash insertion failure, they should

	 * never happen so it is really useful to know if/when they do

	 */

	if (rc == -1)

		hash_failure_debug(ea, access, vsid, trap, ssize,

				   mm->context.user_psize, pte_val(*ptep));



	local_irq_restore(flags);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE