From: Claudio Imbrenda <imbrenda@linux.ibm.com>
To: Janosch Frank <frankja@linux.ibm.com>
Cc: kvm@vger.kernel.org, seiden@linux.ibm.com, nrb@linux.ibm.com,
scgl@linux.ibm.com, thuth@redhat.com
Subject: Re: [kvm-unit-tests PATCH v2 1/7] s390x: snippets: asm: Add a macro to write an exception PSW
Date: Thu, 20 Oct 2022 11:14:01 +0200 [thread overview]
Message-ID: <20221020111401.34912a70@p-imbrenda> (raw)
In-Reply-To: <20221020090009.2189-2-frankja@linux.ibm.com>
On Thu, 20 Oct 2022 09:00:03 +0000
Janosch Frank <frankja@linux.ibm.com> wrote:
> Setting exception new PSWs is commonly needed so let's add a macro for
> that.
>
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
> Reviewed-by: Nico Boehr <nrb@linux.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
> ---
> s390x/snippets/asm/macros.S | 28 ++++++++++++++++++++++++
> s390x/snippets/asm/snippet-pv-diag-288.S | 4 ++--
> s390x/snippets/asm/snippet-pv-diag-500.S | 6 ++---
> 3 files changed, 32 insertions(+), 6 deletions(-)
> create mode 100644 s390x/snippets/asm/macros.S
>
> diff --git a/s390x/snippets/asm/macros.S b/s390x/snippets/asm/macros.S
> new file mode 100644
> index 00000000..667fb6dc
> --- /dev/null
> +++ b/s390x/snippets/asm/macros.S
> @@ -0,0 +1,28 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/*
> + * Commonly used assembly macros
> + *
> + * Copyright (c) 2022 IBM Corp
> + *
> + * Authors:
> + * Janosch Frank <frankja@linux.ibm.com>
> + */
> +#include <asm/asm-offsets.h>
> +
> +/*
> + * Writes a PSW to addr_psw, useful for exception PSWs in lowcore
> + *
> + * reg is the scratch register used for temporary storage, it's NOT restored
> + * The psw address part is defined via psw_new_addr
> + * The psw mask part is always 64 bit
> + */
> +.macro SET_PSW_NEW_ADDR reg, psw_new_addr, addr_psw
> +larl \reg, psw_mask_64
> +stg \reg, \addr_psw
> +larl \reg, \psw_new_addr
> +stg \reg, \addr_psw + 8
> +.endm
> +
> +.section .rodata
> +psw_mask_64:
> + .quad 0x0000000180000000
> diff --git a/s390x/snippets/asm/snippet-pv-diag-288.S b/s390x/snippets/asm/snippet-pv-diag-288.S
> index aaee3cd1..63f2113b 100644
> --- a/s390x/snippets/asm/snippet-pv-diag-288.S
> +++ b/s390x/snippets/asm/snippet-pv-diag-288.S
> @@ -8,6 +8,7 @@
> * Janosch Frank <frankja@linux.ibm.com>
> */
> #include <asm/asm-offsets.h>
> +#include "macros.S"
> .section .text
>
> /* Clean and pre-load registers that are used for diag 288 */
> @@ -19,8 +20,7 @@ lghi %r1, 2
> lghi %r2, 3
>
> /* Let's jump to the pgm exit label on a PGM */
> -larl %r4, exit_pgm
> -stg %r4, GEN_LC_PGM_NEW_PSW + 8
> +SET_PSW_NEW_ADDR 4, exit_pgm, GEN_LC_PGM_NEW_PSW
>
> /* Execute the diag288 */
> diag %r0, %r2, 0x288
> diff --git a/s390x/snippets/asm/snippet-pv-diag-500.S b/s390x/snippets/asm/snippet-pv-diag-500.S
> index 8dd66bd9..f4d75388 100644
> --- a/s390x/snippets/asm/snippet-pv-diag-500.S
> +++ b/s390x/snippets/asm/snippet-pv-diag-500.S
> @@ -8,6 +8,7 @@
> * Janosch Frank <frankja@linux.ibm.com>
> */
> #include <asm/asm-offsets.h>
> +#include "macros.S"
> .section .text
>
> /* Clean and pre-load registers that are used for diag 500 */
> @@ -21,10 +22,7 @@ lghi %r3, 3
> lghi %r4, 4
>
> /* Let's jump to the next label on a PGM */
> -xgr %r5, %r5
> -stg %r5, GEN_LC_PGM_NEW_PSW
> -larl %r5, next
> -stg %r5, GEN_LC_PGM_NEW_PSW + 8
> +SET_PSW_NEW_ADDR 5, next, GEN_LC_PGM_NEW_PSW
>
> /* Execute the diag500 */
> diag 0, 0, 0x500
next prev parent reply other threads:[~2022-10-20 9:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-20 9:00 [kvm-unit-tests PATCH v2 0/7] s390x: PV fixups Janosch Frank
2022-10-20 9:00 ` [kvm-unit-tests PATCH v2 1/7] s390x: snippets: asm: Add a macro to write an exception PSW Janosch Frank
2022-10-20 9:14 ` Claudio Imbrenda [this message]
2022-10-20 9:00 ` [kvm-unit-tests PATCH v2 2/7] s390x: MAKEFILE: Use $< instead of pathsubst Janosch Frank
2022-10-20 9:14 ` Claudio Imbrenda
2022-10-20 9:00 ` [kvm-unit-tests PATCH v2 3/7] s390x: Add a linker script to assembly snippets Janosch Frank
2022-10-20 10:02 ` Claudio Imbrenda
2022-10-20 9:00 ` [kvm-unit-tests PATCH v2 4/7] lib: s390x: sie: Improve validity handling and make it vm specific Janosch Frank
2022-10-20 9:18 ` Claudio Imbrenda
2022-10-20 9:00 ` [kvm-unit-tests PATCH v2 5/7] lib: s390x: Use a new asce for each PV guest Janosch Frank
2022-10-20 9:25 ` Claudio Imbrenda
2022-10-20 11:27 ` Janosch Frank
2022-10-20 11:46 ` Claudio Imbrenda
2022-10-20 9:00 ` [kvm-unit-tests PATCH v2 6/7] lib: s390x: Enable reusability of VMs that were in PV mode Janosch Frank
2022-10-20 9:26 ` Claudio Imbrenda
2022-10-20 9:00 ` [kvm-unit-tests PATCH v2 7/7] lib: s390x: sie: Properly populate SCA Janosch Frank
2022-10-20 9:50 ` Claudio Imbrenda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221020111401.34912a70@p-imbrenda \
--to=imbrenda@linux.ibm.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=nrb@linux.ibm.com \
--cc=scgl@linux.ibm.com \
--cc=seiden@linux.ibm.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox