Commit 4c6ebbb3 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

address_space_write: address_space_to_flatview needs RCU lock 



address_space_write is calling address_space_to_flatview but it can
be called outside the RCU lock.  To fix it, push the rcu_read_lock/unlock
pair up from flatview_write to address_space_write.

Reviewed-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 785a507e

exec.c

+22 −15
Original line number Diff line number Diff line
@@ -3078,6 +3078,7 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, 
    return result;

}



/* Called from RCU critical section.  */

static MemTxResult flatview_write(FlatView *fv, hwaddr addr, MemTxAttrs attrs,

                                  const uint8_t *buf, int len)

{
@@ -3086,25 +3087,14 @@ static MemTxResult flatview_write(FlatView *fv, hwaddr addr, MemTxAttrs attrs, 
    MemoryRegion *mr;

    MemTxResult result = MEMTX_OK;



    if (len > 0) {

        rcu_read_lock();

    l = len;

    mr = flatview_translate(fv, addr, &addr1, &l, true);

    result = flatview_write_continue(fv, addr, attrs, buf, len,

                                     addr1, l, mr);

        rcu_read_unlock();

    }



    return result;

}



MemTxResult address_space_write(AddressSpace *as, hwaddr addr,

                                              MemTxAttrs attrs,

                                              const uint8_t *buf, int len)

{

    return flatview_write(address_space_to_flatview(as), addr, attrs, buf, len);

}



/* Called within RCU critical section.  */

MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr,

                                   MemTxAttrs attrs, uint8_t *buf,
@@ -3213,6 +3203,23 @@ MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, 
                       addr, attrs, buf, len, is_write);

}



MemTxResult address_space_write(AddressSpace *as, hwaddr addr,

                                MemTxAttrs attrs,

                                const uint8_t *buf, int len)

{

    MemTxResult result = MEMTX_OK;

    FlatView *fv;



    if (len > 0) {

        rcu_read_lock();

        fv = address_space_to_flatview(as);

        result = flatview_write(fv, addr, attrs, buf, len);

        rcu_read_unlock();

    }



    return result;

}



void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf,

                            int len, int is_write)

{