From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77F7FC54EBD for ; Thu, 12 Jan 2023 15:57:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240543AbjALP51 (ORCPT ); Thu, 12 Jan 2023 10:57:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240526AbjALP4c (ORCPT ); Thu, 12 Jan 2023 10:56:32 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F7C75F4B; Thu, 12 Jan 2023 07:46:44 -0800 (PST) Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30CFLMFe012826; Thu, 12 Jan 2023 15:46:44 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=N6KQpyCIRLGVNI2BKxfLkWTQQxU4f9VG2jydRh65aag=; b=Sc5Grvz0gdgxMpRz2VdSPRHowjEknw9fbE351yuzINv6D6jV369LM9EF9fPpwMmCUwQW NLMdBRmB0X3WxAxQRGk9R/pMxbJSlvFHRHskicYQv8bBWMAp+e4OyjYBifVq8y1KcjOr 8dCh4gcnRqPgZQfWPy+sjWPcH96R9pJjspiMuAlVb9H/Q6eC541pu/COf00KrSjDvB/C VCTDKZ3NfpfTBRXYwiyib6WE5pU8VOUBEO2Dy/MpF5UCPCWbOyNEEFSTvYuHeBskC2sb 59H00PwrIRU8tlD5yH3rBBM7QXpZ+r8eY7MOIhQBa4JEqd5jkU8ncWsXcDx6Q5Y43ucF dg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3n2msc8p76-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 12 Jan 2023 15:46:43 +0000 Received: from m0098404.ppops.net (m0098404.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 30CFPhdJ027068; Thu, 12 Jan 2023 15:46:43 GMT Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3n2msc8p6d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 12 Jan 2023 15:46:43 +0000 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 30CConSH030619; Thu, 12 Jan 2023 15:46:41 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma03fra.de.ibm.com (PPS) with ESMTPS id 3n1kyx9xsg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 12 Jan 2023 15:46:41 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 30CFkbe442467760 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 12 Jan 2023 15:46:37 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4C33520040; Thu, 12 Jan 2023 15:46:37 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 155D22004D; Thu, 12 Jan 2023 15:46:37 +0000 (GMT) Received: from a46lp67.. (unknown [9.152.108.100]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 12 Jan 2023 15:46:37 +0000 (GMT) From: Janosch Frank To: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, imbrenda@linux.ibm.com, thuth@redhat.com, david@redhat.com, nsg@linux.ibm.com, nrb@linux.ibm.com Subject: [kvm-unit-tests PATCH v2 7/7] lib: s390x: Handle debug prints for SIE exceptions correctly Date: Thu, 12 Jan 2023 15:45:48 +0000 Message-Id: <20230112154548.163021-8-frankja@linux.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230112154548.163021-1-frankja@linux.ibm.com> References: <20230112154548.163021-1-frankja@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: DWvQysgobXtpz_0ix7TKqlobNXdsCNSN X-Proofpoint-GUID: -7KWSVHmAD8EZzbXERJBTgoHP9t0bmDc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2023-01-12_08,2023-01-12_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 lowpriorityscore=0 suspectscore=0 bulkscore=0 malwarescore=0 impostorscore=0 mlxscore=0 mlxlogscore=931 spamscore=0 adultscore=0 priorityscore=1501 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301120112 Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org When we leave SIE due to an exception, we'll still have guest values in registers 0 - 13 and that's not clearly portraied in our debug prints. So let's fix that. Signed-off-by: Janosch Frank --- lib/s390x/interrupt.c | 46 ++++++++++++++++++++++++++++++++++++++----- lib/s390x/sie.h | 2 ++ s390x/cpu.S | 6 ++++-- 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c index dadb7415..ff47c2c2 100644 --- a/lib/s390x/interrupt.c +++ b/lib/s390x/interrupt.c @@ -9,6 +9,7 @@ */ #include #include +#include #include #include #include @@ -188,9 +189,12 @@ static void print_storage_exception_information(void) } } -static void print_int_regs(struct stack_frame_int *stack) +static void print_int_regs(struct stack_frame_int *stack, bool sie) { + struct kvm_s390_sie_block *sblk; + printf("\n"); + printf("%s\n", sie ? "Guest registers:" : "Host registers:"); printf("GPRS:\n"); printf("%016lx %016lx %016lx %016lx\n", stack->grs1[0], stack->grs1[1], stack->grs0[0], stack->grs0[1]); @@ -198,24 +202,56 @@ static void print_int_regs(struct stack_frame_int *stack) stack->grs0[2], stack->grs0[3], stack->grs0[4], stack->grs0[5]); printf("%016lx %016lx %016lx %016lx\n", stack->grs0[6], stack->grs0[7], stack->grs0[8], stack->grs0[9]); - printf("%016lx %016lx %016lx %016lx\n", - stack->grs0[10], stack->grs0[11], stack->grs0[12], stack->grs0[13]); + + if (sie) { + sblk = (struct kvm_s390_sie_block *)stack->grs0[12]; + printf("%016lx %016lx %016lx %016lx\n", + stack->grs0[10], stack->grs0[11], sblk->gg14, sblk->gg15); + } else { + printf("%016lx %016lx %016lx %016lx\n", + stack->grs0[10], stack->grs0[11], stack->grs0[12], stack->grs0[13]); + } + printf("\n"); } static void print_pgm_info(struct stack_frame_int *stack) { - bool in_sie; + bool in_sie, in_sie_gregs; + struct vm_save_area *vregs; in_sie = (lowcore.pgm_old_psw.addr >= (uintptr_t)sie_entry && lowcore.pgm_old_psw.addr <= (uintptr_t)sie_exit); + in_sie_gregs = (lowcore.pgm_old_psw.addr >= (uintptr_t)sie_entry_gregs && + lowcore.pgm_old_psw.addr <= (uintptr_t)sie_exit_gregs); printf("\n"); printf("Unexpected program interrupt %s: %#x on cpu %d at %#lx, ilen %d\n", in_sie ? "in SIE" : "", lowcore.pgm_int_code, stap(), lowcore.pgm_old_psw.addr, lowcore.pgm_int_id); - print_int_regs(stack); + + /* + * If we fall out of SIE before loading the host registers, + * then we need to do it here so we print the host registers + * and not the guest registers. + * + * Back tracing is actually not a problem since SIE restores gr15. + */ + if (in_sie_gregs) { + print_int_regs(stack, true); + vregs = *((struct vm_save_area **)(stack->grs0[13] + __SF_SIE_SAVEAREA)); + + /* + * The grs are not linear on the interrupt stack frame. + * We copy 0 and 1 here and 2 - 15 with the memcopy below. + */ + stack->grs1[0] = vregs->host.grs[0]; + stack->grs1[1] = vregs->host.grs[1]; + /* 2 - 15 */ + memcpy(stack->grs0, &vregs->host.grs[2], sizeof(stack->grs0) - 8); + } + print_int_regs(stack, false); dump_stack(); /* Dump stack doesn't end with a \n so we add it here instead */ diff --git a/lib/s390x/sie.h b/lib/s390x/sie.h index a27a8401..147cb0f2 100644 --- a/lib/s390x/sie.h +++ b/lib/s390x/sie.h @@ -273,6 +273,8 @@ struct vm { extern void sie_entry(void); extern void sie_exit(void); +extern void sie_entry_gregs(void); +extern void sie_exit_gregs(void); extern void sie64a(struct kvm_s390_sie_block *sblk, struct vm_save_area *save_area); void sie(struct vm *vm); void sie_expect_validity(struct vm *vm); diff --git a/s390x/cpu.S b/s390x/cpu.S index 45bd551a..9155b044 100644 --- a/s390x/cpu.S +++ b/s390x/cpu.S @@ -82,7 +82,8 @@ sie64a: # Store scb and save_area pointer into stack frame stg %r2,__SF_SIE_CONTROL(%r15) # save control block pointer stg %r3,__SF_SIE_SAVEAREA(%r15) # save guest register save area - +.globl sie_entry_gregs +sie_entry_gregs: # Load guest's gprs, fprs and fpc .irp i, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ld \i, \i * 8 + SIE_SAVEAREA_GUEST_FPRS(%r3) @@ -121,7 +122,8 @@ sie_exit: .endr lfpc SIE_SAVEAREA_HOST_FPC(%r14) lmg %r0,%r14,SIE_SAVEAREA_HOST_GRS(%r14) # restore kernel registers - +.globl sie_exit_gregs +sie_exit_gregs: br %r14 .align 8 -- 2.34.1