The implementation of the SMMUv3 has multiple places where it reads a

data structure from the guest and directly operates on it without

doing a guest-to-host endianness conversion. Since all SMMU data

structures are little-endian, this means that the SMMU doesn't work

on a big-endian host. In particular, this causes the Avocado test

machine_aarch64_virt.py:Aarch64VirtMachine.test_alpine_virt_tcg_gic_max

to fail on an s390x host.

Add appropriate byte-swapping on reads and writes of guest in-memory

data structures so that the device works correctly on big-endian

hosts.

As part of this we constrain queue_read() to operate only on Cmd

structs and queue_write() on Evt structs, because in practice these

are the only data structures the two functions are used with, and we

need to know what the data structure is to be able to byte-swap its

parts correctly.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Tested-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Message-id: 20230717132641.764660-1-peter.maydell@linaro.org

Cc: qemu-stable@nongnu.org

---

hw/arm/smmu-common.c | 3 +--

hw/arm/smmuv3.c | 39 +++++++++++++++++++++++++++++++--------

2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/smmu-common.c

+++ b/hw/arm/smmu-common.c

@@ -XXX,XX +XXX,XX @@ static int get_pte(dma_addr_t baseaddr, uint32_t index, uint64_t *pte,

dma_addr_t addr = baseaddr + index * sizeof(*pte);

/* TODO: guarantee 64-bit single-copy atomicity */

- ret = dma_memory_read(&address_space_memory, addr, pte, sizeof(*pte),

- MEMTXATTRS_UNSPECIFIED);

+ ret = ldq_le_dma(&address_space_memory, addr, pte, MEMTXATTRS_UNSPECIFIED);

if (ret != MEMTX_OK) {

info->type = SMMU_PTW_ERR_WALK_EABT;

diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/smmuv3.c

+++ b/hw/arm/smmuv3.c

@@ -XXX,XX +XXX,XX @@ static void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn)

trace_smmuv3_write_gerrorn(toggled & pending, s->gerrorn);

}

-static inline MemTxResult queue_read(SMMUQueue *q, void *data)

+static inline MemTxResult queue_read(SMMUQueue *q, Cmd *cmd)

{

dma_addr_t addr = Q_CONS_ENTRY(q);

+ MemTxResult ret;

+ int i;

- return dma_memory_read(&address_space_memory, addr, data, q->entry_size,

- MEMTXATTRS_UNSPECIFIED);

+ ret = dma_memory_read(&address_space_memory, addr, cmd, sizeof(Cmd),

+ MEMTXATTRS_UNSPECIFIED);

+ if (ret != MEMTX_OK) {

+ return ret;

+ }

+ for (i = 0; i < ARRAY_SIZE(cmd->word); i++) {

+ le32_to_cpus(&cmd->word[i]);

+ }

+ return ret;

}

-static MemTxResult queue_write(SMMUQueue *q, void *data)

+static MemTxResult queue_write(SMMUQueue *q, Evt *evt_in)

