On 20/08/2021 13.39, Janosch Frank wrote:
Right now we only get told the kind of program exception as well as
the PSW at the point where it happened.
For addressing exceptions the PSW is not always enough so let's print
the TEID which contains the failing address and flags that tell us
more about the kind of address exception.
Signed-off-by: Janosch Frank <frankja@xxxxxxxxxxxxx>
---
...
--- /dev/null
+++ b/lib/s390x/fault.h
@@ -0,0 +1,44 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Headers for fault.c
+ *
+ * Copyright 2021 IBM Corp.
+ *
+ * Authors:
+ * Janosch Frank <frankja@xxxxxxxxxxxxx>
+ */
+#ifndef _S390X_FAULT_H_
+#define _S390X_FAULT_H_
+
+#include <bitops.h>
+
+/* Instruction execution prevention, i.e. no-execute, 101 */
+static inline bool prot_is_iep(uint64_t teid)
+{
+ if (test_bit_inv(56, &teid) && !test_bit_inv(60, &teid) && test_bit_inv(61, &teid))
+ return true;
+
+ return false;
You could simplify this into:
return test_bit_inv(56, &teid) &&
!test_bit_inv(60, &teid) &&
test_bit_inv(61, &teid);
... but I don't mind too much if you keep the current version.
+}
+
+/* Standard DAT exception, 001 */
+static inline bool prot_is_datp(uint64_t teid)
+{
+ if (!test_bit_inv(56, &teid) && !test_bit_inv(60, &teid) && test_bit_inv(61, &teid))
+ return true;
+
+ return false;
dito
+}
+
+/* Low-address protection exception, 100 */
+static inline bool prot_is_lap(uint64_t teid)
+{
+ if (test_bit_inv(56, &teid) && !test_bit_inv(60, &teid) && !test_bit_inv(61, &teid))
+ return true;
+
+ return false;
dito
+}
+
+void print_decode_teid(uint64_t teid);
+
+#endif /* _S390X_FAULT_H_ */
diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c
index 01ded49d..721e6758 100644
--- a/lib/s390x/interrupt.c
+++ b/lib/s390x/interrupt.c
@@ -12,6 +12,8 @@
#include <sclp.h>
#include <interrupt.h>
#include <sie.h>
+#include <fault.h>
+#include <asm/page.h>
static bool pgm_int_expected;
static bool ext_int_expected;
@@ -76,8 +78,7 @@ static void fixup_pgm_int(struct stack_frame_int *stack)
break;
case PGM_INT_CODE_PROTECTION:
/* Handling for iep.c test case. */
- if (lc->trans_exc_id & 0x80UL && lc->trans_exc_id & 0x04UL &&
- !(lc->trans_exc_id & 0x08UL))
+ if (prot_is_iep(lc->trans_exc_id))
/*
* We branched to the instruction that caused
* the exception so we can use the return
@@ -126,6 +127,26 @@ static void fixup_pgm_int(struct stack_frame_int *stack)
/* suppressed/terminated/completed point already at the next address */
}
+static void print_storage_exception_information(void)
+{
+ switch (lc->pgm_int_code) {
+ case PGM_INT_CODE_PROTECTION:
+ case PGM_INT_CODE_PAGE_TRANSLATION:
+ case PGM_INT_CODE_SEGMENT_TRANSLATION:
+ case PGM_INT_CODE_ASCE_TYPE:
+ case PGM_INT_CODE_REGION_FIRST_TRANS:
+ case PGM_INT_CODE_REGION_SECOND_TRANS:
+ case PGM_INT_CODE_REGION_THIRD_TRANS:
+ case PGM_INT_CODE_SECURE_STOR_ACCESS:
+ case PGM_INT_CODE_NON_SECURE_STOR_ACCESS:
+ case PGM_INT_CODE_SECURE_STOR_VIOLATION:
+ print_decode_teid(lc->trans_exc_id);
+ break;
+ default:
+ return;
Drop the default case?
+ }
+}
+
static void print_int_regs(struct stack_frame_int *stack)
{
printf("\n");
@@ -155,6 +176,10 @@ static void print_pgm_info(struct stack_frame_int *stack)
lc->pgm_int_code, stap(), lc->pgm_old_psw.addr, lc->pgm_int_id);
print_int_regs(stack);
dump_stack();
+
+ /* Dump stack doesn't end with a \n so we add it here instead */
+ printf("\n");
+ print_storage_exception_information();
report_summary();
abort();
}
diff --git a/s390x/Makefile b/s390x/Makefile
index ef8041a6..5d1a33a0 100644
--- a/s390x/Makefile
+++ b/s390x/Makefile
@@ -72,6 +72,7 @@ cflatobjs += lib/s390x/css_lib.o
cflatobjs += lib/s390x/malloc_io.o
cflatobjs += lib/s390x/uv.o
cflatobjs += lib/s390x/sie.o
+cflatobjs += lib/s390x/fault.o
OBJDIRS += lib/s390x
Some nits, but looks fine to me anyway:
Reviewed-by: Thomas Huth <thuth@xxxxxxxxxx>
