Commit 5c24bce3 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-and-plugin-160620-2' into staging 



Testing and plugin updates

  - clear up dtc warnings
  - add support for --enable-tsan builds
  - re-enable shippable cross builds
  - serialise cirrus check steps
  - fix check-tcg plugin issues
  - add lockstep plugin

# gpg: Signature made Tue 16 Jun 2020 14:50:09 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-and-plugin-160620-2: (21 commits)
  plugins: new lockstep plugin for debugging TCG changes
  tests/tcg: ensure -cpu max also used for plugin run
  tests/tcg: build plugin list from contents of src directory
  cirrus.yml: serialise make check
  Revert ".shippable: temporaily disable some cross builds"
  tests: Disable select tests under TSan, which hit TSan issue.
  docs: Added details on TSan to testing.rst
  util: Added tsan annotate for thread name.
  include/qemu: Added tsan.h for annotations.
  tests/docker: Added docker build support for TSan.
  thread: add tsan annotations to QemuSpin
  translate-all: call qemu_spin_destroy for PageDesc
  tcg: call qemu_spin_destroy for tb->jmp_lock
  qht: call qemu_spin_destroy for head buckets
  cputlb: destroy CPUTLB with tlb_destroy
  thread: add qemu_spin_destroy
  cpu: convert queued work to a QSIMPLEQ
  configure: add --enable-tsan flag + fiber annotations for coroutine-ucontext
  Makefile: remove old compatibility gunks
  Makefile: dtc: update, build the libfdt target
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cb8278cd c81950a2

.cirrus.yml

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ freebsd_12_task: 
    - cd build

    - ../configure || { cat config.log; exit 1; }

    - gmake -j8

    - gmake -j8 V=1 check

    - gmake V=1 check



macos_task:

  osx_instance:
@@ -26,7 +26,7 @@ macos_task: 
    - cd build

    - ../configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; }

    - gmake -j$(sysctl -n hw.ncpu)

    - gmake check -j$(sysctl -n hw.ncpu)

    - gmake check



macos_xcode_task:

  osx_instance:
@@ -39,4 +39,4 @@ macos_xcode_task: 
    - cd build

    - ../configure --cc=clang || { cat config.log; exit 1; }

    - gmake -j$(sysctl -n hw.ncpu)

    - gmake check -j$(sysctl -n hw.ncpu)
 
    - gmake check

.shippable.yml

+6 −6
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ env: 
  global:

    - LC_ALL=C

  matrix:

    # - IMAGE=debian-amd64

    #   TARGET_LIST=x86_64-softmmu,x86_64-linux-user

    - IMAGE=debian-amd64

      TARGET_LIST=x86_64-softmmu,x86_64-linux-user

    - IMAGE=debian-win32-cross

      TARGET_LIST=arm-softmmu,i386-softmmu,lm32-softmmu

    - IMAGE=debian-win64-cross
@@ -19,10 +19,10 @@ env: 
      TARGET_LIST=aarch64-softmmu,aarch64-linux-user

    - IMAGE=debian-s390x-cross

      TARGET_LIST=s390x-softmmu,s390x-linux-user

    # - IMAGE=debian-mips-cross

    #   TARGET_LIST=mips-softmmu,mipsel-linux-user

    # - IMAGE=debian-mips64el-cross

    #   TARGET_LIST=mips64el-softmmu,mips64el-linux-user

    - IMAGE=debian-mips-cross

      TARGET_LIST=mips-softmmu,mipsel-linux-user

    - IMAGE=debian-mips64el-cross

      TARGET_LIST=mips64el-softmmu,mips64el-linux-user

    - IMAGE=debian-ppc64el-cross

      TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user

build:

Makefile

+5 −11
Original line number Diff line number Diff line
@@ -526,13 +526,14 @@ $(SOFTMMU_FUZZ_RULES): $(edk2-decompressed) 
$(TARGET_DIRS_RULES):

	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" $(notdir $@),)



DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt

