Commit 66706192 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-tcg-plugins-150520-2' into staging 



Various testing, tcg and plugin updates

  - fix bug in gdbstub tests that leave hanging QEMUs
  - tweak s390x travis test
  - re-factor guest_base handling
  - support "notes" in disassembler output
  - include guest address notes in out_asm
  - cleanup plugin headers and and constify hwaddr
  - updates MAINTAINERS for cpu-common.c

# gpg: Signature made Fri 15 May 2020 15:40:40 BST
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-testing-tcg-plugins-150520-2:
  MAINTAINERS: update the orphaned cpus-common.c file
  qemu/qemu-plugin: Make qemu_plugin_hwaddr_is_io() hwaddr argument const
  qemu/plugin: Move !CONFIG_PLUGIN stubs altogether
  qemu/plugin: Trivial code movement
  translate-all: include guest address in out_asm output
  disas: add optional note support to cap_disas
  disas: include an optional note for the start of disassembly
  accel/tcg: don't disable exec_tb trace events
  accel/tcg: Relax va restrictions on 64-bit guests
  exec/cpu-all: Use bool for have_guest_base
  linux-user: completely re-write init_guest_space
  travis.yml: Improve the --disable-tcg test on s390x
  tests/guest-debug: catch hanging guests

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2478b8ec adf1cfbd

.travis.yml

+4 −14
Original line number Diff line number Diff line
@@ -502,9 +502,10 @@ jobs: 
              $(exit $BUILD_RC);

          fi



    - name: "[s390x] GCC check (KVM)"

    - name: "[s390x] Clang (disable-tcg)"

      arch: s390x

      dist: bionic

      compiler: clang

      addons:

        apt_packages:

          - libaio-dev
@@ -528,21 +529,10 @@ jobs: 
          - libusb-1.0-0-dev

          - libvdeplug-dev

          - libvte-2.91-dev

          # Tests dependencies

          - genisoimage

      env:

        - TEST_CMD="make check-unit"

        - CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-tools"

      script:

        - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF )

        - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?

        - |

          if [ "$BUILD_RC" -eq 0 ] ; then

              mv pc-bios/s390-ccw/*.img pc-bios/ ;

              ${TEST_CMD} ;

          else

              $(exit $BUILD_RC);

          fi

        - CONFIG="--disable-containers --disable-tcg --enable-kvm

                  --disable-tools --host-cc=clang --cxx=clang++"



    # Release builds

    # The make-release script expect a QEMU version, so our tag must start with a 'v'.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ M: Richard Henderson <rth@twiddle.net> 
R: Paolo Bonzini <pbonzini@redhat.com>

S: Maintained

F: cpus.c

F: cpus-common.c

F: exec.c

F: accel/tcg/

F: accel/stubs/tcg-stub.c

accel/tcg/trace-events

+4 −4
Original line number Diff line number Diff line 
# See docs/devel/tracing.txt for syntax documentation.



# TCG related tracing (mostly disabled by default)

# TCG related tracing

# cpu-exec.c

disable exec_tb(void *tb, uintptr_t pc) "tb:%p pc=0x%"PRIxPTR

disable exec_tb_nocache(void *tb, uintptr_t pc) "tb:%p pc=0x%"PRIxPTR

disable exec_tb_exit(void *last_tb, unsigned int flags) "tb:%p flags=0x%x"

exec_tb(void *tb, uintptr_t pc) "tb:%p pc=0x%"PRIxPTR

exec_tb_nocache(void *tb, uintptr_t pc) "tb:%p pc=0x%"PRIxPTR

exec_tb_exit(void *last_tb, unsigned int flags) "tb:%p flags=0x%x"



# translate-all.c

translate_block(void *tb, uintptr_t pc, uint8_t *tb_code) "tb:%p, pc:0x%"PRIxPTR", tb_code:%p"

accel/tcg/translate-all.c

+42 −12
Original line number Diff line number Diff line
@@ -173,8 +173,13 @@ struct page_collection { 
#define TB_FOR_EACH_JMP(head_tb, tb, n)                                 \

    TB_FOR_EACH_TAGGED((head_tb)->jmp_list_head, tb, n, jmp_list_next)



/* In system mode we want L1_MAP to be based on ram offsets,

   while in user mode we want it to be based on virtual addresses.  */

/*

 * In system mode we want L1_MAP to be based on ram offsets,

 * while in user mode we want it to be based on virtual addresses.

 *

 * TODO: For user mode, see the caveat re host vs guest virtual

 * address spaces near GUEST_ADDR_MAX.

 */

