From: Jordan Niethe <jniethe5@gmail.com>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, philmd@linaro.org
Subject: Re: [PATCH for-8.0] tcg/sparc64: Disable direct linking for goto_tb
Date: Wed, 19 Jul 2023 11:03:13 +1000 [thread overview]
Message-ID: <d9644b89-6ddf-8569-3ff8-b0c0b4f9dbe3@gmail.com> (raw)
In-Reply-To: <20230404150435.1571646-1-richard.henderson@linaro.org>
On 5/4/23 1:04 am, Richard Henderson wrote:
> Something is wrong with this code, and also wrong with gdb on the
> sparc systems to which I have access, so I cannot debug it either.
> Disable for now, so the release is not broken.
I'm not sure if it is the entire problem but it looks like the broken
code had the same race as on ppc [1] between loading TCG_REG_TB and
patching and executing the direct branch.
[1]
https://lore.kernel.org/qemu-devel/20230717093001.13167-1-jniethe5@gmail.com/#t
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> tcg/sparc64/tcg-target.c.inc | 30 ++++--------------------------
> 1 file changed, 4 insertions(+), 26 deletions(-)
>
> diff --git a/tcg/sparc64/tcg-target.c.inc b/tcg/sparc64/tcg-target.c.inc
> index ccc4144f7c..694f2b9dd4 100644
> --- a/tcg/sparc64/tcg-target.c.inc
> +++ b/tcg/sparc64/tcg-target.c.inc
> @@ -1445,12 +1445,12 @@ static void tcg_out_goto_tb(TCGContext *s, int which)
> {
> ptrdiff_t off = tcg_tbrel_diff(s, (void *)get_jmp_target_addr(s, which));
>
> - /* Direct branch will be patched by tb_target_set_jmp_target. */
> + /* Load link and indirect branch. */
> set_jmp_insn_offset(s, which);
> - tcg_out32(s, CALL);
> - /* delay slot */
> - tcg_debug_assert(check_fit_ptr(off, 13));
> tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_TB, TCG_REG_TB, off);
> + tcg_out_arithi(s, TCG_REG_G0, TCG_REG_TB, 0, JMPL);
> + /* delay slot */
> + tcg_out_nop(s);
> set_jmp_reset_offset(s, which);
>
> /*
> @@ -1469,28 +1469,6 @@ static void tcg_out_goto_tb(TCGContext *s, int which)
> void tb_target_set_jmp_target(const TranslationBlock *tb, int n,
> uintptr_t jmp_rx, uintptr_t jmp_rw)
> {
> - uintptr_t addr = tb->jmp_target_addr[n];
> - intptr_t br_disp = (intptr_t)(addr - jmp_rx) >> 2;
> - tcg_insn_unit insn;
> -
> - br_disp >>= 2;
> - if (check_fit_ptr(br_disp, 19)) {
> - /* ba,pt %icc, addr */
> - insn = deposit32(INSN_OP(0) | INSN_OP2(1) | INSN_COND(COND_A)
> - | BPCC_ICC | BPCC_PT, 0, 19, br_disp);
> - } else if (check_fit_ptr(br_disp, 22)) {
> - /* ba addr */
> - insn = deposit32(INSN_OP(0) | INSN_OP2(2) | INSN_COND(COND_A),
> - 0, 22, br_disp);
> - } else {
> - /* The code_gen_buffer can't be larger than 2GB. */
> - tcg_debug_assert(check_fit_ptr(br_disp, 30));
> - /* call addr */
> - insn = deposit32(CALL, 0, 30, br_disp);
> - }
> -
> - qatomic_set((uint32_t *)jmp_rw, insn);
> - flush_idcache_range(jmp_rx, jmp_rw, 4);
> }
>
> static void tcg_out_op(TCGContext *s, TCGOpcode opc,
>
next prev parent reply other threads:[~2023-07-19 1:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-04 15:04 [PATCH for-8.0] tcg/sparc64: Disable direct linking for goto_tb Richard Henderson
2023-04-04 15:32 ` Alex Bennée
2023-04-04 15:42 ` Richard Henderson
2023-07-19 1:03 ` Jordan Niethe [this message]
2023-07-23 16:55 ` Richard Henderson
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=d9644b89-6ddf-8569-3ff8-b0c0b4f9dbe3@gmail.com \
--to=jniethe5@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/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).