* [PATCH] hw/char/riscv_htif: Fix htif_mm_write that causes infinite loop in ACT.
@ 2024-09-27 7:00 MingZhu Yan
0 siblings, 0 replies; 3+ messages in thread
From: MingZhu Yan @ 2024-09-27 7:00 UTC (permalink / raw)
To: qemu-riscv; +Cc: qemu-devel, trdthg47, MingZhu Yan
Applications sometimes only write the lower 32-bit payload bytes, this is used
in ACT tests. As a workaround, this refers to the solution of sail-riscv.
if the payload is written a few times with the same value, we process the whole
htif command anyway.
Signed-off-by: MingZhu Yan <yanmingzhu@iscas.ac.cn>
---
hw/char/riscv_htif.c | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/hw/char/riscv_htif.c b/hw/char/riscv_htif.c
index 9bef60def1..d74cce3bef 100644
--- a/hw/char/riscv_htif.c
+++ b/hw/char/riscv_htif.c
@@ -65,16 +65,8 @@ void htif_symbol_callback(const char *st_name, int st_info, uint64_t st_value,
{
if (strcmp("fromhost", st_name) == 0) {
fromhost_addr = st_value;
- if (st_size != 8) {
- error_report("HTIF fromhost must be 8 bytes");
- exit(1);
- }
} else if (strcmp("tohost", st_name) == 0) {
tohost_addr = st_value;
- if (st_size != 8) {
- error_report("HTIF tohost must be 8 bytes");
- exit(1);
- }
} else if (strcmp("begin_signature", st_name) == 0) {
begin_sig_addr = st_value;
} else if (strcmp("end_signature", st_name) == 0) {
@@ -290,18 +282,26 @@ static void htif_mm_write(void *opaque, hwaddr addr,
uint64_t value, unsigned size)
{
HTIFState *s = opaque;
- if (addr == TOHOST_OFFSET1) {
- if (s->tohost == 0x0) {
- s->allow_tohost = 1;
- s->tohost = value & 0xFFFFFFFF;
+ int htif_cmd_write = 0;
+ if (size == 8 && addr == TOHOST_OFFSET1) {
+ htif_cmd_write = 1;
+ s->tohost = value;
+ htif_handle_tohost_write(s, s->tohost);
+ } else if (size == 4 && addr == TOHOST_OFFSET1) {
+ if ((value) == (s->tohost & 0xFFFF)) {
+ s->allow_tohost = s->allow_tohost + 1;
} else {
s->allow_tohost = 0;
}
- } else if (addr == TOHOST_OFFSET2) {
- if (s->allow_tohost) {
- s->tohost |= value << 32;
- htif_handle_tohost_write(s, s->tohost);
+ s->tohost = deposit64(s->tohost, 0, 32, value);
+ } else if (size == 4 && addr == TOHOST_OFFSET2) {
+ if ((value & 0xFF) == (s->tohost & 0xFF00)) {
+ s->allow_tohost = s->allow_tohost + 1;
+ } else {
+ s->allow_tohost = 1;
}
+ htif_cmd_write = 1;
+ s->tohost = deposit64(s->tohost, 32, 32, value);
} else if (addr == FROMHOST_OFFSET1) {
s->fromhost_inprogress = 1;
s->fromhost = value & 0xFFFFFFFF;
@@ -312,6 +312,9 @@ static void htif_mm_write(void *opaque, hwaddr addr,
qemu_log("Invalid htif write: address %016" PRIx64 "\n",
(uint64_t)addr);
}
+ if ((s->tohost == 1 && htif_cmd_write) || s->allow_tohost > 2) {
+ htif_handle_tohost_write(s, s->tohost);
+ }
}
static const MemoryRegionOps htif_mm_ops = {
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] hw/char/riscv_htif: Fix htif_mm_write that causes infinite loop in ACT.
@ 2024-09-27 8:35 MingZhu Yan
2024-10-01 6:12 ` Alistair Francis
0 siblings, 1 reply; 3+ messages in thread
From: MingZhu Yan @ 2024-09-27 8:35 UTC (permalink / raw)
To: qemu-riscv; +Cc: qemu-devel, trdthg47, MingZhu Yan
Applications sometimes only write the lower 32-bit payload bytes, this is used
in ACT tests. As a workaround, this refers to the solution of sail-riscv.
if the payload is written a few times with the same value, we process the whole
htif command anyway.
Signed-off-by: MingZhu Yan <yanmingzhu@iscas.ac.cn>
---
hw/char/riscv_htif.c | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/hw/char/riscv_htif.c b/hw/char/riscv_htif.c
index 9bef60def1..d74cce3bef 100644
--- a/hw/char/riscv_htif.c
+++ b/hw/char/riscv_htif.c
@@ -65,16 +65,8 @@ void htif_symbol_callback(const char *st_name, int st_info, uint64_t st_value,
{
if (strcmp("fromhost", st_name) == 0) {
fromhost_addr = st_value;
- if (st_size != 8) {
- error_report("HTIF fromhost must be 8 bytes");
- exit(1);
- }
} else if (strcmp("tohost", st_name) == 0) {
tohost_addr = st_value;
- if (st_size != 8) {
- error_report("HTIF tohost must be 8 bytes");
- exit(1);
- }
} else if (strcmp("begin_signature", st_name) == 0) {
begin_sig_addr = st_value;
} else if (strcmp("end_signature", st_name) == 0) {
@@ -290,18 +282,26 @@ static void htif_mm_write(void *opaque, hwaddr addr,
uint64_t value, unsigned size)
{
HTIFState *s = opaque;
- if (addr == TOHOST_OFFSET1) {
- if (s->tohost == 0x0) {
- s->allow_tohost = 1;
- s->tohost = value & 0xFFFFFFFF;
+ int htif_cmd_write = 0;
+ if (size == 8 && addr == TOHOST_OFFSET1) {
+ htif_cmd_write = 1;
+ s->tohost = value;
+ htif_handle_tohost_write(s, s->tohost);
+ } else if (size == 4 && addr == TOHOST_OFFSET1) {
+ if ((value) == (s->tohost & 0xFFFF)) {
+ s->allow_tohost = s->allow_tohost + 1;
} else {
s->allow_tohost = 0;
}
- } else if (addr == TOHOST_OFFSET2) {
- if (s->allow_tohost) {
- s->tohost |= value << 32;
- htif_handle_tohost_write(s, s->tohost);
+ s->tohost = deposit64(s->tohost, 0, 32, value);
+ } else if (size == 4 && addr == TOHOST_OFFSET2) {
+ if ((value & 0xFF) == (s->tohost & 0xFF00)) {
+ s->allow_tohost = s->allow_tohost + 1;
+ } else {
+ s->allow_tohost = 1;
}
+ htif_cmd_write = 1;
+ s->tohost = deposit64(s->tohost, 32, 32, value);
} else if (addr == FROMHOST_OFFSET1) {
s->fromhost_inprogress = 1;
s->fromhost = value & 0xFFFFFFFF;
@@ -312,6 +312,9 @@ static void htif_mm_write(void *opaque, hwaddr addr,
qemu_log("Invalid htif write: address %016" PRIx64 "\n",
(uint64_t)addr);
}
+ if ((s->tohost == 1 && htif_cmd_write) || s->allow_tohost > 2) {
+ htif_handle_tohost_write(s, s->tohost);
+ }
}
static const MemoryRegionOps htif_mm_ops = {
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] hw/char/riscv_htif: Fix htif_mm_write that causes infinite loop in ACT.
2024-09-27 8:35 MingZhu Yan
@ 2024-10-01 6:12 ` Alistair Francis
0 siblings, 0 replies; 3+ messages in thread
From: Alistair Francis @ 2024-10-01 6:12 UTC (permalink / raw)
To: MingZhu Yan; +Cc: qemu-riscv, qemu-devel, MingZhu Yan
On Fri, Sep 27, 2024 at 11:26 PM MingZhu Yan <trdthg47@gmail.com> wrote:
>
> Applications sometimes only write the lower 32-bit payload bytes, this is used
> in ACT tests. As a workaround, this refers to the solution of sail-riscv.
I'm not sure what ACT is, but this feels like a guest bug, not a QEMU issue.
Alistair
> if the payload is written a few times with the same value, we process the whole
> htif command anyway.
>
> Signed-off-by: MingZhu Yan <yanmingzhu@iscas.ac.cn>
> ---
> hw/char/riscv_htif.c | 35 +++++++++++++++++++----------------
> 1 file changed, 19 insertions(+), 16 deletions(-)
>
> diff --git a/hw/char/riscv_htif.c b/hw/char/riscv_htif.c
> index 9bef60def1..d74cce3bef 100644
> --- a/hw/char/riscv_htif.c
> +++ b/hw/char/riscv_htif.c
> @@ -65,16 +65,8 @@ void htif_symbol_callback(const char *st_name, int st_info, uint64_t st_value,
> {
> if (strcmp("fromhost", st_name) == 0) {
> fromhost_addr = st_value;
> - if (st_size != 8) {
> - error_report("HTIF fromhost must be 8 bytes");
> - exit(1);
> - }
> } else if (strcmp("tohost", st_name) == 0) {
> tohost_addr = st_value;
> - if (st_size != 8) {
> - error_report("HTIF tohost must be 8 bytes");
> - exit(1);
> - }
> } else if (strcmp("begin_signature", st_name) == 0) {
> begin_sig_addr = st_value;
> } else if (strcmp("end_signature", st_name) == 0) {
> @@ -290,18 +282,26 @@ static void htif_mm_write(void *opaque, hwaddr addr,
> uint64_t value, unsigned size)
> {
> HTIFState *s = opaque;
> - if (addr == TOHOST_OFFSET1) {
> - if (s->tohost == 0x0) {
> - s->allow_tohost = 1;
> - s->tohost = value & 0xFFFFFFFF;
> + int htif_cmd_write = 0;
> + if (size == 8 && addr == TOHOST_OFFSET1) {
> + htif_cmd_write = 1;
> + s->tohost = value;
> + htif_handle_tohost_write(s, s->tohost);
> + } else if (size == 4 && addr == TOHOST_OFFSET1) {
> + if ((value) == (s->tohost & 0xFFFF)) {
> + s->allow_tohost = s->allow_tohost + 1;
> } else {
> s->allow_tohost = 0;
> }
> - } else if (addr == TOHOST_OFFSET2) {
> - if (s->allow_tohost) {
> - s->tohost |= value << 32;
> - htif_handle_tohost_write(s, s->tohost);
> + s->tohost = deposit64(s->tohost, 0, 32, value);
> + } else if (size == 4 && addr == TOHOST_OFFSET2) {
> + if ((value & 0xFF) == (s->tohost & 0xFF00)) {
> + s->allow_tohost = s->allow_tohost + 1;
> + } else {
> + s->allow_tohost = 1;
> }
> + htif_cmd_write = 1;
> + s->tohost = deposit64(s->tohost, 32, 32, value);
> } else if (addr == FROMHOST_OFFSET1) {
> s->fromhost_inprogress = 1;
> s->fromhost = value & 0xFFFFFFFF;
> @@ -312,6 +312,9 @@ static void htif_mm_write(void *opaque, hwaddr addr,
> qemu_log("Invalid htif write: address %016" PRIx64 "\n",
> (uint64_t)addr);
> }
> + if ((s->tohost == 1 && htif_cmd_write) || s->allow_tohost > 2) {
> + htif_handle_tohost_write(s, s->tohost);
> + }
> }
>
> static const MemoryRegionOps htif_mm_ops = {
> --
> 2.34.1
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-01 16:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-27 7:00 [PATCH] hw/char/riscv_htif: Fix htif_mm_write that causes infinite loop in ACT MingZhu Yan
-- strict thread matches above, loose matches on Subject: below --
2024-09-27 8:35 MingZhu Yan
2024-10-01 6:12 ` Alistair Francis
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).