Commit db84fd97 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

address_space_rw: address_space_to_flatview needs RCU lock 



address_space_rw is calling address_space_to_flatview but it can
be called outside the RCU lock.  To fix it, transform flatview_rw
into address_space_rw, since flatview_rw is otherwise unused.

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

exec.c

+10 −18
Original line number Diff line number Diff line
@@ -3181,24 +3181,6 @@ static MemTxResult flatview_read(FlatView *fv, hwaddr addr, 
                                  addr1, l, mr);

}



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

                               uint8_t *buf, int len, bool is_write)

{

    if (is_write) {

        return flatview_write(fv, addr, attrs, (uint8_t *)buf, len);

    } else {

        return flatview_read(fv, addr, attrs, (uint8_t *)buf, len);

    }

}



MemTxResult address_space_rw(AddressSpace *as, hwaddr addr,

                             MemTxAttrs attrs, uint8_t *buf,

                             int len, bool is_write)

{

    return flatview_rw(address_space_to_flatview(as),

                       addr, attrs, buf, len, is_write);

}



MemTxResult address_space_read_full(AddressSpace *as, hwaddr addr,

                                    MemTxAttrs attrs, uint8_t *buf, int len)

{
@@ -3232,6 +3214,16 @@ MemTxResult address_space_write(AddressSpace *as, hwaddr addr, 
    return result;

}



MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, MemTxAttrs attrs,

                             uint8_t *buf, int len, bool is_write)

{

    if (is_write) {

        return address_space_write(as, addr, attrs, buf, len);

    } else {

        return address_space_read_full(as, addr, attrs, buf, len);

    }

}



void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf,

                            int len, int is_write)

{