Commit ae2810c4 authored by Juan Quintela's avatar Juan Quintela
Browse files

memory: syncronize kvm bitmap using bitmaps operations 



If bitmaps are aligned properly, use bitmap operations.  If they are
not, just use old bit at a time code.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarOrit Wasserman <owasserm@redhat.com>
parent 5ff7fb77

include/exec/ram_addr.h

+36 −18
Original line number Diff line number Diff line
@@ -83,13 +83,30 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, 
                                                          ram_addr_t start,

                                                          ram_addr_t pages)

{

    unsigned int i, j;

    unsigned long i, j;

    unsigned long page_number, c;

    hwaddr addr;

    ram_addr_t ram_addr;

    unsigned int len = (pages + HOST_LONG_BITS - 1) / HOST_LONG_BITS;

    unsigned long len = (pages + HOST_LONG_BITS - 1) / HOST_LONG_BITS;

    unsigned long hpratio = getpagesize() / TARGET_PAGE_SIZE;

    unsigned long page = BIT_WORD(start >> TARGET_PAGE_BITS);



    /* start address is aligned at the start of a word? */

    if (((page * BITS_PER_LONG) << TARGET_PAGE_BITS) == start) {

        long k;

        long nr = BITS_TO_LONGS(pages);



        for (k = 0; k < nr; k++) {

            if (bitmap[k]) {

                unsigned long temp = leul_to_cpu(bitmap[k]);



                ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION][page + k] |= temp;

                ram_list.dirty_memory[DIRTY_MEMORY_VGA][page + k] |= temp;

                ram_list.dirty_memory[DIRTY_MEMORY_CODE][page + k] |= temp;

            }

        }

        xen_modified_memory(start, pages);

    } else {

        /*

         * bitmap-traveling is faster than memory-traveling (for addr...)

         * especially when most of the memory is not dirty.
@@ -109,6 +126,7 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, 
            }

        }

    }

}



static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start,

                                                         ram_addr_t length,