From nobody Sat May 4 19:30:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494223404436612.7158501184538; Sun, 7 May 2017 23:03:24 -0700 (PDT) Received: from localhost ([::1]:57856 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7blS-0000qs-7h for importer@patchew.org; Mon, 08 May 2017 02:03:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7big-0007S4-0E for qemu-devel@nongnu.org; Mon, 08 May 2017 02:00:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7bie-00052t-5T for qemu-devel@nongnu.org; Mon, 08 May 2017 02:00:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55156) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d7bid-00052p-S8 for qemu-devel@nongnu.org; Mon, 08 May 2017 02:00:28 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B86D523E6E2 for ; Mon, 8 May 2017 06:00:26 +0000 (UTC) Received: from pxdev.xzpeter.org.com (vpn1-5-39.pek2.redhat.com [10.72.5.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id A24D85DD66; Mon, 8 May 2017 06:00:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B86D523E6E2 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=peterx@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B86D523E6E2 From: Peter Xu To: qemu-devel@nongnu.org Date: Mon, 8 May 2017 14:00:03 +0800 Message-Id: <1494223204-16388-2-git-send-email-peterx@redhat.com> In-Reply-To: <1494223204-16388-1-git-send-email-peterx@redhat.com> References: <1494223204-16388-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 08 May 2017 06:00:26 +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 v4 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 , Markus Armbruster , peterx@redhat.com, "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" So that it can simplifies the iterators. Signed-off-by: Peter Xu Reviewed-by: Dr. David Alan Gilbert --- 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; } =20 - QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { + RAMBLOCK_FOREACH(block) { ram_addr_t end, next =3D RAM_ADDR_MAX; =20 end =3D block->offset + block->max_length; =20 - QLIST_FOREACH_RCU(next_block, &ram_list.blocks, next) { + RAMBLOCK_FOREACH(next_block) { if (next_block->offset >=3D end) { next =3D MIN(next, next_block->offset); } @@ -1609,7 +1609,7 @@ unsigned long last_ram_page(void) ram_addr_t last =3D 0; =20 rcu_read_lock(); - QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { + RAMBLOCK_FOREACH(block) { last =3D MAX(last, block->offset + block->max_length); } rcu_read_unlock(); @@ -1659,7 +1659,7 @@ void qemu_ram_set_idstr(RAMBlock *new_block, const ch= ar *name, DeviceState *dev) pstrcat(new_block->idstr, sizeof(new_block->idstr), name); =20 rcu_read_lock(); - QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { + RAMBLOCK_FOREACH(block) { if (block !=3D 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 =3D 0; =20 - QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { + RAMBLOCK_FOREACH(block) { largest =3D MAX(largest, qemu_ram_pagesize(block)); } =20 @@ -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 =3D 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 lengt= h) int flags; void *area, *vaddr; =20 - QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { + RAMBLOCK_FOREACH(block) { offset =3D addr - block->offset; if (offset < block->max_length) { vaddr =3D ramblock_ptr(block, offset); @@ -2167,7 +2167,7 @@ RAMBlock *qemu_ram_block_from_host(void *ptr, bool ro= und_offset, goto found; } =20 - QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { + RAMBLOCK_FOREACH(block) { /* This case append when the block is not mapped. */ if (block->host =3D=3D NULL) { continue; @@ -2200,7 +2200,7 @@ RAMBlock *qemu_ram_block_by_name(const char *name) { RAMBlock *block; =20 - 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, voi= d *opaque) int ret =3D 0; =20 rcu_read_lock(); - QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { + RAMBLOCK_FOREACH(block) { ret =3D 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" =20 typedef struct RAMBlockNotifier RAMBlockNotifier; =20 @@ -54,6 +55,10 @@ typedef struct RAMList { } RAMList; extern RAMList ram_list; =20 +/* 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); =20 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 =3D 0; =20 - QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { + RAMBLOCK_FOREACH(block) { summary |=3D block->page_size; } =20 @@ -700,7 +700,7 @@ static void migration_bitmap_sync(RAMState *rs) =20 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 =3D 0; =20 rcu_read_lock(); - QLIST_FOREACH_RCU(block, &ram_list.blocks, next) + RAMBLOCK_FOREACH(block) { total +=3D block->used_length; + } rcu_read_unlock(); return total; } @@ -1543,7 +1544,7 @@ void ram_postcopy_migrated_memory_release(MigrationSt= ate *ms) struct RAMBlock *block; unsigned long *bitmap =3D atomic_rcu_read(&rs->ram_bitmap)->bmap; =20 - QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { + RAMBLOCK_FOREACH(block) { unsigned long first =3D block->offset >> TARGET_PAGE_BITS; unsigned long range =3D first + (block->used_length >> TARGET_PAGE= _BITS); unsigned long run_start =3D find_next_zero_bit(bitmap, range, firs= t); @@ -1624,7 +1625,7 @@ static int postcopy_each_ram_send_discard(MigrationSt= ate *ms) struct RAMBlock *block; int ret; =20 - QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { + RAMBLOCK_FOREACH(block) { unsigned long first =3D block->offset >> TARGET_PAGE_BITS; PostcopyDiscardState *pds =3D postcopy_discard_send_init(ms, first, @@ -1802,7 +1803,7 @@ static int postcopy_chunk_hostpages(MigrationState *m= s) rs->last_sent_block =3D NULL; rs->last_page =3D 0; =20 - QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { + RAMBLOCK_FOREACH(block) { unsigned long first =3D block->offset >> TARGET_PAGE_BITS; =20 PostcopyDiscardState *pds =3D @@ -2021,7 +2022,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque) =20 qemu_put_be64(f, ram_bytes_total() | RAM_SAVE_FLAG_MEM_SIZE); =20 - 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); --=20 2.7.4 From nobody Sat May 4 19:30:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494223333595662.9711252458651; Sun, 7 May 2017 23:02:13 -0700 (PDT) Received: from localhost ([::1]:57851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7bkJ-0008Ni-Sx for importer@patchew.org; Mon, 08 May 2017 02:02:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7bii-0007Tb-3j for qemu-devel@nongnu.org; Mon, 08 May 2017 02:00:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7big-00053B-VF for qemu-devel@nongnu.org; Mon, 08 May 2017 02:00:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38250) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d7big-000531-MY for qemu-devel@nongnu.org; Mon, 08 May 2017 02:00:30 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7D4D88050A for ; Mon, 8 May 2017 06:00:29 +0000 (UTC) Received: from pxdev.xzpeter.org.com (vpn1-5-39.pek2.redhat.com [10.72.5.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5061F1BD869; Mon, 8 May 2017 06:00:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7D4D88050A Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=peterx@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7D4D88050A From: Peter Xu To: qemu-devel@nongnu.org Date: Mon, 8 May 2017 14:00:04 +0800 Message-Id: <1494223204-16388-3-git-send-email-peterx@redhat.com> In-Reply-To: <1494223204-16388-1-git-send-email-peterx@redhat.com> References: <1494223204-16388-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 08 May 2017 06:00:29 +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 v4 2/2] ramblock: add new hmp command "info ramblock" 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 , Markus Armbruster , peterx@redhat.com, "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" To dump information about ramblocks. It looks like: (qemu) info ramblock Block Name PSize Offset Used = Total /objects/mem 2M 0x0000000000000000 0x0000000080000000 0x= 0000000080000000 vga.vram 4K 0x0000000080060000 0x0000000001000000 0x= 0000000001000000 /rom@etc/acpi/tables 4K 0x00000000810b0000 0x0000000000020000 0x= 0000000000200000 pc.bios 4K 0x0000000080000000 0x0000000000040000 0x= 0000000000040000 0000:00:03.0/e1000.rom 4K 0x0000000081070000 0x0000000000040000 0x= 0000000000040000 pc.rom 4K 0x0000000080040000 0x0000000000020000 0x= 0000000000020000 0000:00:02.0/vga.rom 4K 0x0000000081060000 0x0000000000010000 0x= 0000000000010000 /rom@etc/table-loader 4K 0x00000000812b0000 0x0000000000001000 0x= 0000000000001000 /rom@etc/acpi/rsdp 4K 0x00000000812b1000 0x0000000000001000 0x= 0000000000001000 Ramblock is something hidden internally in QEMU implementation, and this command should only be used by mostly QEMU developers on RAM stuff. It is not a command suitable for QMP interface. So only HMP interface is provided for it. Signed-off-by: Peter Xu --- exec.c | 20 ++++++++++++++++++++ hmp-commands-info.hx | 14 ++++++++++++++ hmp.c | 6 ++++++ hmp.h | 1 + include/exec/ramlist.h | 1 + include/qemu-common.h | 1 + util/cutils.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 89 insertions(+) diff --git a/exec.c b/exec.c index 50519ae..5e50bdf 100644 --- a/exec.c +++ b/exec.c @@ -71,6 +71,8 @@ #include "qemu/mmap-alloc.h" #endif =20 +#include "monitor/monitor.h" + //#define DEBUG_SUBPAGE =20 #if !defined(CONFIG_USER_ONLY) @@ -1333,6 +1335,24 @@ void qemu_mutex_unlock_ramlist(void) qemu_mutex_unlock(&ram_list.mutex); } =20 +void ram_block_dump(Monitor *mon) +{ + RAMBlock *block; + + rcu_read_lock(); + monitor_printf(mon, "%24s %8s %18s %18s %18s\n", + "Block Name", "PSize", "Offset", "Used", "Total"); + RAMBLOCK_FOREACH(block) { + monitor_printf(mon, "%24s %8s 0x%016" PRIx64 " 0x%016" PRIx64 + " 0x%016" PRIx64 "\n", block->idstr, + page_size_to_str(block->page_size), + (uint64_t)block->offset, + (uint64_t)block->used_length, + (uint64_t)block->max_length); + } + rcu_read_unlock(); +} + #ifdef __linux__ /* * FIXME TOCTTOU: this iterates over memory backends' mem-path, which diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index a53f105..ae16901 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -788,6 +788,20 @@ Display the latest dump status. ETEXI =20 { + .name =3D "ramblock", + .args_type =3D "", + .params =3D "", + .help =3D "Display system ramblock information", + .cmd =3D hmp_info_ramblock, + }, + +STEXI +@item info ramblock +@findex ramblock +Dump all the ramblocks of the system. +ETEXI + + { .name =3D "hotpluggable-cpus", .args_type =3D "", .params =3D "", diff --git a/hmp.c b/hmp.c index ab407d6..8369388 100644 --- a/hmp.c +++ b/hmp.c @@ -37,6 +37,7 @@ #include "qemu-io.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "exec/ramlist.h" #include "hw/intc/intc.h" =20 #ifdef CONFIG_SPICE @@ -2563,6 +2564,11 @@ void hmp_info_dump(Monitor *mon, const QDict *qdict) qapi_free_DumpQueryResult(result); } =20 +void hmp_info_ramblock(Monitor *mon, const QDict *qdict) +{ + ram_block_dump(mon); +} + void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) { Error *err =3D NULL; diff --git a/hmp.h b/hmp.h index 799fd37..7353b67 100644 --- a/hmp.h +++ b/hmp.h @@ -136,6 +136,7 @@ void hmp_rocker_ports(Monitor *mon, const QDict *qdict); void hmp_rocker_of_dpa_flows(Monitor *mon, const QDict *qdict); void hmp_rocker_of_dpa_groups(Monitor *mon, const QDict *qdict); void hmp_info_dump(Monitor *mon, const QDict *qdict); +void hmp_info_ramblock(Monitor *mon, const QDict *qdict); void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict); void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict); =20 diff --git a/include/exec/ramlist.h b/include/exec/ramlist.h index f1c6b45..2e2ac6c 100644 --- a/include/exec/ramlist.h +++ b/include/exec/ramlist.h @@ -73,5 +73,6 @@ void ram_block_notifier_remove(RAMBlockNotifier *n); void ram_block_notify_add(void *host, size_t size); void ram_block_notify_remove(void *host, size_t size); =20 +void ram_block_dump(Monitor *mon); =20 #endif /* RAMLIST_H */ diff --git a/include/qemu-common.h b/include/qemu-common.h index d218821..62aef10 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -146,6 +146,7 @@ int parse_debug_env(const char *name, int max, int init= ial); =20 const char *qemu_ether_ntoa(const MACAddr *mac); void page_size_init(void); +const char *page_size_to_str(size_t psize); =20 /* returns non-zero if dump is in progress, otherwise zero is * returned. */ diff --git a/util/cutils.c b/util/cutils.c index 50ad179..b0fe88a 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -619,3 +619,49 @@ const char *qemu_ether_ntoa(const MACAddr *mac) =20 return ret; } + +const char *page_size_to_str(size_t psize) +{ + switch (psize) { + case 0x1000: + return "4K"; + case 0x2000: + return "8K"; + case 0x4000: + return "16K"; + case 0x8000: + return "32K"; + case 0x10000: + return "64K"; + case 0x20000: + return "128K"; + case 0x40000: + return "256K"; + case 0x80000: + return "512K"; + case 0x100000: + return "1M"; + case 0x200000: + return "2M"; + case 0x400000: + return "4M"; + case 0x800000: + return "8M"; + case 0x1000000: + return "16M"; + case 0x2000000: + return "32M"; + case 0x4000000: + return "64M"; + case 0x8000000: + return "128M"; + case 0x10000000: + return "256M"; + case 0x20000000: + return "512M"; + case 0x40000000: + return "1G"; + default: + return "N/A"; + } +} --=20 2.7.4