target-arm queue. This has the "plumb txattrs through various

bits of exec.c" patches, and a collection of bug fixes from

various people.

The following changes since commit a3ac12fba028df90f7b3dbec924995c126c41022:

Merge remote-tracking branch 'remotes/ehabkost/tags/numa-next-pull-request' into staging (2018-05-31 11:12:36 +0100)

git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20180531

for you to fetch changes up to 49d1dca0520ea71bc21867fab6647f474fcf857b:

KVM: GIC: Fix memory leak due to calling kvm_init_irq_routing twice (2018-05-31 14:52:53 +0100)

* target/arm: Honour FPCR.FZ in FRECPX

* MAINTAINERS: Add entries for newer MPS2 boards and devices

* hw/intc/arm_gicv3: Fix APxR<n> register dispatching

* arm_gicv3_kvm: fix bug in writing zero bits back to the in-kernel

GIC state

* tcg: Fix helper function vs host abi for float16

* arm: fix qemu crash on startup with -bios option

* arm: fix malloc type mismatch

* xlnx-zdma: Correct mem leaks and memset to zero on desc unaligned errors

* Correct CPACR reset value for v7 cores

* memory.h: Improve IOMMU related documentation

* exec: Plumb transaction attributes through various functions in

preparation for allowing IOMMUs to see them

* vmstate.h: Provide VMSTATE_BOOL_SUB_ARRAY

* ARM: ACPI: Fix use-after-free due to memory realloc

* KVM: GIC: Fix memory leak due to calling kvm_init_irq_routing twice

Francisco Iglesias (1):

xlnx-zdma: Correct mem leaks and memset to zero on desc unaligned errors

Igor Mammedov (1):

arm: fix qemu crash on startup with -bios option

Jan Kiszka (1):

hw/intc/arm_gicv3: Fix APxR<n> register dispatching

Paolo Bonzini (1):

arm: fix malloc type mismatch

Peter Maydell (17):

target/arm: Honour FPCR.FZ in FRECPX

MAINTAINERS: Add entries for newer MPS2 boards and devices

Correct CPACR reset value for v7 cores

memory.h: Improve IOMMU related documentation

Make tb_invalidate_phys_addr() take a MemTxAttrs argument

Make address_space_translate{, _cached}() take a MemTxAttrs argument

Make address_space_map() take a MemTxAttrs argument

Make address_space_access_valid() take a MemTxAttrs argument

Make flatview_extend_translation() take a MemTxAttrs argument

Make memory_region_access_valid() take a MemTxAttrs argument

Make MemoryRegion valid.accepts callback take a MemTxAttrs argument

Make flatview_access_valid() take a MemTxAttrs argument

Make flatview_translate() take a MemTxAttrs argument

Make address_space_get_iotlb_entry() take a MemTxAttrs argument

Make flatview_do_translate() take a MemTxAttrs argument

Make address_space_translate_iommu take a MemTxAttrs argument

vmstate.h: Provide VMSTATE_BOOL_SUB_ARRAY

Richard Henderson (1):

tcg: Fix helper function vs host abi for float16

Shannon Zhao (3):

arm_gicv3_kvm: increase clroffset accordingly

ARM: ACPI: Fix use-after-free due to memory realloc

KVM: GIC: Fix memory leak due to calling kvm_init_irq_routing twice

include/exec/exec-all.h | 5 +-

include/exec/helper-head.h | 2 +-

include/exec/memory-internal.h | 3 +-

include/exec/memory.h | 128 +++++++++++++++++++++++++++++++++++------

include/migration/vmstate.h | 3 +

include/sysemu/dma.h | 6 +-

accel/tcg/translate-all.c | 4 +-

exec.c | 95 ++++++++++++++++++------------

hw/arm/boot.c | 18 +++---

hw/arm/virt-acpi-build.c | 20 +++++--

hw/dma/xlnx-zdma.c | 10 +++-

