From patchwork Wed Apr 26 07:44:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 755289 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wCXDq6M74z9s2G for ; Wed, 26 Apr 2017 17:45:31 +1000 (AEST) Received: from localhost ([::1]:53271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3Hdh-0001ql-AK for incoming@patchwork.ozlabs.org; Wed, 26 Apr 2017 03:45:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3Hd9-0001mu-1o for qemu-devel@nongnu.org; Wed, 26 Apr 2017 03:44:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3Hd7-0001NS-Rb for qemu-devel@nongnu.org; Wed, 26 Apr 2017 03:44:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45654) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d3Hd7-0001Mo-I2 for qemu-devel@nongnu.org; Wed, 26 Apr 2017 03:44:53 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 74125C0567A2 for ; Wed, 26 Apr 2017 07:44:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 74125C0567A2 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=peterx@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 74125C0567A2 Received: from pxdev.xzpeter.org.com (ovpn-8-40.pek2.redhat.com [10.72.8.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE41E5C475; Wed, 26 Apr 2017 07:44:49 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Wed, 26 Apr 2017 15:44:34 +0800 Message-Id: <1493192675-16104-2-git-send-email-peterx@redhat.com> In-Reply-To: <1493192675-16104-1-git-send-email-peterx@redhat.com> References: <1493192675-16104-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 26 Apr 2017 07:44:52 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] ramblock: add RAMBLOCK_FOREACH() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , peterx@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" So that it can simplifies the iterators. Signed-off-by: Peter Xu --- 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);