From: Alistair Francis <alistair23@gmail.com>
To: Irina Ryapolova <irina.ryapolova@syntacore.com>
Cc: qemu-devel@nongnu.org, qemu-riscv@nongnu.org, palmer@dabbelt.com,
alistair.francis@wdc.com, bin.meng@windriver.com,
liwei1518@gmail.com, dbarboza@ventanamicro.com,
zhiwei_liu@linux.alibaba.com
Subject: Re: [PATCH v3 2/2] target/riscv: UPDATE xATP write CSR
Date: Fri, 16 Feb 2024 10:33:16 +1000 [thread overview]
Message-ID: <CAKmqyKNhRJtgg7ycxzN=AjmAM35F=Q4m51Xpfy=As5_Vtes6mw@mail.gmail.com> (raw)
In-Reply-To: <20240109145923.37893-2-irina.ryapolova@syntacore.com>
On Wed, Jan 10, 2024 at 2:07 AM Irina Ryapolova
<irina.ryapolova@syntacore.com> wrote:
>
> Added xATP_MODE validation for vsatp/hgatp CSRs.
> The xATP register is an SXLEN-bit read/write WARL register, so
> the legal value must be returned (See riscv-privileged-20211203, SATP/VSATP/HGATP CSRs).
>
> Signed-off-by: Irina Ryapolova <irina.ryapolova@syntacore.com>
> Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Thanks for the patches.
In the future can you please send a multi-patch series with a cover
letter. It makes
the QEMU automation a lot easier to work with.
I have applied these two patches to the riscv-to-apply.next branch
Alistair
> ---
> target/riscv/csr.c | 52 ++++++++++++++++++++++++++--------------------
> 1 file changed, 29 insertions(+), 23 deletions(-)
>
> diff --git a/target/riscv/csr.c b/target/riscv/csr.c
> index 735fb27be7..6d7a3dd9aa 100644
> --- a/target/riscv/csr.c
> +++ b/target/riscv/csr.c
> @@ -1282,6 +1282,32 @@ static bool validate_vm(CPURISCVState *env, target_ulong vm)
> return get_field(mode_supported, (1 << vm));
> }
>
> +static target_ulong legalize_xatp(CPURISCVState *env, target_ulong old_xatp,
> + target_ulong val)
> +{
> + target_ulong mask;
> + bool vm;
> + if (riscv_cpu_mxl(env) == MXL_RV32) {
> + vm = validate_vm(env, get_field(val, SATP32_MODE));
> + mask = (val ^ old_xatp) & (SATP32_MODE | SATP32_ASID | SATP32_PPN);
> + } else {
> + vm = validate_vm(env, get_field(val, SATP64_MODE));
> + mask = (val ^ old_xatp) & (SATP64_MODE | SATP64_ASID | SATP64_PPN);
> + }
> +
> + if (vm && mask) {
> + /*
> + * The ISA defines SATP.MODE=Bare as "no translation", but we still
> + * pass these through QEMU's TLB emulation as it improves
> + * performance. Flushing the TLB on SATP writes with paging
> + * enabled avoids leaking those invalid cached mappings.
> + */
> + tlb_flush(env_cpu(env));
> + return val;
> + }
> + return old_xatp;
> +}
> +
> static target_ulong legalize_mpp(CPURISCVState *env, target_ulong old_mpp,
> target_ulong val)
> {
> @@ -2997,31 +3023,11 @@ static RISCVException read_satp(CPURISCVState *env, int csrno,
> static RISCVException write_satp(CPURISCVState *env, int csrno,
> target_ulong val)
> {
> - target_ulong mask;
> - bool vm;
> -
> if (!riscv_cpu_cfg(env)->mmu) {
> return RISCV_EXCP_NONE;
> }
>
> - if (riscv_cpu_mxl(env) == MXL_RV32) {
> - vm = validate_vm(env, get_field(val, SATP32_MODE));
> - mask = (val ^ env->satp) & (SATP32_MODE | SATP32_ASID | SATP32_PPN);
> - } else {
> - vm = validate_vm(env, get_field(val, SATP64_MODE));
> - mask = (val ^ env->satp) & (SATP64_MODE | SATP64_ASID | SATP64_PPN);
> - }
> -
> - if (vm && mask) {
> - /*
> - * The ISA defines SATP.MODE=Bare as "no translation", but we still
> - * pass these through QEMU's TLB emulation as it improves
> - * performance. Flushing the TLB on SATP writes with paging
> - * enabled avoids leaking those invalid cached mappings.
> - */
> - tlb_flush(env_cpu(env));
> - env->satp = val;
> - }
> + env->satp = legalize_xatp(env, env->satp, val);
> return RISCV_EXCP_NONE;
> }
>
> @@ -3506,7 +3512,7 @@ static RISCVException read_hgatp(CPURISCVState *env, int csrno,
> static RISCVException write_hgatp(CPURISCVState *env, int csrno,
> target_ulong val)
> {
> - env->hgatp = val;
> + env->hgatp = legalize_xatp(env, env->hgatp, val);
> return RISCV_EXCP_NONE;
> }
>
> @@ -3772,7 +3778,7 @@ static RISCVException read_vsatp(CPURISCVState *env, int csrno,
> static RISCVException write_vsatp(CPURISCVState *env, int csrno,
> target_ulong val)
> {
> - env->vsatp = val;
> + env->vsatp = legalize_xatp(env, env->vsatp, val);
> return RISCV_EXCP_NONE;
> }
>
> --
> 2.25.1
>
>
next prev parent reply other threads:[~2024-02-16 0:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-09 14:59 [PATCH v3 1/2] target/riscv: FIX xATP_MODE validation Irina Ryapolova
2024-01-09 14:59 ` [PATCH v3 2/2] target/riscv: UPDATE xATP write CSR Irina Ryapolova
2024-02-15 3:45 ` Alistair Francis
2024-02-16 0:33 ` Alistair Francis [this message]
2024-02-15 3:43 ` [PATCH v3 1/2] target/riscv: FIX xATP_MODE validation Alistair Francis
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='CAKmqyKNhRJtgg7ycxzN=AjmAM35F=Q4m51Xpfy=As5_Vtes6mw@mail.gmail.com' \
--to=alistair23@gmail.com \
--cc=alistair.francis@wdc.com \
--cc=bin.meng@windriver.com \
--cc=dbarboza@ventanamicro.com \
--cc=irina.ryapolova@syntacore.com \
--cc=liwei1518@gmail.com \
--cc=palmer@dabbelt.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=zhiwei_liu@linux.alibaba.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).