powerpc/ps3: Make real stack frames for LV1 hcalls
authorNicholas Piggin <npiggin@gmail.com>
Wed, 27 Dec 2023 07:24:05 +0000 (17:24 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 21 Feb 2024 12:14:52 +0000 (23:14 +1100)
The PS3 hcall assembly code makes ad-hoc stack frames that don't have
a back-chain pointer or meet other requirements like minimum frame size.
This probably confuses stack unwinders. Give all hcalls a real stack
frame.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Tested-by: Geoff Levand <geoff@infradead.org>
[mpe: Add missing \ in LV1_2_IN_4_OUT]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20231227072405.63751-4-npiggin@gmail.com
arch/powerpc/platforms/ps3/hvcall.S

index b854675..e8ab3d6 100644 (file)
@@ -9,6 +9,7 @@
 
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
+#include <asm/ptrace.h>
 
 #define lv1call .long 0x44000022; extsw r3, r3
 
@@ -18,8 +19,10 @@ _GLOBAL(_##API_NAME)                         \
        mflr    r0;                             \
        std     r0, LRSAVE(r1);                 \
                                                \
+       stdu    r1, -STACK_FRAME_MIN_SIZE(r1);  \
        li      r11, API_NUMBER;                \
        lv1call;                                \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE;   \
                                                \
        ld      r0, LRSAVE(r1);                 \
        mtlr    r0;                             \
@@ -40,12 +43,13 @@ _GLOBAL(_##API_NAME)                                \
        mflr    r0;                             \
        std     r0, LRSAVE(r1);                 \
                                                \
-       stdu    r3, -8(r1);                     \
+       std     r3, -8(r1);                     \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-8(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 8;                      \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+8; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
                                                \
@@ -60,12 +64,13 @@ _GLOBAL(_##API_NAME)                                \
        std     r0, LRSAVE(r1);                 \
                                                \
        std     r3, -8(r1);                     \
-       stdu    r4, -16(r1);                    \
+       std     r4, -16(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-16(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 16;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+16; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -83,12 +88,13 @@ _GLOBAL(_##API_NAME)                                \
                                                \
        std     r3, -8(r1);                     \
        std     r4, -16(r1);                    \
-       stdu    r5, -24(r1);                    \
+       std     r5, -24(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-24(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 24;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+24; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -112,12 +118,13 @@ _GLOBAL(_##API_NAME)                              \
        std     r6, -32(r1);                    \
        std     r7, -40(r1);                    \
        std     r8, -48(r1);                    \
-       stdu    r9, -56(r1);                    \
+       std     r9, -56(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-56(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 56;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+56; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -143,12 +150,13 @@ _GLOBAL(_##API_NAME)                              \
        mflr    r0;                             \
        std     r0, LRSAVE(r1);                 \
                                                \
-       stdu    r4, -8(r1);                     \
+       std     r4, -8(r1);                     \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-8(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 8;                      \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+8; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
                                                \
@@ -163,12 +171,13 @@ _GLOBAL(_##API_NAME)                              \
        std     r0, LRSAVE(r1);                 \
                                                \
        std     r4, -8(r1);                     \
-       stdu    r5, -16(r1);                    \
+       std     r5, -16(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-16(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 16;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+16; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -186,12 +195,13 @@ _GLOBAL(_##API_NAME)                              \
                                                \
        std     r4, -8(r1);                     \
        std     r5, -16(r1);                    \
-       stdu    r6, -24(r1);                    \
+       std     r6, -24(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-24(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 24;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+24; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -212,12 +222,13 @@ _GLOBAL(_##API_NAME)                              \
        std     r4, -8(r1);                     \
        std     r5, -16(r1);                    \
        std     r6, -24(r1);                    \
-       stdu    r7, -32(r1);                    \
+       std     r7, -32(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-32(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 32;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+32; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -241,12 +252,13 @@ _GLOBAL(_##API_NAME)                              \
        std     r5, -16(r1);                    \
        std     r6, -24(r1);                    \
        std     r7, -32(r1);                    \
-       stdu    r8, -40(r1);                    \
+       std     r8, -40(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-40(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 40;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+40; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -273,12 +285,13 @@ _GLOBAL(_##API_NAME)                              \
        std     r6, -24(r1);                    \
        std     r7, -32(r1);                    \
        std     r8, -40(r1);                    \
-       stdu    r9, -48(r1);                    \
+       std     r9, -48(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-48(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 48;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+48; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -308,12 +321,13 @@ _GLOBAL(_##API_NAME)                              \
        std     r7, -32(r1);                    \
        std     r8, -40(r1);                    \
        std     r9, -48(r1);                    \
-       stdu    r10, -56(r1);                   \
+       std     r10, -56(r1);                   \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-56(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 56;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+56; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -339,12 +353,13 @@ _GLOBAL(_##API_NAME)                              \
        mflr    r0;                             \
        std     r0, LRSAVE(r1);                 \
                                                \
-       stdu    r5, -8(r1);                     \
+       std     r5, -8(r1);                     \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-8(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 8;                      \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+8; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
                                                \
@@ -359,12 +374,13 @@ _GLOBAL(_##API_NAME)                              \
        std     r0, LRSAVE(r1);                 \
                                                \
        std     r5, -8(r1);                     \
-       stdu    r6, -16(r1);                    \
+       std     r6, -16(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-16(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 16;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+16; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -382,12 +398,13 @@ _GLOBAL(_##API_NAME)                              \
                                                \
        std     r5, -8(r1);                     \
        std     r6, -16(r1);                    \
-       stdu    r7, -24(r1);                    \
+       std     r7, -24(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-24(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 24;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+24; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -408,12 +425,13 @@ _GLOBAL(_##API_NAME)                              \
        std     r5, -8(r1);                     \
        std     r6, -16(r1);                    \
        std     r7, -24(r1);                    \
-       stdu    r8, -32(r1);                    \
+       std     r8, -32(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-32(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 32;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+32;\
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -437,12 +455,13 @@ _GLOBAL(_##API_NAME)                              \
        std     r6, -16(r1);                    \
        std     r7, -24(r1);                    \
        std     r8, -32(r1);                    \
-       stdu    r9, -40(r1);                    \
+       std     r9, -40(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-40(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 40;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+40; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -464,12 +483,13 @@ _GLOBAL(_##API_NAME)                              \
        mflr    r0;                             \
        std     r0, LRSAVE(r1);                 \
                                                \
-       stdu    r6, -8(r1);                     \
+       std     r6, -8(r1);                     \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-8(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 8;                      \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+8; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
                                                \
@@ -484,12 +504,13 @@ _GLOBAL(_##API_NAME)                              \
        std     r0, LRSAVE(r1);                 \
                                                \
        std     r6, -8(r1);                     \
-       stdu    r7, -16(r1);                    \
+       std     r7, -16(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-16(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 16;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+16; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -507,12 +528,13 @@ _GLOBAL(_##API_NAME)                              \
                                                \
        std     r6, -8(r1);                     \
        std     r7, -16(r1);                    \
-       stdu    r8, -24(r1);                    \
+       std     r8, -24(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-24(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 24;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+24; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -530,12 +552,13 @@ _GLOBAL(_##API_NAME)                              \
        mflr    r0;                             \
        std     r0, LRSAVE(r1);                 \
                                                \
-       stdu    r7, -8(r1);                     \
+       std     r7, -8(r1);                     \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-8(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 8;                      \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+8; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
                                                \
@@ -550,12 +573,13 @@ _GLOBAL(_##API_NAME)                              \
        std     r0, LRSAVE(r1);                 \
                                                \
        std     r7, -8(r1);                     \
-       stdu    r8, -16(r1);                    \
+       std     r8, -16(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-16(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 16;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+16; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -573,12 +597,13 @@ _GLOBAL(_##API_NAME)                              \
                                                \
        std     r7, -8(r1);                     \
        std     r8, -16(r1);                    \
-       stdu    r9, -24(r1);                    \
+       std     r9, -24(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-24(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 24;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+24; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -596,12 +621,13 @@ _GLOBAL(_##API_NAME)                              \
        mflr    r0;                             \
        std     r0, LRSAVE(r1);                 \
                                                \
-       stdu    r8, -8(r1);                     \
+       std     r8, -8(r1);                     \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-8(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 8;                      \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+8; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
                                                \
@@ -616,12 +642,13 @@ _GLOBAL(_##API_NAME)                              \
        std     r0, LRSAVE(r1);                 \
                                                \
        std     r8, -8(r1);                     \
-       stdu    r9, -16(r1);                    \
+       std     r9, -16(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-16(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 16;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+16; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -639,12 +666,13 @@ _GLOBAL(_##API_NAME)                              \
                                                \
        std     r8, -8(r1);                     \
        std     r9, -16(r1);                    \
-       stdu    r10, -24(r1);                   \
+       std     r10, -24(r1);                   \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-24(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 24;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+24; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -662,12 +690,13 @@ _GLOBAL(_##API_NAME)                              \
        mflr    r0;                             \
        std     r0, LRSAVE(r1);                 \
                                                \
-       stdu    r9, -8(r1);                     \
+       std     r9, -8(r1);                     \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-8(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 8;                      \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+8; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
                                                \
@@ -682,12 +711,13 @@ _GLOBAL(_##API_NAME)                              \
        std     r0, LRSAVE(r1);                 \
                                                \
        std     r9, -8(r1);                     \
-       stdu    r10, -16(r1);                   \
+       std     r10, -16(r1);                   \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-16(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 16;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+16; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -704,12 +734,13 @@ _GLOBAL(_##API_NAME)                              \
        std     r0, LRSAVE(r1);                 \
                                                \
        std     r9, -8(r1);                     \
-       stdu    r10, -16(r1);                   \
+       std     r10, -16(r1);                   \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-16(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 16;                     \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+16; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
        ld      r11, -16(r1);                   \
@@ -727,12 +758,13 @@ _GLOBAL(_##API_NAME)                              \
        mflr    r0;                             \
        std     r0, LRSAVE(r1);                 \
                                                \
-       stdu    r10, -8(r1);                    \
+       std     r10, -8(r1);                    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE-8(r1); \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
-       addi    r1, r1, 8;                      \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE+8; \
        ld      r11, -8(r1);                    \
        std     r4, 0(r11);                     \
                                                \
@@ -747,10 +779,12 @@ _GLOBAL(_##API_NAME)                              \
        std     r0, LRSAVE(r1);                 \
                                                \
        std     r10, STK_PARAM_AREA+8*7(r1);    \
+       stdu    r1, -STACK_FRAME_MIN_SIZE(r1);  \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE;   \
        ld      r11, STK_PARAM_AREA+8*7(r1);    \
        std     r4, 0(r11);                     \
        ld      r11, STK_PARAM_AREA+8*8(r1);    \
@@ -773,10 +807,12 @@ _GLOBAL(_##API_NAME)                              \
                                                \
        mflr    r0;                             \
        std     r0, LRSAVE(r1);                 \
+       stdu    r1, -STACK_FRAME_MIN_SIZE(r1);  \
                                                \
        li      r11, API_NUMBER;                \
        lv1call;                                \
                                                \
+       addi    r1, r1, STACK_FRAME_MIN_SIZE;   \
        ld      r11, STK_PARAM_AREA+8*8(r1);    \
        std     r4, 0(r11);                     \
                                                \