Attachment 282881 Details for Bug 418231 – ppc64 stack increase 4x (from 16KB to 64KB)

[patch] ppc64 stack increase 4x (from 16KB to 64KB)

kernel-ppc-stack4x.patch (text/plain), 3.16 KB, created by Jan Kratochvil on 2007-12-10 16:04:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kratochvil

Created: 2007-12-10 16:04:42 UTC

Size: 3.16 KB

patch

obsolete

>--- ./include/asm-powerpc/thread_info.h-orig	2007-10-09 22:31:38.000000000 +0200
>+++ ./include/asm-powerpc/thread_info.h	2007-12-09 19:30:39.000000000 +0100
>@@ -13,9 +13,9 @@
> /* We have 8k stacks on ppc32 and 16k on ppc64 */
> 
> #ifdef CONFIG_PPC64
>-#define THREAD_SHIFT		14
>+#define THREAD_SHIFT		16
> #else
>-#define THREAD_SHIFT		13
>+#define THREAD_SHIFT		14
> #endif
> 
> #define THREAD_SIZE		(1 << THREAD_SHIFT)
>--- ./arch/powerpc/kernel/head_64.S-orig	2007-12-09 20:01:48.000000000 +0100
>+++ ./arch/powerpc/kernel/head_64.S	2007-12-10 10:44:39.000000000 +0100
>@@ -1825,7 +1825,15 @@
> 	LOAD_REG_ADDR(r3, current_set)
> 	sldi	r28,r24,3		/* get current_set[cpu#]	 */
> 	ldx	r1,r3,r28
>+#if 0
> 	addi	r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
>+#else
>+	addi	r1,r1,THREAD_SIZE / 4
>+	addi	r1,r1,THREAD_SIZE / 4
>+	addi	r1,r1,THREAD_SIZE / 4
>+	addi	r1,r1,THREAD_SIZE / 4
>+	addi	r1,r1,-STACK_FRAME_OVERHEAD
>+#endif
> 	std	r1,PACAKSAVE(r13)
> 
> 	/* Clear backchain so we get nice backtraces */
>@@ -1910,7 +1918,14 @@
> 	add	r3,r3,r26
> 
> 	/* set up a stack pointer (physical address) */
>+#if 0
> 	addi	r1,r3,THREAD_SIZE
>+#else
>+	addi	r1,r3,THREAD_SIZE / 4
>+	addi	r1,r1,THREAD_SIZE / 4
>+	addi	r1,r1,THREAD_SIZE / 4
>+	addi	r1,r1,THREAD_SIZE / 4
>+#endif
> 	li	r0,0
> 	stdu	r0,-STACK_FRAME_OVERHEAD(r1)
> 
>@@ -1951,7 +1966,14 @@
> 	LOAD_REG_IMMEDIATE(r3,init_thread_union)
> 
> 	/* set up the stack */
>+#if 0
> 	addi	r1,r3,THREAD_SIZE
>+#else
>+	addi	r1,r3,THREAD_SIZE / 4
>+	addi	r1,r1,THREAD_SIZE / 4
>+	addi	r1,r1,THREAD_SIZE / 4
>+	addi	r1,r1,THREAD_SIZE / 4
>+#endif
> 	li	r0,0
> 	stdu	r0,-STACK_FRAME_OVERHEAD(r1)
> 
>--- ./arch/powerpc/kernel/misc_64.S-orig	2007-12-09 20:01:48.000000000 +0100
>+++ ./arch/powerpc/kernel/misc_64.S	2007-12-10 10:32:36.000000000 +0100
>@@ -43,7 +43,15 @@
> _GLOBAL(call_do_softirq)
> 	mflr	r0
> 	std	r0,16(r1)
>+#if 0
> 	stdu	r1,THREAD_SIZE-112(r3)
>+#else
>+	addi	r3,r3,THREAD_SIZE / 4
>+	addi	r3,r3,THREAD_SIZE / 4
>+	addi	r3,r3,THREAD_SIZE / 4
>+	addi	r3,r3,THREAD_SIZE / 4
>+	stdu	r1,-112(r3)
>+#endif
> 	mr	r1,r3
> 	bl	.__do_softirq
> 	ld	r1,0(r1)
>@@ -56,7 +64,15 @@
> 	mflr	r0
> 	std	r0,16(r1)
> 	mtctr	r8
>+#if 0
> 	stdu	r1,THREAD_SIZE-112(r6)
>+#else
>+	addi	r6,r6,THREAD_SIZE / 4
>+	addi	r6,r6,THREAD_SIZE / 4
>+	addi	r6,r6,THREAD_SIZE / 4
>+	addi	r6,r6,THREAD_SIZE / 4
>+	stdu	r1,-112(r6)
>+#endif
> 	mr	r1,r6
> 	bctrl
> 	ld	r1,0(r1)
>@@ -565,7 +581,15 @@
> 	std	r0,16(r1)
> 
> 	/* switch stacks to newstack -- &kexec_stack.stack */
>+#if 0
> 	stdu	r1,THREAD_SIZE-112(r3)
>+#else
>+	addi	r3,r3,THREAD_SIZE / 4
>+	addi	r3,r3,THREAD_SIZE / 4
>+	addi	r3,r3,THREAD_SIZE / 4
>+	addi	r3,r3,THREAD_SIZE / 4
>+	stdu	r1,-112(r3)
>+#endif
> 	mr	r1,r3
> 
> 	li	r0,0
>--- ./arch/powerpc/kernel/entry_64.S-orig	2006-09-20 05:42:06.000000000 +0200
>+++ ./arch/powerpc/kernel/entry_64.S	2007-12-10 10:50:45.000000000 +0100
>@@ -386,7 +386,15 @@
> 	/* Note: this uses SWITCH_FRAME_SIZE rather than INT_FRAME_SIZE
> 	   because we don't need to leave the 288-byte ABI gap at the
> 	   top of the kernel stack. */
>+#if 0
> 	addi	r7,r7,THREAD_SIZE-SWITCH_FRAME_SIZE
>+#else
>+	addi	r7,r7,THREAD_SIZE / 4
>+	addi	r7,r7,THREAD_SIZE / 4
>+	addi	r7,r7,THREAD_SIZE / 4
>+	addi	r7,r7,THREAD_SIZE / 4
>+	addi	r7,r7,-SWITCH_FRAME_SIZE
>+#endif
> 
> 	mr	r1,r8		/* start using new stack pointer */
> 	std	r7,PACAKSAVE(r13)

Actions: View | Diff

Attachments on bug 418231: 282881