Re: [Qemu-devel] [PATCH v4 1/2] ramblock: add RAMBLOCK_FOREACH()

[Dr. David Alan Gilbert]

* Peter Xu (address@hidden) wrote:
> So that it can simplifies the iterators.
> 
> Signed-off-by: Peter Xu <address@hidden>

Reviewed-by: Dr. David Alan Gilbert <address@hidden>

> ---
>  exec.c                 | 22 +++++++++++-----------
>  include/exec/ramlist.h |  5 +++++
>  migration/ram.c        | 15 ++++++++-------
>  3 files changed, 24 insertions(+), 18 deletions(-)
> 
> diff --git a/exec.c b/exec.c
> index eac6085..50519ae 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -978,7 +978,7 @@ static RAMBlock *qemu_get_ram_block(ram_addr_t addr)
>      if (block && addr - block->offset < block->max_length) {
>          return block;
>      }
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          if (addr - block->offset < block->max_length) {
>              goto found;
>          }
> @@ -1578,12 +1578,12 @@ static ram_addr_t find_ram_offset(ram_addr_t size)
>          return 0;
>      }
>  
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          ram_addr_t end, next = RAM_ADDR_MAX;
>  
>          end = block->offset + block->max_length;
>  
> -        QLIST_FOREACH_RCU(next_block, &ram_list.blocks, next) {
> +        RAMBLOCK_FOREACH(next_block) {
>              if (next_block->offset >= end) {
>                  next = MIN(next, next_block->offset);
>              }
> @@ -1609,7 +1609,7 @@ unsigned long last_ram_page(void)
>      ram_addr_t last = 0;
>  
>      rcu_read_lock();
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          last = MAX(last, block->offset + block->max_length);
>      }
>      rcu_read_unlock();
> @@ -1659,7 +1659,7 @@ void qemu_ram_set_idstr(RAMBlock *new_block, const char 
> *name, DeviceState *dev)
>      pstrcat(new_block->idstr, sizeof(new_block->idstr), name);
>  
>      rcu_read_lock();
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          if (block != new_block &&
>              !strcmp(block->idstr, new_block->idstr)) {
>              fprintf(stderr, "RAMBlock \"%s\" already registered, abort!\n",
> @@ -1693,7 +1693,7 @@ size_t qemu_ram_pagesize_largest(void)
>      RAMBlock *block;
>      size_t largest = 0;
>  
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          largest = MAX(largest, qemu_ram_pagesize(block));
>      }
>  
> @@ -1839,7 +1839,7 @@ static void ram_block_add(RAMBlock *new_block, Error 
> **errp)
>       * QLIST (which has an RCU-friendly variant) does not have insertion at
>       * tail, so save the last element in last_block.
>       */
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          last_block = block;
>          if (block->max_length < new_block->max_length) {
>              break;
> @@ -2021,7 +2021,7 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length)
>      int flags;
>      void *area, *vaddr;
>  
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          offset = addr - block->offset;
>          if (offset < block->max_length) {
>              vaddr = ramblock_ptr(block, offset);
> @@ -2167,7 +2167,7 @@ RAMBlock *qemu_ram_block_from_host(void *ptr, bool 
> round_offset,
>          goto found;
>      }
>  
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          /* This case append when the block is not mapped. */
>          if (block->host == NULL) {
>              continue;
> @@ -2200,7 +2200,7 @@ RAMBlock *qemu_ram_block_by_name(const char *name)
>  {
>      RAMBlock *block;
>  
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          if (!strcmp(name, block->idstr)) {
>              return block;
>          }
> @@ -3424,7 +3424,7 @@ int qemu_ram_foreach_block(RAMBlockIterFunc func, void 
> *opaque)
>      int ret = 0;
>  
>      rcu_read_lock();
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          ret = func(block->idstr, block->host, block->offset,
>                     block->used_length, opaque);
>          if (ret) {
> diff --git a/include/exec/ramlist.h b/include/exec/ramlist.h
> index c59880d..f1c6b45 100644
> --- a/include/exec/ramlist.h
> +++ b/include/exec/ramlist.h
> @@ -4,6 +4,7 @@
>  #include "qemu/queue.h"
>  #include "qemu/thread.h"
>  #include "qemu/rcu.h"
> +#include "qemu/rcu_queue.h"
>  
>  typedef struct RAMBlockNotifier RAMBlockNotifier;
>  
> @@ -54,6 +55,10 @@ typedef struct RAMList {
>  } RAMList;
>  extern RAMList ram_list;
>  
> +/* Should be holding either ram_list.mutex, or the RCU lock. */
> +#define  RAMBLOCK_FOREACH(block)  \
> +    QLIST_FOREACH_RCU(block, &ram_list.blocks, next)
> +
>  void qemu_mutex_lock_ramlist(void);
>  void qemu_mutex_unlock_ramlist(void);
>  
> diff --git a/migration/ram.c b/migration/ram.c
> index f48664e..7ba5d7e 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -672,7 +672,7 @@ uint64_t ram_pagesize_summary(void)
>      RAMBlock *block;
>      uint64_t summary = 0;
>  
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          summary |= block->page_size;
>      }
>  
> @@ -700,7 +700,7 @@ static void migration_bitmap_sync(RAMState *rs)
>  
>      qemu_mutex_lock(&rs->bitmap_mutex);
>      rcu_read_lock();
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          migration_bitmap_sync_range(rs, block, 0, block->used_length);
>      }
>      rcu_read_unlock();
> @@ -1439,8 +1439,9 @@ uint64_t ram_bytes_total(void)
>      uint64_t total = 0;
>  
>      rcu_read_lock();
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next)
> +    RAMBLOCK_FOREACH(block) {
>          total += block->used_length;
> +    }
>      rcu_read_unlock();
>      return total;
>  }
> @@ -1543,7 +1544,7 @@ void 
> ram_postcopy_migrated_memory_release(MigrationState *ms)
>      struct RAMBlock *block;
>      unsigned long *bitmap = atomic_rcu_read(&rs->ram_bitmap)->bmap;
>  
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          unsigned long first = block->offset >> TARGET_PAGE_BITS;
>          unsigned long range = first + (block->used_length >> 
> TARGET_PAGE_BITS);
>          unsigned long run_start = find_next_zero_bit(bitmap, range, first);
> @@ -1624,7 +1625,7 @@ static int 
> postcopy_each_ram_send_discard(MigrationState *ms)
>      struct RAMBlock *block;
>      int ret;
>  
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          unsigned long first = block->offset >> TARGET_PAGE_BITS;
>          PostcopyDiscardState *pds = postcopy_discard_send_init(ms,
>                                                                 first,
> @@ -1802,7 +1803,7 @@ static int postcopy_chunk_hostpages(MigrationState *ms)
>      rs->last_sent_block = NULL;
>      rs->last_page = 0;
>  
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          unsigned long first = block->offset >> TARGET_PAGE_BITS;
>  
>          PostcopyDiscardState *pds =
> @@ -2021,7 +2022,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
>  
>      qemu_put_be64(f, ram_bytes_total() | RAM_SAVE_FLAG_MEM_SIZE);
>  
> -    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
> +    RAMBLOCK_FOREACH(block) {
>          qemu_put_byte(f, strlen(block->idstr));
>          qemu_put_buffer(f, (uint8_t *)block->idstr, strlen(block->idstr));
>          qemu_put_be64(f, block->used_length);
> -- 
> 2.7.4
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK