s390x: Fix uv_call() exception behavior
PATCH 1/1 s390x: Fix uv_call() exception behavior
On a program exception we usually skip the instruction that caused the exception and continue. That won't work for UV calls since a "brc 3,0b" will retry the instruction if the CC is > 1.
---
I know this isn't very pretty.
I'm open for suggestions.
--- lib/s390x/asm/uv.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
lib/s390x/asm/uv.h +8 -6
@@ -53,21 +53,23 @@ struct uv_cb_share {static inline int uv_call (unsigned long r1,unsigned long r2) {int cc; +struct lowcore *lc =0x0 ;/* -* The brc instruction will take care of the cc 2/3 case where -* we need to continue the execution because we were -* interrupted. The inline assembly will only return on -* success/error i.e. cc 0/1. -*/ +* CC 2 and 3 tell us to re-execute because the instruction +* hasn't yet finished. +*/ + lc->pgm_int_code =0 ; +retry: asmvolatile ("0: .insn rrf,0xB9A40000,%[r1],%[r2],0,0\n" -" brc 3,0b\n" " ipm %[cc]\n" " srl %[cc],28\n" : [cc]"=d" (cc) : [r1]"a" (r1), [r2]"a" (r2) :"memory" ,"cc" ); +if (!lc->pgm_int_code && cc >1 ) + goto retry;return cc; }
Signature · 1 line
2.25.1
Quoted 35 lines · Janosch Frank
On a program exception we usually skip the instruction that caused the exception and continue. That won't work for UV calls since a "brc 3,0b" will retry the instruction if the CC is > 1.
Signed-off-by Janosch Frank <[email protected]>---
I know this isn't very pretty.
I'm open for suggestions.--- lib/s390x/asm/uv.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)lib/s390x/asm/uv.h +6
-5@@ -53,21 +53,23 @@ struct uv_cb_share {static inline int uv_call (unsigned long r1,unsigned long r2) {int cc; +struct lowcore *lc =0x0 ;/* -* The brc instruction will take care of the cc 2/3 case where -* we need to continue the execution because we were -* interrupted. The inline assembly will only return on -* success/error i.e. cc 0/1. -*/ +* CC 2 and 3 tell us to re-execute because the instruction +* hasn't yet finished. +*/ + lc->pgm_int_code =0 ; +retry:
lib/s390x/asm/uv.h struct uv_cb_share { · line 72
Quoted 10 lines
lib/s390x/asm/uv.h +2
-1asmvolatile ("0: .insn rrf,0xB9A40000,%[r1],%[r2],0,0\n" -" brc 3,0b\n" " ipm %[cc]\n" " srl %[cc],28\n" : [cc]"=d" (cc) : [r1]"a" (r1), [r2]"a" (r2) :"memory" ,"cc" ); +if (!lc->pgm_int_code && cc >1 ) + goto retry;
Why not simply:
do {
asm volatile(...);
} while (!lc->pgm_int_code && cc > 1)?
Thomas
Quoted 49 lines · Thomas Huth
Quoted 35 lines · Janosch Frank
On a program exception we usually skip the instruction that caused the exception and continue. That won't work for UV calls since a "brc 3,0b" will retry the instruction if the CC is > 1.
Signed-off-by Janosch Frank <[email protected]>---
I know this isn't very pretty.
I'm open for suggestions.--- lib/s390x/asm/uv.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)lib/s390x/asm/uv.h +6
-5@@ -53,21 +53,23 @@ struct uv_cb_share {static inline int uv_call (unsigned long r1,unsigned long r2) {int cc; +struct lowcore *lc =0x0 ;/* -* The brc instruction will take care of the cc 2/3 case where -* we need to continue the execution because we were -* interrupted. The inline assembly will only return on -* success/error i.e. cc 0/1. -*/ +* CC 2 and 3 tell us to re-execute because the instruction +* hasn't yet finished. +*/ + lc->pgm_int_code =0 ; +retry:lib/s390x/asm/uv.h struct uv_cb_share { · line 72
Quoted 10 lines
lib/s390x/asm/uv.h +2
-1asmvolatile ("0: .insn rrf,0xB9A40000,%[r1],%[r2],0,0\n" -" brc 3,0b\n" " ipm %[cc]\n" " srl %[cc],28\n" : [cc]"=d" (cc) : [r1]"a" (r1), [r2]"a" (r2) :"memory" ,"cc" ); +if (!lc->pgm_int_code && cc >1 ) + goto retry;Why not simply:
Quoted 5 lines
do { asm volatile(...); } while (!lc->pgm_int_code && cc > 1)?
That would also be an option but it would basically be the same horrible looking quick fix.
Claudio proposed implementing a one shot uv_call that doesn't branch back. We should be able to use that purely for privilege checks.
Quoted 3 lines
Thomas
PATCH v2 1/1 s390x: Fix uv_call() exception behavior
In reply to Janosch FrankOn a program exception we usually skip the instruction that caused the exception and continue. That won't work for UV calls since a "brc 3,0b" will retry the instruction if the CC is > 1. Let's forgo the brc when checking for privilege exceptions and use a uv_call_once().
--- lib/s390x/asm/uv.h | 24 ++++++++++++++++-------- s390x/uv-guest.c | 6 +++--- 2 files changed, 19 insertions(+), 11 deletions(-)
lib/s390x/asm/uv.h +16 -8
@@ -50,19 +50,12 @@ struct uv_cb_share {u64 reserved28; } __attribute__((packed)) __attribute__((aligned(8))); -static inline int uv_call (unsigned long r1,unsigned long r2) +static inline int uv_call_once (unsigned long r1,unsigned long r2) {int cc; -/* -* The brc instruction will take care of the cc 2/3 case where -* we need to continue the execution because we were -* interrupted. The inline assembly will only return on -* success/error i.e. cc 0/1. -*/ asmvolatile ("0: .insn rrf,0xB9A40000,%[r1],%[r2],0,0\n" -" brc 3,0b\n" " ipm %[cc]\n" " srl %[cc],28\n" : [cc] "=d" (cc)
@@ -71,4 +64,19 @@ static inline int uv_call(unsigned long r1, unsigned long r2) return cc; } +static inline int uv_call (unsigned long r1,unsigned long r2) +{ +int cc; + +/* +* CC 2 and 3 tell us to re-execute because the instruction +* hasn't yet finished. +*/ +do { + cc =uv_call_once (r1, r2); + }while (cc >1 ); + +return cc; +} +#endif
s390x/uv-guest.c +3 -3
@@ -31,7 +31,7 @@ static void test_priv(void) uvcb.len =sizeof (struct uv_cb_qui );expect_pgm_int ();enter_pstate (); -uv_call (0 , (u64)&uvcb); +uv_call_once (0 , (u64)&uvcb);check_pgm_int_code (PGM_INT_CODE_PRIVILEGED_OPERATION );report_prefix_pop ();
@@ -40,7 +40,7 @@ static void test_priv(void) uvcb.len =sizeof (struct uv_cb_share );expect_pgm_int ();enter_pstate (); -uv_call (0 , (u64)&uvcb); +uv_call_once (0 , (u64)&uvcb);check_pgm_int_code (PGM_INT_CODE_PRIVILEGED_OPERATION );report_prefix_pop ();
@@ -49,7 +49,7 @@ static void test_priv(void) uvcb.len =sizeof (struct uv_cb_share );expect_pgm_int ();enter_pstate (); -uv_call (0 , (u64)&uvcb); +uv_call_once (0 , (u64)&uvcb);check_pgm_int_code (PGM_INT_CODE_PRIVILEGED_OPERATION );report_prefix_pop ();
Signature · 1 line
2.25.1
Quoted 81 lines · Janosch Frank
On a program exception we usually skip the instruction that caused the exception and continue. That won't work for UV calls since a "brc 3,0b" will retry the instruction if the CC is > 1. Let's forgo the brc when checking for privilege exceptions and use a
uv_call_once().Signed-off-by Janosch Frank <[email protected]>Suggested-by Claudio Imbrenda <[email protected]>--- lib/s390x/asm/uv.h | 24 ++++++++++++++++-------- s390x/uv-guest.c | 6 +++--- 2 files changed, 19 insertions(+), 11 deletions(-)lib/s390x/asm/uv.h +16
-8@@ -50,19 +50,12 @@ struct uv_cb_share {u64 reserved28; } __attribute__((packed)) __attribute__((aligned(8))); -static inline int uv_call (unsigned long r1,unsigned long r2) +static inline int uv_call_once (unsigned long r1,unsigned long r2) {int cc; -/* -* The brc instruction will take care of the cc 2/3 case where -* we need to continue the execution because we were -* interrupted. The inline assembly will only return on -* success/error i.e. cc 0/1. -*/ asmvolatile ("0: .insn rrf,0xB9A40000,%[r1],%[r2],0,0\n" -" brc 3,0b\n" " ipm %[cc]\n" " srl %[cc],28\n" : [cc] "=d" (cc)@@ -71,4 +64,19 @@ static inline int uv_call(unsigned long r1, unsigned long r2) return cc; } +static inline int uv_call (unsigned long r1,unsigned long r2) +{ +int cc; + +/* +* CC 2 and 3 tell us to re-execute because the instruction +* hasn't yet finished. +*/ +do { + cc =uv_call_once (r1, r2); + }while (cc >1 ); + +return cc; +} +#endif s390x/uv-guest.c +2
-2@@ -31,7 +31,7 @@ static void test_priv(void) uvcb.len =sizeof (struct uv_cb_qui );expect_pgm_int ();enter_pstate (); -uv_call (0 , (u64)&uvcb); +uv_call_once (0 , (u64)&uvcb);check_pgm_int_code (PGM_INT_CODE_PRIVILEGED_OPERATION );report_prefix_pop ();@@ -40,7 +40,7 @@ static void test_priv(void) uvcb.len =sizeof (struct uv_cb_share );expect_pgm_int ();enter_pstate (); -uv_call (0 , (u64)&uvcb); +uv_call_once (0 , (u64)&uvcb);check_pgm_int_code (PGM_INT_CODE_PRIVILEGED_OPERATION );report_prefix_pop ();
s390x/uv-guest.c static void test_priv(void) · line 54
Quoted 7 lines
s390x/uv-guest.c +1
-1@@ -49,7 +49,7 @@ static void test_priv(void) uvcb.len =sizeof (struct uv_cb_share );expect_pgm_int ();enter_pstate (); -uv_call (0 , (u64)&uvcb); +uv_call_once (0 , (u64)&uvcb);check_pgm_int_code (PGM_INT_CODE_PRIVILEGED_OPERATION );report_prefix_pop ();
That looks nicer, indeed.
Quoted 5 lines · On Mon, 18 Jan 2021 10:09:22 -0500 Janosch Frank <[email protected]> wrote:
On a program exception we usually skip the instruction that caused the exception and continue. That won't work for UV calls since a "brc 3,0b" will retry the instruction if the CC is > 1. Let's forgo the brc when checking for privilege exceptions and use a
uv_call_once().
Quoted 7 lines
Signed-off-by Janosch Frank <[email protected]>Suggested-by Claudio Imbrenda <[email protected]>--- lib/s390x/asm/uv.h | 24 ++++++++++++++++-------- s390x/uv-guest.c | 6 +++--- 2 files changed, 19 insertions(+), 11 deletions(-)