# LIBFDT_lib="": avoid breaking existing trees with objects requiring -fPIC

DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_lib=""

DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS)

DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt

DTC_CPPFLAGS=-I$(SRC_PATH)/dtc/libfdt



.PHONY: dtc/all

dtc/all: .git-submodule-status dtc/libfdt dtc/tests

	$(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,)

dtc/all: .git-submodule-status dtc/libfdt

	$(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt,)



dtc/%: .git-submodule-status

	@mkdir -p $@
@@ -561,12 +562,6 @@ slirp/all: .git-submodule-status 
		CC="$(CC)" AR="$(AR)" 	LD="$(LD)" RANLIB="$(RANLIB)"	\

		CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)")



# Compatibility gunk to keep make working across the rename of targets

# for recursion, to be removed some time after 4.1.

subdir-dtc: dtc/all

subdir-capstone: capstone/all

subdir-slirp: slirp/all



$(filter %/all, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \

	$(qom-obj-y)
@@ -820,7 +815,6 @@ distclean: clean 
	rm -rf $$d || exit 1 ; \

        done

	rm -Rf .sdk

	if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi



KEYMAPS=da     en-gb  et  fr     fr-ch  is  lt  no  pt-br  sv \

ar      de     en-us  fi  fr-be  hr     it  lv  nl         pl  ru     th \

accel/tcg/cputlb.c

+15 −0
Original line number Diff line number Diff line
@@ -270,6 +270,21 @@ void tlb_init(CPUState *cpu) 
    }

}



void tlb_destroy(CPUState *cpu)

{

    CPUArchState *env = cpu->env_ptr;

    int i;



    qemu_spin_destroy(&env_tlb(env)->c.lock);

    for (i = 0; i < NB_MMU_MODES; i++) {

        CPUTLBDesc *desc = &env_tlb(env)->d[i];

        CPUTLBDescFast *fast = &env_tlb(env)->f[i];



        g_free(fast->table);

        g_free(desc->iotlb);

    }

}



/* flush_all_helper: run fn across all cpus

 *

 * If the wait flag is set then the src cpu's helper will be queued as

accel/tcg/translate-all.c

+17 −0
Original line number Diff line number Diff line
@@ -384,6 +384,11 @@ static int cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb, 
    return 0;

}



void tb_destroy(TranslationBlock *tb)

{

    qemu_spin_destroy(&tb->jmp_lock);

}



bool cpu_restore_state(CPUState *cpu, uintptr_t host_pc, bool will_exit)

{

    TranslationBlock *tb;
@@ -413,6 +418,7 @@ bool cpu_restore_state(CPUState *cpu, uintptr_t host_pc, bool will_exit) 
                /* one-shot translation, invalidate it immediately */

                tb_phys_invalidate(tb, -1);

                tcg_tb_remove(tb);

                tb_destroy(tb);

            }

            r = true;

        }
@@ -541,6 +547,15 @@ static PageDesc *page_find_alloc(tb_page_addr_t index, int alloc) 
#endif

        existing = atomic_cmpxchg(lp, NULL, pd);

        if (unlikely(existing)) {

#ifndef CONFIG_USER_ONLY

            {

                int i;



                for (i = 0; i < V_L2_SIZE; i++) {

                    qemu_spin_destroy(&pd[i].lock);

                }

            }

#endif

            g_free(pd);

            pd = existing;

        }
@@ -1886,6 +1901,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, 


        orig_aligned -= ROUND_UP(sizeof(*tb), qemu_icache_linesize);

        atomic_set(&tcg_ctx->code_gen_ptr, (void *)orig_aligned);

        tb_destroy(tb);

        return existing_tb;

    }

    tcg_tb_insert(tb);
@@ -2235,6 +2251,7 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) 
            tb_phys_invalidate(tb->orig_tb, -1);

        }

        tcg_tb_remove(tb);

        tb_destroy(tb);

    }



    /* TODO: If env->pc != tb->pc (i.e. the faulting instruction was not