#if !defined(CONFIG_USER_ONLY)

#if HOST_LONG_BITS < TARGET_PHYS_ADDR_SPACE_BITS

# define L1_MAP_ADDR_SPACE_BITS  HOST_LONG_BITS
@@ -182,7 +187,7 @@ struct page_collection { 
# define L1_MAP_ADDR_SPACE_BITS  TARGET_PHYS_ADDR_SPACE_BITS

#endif

#else

# define L1_MAP_ADDR_SPACE_BITS  TARGET_VIRT_ADDR_SPACE_BITS

# define L1_MAP_ADDR_SPACE_BITS  MIN(HOST_LONG_BITS, TARGET_ABI_BITS)

#endif



/* Size of the L2 (and L3, etc) page tables.  */
@@ -1789,14 +1794,43 @@ TranslationBlock *tb_gen_code(CPUState *cpu, 
    if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM) &&

        qemu_log_in_addr_range(tb->pc)) {

        FILE *logfile = qemu_log_lock();

        int code_size, data_size = 0;

        g_autoptr(GString) note = g_string_new("[tb header & initial instruction]");

        size_t chunk_start = 0;

        int insn = 0;

        qemu_log("OUT: [size=%d]\n", gen_code_size);

        if (tcg_ctx->data_gen_ptr) {

            size_t code_size = tcg_ctx->data_gen_ptr - tb->tc.ptr;

            size_t data_size = gen_code_size - code_size;

            size_t i;

            code_size = tcg_ctx->data_gen_ptr - tb->tc.ptr;

            data_size = gen_code_size - code_size;

        } else {

            code_size = gen_code_size;

        }



        /* Dump header and the first instruction */

        chunk_start = tcg_ctx->gen_insn_end_off[insn];

        log_disas(tb->tc.ptr, chunk_start, note->str);



            log_disas(tb->tc.ptr, code_size);

        /*

         * Dump each instruction chunk, wrapping up empty chunks into

         * the next instruction. The whole array is offset so the

         * first entry is the beginning of the 2nd instruction.

         */

        while (insn <= tb->icount && chunk_start < code_size) {

            size_t chunk_end = tcg_ctx->gen_insn_end_off[insn];

            if (chunk_end > chunk_start) {

                g_string_printf(note, "[guest addr: " TARGET_FMT_lx "]",

                                tcg_ctx->gen_insn_data[insn][0]);

                log_disas(tb->tc.ptr + chunk_start, chunk_end - chunk_start,

                          note->str);

                chunk_start = chunk_end;

            }

            insn++;

        }



        /* Finally dump any data we may have after the block */

        if (data_size) {

            int i;

            qemu_log("  data: [size=%d]\n", data_size);

            for (i = 0; i < data_size; i += sizeof(tcg_target_ulong)) {

                if (sizeof(tcg_target_ulong) == 8) {

                    qemu_log("0x%08" PRIxPTR ":  .quad  0x%016" PRIx64 "\n",
@@ -1808,8 +1842,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, 
                             *(uint32_t *)(tcg_ctx->data_gen_ptr + i));

                }

            }

        } else {

            log_disas(tb->tc.ptr, gen_code_size);

        }

        qemu_log("\n");

        qemu_log_flush();
@@ -2497,9 +2529,7 @@ void page_set_flags(target_ulong start, target_ulong end, int flags) 
    /* This function should never be called with addresses outside the

       guest address space.  If this assert fires, it probably indicates

       a missing call to h2g_valid.  */

#if TARGET_ABI_BITS > L1_MAP_ADDR_SPACE_BITS

    assert(end <= ((target_ulong)1 << L1_MAP_ADDR_SPACE_BITS));

#endif

    assert(end - 1 <= GUEST_ADDR_MAX);

    assert(start < end);

    assert_memory_lock();

bsd-user/main.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
int singlestep;

unsigned long mmap_min_addr;

unsigned long guest_base;

int have_guest_base;

bool have_guest_base;

unsigned long reserved_va;



static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX;
@@ -828,7 +828,7 @@ int main(int argc, char **argv) 
            }

        } else if (!strcmp(r, "B")) {

           guest_base = strtol(argv[optind++], NULL, 0);

           have_guest_base = 1;

           have_guest_base = true;

        } else if (!strcmp(r, "drop-ld-preload")) {

            (void) envlist_unsetenv(envlist, "LD_PRELOAD");

        } else if (!strcmp(r, "bsd")) {