hw/hppa/dino.c | 3 +-

hw/intc/arm_gic_kvm.c | 1 -

hw/intc/arm_gicv3_cpuif.c | 12 ++--

hw/intc/arm_gicv3_kvm.c | 2 +-

hw/nvram/fw_cfg.c | 12 ++--

hw/s390x/s390-pci-inst.c | 3 +-

hw/scsi/esp.c | 3 +-

hw/vfio/common.c | 3 +-

hw/virtio/vhost.c | 3 +-

hw/xen/xen_pt_msi.c | 3 +-

memory.c | 12 ++--

memory_ldst.inc.c | 18 +++---

target/arm/gdbstub.c | 3 +-

target/arm/helper-a64.c | 41 +++++++------

target/arm/helper.c | 90 ++++++++++++++++-------------

target/ppc/mmu-hash64.c | 3 +-

target/riscv/helper.c | 2 +-

target/s390x/diag.c | 6 +-

target/s390x/excp_helper.c | 3 +-

target/s390x/mmu_helper.c | 3 +-

target/s390x/sigp.c | 3 +-

target/xtensa/op_helper.c | 3 +-

MAINTAINERS | 9 ++-

34 files changed, 353 insertions(+), 182 deletions(-)

From: Jan Kiszka <jan.kiszka@siemens.com>

There was a nasty flip in identifying which register group an access is

targeting. The issue caused spuriously raised priorities of the guest

when handing CPUs over in the Jailhouse hypervisor.

Cc: qemu-stable@nongnu.org

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

Message-id: 28b927d3-da58-bce4-cc13-bfec7f9b1cb9@siemens.com

hw/intc/arm_gicv3_cpuif.c | 12 ++++++------

1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c

--- a/hw/intc/arm_gicv3_cpuif.c

+++ b/hw/intc/arm_gicv3_cpuif.c

@@ -XXX,XX +XXX,XX @@ static uint64_t icv_ap_read(CPUARMState *env, const ARMCPRegInfo *ri)

GICv3CPUState *cs = icc_cs_from_env(env);

int regno = ri->opc2 & 3;

- int grp = ri->crm & 1 ? GICV3_G0 : GICV3_G1NS;

+ int grp = (ri->crm & 1) ? GICV3_G1NS : GICV3_G0;

uint64_t value = cs->ich_apr[grp][regno];

trace_gicv3_icv_ap_read(ri->crm & 1, regno, gicv3_redist_affid(cs), value);

