From: David Hildenbrand <david@redhat.com>
To: Ilya Leoshkevich <iii@linux.ibm.com>,
Cornelia Huck <cohuck@redhat.com>, Thomas Huth <thuth@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
qemu-s390x@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [PATCH v2] target/s390x: Fix translation exception on illegal instruction
Date: Wed, 14 Apr 2021 09:34:22 +0200 [thread overview]
Message-ID: <72f45896-4943-9c20-e0ca-9091ca068d0f@redhat.com> (raw)
In-Reply-To: <20210413165257.21426-1-iii@linux.ibm.com>
On 13.04.21 18:52, Ilya Leoshkevich wrote:
> Hitting an uretprobe in a s390x TCG guest causes a SIGSEGV. What
> happens is:
>
> * uretprobe maps a userspace page containing an invalid instruction.
> * uretprobe replaces the target function's return address with the
> address of that page.
> * When tb_gen_code() is called on that page, tb->size ends up being 0
> (because the page starts with the invalid instruction), which causes
> virt_page2 to point to the previous page.
> * The previous page is not mapped, so this causes a spurious
> translation exception.
>
> The bug is that tb->size must never be 0: even if there is an illegal
> instruction, the instruction bytes that have been looked at must count
> towards tb->size. So adjust s390x's translate_one() to act this way
> for both illegal instructions and instructions that are known to
> generate exceptions.
>
> Also add an assertion to tb_gen_code() in order to detect such
> situations in future.
>
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> ---
>
> v1: https://lists.nongnu.org/archive/html/qemu-devel/2021-04/msg02037.html
> v1 -> v2: Fix target/s390x instead of trying to tolerate tb->size == 0
> in tb_gen_code().
>
> accel/tcg/translate-all.c | 1 +
> target/s390x/translate.c | 16 +++++++++++-----
> 2 files changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
> index ba6ab09790..93b2dae112 100644
> --- a/accel/tcg/translate-all.c
> +++ b/accel/tcg/translate-all.c
> @@ -1913,6 +1913,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
>
> tcg_ctx->cpu = env_cpu(env);
> gen_intermediate_code(cpu, tb, max_insns);
> + assert(tb->size != 0);
> tcg_ctx->cpu = NULL;
> max_insns = tb->icount;
>
> diff --git a/target/s390x/translate.c b/target/s390x/translate.c
> index 4f953ddfba..e243624d2a 100644
> --- a/target/s390x/translate.c
> +++ b/target/s390x/translate.c
> @@ -6412,7 +6412,8 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
> qemu_log_mask(LOG_UNIMP, "unimplemented opcode 0x%02x%02x\n",
> s->fields.op, s->fields.op2);
> gen_illegal_opcode(s);
> - return DISAS_NORETURN;
> + ret = DISAS_NORETURN;
> + goto out;
> }
>
> #ifndef CONFIG_USER_ONLY
> @@ -6428,7 +6429,8 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
> /* privileged instruction */
> if ((s->base.tb->flags & FLAG_MASK_PSTATE) && (insn->flags & IF_PRIV)) {
> gen_program_exception(s, PGM_PRIVILEGED);
> - return DISAS_NORETURN;
> + ret = DISAS_NORETURN;
> + goto out;
> }
>
> /* if AFP is not enabled, instructions and registers are forbidden */
> @@ -6455,7 +6457,8 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
> }
> if (dxc) {
> gen_data_exception(dxc);
> - return DISAS_NORETURN;
> + ret = DISAS_NORETURN;
> + goto out;
> }
> }
>
> @@ -6463,7 +6466,8 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
> if (insn->flags & IF_VEC) {
> if (!((s->base.tb->flags & FLAG_MASK_VECTOR))) {
> gen_data_exception(0xfe);
> - return DISAS_NORETURN;
> + ret = DISAS_NORETURN;
> + goto out;
> }
> }
>
> @@ -6484,7 +6488,8 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
> (insn->spec & SPEC_r1_f128 && !is_fp_pair(get_field(s, r1))) ||
> (insn->spec & SPEC_r2_f128 && !is_fp_pair(get_field(s, r2)))) {
> gen_program_exception(s, PGM_SPECIFICATION);
> - return DISAS_NORETURN;
> + ret = DISAS_NORETURN;
> + goto out;
> }
> }
>
> @@ -6544,6 +6549,7 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s)
> }
> #endif
>
> +out:
> /* Advance to the next instruction. */
> s->base.pc_next = s->pc_tmp;
> return ret;
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
next prev parent reply other threads:[~2021-04-14 7:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 16:52 [PATCH v2] target/s390x: Fix translation exception on illegal instruction Ilya Leoshkevich
2021-04-14 0:34 ` Richard Henderson
2021-04-14 7:34 ` David Hildenbrand [this message]
2021-04-14 8:38 ` Cornelia Huck
2021-04-14 9:19 ` Ilya Leoshkevich
2021-04-14 10:27 ` Ilya Leoshkevich
2021-04-14 10:39 ` Cornelia Huck
2021-04-14 10:48 ` Cornelia Huck
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=72f45896-4943-9c20-e0ca-9091ca068d0f@redhat.com \
--to=david@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=iii@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--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;
as well as URLs for NNTP newsgroup(s).