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 3D527C742A7 for ; Wed, 8 Mar 2023 15:20:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231611AbjCHPUC (ORCPT ); Wed, 8 Mar 2023 10:20:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232107AbjCHPTq (ORCPT ); Wed, 8 Mar 2023 10:19:46 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D7D993128 for ; Wed, 8 Mar 2023 07:19:39 -0800 (PST) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 328DMXe9018844 for ; Wed, 8 Mar 2023 15:19:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : to : cc : subject : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=pp1; bh=kKA0wVdGslcDrfgLS9hLAImmqYm0AfMKN2yGYx4RDz8=; b=FPcX2YBVrZ5t3oZ886JQk40ajIrpK/1FfK+QqLGOl/j2k1rcWSy/HZoQUGK9FX5PeACl xvlNaDGMbnMOkOPmN6cus4i66OeGXZMXQqnBRXEnsJYfYy/r5YR+e3QA94HGvQF6hfvG 9+gssuDk4CY2dG9QlUnTpvskNYhbfVqbiCYvaxAfUCyjxRnvBFgac0JUL0aJDmXl1PPt rlKI5QZj12IK2KZJlU3GklOk08XUXxTMOp634NU6qLY/qH1sfdh3rstdW3Xqoy9pl9gu Q96CGS64l9j59FaYSGIvCErInGd0ELcnz+/Of80Jwqzli9AENpBEv627ogllxFpuuDjf AA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3p6ry3ef1s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 08 Mar 2023 15:19:38 +0000 Received: from m0098399.ppops.net (m0098399.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 328ELW4w008630 for ; Wed, 8 Mar 2023 15:19:38 GMT Received: from ppma02fra.de.ibm.com (47.49.7a9f.ip4.static.sl-reverse.com [159.122.73.71]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3p6ry3ef0x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 08 Mar 2023 15:19:38 +0000 Received: from pps.filterd (ppma02fra.de.ibm.com [127.0.0.1]) by ppma02fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3280bbbP032279; Wed, 8 Mar 2023 15:19:35 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma02fra.de.ibm.com (PPS) with ESMTPS id 3p6g038r0d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 08 Mar 2023 15:19:35 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 328FJWrt28574416 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 8 Mar 2023 15:19:32 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 585F620049; Wed, 8 Mar 2023 15:19:32 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DA5FA20040; Wed, 8 Mar 2023 15:19:31 +0000 (GMT) Received: from p-imbrenda (unknown [9.179.29.172]) by smtpav05.fra02v.mail.ibm.com (Postfix) with SMTP; Wed, 8 Mar 2023 15:19:31 +0000 (GMT) Date: Wed, 8 Mar 2023 16:12:28 +0100 From: Claudio Imbrenda To: Marc Hartmayer Cc: , Janosch Frank , David Hildenbrand , Nina Schoetterl-Glausch , Nico Boehr , Thomas Huth Subject: Re: [kvm-unit-tests PATCH v3 6/7] s390x: define a macro for the stack frame size Message-ID: <20230308161228.3d4b89bb@p-imbrenda> In-Reply-To: <20230307091051.13945-7-mhartmay@linux.ibm.com> References: <20230307091051.13945-1-mhartmay@linux.ibm.com> <20230307091051.13945-7-mhartmay@linux.ibm.com> Organization: IBM X-Mailer: Claws Mail 4.1.1 (GTK 3.24.35; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: RY8Ng6k_OkfNY6gcmVQX1efuTP2YCyfC X-Proofpoint-ORIG-GUID: op2n-PYmDB7aHm42cVPk_RY6SuqjSrDf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-08_08,2023-03-08_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 impostorscore=0 mlxlogscore=999 priorityscore=1501 lowpriorityscore=0 spamscore=0 bulkscore=0 malwarescore=0 phishscore=0 suspectscore=0 clxscore=1015 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303080129 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Tue, 7 Mar 2023 10:10:50 +0100 Marc Hartmayer wrote: > Define and use a macro for the stack frame size. While at it, fix > whitespace in the `gs_handler_asm` block. > > Signed-off-by: Marc Hartmayer > Co-developed-by: Nina Schoetterl-Glausch Reviewed-by: Claudio Imbrenda > --- > lib/s390x/asm-offsets.c | 1 + > s390x/Makefile | 2 +- > s390x/cstart64.S | 2 +- > s390x/flat.lds.S | 4 +++- > s390x/gs.c | 38 +++++++++++++++++++++---------------- > s390x/macros.S | 4 ++-- > s390x/snippets/c/flat.lds.S | 6 ++++-- > 7 files changed, 34 insertions(+), 23 deletions(-) > > diff --git a/lib/s390x/asm-offsets.c b/lib/s390x/asm-offsets.c > index f612f3277a95..188dd2e51181 100644 > --- a/lib/s390x/asm-offsets.c > +++ b/lib/s390x/asm-offsets.c > @@ -87,6 +87,7 @@ int main(void) > OFFSET(STACK_FRAME_INT_GRS0, stack_frame_int, grs0); > OFFSET(STACK_FRAME_INT_GRS1, stack_frame_int, grs1); > DEFINE(STACK_FRAME_INT_SIZE, sizeof(struct stack_frame_int)); > + DEFINE(STACK_FRAME_SIZE, sizeof(struct stack_frame)); > > return 0; > } > diff --git a/s390x/Makefile b/s390x/Makefile > index e13a04eecb3e..fc8201f7762b 100644 > --- a/s390x/Makefile > +++ b/s390x/Makefile > @@ -160,7 +160,7 @@ $(SNIPPET_DIR)/c/%.gbin: $(SNIPPET_DIR)/c/%.o $(snippet_lib) $(FLATLIBS) $(SNIPP > $(OBJCOPY) -I binary -O elf64-s390 -B "s390:64-bit" $< $@ > > lds-autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d -MT $@ > -%.lds: %.lds.S > +%.lds: %.lds.S $(asm-offsets) > $(CPP) $(lds-autodepend-flags) $(CPPFLAGS) -P -C -o $@ $< > > .SECONDEXPANSION: > diff --git a/s390x/cstart64.S b/s390x/cstart64.S > index 6f83da2a6c0a..468ace3ea4df 100644 > --- a/s390x/cstart64.S > +++ b/s390x/cstart64.S > @@ -38,7 +38,7 @@ start: > /* setup stack */ > larl %r15, stackptr > /* Clear first stack frame */ > - xc 0(160,%r15), 0(%r15) > + xc 0(STACK_FRAME_SIZE,%r15), 0(%r15) > /* setup initial PSW mask + control registers*/ > larl %r1, initial_psw > lpswe 0(%r1) > diff --git a/s390x/flat.lds.S b/s390x/flat.lds.S > index 952f6cd457ed..0cb7e383cc76 100644 > --- a/s390x/flat.lds.S > +++ b/s390x/flat.lds.S > @@ -1,3 +1,5 @@ > +#include > + > SECTIONS > { > .lowcore : { > @@ -44,6 +46,6 @@ SECTIONS > /* > * stackptr set with initial stack frame preallocated > */ > - stackptr = . - 160; > + stackptr = . - STACK_FRAME_SIZE; > stacktop = .; > } > diff --git a/s390x/gs.c b/s390x/gs.c > index 4993eb8f43a9..9ae893eaf89a 100644 > --- a/s390x/gs.c > +++ b/s390x/gs.c > @@ -9,6 +9,7 @@ > * Janosch Frank > */ > #include > +#include > #include > #include > #include > @@ -35,22 +36,27 @@ static inline unsigned long load_guarded(unsigned long *p) > > /* guarded-storage event handler and finally it calls gs_handler */ > extern void gs_handler_asm(void); > - asm(".globl gs_handler_asm\n" > - "gs_handler_asm:\n" > - " lgr %r14,%r15\n" /* Save current stack address in r14 */ > - " aghi %r15,-320\n" /* Allocate stack frame */ > - " stmg %r0,%r13,192(%r15)\n" /* Store regs to save area */ > - " stg %r14,312(%r15)\n" > - " la %r2,160(%r15)\n" /* Store gscb address in this_cb */ > - " .insn rxy,0xe30000000049,0,160(%r15)\n" /* stgsc */ > - " lg %r14,24(%r2)\n" /* Get GSEPLA from GSCB*/ > - " lg %r14,40(%r14)\n" /* Get GSERA from GSEPL*/ > - " stg %r14,304(%r15)\n" /* Store GSERA in r14 of reg save area */ > - " brasl %r14,gs_handler\n" /* Jump to gs_handler */ > - " lmg %r0,%r15,192(%r15)\n" /* Restore regs */ > - " aghi %r14, 6\n" /* Add lgg instr len to GSERA */ > - " br %r14\n" /* Jump to next instruction after lgg */ > - " .size gs_handler_asm,.-gs_handler_asm\n"); > + asm ( ".macro STGSC args:vararg\n" > + " .insn rxy,0xe30000000049,\\args\n" > + " .endm\n" > + " .globl gs_handler_asm\n" > + "gs_handler_asm:\n" > + " lgr %r14,%r15\n" /* Save current stack address in r14 */ > + ".Lgs_handler_frame = 16*8+32+" xstr(STACK_FRAME_SIZE) "\n" > + " aghi %r15,-(.Lgs_handler_frame)\n" /* Allocate stack frame */ > + " stmg %r0,%r13,192(%r15)\n" /* Store regs to save area */ > + " stg %r14,312(%r15)\n" > + " la %r2," xstr(STACK_FRAME_SIZE) "(%r15)\n" /* Store gscb address in this_cb */ > + " STGSC %r0," xstr(STACK_FRAME_SIZE) "(%r15)\n" > + " lg %r14,24(%r2)\n" /* Get GSEPLA from GSCB*/ > + " lg %r14,40(%r14)\n" /* Get GSERA from GSEPL*/ > + " stg %r14,304(%r15)\n" /* Store GSERA in r14 of reg save area */ > + " brasl %r14,gs_handler\n" /* Jump to gs_handler */ > + " lmg %r0,%r15,192(%r15)\n" /* Restore regs */ > + " aghi %r14, 6\n" /* Add lgg instr len to GSERA */ > + " br %r14\n" /* Jump to next instruction after lgg */ > + ".size gs_handler_asm,.-gs_handler_asm\n" > + ); > > void gs_handler(struct gs_cb *this_cb) > { > diff --git a/s390x/macros.S b/s390x/macros.S > index 13cff299488f..e2a56a366c70 100644 > --- a/s390x/macros.S > +++ b/s390x/macros.S > @@ -21,14 +21,14 @@ > /* Save the stack address in GR2 which is the first function argument */ > lgr %r2, %r15 > /* Allocate stack space for called C function, as specified in s390 ELF ABI */ > - slgfi %r15, 160 > + slgfi %r15, STACK_FRAME_SIZE > /* > * Save the address of the interrupt stack into the back chain > * of the called function. > */ > stg %r2, STACK_FRAME_INT_BACKCHAIN(%r15) > brasl %r14, \c_func > - algfi %r15, 160 > + algfi %r15, STACK_FRAME_SIZE > RESTORE_REGS_STACK > lpswe \old_psw > .endm > diff --git a/s390x/snippets/c/flat.lds.S b/s390x/snippets/c/flat.lds.S > index 9e5eb66bec23..468b5f1eebe8 100644 > --- a/s390x/snippets/c/flat.lds.S > +++ b/s390x/snippets/c/flat.lds.S > @@ -1,3 +1,5 @@ > +#include > + > SECTIONS > { > .lowcore : { > @@ -18,9 +20,9 @@ SECTIONS > . = 0x4000; > /* > * The stack grows down from 0x4000 to 0x2000, we pre-allocoate > - * a frame via the -160. > + * a frame via the -STACK_FRAME_SIZE. > */ > - stackptr = . - 160; > + stackptr = . - STACK_FRAME_SIZE; > stacktop = .; > /* Start text 0x4000 */ > .text : {