Commit f35e44e7 authored by Alex Bennée's avatar Alex Bennée Committed by Paolo Bonzini
Browse files

exec.c: ensure all AddressSpaceDispatch updates under RCU 



The memory_dispatch field is meant to be protected by RCU so we should
use the correct primitives when accessing it. This race was flagged up
by the ThreadSanitizer.

Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Message-Id: <20161021153418.21571-1-alex.bennee@linaro.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 28017e01

exec.c

+2 −2
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ address_space_translate_for_iotlb(CPUState *cpu, int asidx, hwaddr addr, 
                                  hwaddr *xlat, hwaddr *plen)

{

    MemoryRegionSection *section;

    AddressSpaceDispatch *d = cpu->cpu_ases[asidx].memory_dispatch;

    AddressSpaceDispatch *d = atomic_rcu_read(&cpu->cpu_ases[asidx].memory_dispatch);



    section = address_space_translate_internal(d, addr, xlat, plen, false);
@@ -2376,7 +2376,7 @@ static void tcg_commit(MemoryListener *listener) 
     * may have split the RCU critical section.

     */

    d = atomic_rcu_read(&cpuas->as->dispatch);

    cpuas->memory_dispatch = d;

    atomic_rcu_set(&cpuas->memory_dispatch, d);

    tlb_flush(cpuas->cpu, 1);

}