{

dma_addr_t addr = Q_PROD_ENTRY(q);

MemTxResult ret;

+ Evt evt = *evt_in;

+ int i;

- ret = dma_memory_write(&address_space_memory, addr, data, q->entry_size,

+ for (i = 0; i < ARRAY_SIZE(evt.word); i++) {

+ cpu_to_le32s(&evt.word[i]);

+ }

+ ret = dma_memory_write(&address_space_memory, addr, &evt, sizeof(Evt),

MEMTXATTRS_UNSPECIFIED);

if (ret != MEMTX_OK) {

return ret;

@@ -XXX,XX +XXX,XX @@ static void smmuv3_init_regs(SMMUv3State *s)

static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf,

SMMUEventInfo *event)

{

- int ret;

+ int ret, i;

trace_smmuv3_get_ste(addr);

/* TODO: guarantee 64-bit single-copy atomicity */

@@ -XXX,XX +XXX,XX @@ static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf,

event->u.f_ste_fetch.addr = addr;

return -EINVAL;

}

+ for (i = 0; i < ARRAY_SIZE(buf->word); i++) {

+ le32_to_cpus(&buf->word[i]);

+ }

return 0;

}

@@ -XXX,XX +XXX,XX @@ static int smmu_get_cd(SMMUv3State *s, STE *ste, uint32_t ssid,

CD *buf, SMMUEventInfo *event)

{

dma_addr_t addr = STE_CTXPTR(ste);

- int ret;

+ int ret, i;

trace_smmuv3_get_cd(addr);

/* TODO: guarantee 64-bit single-copy atomicity */

@@ -XXX,XX +XXX,XX @@ static int smmu_get_cd(SMMUv3State *s, STE *ste, uint32_t ssid,

event->u.f_ste_fetch.addr = addr;

return -EINVAL;

}

+ for (i = 0; i < ARRAY_SIZE(buf->word); i++) {

+ le32_to_cpus(&buf->word[i]);

+ }

return 0;

}

@@ -XXX,XX +XXX,XX @@ static int smmu_find_ste(SMMUv3State *s, uint32_t sid, STE *ste,

return -EINVAL;

}

if (s->features & SMMU_FEATURE_2LVL_STE) {

- int l1_ste_offset, l2_ste_offset, max_l2_ste, span;

+ int l1_ste_offset, l2_ste_offset, max_l2_ste, span, i;

dma_addr_t l1ptr, l2ptr;

STEDesc l1std;

@@ -XXX,XX +XXX,XX @@ static int smmu_find_ste(SMMUv3State *s, uint32_t sid, STE *ste,

event->u.f_ste_fetch.addr = l1ptr;

return -EINVAL;

}

+ for (i = 0; i < ARRAY_SIZE(l1std.word); i++) {

+ le32_to_cpus(&l1std.word[i]);

+ }

span = L1STD_SPAN(&l1std);

--

2.34.1

The POSIX definition of the 'read' utility requires that you

specify the variable name to set; omitting the name and

having it default to 'REPLY' is a bashism. If your system

sh is dash, then it will print an error message during build:

qemu/pc-bios/s390-ccw/../../scripts/git-submodule.sh: 106: read: arg count

Specify the variable name explicitly.

Fixes: fdb8fd8cb915647b ("git-submodule: allow partial update of .git-submodule-status")

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Message-id: 20230720153038.1587196-1-peter.maydell@linaro.org

---

scripts/git-submodule.sh | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh

index XXXXXXX..XXXXXXX 100755

--- a/scripts/git-submodule.sh

+++ b/scripts/git-submodule.sh

@@ -XXX,XX +XXX,XX @@ update)

check_updated $module || echo Updated "$module"

done

- (while read -r; do

+ (while read -r REPLY; do

for module in $modules; do

case $REPLY in

*" $module "*) continue 2 ;;

--

2.34.1

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Message-id: 20230721143239.1753066-1-peter.maydell@linaro.org

The "expected failure" tests for decodetree result in the

error messages from decodetree ending up in logs and in

V=1 output:

>>> MALLOC_PERTURB_=226 /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/x86/pyvenv/bin/python3 /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/scripts/decodetree.py --output-null --test-for-error /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/x86/../../tests/decode/err_argset1.decode

――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― ✀ ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――

/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/x86/../../tests/decode/err_argset1.decode:5: error: duplicate argument "a"

―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――

1/44 qemu:decodetree / err_argset1 OK 0.05s

This then produces false positives when scanning the

logfiles for strings like "error: ".

For the expected-failure tests, make decodetree print

"detected:" instead of "error:".

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Message-id: 20230720131521.1325905-1-peter.maydell@linaro.org

---

scripts/decodetree.py | 6 +++++-

1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/decodetree.py b/scripts/decodetree.py

index XXXXXXX..XXXXXXX 100644

--- a/scripts/decodetree.py

+++ b/scripts/decodetree.py

@@ -XXX,XX +XXX,XX @@ def error_with_file(file, lineno, *args):

global output_file

global output_fd

+ # For the test suite expected-errors case, don't print the

+ # string "error: ", so they don't turn up as false positives

+ # if you grep the meson logs for strings like that.

+ end = 'error: ' if not testforerror else 'detected: '

prefix = ''

if file:

prefix += f'{file}:'

@@ -XXX,XX +XXX,XX @@ def error_with_file(file, lineno, *args):

prefix += f'{lineno}:'

if prefix:

prefix += ' '

- print(prefix, end='error: ', file=sys.stderr)

+ print(prefix, end=end, file=sys.stderr)

print(*args, file=sys.stderr)

if output_file and output_fd:

--

2.34.1