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

Merge remote-tracking branch 'remotes/stsquad/tags/pull-misc-for-rc0-150720-3' into staging 



Final fixes for 5.1-rc0

  - minor documentation nit
  - docker.py bootstrap fixes
  - tweak containers.yml wildcards
  - fix float16 nan detection
  - conditional use of -Wpsabi
  - fix missing iotlb data for plugins
  - proper locking for helper based bb count
  - drop ppc64abi32 from the plugin check-tcg test

# gpg: Signature made Wed 15 Jul 2020 11:59:08 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-misc-for-rc0-150720-3:
  .travis.yml: skip ppc64abi32-linux-user with plugins
  plugins: expand the bb plugin to be thread safe and track per-cpu
  cputlb: ensure we save the IOTLB data in case of reset
  tests/plugins: don't unconditionally add -Wpsabi
  fpu/softfloat: fix up float16 nan recognition
  gitlab-ci/containers: Add missing wildcard where we should look for changes
  docker.py: fix fetching of FROM layers
  tests/docker: Remove the libssh workaround from the ubuntu 20.04 image
  docs/devel: fix grammar in multi-thread-tcg

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f1d59486 0571d280

.gitlab-ci.d/containers.yml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
    - changes:

      - .gitlab-ci.d/containers.yml

      - tests/docker/*

      - tests/docker/dockerfiles/*

    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'

    - if: '$CI_COMMIT_REF_NAME == "testing/next"'

.travis.yml

+2 −1
Original line number Diff line number Diff line
@@ -350,9 +350,10 @@ jobs: 
    # Run check-tcg against linux-user (with plugins)

    # we skip sparc64-linux-user until it has been fixed somewhat

    # we skip cris-linux-user as it doesn't use the common run loop

    # we skip ppc64abi32-linux-user as it seems to have a broken libc

    - name: "GCC plugins check-tcg (user)"

      env:

        - CONFIG="--disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user,cris-linux-user"

        - CONFIG="--disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user,cris-linux-user,ppc64abi32-linux-user"

        - TEST_BUILD_CMD="make build-tcg"

        - TEST_CMD="make check-tcg"

        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"

accel/tcg/cputlb.c

+35 −3
Original line number Diff line number Diff line
@@ -1073,6 +1073,24 @@ static uint64_t io_readx(CPUArchState *env, CPUIOTLBEntry *iotlbentry, 
    return val;

}



/*

 * Save a potentially trashed IOTLB entry for later lookup by plugin.

 *

 * We also need to track the thread storage address because the RCU

 * cleanup that runs when we leave the critical region (the current

 * execution) is actually in a different thread.

 */

static void save_iotlb_data(CPUState *cs, hwaddr addr,

                            MemoryRegionSection *section, hwaddr mr_offset)

{

#ifdef CONFIG_PLUGIN

    SavedIOTLB *saved = &cs->saved_iotlb;

    saved->addr = addr;

    saved->section = section;

    saved->mr_offset = mr_offset;

#endif

}



static void io_writex(CPUArchState *env, CPUIOTLBEntry *iotlbentry,

                      int mmu_idx, uint64_t val, target_ulong addr,

                      uintptr_t retaddr, MemOp op)
@@ -1092,6 +1110,12 @@ static void io_writex(CPUArchState *env, CPUIOTLBEntry *iotlbentry, 
    }

    cpu->mem_io_pc = retaddr;



    /*

     * The memory_region_dispatch may trigger a flush/resize

     * so for plugins we save the iotlb_data just in case.

     */

    save_iotlb_data(cpu, iotlbentry->addr, section, mr_offset);



    if (mr->global_locking && !qemu_mutex_iothread_locked()) {

        qemu_mutex_lock_iothread();

        locked = true;
@@ -1381,8 +1405,11 @@ void *tlb_vaddr_to_host(CPUArchState *env, abi_ptr addr, 
 * in the softmmu lookup code (or helper). We don't handle re-fills or

 * checking the victim table. This is purely informational.

 *

 * This should never fail as the memory access being instrumented

 * should have just filled the TLB.

 * This almost never fails as the memory access being instrumented

 * should have just filled the TLB. The one corner case is io_writex

 * which can cause TLB flushes and potential resizing of the TLBs

 * loosing the information we need. In those cases we need to recover

 * data from a copy of the io_tlb entry.

 */



bool tlb_plugin_lookup(CPUState *cpu, target_ulong addr, int mmu_idx,
@@ -1406,8 +1433,13 @@ bool tlb_plugin_lookup(CPUState *cpu, target_ulong addr, int mmu_idx, 
            data->v.ram.hostaddr = addr + tlbe->addend;

        }

        return true;

    } else {

        SavedIOTLB *saved = &cpu->saved_iotlb;

        data->is_io = true;

        data->v.io.section = saved->section;

        data->v.io.offset = saved->mr_offset;

        return true;

    }

    return false;

}



#endif

configure

+3 −0
Original line number Diff line number Diff line
@@ -7115,6 +7115,9 @@ echo "GIT_UPDATE=$git_update" >> $config_host_mak 


echo "ARCH=$ARCH" >> $config_host_mak



echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak

echo "GLIB_LDFLAGS=$glib_ldflags" >> $config_host_mak



if test "$default_devices" = "yes" ; then

  echo "CONFIG_MINIKCONF_MODE=--defconfig" >> $config_host_mak

else

docs/devel/multi-thread-tcg.rst

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ including: 


  - debugging operations (breakpoint insertion/removal)

  - some CPU helper functions

  - linux-user spawning it's first thread

  - linux-user spawning its first thread



This is done with the async_safe_run_on_cpu() mechanism to ensure all

vCPUs are quiescent when changes are being made to shared global