[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/20] target/ppc: fix icount support on Book-e vms accessing SPRs
From: |
David Gibson |
Subject: |
[PULL 18/20] target/ppc: fix icount support on Book-e vms accessing SPRs |
Date: |
Wed, 10 Mar 2021 15:10:00 +1100 |
From: Vitaly Cheptsov <cheptsov@ispras.ru>
Failing to guard SPR access with gen_io_start/gen_stop_exception
causes "Bad icount read" exceptions when running VMs with
e500mc and e500v2 CPUs with an icount parameter.
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Greg Kurz <groug@kaod.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Vitaly Cheptsov <cheptsov@ispras.ru>
Message-Id: <20210303140851.78383-1-cheptsov@ispras.ru>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
target/ppc/translate_init.c.inc | 36 +++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/target/ppc/translate_init.c.inc b/target/ppc/translate_init.c.inc
index e7324e85cd..09c9ae2c98 100644
--- a/target/ppc/translate_init.c.inc
+++ b/target/ppc/translate_init.c.inc
@@ -567,35 +567,71 @@ static void spr_write_601_ubatl(DisasContext *ctx, int
sprn, int gprn)
#if !defined(CONFIG_USER_ONLY)
static void spr_read_40x_pit(DisasContext *ctx, int gprn, int sprn)
{
+ if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
+ gen_io_start();
+ }
gen_helper_load_40x_pit(cpu_gpr[gprn], cpu_env);
+ if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
+ gen_stop_exception(ctx);
+ }
}
static void spr_write_40x_pit(DisasContext *ctx, int sprn, int gprn)
{
+ if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
+ gen_io_start();
+ }
gen_helper_store_40x_pit(cpu_env, cpu_gpr[gprn]);
+ if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
+ gen_stop_exception(ctx);
+ }
}
static void spr_write_40x_dbcr0(DisasContext *ctx, int sprn, int gprn)
{
+ if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
+ gen_io_start();
+ }
gen_store_spr(sprn, cpu_gpr[gprn]);
gen_helper_store_40x_dbcr0(cpu_env, cpu_gpr[gprn]);
/* We must stop translation as we may have rebooted */
gen_stop_exception(ctx);
+ if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
+ gen_stop_exception(ctx);
+ }
}
static void spr_write_40x_sler(DisasContext *ctx, int sprn, int gprn)
{
+ if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
+ gen_io_start();
+ }
gen_helper_store_40x_sler(cpu_env, cpu_gpr[gprn]);
+ if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
+ gen_stop_exception(ctx);
+ }
}
static void spr_write_booke_tcr(DisasContext *ctx, int sprn, int gprn)
{
+ if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
+ gen_io_start();
+ }
gen_helper_store_booke_tcr(cpu_env, cpu_gpr[gprn]);
+ if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
+ gen_stop_exception(ctx);
+ }
}
static void spr_write_booke_tsr(DisasContext *ctx, int sprn, int gprn)
{
+ if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
+ gen_io_start();
+ }
gen_helper_store_booke_tsr(cpu_env, cpu_gpr[gprn]);
+ if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
+ gen_stop_exception(ctx);
+ }
}
#endif
--
2.29.2
- [PULL 14/20] hw/ppc: e500: Add missing <ranges> in the eTSEC node, (continued)
- [PULL 14/20] hw/ppc: e500: Add missing <ranges> in the eTSEC node, David Gibson, 2021/03/09
- [PULL 17/20] qemu_timer.c: add timer_deadline_ms() helper, David Gibson, 2021/03/09
- [PULL 13/20] hw/net: fsl_etsec: Fix build error when HEX_DUMP is on, David Gibson, 2021/03/09
- [PULL 15/20] spapr.c: add 'unplug already in progress' message for PHB unplug, David Gibson, 2021/03/09
- [PULL 05/20] pseries: Update SLOF firmware image, David Gibson, 2021/03/09
- [PULL 01/20] hw/display/sm501: Remove dead code for non-32-bit RGB surfaces, David Gibson, 2021/03/09
- [PULL 08/20] docs/system: Extend PPC section, David Gibson, 2021/03/09
- [PULL 19/20] spapr.c: remove duplicated assert in spapr_memory_unplug_request(), David Gibson, 2021/03/09
- [PULL 16/20] spapr_pci.c: add 'unplug already in progress' message for PCI unplug, David Gibson, 2021/03/09
- [PULL 20/20] spapr.c: send QAPI event when memory hotunplug fails, David Gibson, 2021/03/09
- [PULL 18/20] target/ppc: fix icount support on Book-e vms accessing SPRs,
David Gibson <=
- Re: [PULL 00/20] ppc-for-6.0 queue 20210310, Bin Meng, 2021/03/09
- Re: [PULL 00/20] ppc-for-6.0 queue 20210310, Ivan Warren, 2021/03/10
- Re: [PULL 00/20] ppc-for-6.0 queue 20210310, David Gibson, 2021/03/10
- Re: [PULL 00/20] ppc-for-6.0 queue 20210310, Ivan Warren, 2021/03/10
- Re: [PULL 00/20] ppc-for-6.0 queue 20210310, David Gibson, 2021/03/11
- Re: [PULL 00/20] ppc-for-6.0 queue 20210310, Richard Henderson, 2021/03/11
- Re: [PULL 00/20] ppc-for-6.0 queue 20210310, Greg Kurz, 2021/03/11
- Re: [PULL 00/20] ppc-for-6.0 queue 20210310, Greg Kurz, 2021/03/11