powerpc/hash: Skip non initialized page size in init_hpte_page_sizes

Message ID 20171128083440.18688-1-aneesh.kumar@linux.vnet.ibm.com
State Accepted
Commit 10527e808123f4b12db604993638b368220e7814
Headers show
Series
  • powerpc/hash: Skip non initialized page size in init_hpte_page_sizes
Related show

Commit Message

Aneesh Kumar K.V Nov. 28, 2017, 8:34 a.m.
One of the easiest way to test config with 4K HPTE is to disable 64K hardware
page size like below.

int __init htab_dt_scan_page_sizes(unsigned long node,

 		size -= 3; prop += 3;
 		base_idx = get_idx_from_shift(base_shift);
-		if (base_idx < 0) {
+		if (base_idx < 0 || base_idx == MMU_PAGE_64K) {
 			/* skip the pte encoding also */
 			prop += lpnum * 2; size -= lpnum * 2;

But then this results in error in other part of the code such as MPSS parsing
where we look at 4K base page size and 64K actual page size support.

This patch fix MPSS parsing by ignoring the actual page sizes marked
unsupported. In reality this can happen only with a corrupt device tree. But it
is good to tighten the error check.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 arch/powerpc/mm/hash_utils_64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Ellerman Jan. 22, 2018, 3:34 a.m. | #1
On Tue, 2017-11-28 at 08:34:40 UTC, "Aneesh Kumar K.V" wrote:
> One of the easiest way to test config with 4K HPTE is to disable 64K hardware
> page size like below.
> 
> int __init htab_dt_scan_page_sizes(unsigned long node,
> 
>  		size -= 3; prop += 3;
>  		base_idx = get_idx_from_shift(base_shift);
> -		if (base_idx < 0) {
> +		if (base_idx < 0 || base_idx == MMU_PAGE_64K) {
>  			/* skip the pte encoding also */
>  			prop += lpnum * 2; size -= lpnum * 2;
> 
> But then this results in error in other part of the code such as MPSS parsing
> where we look at 4K base page size and 64K actual page size support.
> 
> This patch fix MPSS parsing by ignoring the actual page sizes marked
> unsupported. In reality this can happen only with a corrupt device tree. But it
> is good to tighten the error check.
> 
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/10527e808123f4b12db604993638b3

cheers

Patch

diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index e700660459c4..2ae18ff91390 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -601,7 +601,7 @@  static void init_hpte_page_sizes(void)
 			continue;	/* not a supported page size */
 		for (ap = bp; ap < MMU_PAGE_COUNT; ++ap) {
 			penc = mmu_psize_defs[bp].penc[ap];
-			if (penc == -1)
+			if (penc == -1 || !mmu_psize_defs[ap].shift)
 				continue;
 			shift = mmu_psize_defs[ap].shift - LP_SHIFT;
 			if (shift <= 0)