@@ -XXX,XX +XXX,XX @@ static void icv_ap_write(CPUARMState *env, const ARMCPRegInfo *ri,

GICv3CPUState *cs = icc_cs_from_env(env);

int regno = ri->opc2 & 3;

- int grp = ri->crm & 1 ? GICV3_G0 : GICV3_G1NS;

+ int grp = (ri->crm & 1) ? GICV3_G1NS : GICV3_G0;

trace_gicv3_icv_ap_write(ri->crm & 1, regno, gicv3_redist_affid(cs), value);

@@ -XXX,XX +XXX,XX @@ static uint64_t icc_ap_read(CPUARMState *env, const ARMCPRegInfo *ri)

uint64_t value;

int regno = ri->opc2 & 3;

- int grp = ri->crm & 1 ? GICV3_G0 : GICV3_G1;

+ int grp = (ri->crm & 1) ? GICV3_G1 : GICV3_G0;

if (icv_access(env, grp == GICV3_G0 ? HCR_FMO : HCR_IMO)) {

return icv_ap_read(env, ri);

@@ -XXX,XX +XXX,XX @@ static void icc_ap_write(CPUARMState *env, const ARMCPRegInfo *ri,

GICv3CPUState *cs = icc_cs_from_env(env);

int regno = ri->opc2 & 3;

- int grp = ri->crm & 1 ? GICV3_G0 : GICV3_G1;

+ int grp = (ri->crm & 1) ? GICV3_G1 : GICV3_G0;

if (icv_access(env, grp == GICV3_G0 ? HCR_FMO : HCR_IMO)) {

icv_ap_write(env, ri, value);

@@ -XXX,XX +XXX,XX @@ static uint64_t ich_ap_read(CPUARMState *env, const ARMCPRegInfo *ri)

GICv3CPUState *cs = icc_cs_from_env(env);

int regno = ri->opc2 & 3;

- int grp = ri->crm & 1 ? GICV3_G0 : GICV3_G1NS;

+ int grp = (ri->crm & 1) ? GICV3_G1NS : GICV3_G0;

uint64_t value;

value = cs->ich_apr[grp][regno];

@@ -XXX,XX +XXX,XX @@ static void ich_ap_write(CPUARMState *env, const ARMCPRegInfo *ri,

{

GICv3CPUState *cs = icc_cs_from_env(env);

int regno = ri->opc2 & 3;

- int grp = ri->crm & 1 ? GICV3_G0 : GICV3_G1NS;

+ int grp = (ri->crm & 1) ? GICV3_G1NS : GICV3_G0;

trace_gicv3_ich_ap_write(ri->crm & 1, regno, gicv3_redist_affid(cs), value);

2.17.1

From: Igor Mammedov <imammedo@redhat.com>

When QEMU is started with following CLI

-machine virt,gic-version=3,accel=kvm -cpu host -bios AAVMF_CODE.fd

it crashes with abort at

accel/kvm/kvm-all.c:2164:

KVM_SET_DEVICE_ATTR failed: Group 6 attr 0x000000000000c665: Invalid argument

Which is caused by implicit dependency of kvm_arm_gicv3_reset() on

arm_gicv3_icc_reset() where the later is called by CPU reset

reset callback.

However commit:

3b77f6c arm/boot: split load_dtb() from arm_load_kernel()

broke CPU reset callback registration in case

arm_load_kernel()

...

if (!info->kernel_filename || info->firmware_loaded)

branch is taken, i.e. it's sufficient to provide a firmware

or do not provide kernel on CLI to skip cpu reset callback

registration, where before offending commit the callback

has been registered unconditionally.

Fix it by registering the callback right at the beginning of

arm_load_kernel() unconditionally instead of doing it at the end.

NOTE:

we probably should eliminate that dependency anyways as well as

separate arch CPU reset parts from arm_load_kernel() into CPU

itself, but that refactoring that I probably would have to do

anyways later for CPU hotplug to work.

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

Signed-off-by: Igor Mammedov <imammedo@redhat.com>

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

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

Message-id: 1527070950-208350-1-git-send-email-imammedo@redhat.com

hw/arm/boot.c | 18 +++++++++---------

1 file changed, 9 insertions(+), 9 deletions(-)

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

--- a/hw/arm/boot.c

+++ b/hw/arm/boot.c

@@ -XXX,XX +XXX,XX @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info)

static const ARMInsnFixup *primary_loader;

AddressSpace *as = arm_boot_address_space(cpu, info);

+ /* CPU objects (unlike devices) are not automatically reset on system

+ * reset, so we must always register a handler to do so. If we're

+ * actually loading a kernel, the handler is also responsible for

+ * arranging that we start it correctly.

+ */

+ for (cs = first_cpu; cs; cs = CPU_NEXT(cs)) {

+ qemu_register_reset(do_cpu_reset, ARM_CPU(cs));

+ }

+

/* The board code is not supposed to set secure_board_setup unless

* running its code in secure mode is actually possible, and KVM

* doesn't support secure.

@@ -XXX,XX +XXX,XX @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info)

ARM_CPU(cs)->env.boot_info = info;

2.17.1

From: Shannon Zhao <zhaoshenglong@huawei.com>

It forgot to increase clroffset during the loop. So it only clear the

first 4 bytes.

Fixes: 367b9f527becdd20ddf116e17a3c0c2bbc486920

Cc: qemu-stable@nongnu.org

Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>

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

Message-id: 1527047633-12368-1-git-send-email-zhaoshenglong@huawei.com

hw/intc/arm_gicv3_kvm.c | 1 +

1 file changed, 1 insertion(+)

diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c

--- a/hw/intc/arm_gicv3_kvm.c

+++ b/hw/intc/arm_gicv3_kvm.c

@@ -XXX,XX +XXX,XX @@ static void kvm_dist_putbmp(GICv3State *s, uint32_t offset,

if (clroffset != 0) {

reg = 0;

kvm_gicd_access(s, clroffset, &reg, true);

+ clroffset += 4;

}

reg = *gic_bmp_ptr32(bmp, irq);

kvm_gicd_access(s, offset, &reg, true);

2.17.1

In commit f0aff255700 we made cpacr_write() enforce that some CPACR

bits are RAZ/WI and some are RAO/WI for ARMv7 cores. Unfortunately

we forgot to also update the register's reset value. The effect

was that (a) a guest that read CPACR on reset would not see ones in

the RAO bits, and (b) if you did a migration before the guest did

a write to the CPACR then the migration would fail because the

destination would enforce the RAO bits and then complain that they

didn't match the zero value from the source.

Tested-by: Cédric Le Goater <clg@kaod.org>

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

target/arm/helper.c | 10 +++++++++-

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

@@ -XXX,XX +XXX,XX @@ static void cpacr_write(CPUARMState *env, const ARMCPRegInfo *ri,

env->cp15.cpacr_el1 = value;

}

+static void cpacr_reset(CPUARMState *env, const ARMCPRegInfo *ri)

+{

+ /* Call cpacr_write() so that we reset with the correct RAO bits set

+ * for our CPU features.

+ */

+ cpacr_write(env, ri, 0);

+}

+

static CPAccessResult cpacr_access(CPUARMState *env, const ARMCPRegInfo *ri,

bool isread)

@@ -XXX,XX +XXX,XX @@ static const ARMCPRegInfo v6_cp_reginfo[] = {

{ .name = "CPACR", .state = ARM_CP_STATE_BOTH, .opc0 = 3,

.crn = 1, .crm = 0, .opc1 = 0, .opc2 = 2, .accessfn = cpacr_access,

.access = PL1_RW, .fieldoffset = offsetof(CPUARMState, cp15.cpacr_el1),

- .resetvalue = 0, .writefn = cpacr_write },

+ .resetfn = cpacr_reset, .writefn = cpacr_write },

REGINFO_SENTINEL

2.17.1

From: Richard Henderson <richard.henderson@linaro.org>

Depending on the host abi, float16, aka uint16_t, values are

passed and returned either zero-extended in the host register

or with garbage at the top of the host register.

The tcg code generator has so far been assuming garbage, as that

matches the x86 abi, but this is incorrect for other host abis.

Further, target/arm has so far been assuming zero-extended results,

so that it may store the 16-bit value into a 32-bit slot with the

high 16-bits already clear.

Rectify both problems by mapping "f16" in the helper definition

to uint32_t instead of (a typedef for) uint16_t. This forces

the host compiler to assume garbage in the upper 16 bits on input

and to zero-extend the result on output.

Cc: qemu-stable@nongnu.org

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

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Tested-by: Laurent Desnogues <laurent.desnogues@gmail.com>

Message-id: 20180522175629.24932-1-richard.henderson@linaro.org

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

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

---

include/exec/helper-head.h | 2 +-

target/arm/helper-a64.c | 35 +++++++++--------

target/arm/helper.c | 80 +++++++++++++++++++-------------------

3 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/include/exec/helper-head.h b/include/exec/helper-head.h

--- a/include/exec/helper-head.h

+++ b/include/exec/helper-head.h

#define dh_ctype_int int

#define dh_ctype_i64 uint64_t

#define dh_ctype_s64 int64_t

-#define dh_ctype_f16 float16

+#define dh_ctype_f16 uint32_t

#define dh_ctype_f32 float32

#define dh_ctype_f64 float64

#define dh_ctype_ptr void *

diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/helper-a64.c

+++ b/target/arm/helper-a64.c

@@ -XXX,XX +XXX,XX @@ static inline uint32_t float_rel_to_flags(int res)

return flags;

-uint64_t HELPER(vfp_cmph_a64)(float16 x, float16 y, void *fp_status)

+uint64_t HELPER(vfp_cmph_a64)(uint32_t x, uint32_t y, void *fp_status)

{

return float_rel_to_flags(float16_compare_quiet(x, y, fp_status));

}

-uint64_t HELPER(vfp_cmpeh_a64)(float16 x, float16 y, void *fp_status)

+uint64_t HELPER(vfp_cmpeh_a64)(uint32_t x, uint32_t y, void *fp_status)

{

return float_rel_to_flags(float16_compare(x, y, fp_status));

}

@@ -XXX,XX +XXX,XX @@ uint64_t HELPER(neon_cgt_f64)(float64 a, float64 b, void *fpstp)

#define float64_three make_float64(0x4008000000000000ULL)

#define float64_one_point_five make_float64(0x3FF8000000000000ULL)

-float16 HELPER(recpsf_f16)(float16 a, float16 b, void *fpstp)

+uint32_t HELPER(recpsf_f16)(uint32_t a, uint32_t b, void *fpstp)

{

float_status *fpst = fpstp;

@@ -XXX,XX +XXX,XX @@ float64 HELPER(recpsf_f64)(float64 a, float64 b, void *fpstp)

return float64_muladd(a, b, float64_two, 0, fpst);

}

-float16 HELPER(rsqrtsf_f16)(float16 a, float16 b, void *fpstp)

+uint32_t HELPER(rsqrtsf_f16)(uint32_t a, uint32_t b, void *fpstp)

{

float_status *fpst = fpstp;

@@ -XXX,XX +XXX,XX @@ uint64_t HELPER(neon_addlp_u16)(uint64_t a)

}

/* Floating-point reciprocal exponent - see FPRecpX in ARM ARM */

-float16 HELPER(frecpx_f16)(float16 a, void *fpstp)

+uint32_t HELPER(frecpx_f16)(uint32_t a, void *fpstp)

{

float_status *fpst = fpstp;

uint16_t val16, sbit;

@@ -XXX,XX +XXX,XX @@ void HELPER(casp_be_parallel)(CPUARMState *env, uint32_t rs, uint64_t addr,

#define ADVSIMD_HELPER(name, suffix) HELPER(glue(glue(advsimd_, name), suffix))

#define ADVSIMD_HALFOP(name) \

-float16 ADVSIMD_HELPER(name, h)(float16 a, float16 b, void *fpstp) \

+uint32_t ADVSIMD_HELPER(name, h)(uint32_t a, uint32_t b, void *fpstp) \

{ \

float_status *fpst = fpstp; \

return float16_ ## name(a, b, fpst); \

@@ -XXX,XX +XXX,XX @@ ADVSIMD_HALFOP(mulx)

ADVSIMD_TWOHALFOP(mulx)

/* fused multiply-accumulate */

-float16 HELPER(advsimd_muladdh)(float16 a, float16 b, float16 c, void *fpstp)

+uint32_t HELPER(advsimd_muladdh)(uint32_t a, uint32_t b, uint32_t c,

+ void *fpstp)

{

float_status *fpst = fpstp;

return float16_muladd(a, b, c, 0, fpst);

@@ -XXX,XX +XXX,XX @@ uint32_t HELPER(advsimd_muladd2h)(uint32_t two_a, uint32_t two_b,

#define ADVSIMD_CMPRES(test) (test) ? 0xffff : 0

-uint32_t HELPER(advsimd_ceq_f16)(float16 a, float16 b, void *fpstp)

+uint32_t HELPER(advsimd_ceq_f16)(uint32_t a, uint32_t b, void *fpstp)

{

float_status *fpst = fpstp;

int compare = float16_compare_quiet(a, b, fpst);

return ADVSIMD_CMPRES(compare == float_relation_equal);

}

-uint32_t HELPER(advsimd_cge_f16)(float16 a, float16 b, void *fpstp)

+uint32_t HELPER(advsimd_cge_f16)(uint32_t a, uint32_t b, void *fpstp)

{

float_status *fpst = fpstp;

int compare = float16_compare(a, b, fpst);

@@ -XXX,XX +XXX,XX @@ uint32_t HELPER(advsimd_cge_f16)(float16 a, float16 b, void *fpstp)

compare == float_relation_equal);

}

-uint32_t HELPER(advsimd_cgt_f16)(float16 a, float16 b, void *fpstp)

+uint32_t HELPER(advsimd_cgt_f16)(uint32_t a, uint32_t b, void *fpstp)

{

float_status *fpst = fpstp;

int compare = float16_compare(a, b, fpst);

return ADVSIMD_CMPRES(compare == float_relation_greater);

}

-uint32_t HELPER(advsimd_acge_f16)(float16 a, float16 b, void *fpstp)

+uint32_t HELPER(advsimd_acge_f16)(uint32_t a, uint32_t b, void *fpstp)

{

float_status *fpst = fpstp;

float16 f0 = float16_abs(a);

@@ -XXX,XX +XXX,XX @@ uint32_t HELPER(advsimd_acge_f16)(float16 a, float16 b, void *fpstp)

compare == float_relation_equal);

}

-uint32_t HELPER(advsimd_acgt_f16)(float16 a, float16 b, void *fpstp)

+uint32_t HELPER(advsimd_acgt_f16)(uint32_t a, uint32_t b, void *fpstp)

{

float_status *fpst = fpstp;

float16 f0 = float16_abs(a);

@@ -XXX,XX +XXX,XX @@ uint32_t HELPER(advsimd_acgt_f16)(float16 a, float16 b, void *fpstp)

}

/* round to integral */

-float16 HELPER(advsimd_rinth_exact)(float16 x, void *fp_status)

+uint32_t HELPER(advsimd_rinth_exact)(uint32_t x, void *fp_status)

{

return float16_round_to_int(x, fp_status);

}

-float16 HELPER(advsimd_rinth)(float16 x, void *fp_status)

+uint32_t HELPER(advsimd_rinth)(uint32_t x, void *fp_status)

{

int old_flags = get_float_exception_flags(fp_status), new_flags;

float16 ret;

@@ -XXX,XX +XXX,XX @@ float16 HELPER(advsimd_rinth)(float16 x, void *fp_status)

* setting the mode appropriately before calling the helper.

*/

-uint32_t HELPER(advsimd_f16tosinth)(float16 a, void *fpstp)

+uint32_t HELPER(advsimd_f16tosinth)(uint32_t a, void *fpstp)

{

float_status *fpst = fpstp;

@@ -XXX,XX +XXX,XX @@ uint32_t HELPER(advsimd_f16tosinth)(float16 a, void *fpstp)

return float16_to_int16(a, fpst);

}

-uint32_t HELPER(advsimd_f16touinth)(float16 a, void *fpstp)

+uint32_t HELPER(advsimd_f16touinth)(uint32_t a, void *fpstp)

{

float_status *fpst = fpstp;

@@ -XXX,XX +XXX,XX @@ uint32_t HELPER(advsimd_f16touinth)(float16 a, void *fpstp)

* Square Root and Reciprocal square root

*/

-float16 HELPER(sqrt_f16)(float16 a, void *fpstp)

+uint32_t HELPER(sqrt_f16)(uint32_t a, void *fpstp)

{

float_status *s = fpstp;