Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

powerpc/mm: Fix hang accessing top of vmalloc space

Browse source 
On pSeries, we always force the IO space to be mapped using 4K
pages even with a 64K base page size to cope with some limitations
in the HV interface to some devices.

However, the SLB miss handler code to discriminate between vmalloc
and ioremap space uses a CPU feature section such that the code
is nop'ed out when the processor support large pages non-cachable
mappings.

Thus, we end up always using the ioremap page size for vmalloc
segments on such processors, causing a discrepency between the
segment and the hash table, and thus a hang continously hashing
the page.

It works for the first segment of the vmalloc space since that
segment is "bolted" in by C code correctly, and thankfully we
almost never use the vmalloc space beyond the first segment,
but the new percpu code made the bug happen.

This fixes it by removing the feature section from the assembly,
we now always do the comparison between vmalloc and ioremap.

Signed-off-by; Benjamin Herrenschmidt <benh@kernel.crashing.org>

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt 2009-10-12 20:43:47 +00:00
parent aee7a283bb
commit 8d8997f34e
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/powerpc/mm/slb_low.S
View file

@ -72,19 +72,17 @@ _GLOBAL(slb_miss_kernel_load_vmemmap)
1: 1:
#endif /* CONFIG_SPARSEMEM_VMEMMAP */ #endif /* CONFIG_SPARSEMEM_VMEMMAP */
/* vmalloc/ioremap mapping encoding bits, the "li" instructions below /* vmalloc mapping gets the encoding from the PACA as the mapping
* will be patched by the kernel at boot * can be demoted from 64K -> 4K dynamically on some machines
*/ */
BEGIN_FTR_SECTION
/* check whether this is in vmalloc or ioremap space */
clrldi r11,r10,48 clrldi r11,r10,48
cmpldi r11,(VMALLOC_SIZE >> 28) - 1 cmpldi r11,(VMALLOC_SIZE >> 28) - 1
bgt 5f bgt 5f
lhz r11,PACAVMALLOCSLLP(r13) lhz r11,PACAVMALLOCSLLP(r13)
b 6f b 6f
5: 5:
END_FTR_SECTION_IFCLR(CPU_FTR_CI_LARGE_PAGE) /* IO mapping */
_GLOBAL(slb_miss_kernel_load_io) _GLOBAL(slb_miss_kernel_load_io)
li r11,0 li r11,0
6: 6:
BEGIN_FTR_SECTION BEGIN_FTR_SECTION