From nobody Mon May 6 12:14:11 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.zohomail.com; dkim=fail; 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 151698289496628.71171292062104; Fri, 26 Jan 2018 08:08:14 -0800 (PST) Received: from localhost ([::1]:35757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ef6Xz-0006TS-Ji for importer@patchew.org; Fri, 26 Jan 2018 11:08:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ef6Vb-0004mq-O9 for qemu-devel@nongnu.org; Fri, 26 Jan 2018 11:05:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ef6VV-0003UY-8h for qemu-devel@nongnu.org; Fri, 26 Jan 2018 11:05:43 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:60042) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ef6VU-0003Tk-Qn for qemu-devel@nongnu.org; Fri, 26 Jan 2018 11:05:37 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20180126160534euoutp02835a5fcc8251365d2252a06bf76627bf~NZ8JekDna3255132551euoutp02p; Fri, 26 Jan 2018 16:05:33 +0000 (GMT) Received: from eusmges2.samsung.com (unknown [203.254.199.241]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180126160533eucas1p1dc8b04b5a7d1bc4517bd947daa9f7e97~NZ8Ix00bT1679116791eucas1p1K; Fri, 26 Jan 2018 16:05:33 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2.samsung.com (EUCPMTA) with SMTP id 41.D1.12907.CC15B6A5; Fri, 26 Jan 2018 16:05:32 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180126160531eucas1p2e972758feaca9f6d174e6399aca78c81~NZ8HVrTrt1187511875eucas1p2s; Fri, 26 Jan 2018 16:05:31 +0000 (GMT) Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 5D.15.18832.BC15B6A5; Fri, 26 Jan 2018 16:05:31 +0000 (GMT) Received: from aperevalov-ubuntu.rnd.samsung.ru ([106.109.129.199]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P36007H27CZ4Y80@eusync4.samsung.com>; Fri, 26 Jan 2018 16:05:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20180126160534euoutp02835a5fcc8251365d2252a06bf76627bf~NZ8JekDna3255132551euoutp02p DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1516982734; bh=vBtBGC5yvxwxTnxOV3MWwwVY1+Tyz6vfdG5Vz0LxCwo=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=B+fIeKz//suw9AMr9f7rm18iwuwXlrAavEZfAM0ltcQIiW9SDP3VjTIjza3ebqnxH 8DA4mIi68W9hzNY+EzWjcXhqzJ1uuf50I6NFUvRGOerhX6ax5HNBI8SZTKV3zAjGjt GlZp5ZSyAxitFCWt4WhMIpQ+GfC0pXS1OSyy0GJE= X-AuditID: cbfec7f1-f793a6d00000326b-36-5a6b51cc09d5 From: Alexey Perevalov To: qemu-devel@nongnu.org, dgilbert@redhat.com Date: Fri, 26 Jan 2018 19:05:20 +0300 Message-id: <1516982720-26501-2-git-send-email-a.perevalov@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1516982720-26501-1-git-send-email-a.perevalov@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsWy7djP87pnArOjDCZuVreYe/c8i8XKyUuY LHq33WO3OLHpILPFpwYpiy37v7FbHO/dwWJxZ0sfkwOHx4EXC9k9nlzbzOTxft9VNo++LasY A1iiuGxSUnMyy1KL9O0SuDI6n5UUXHCsmLqAtYFxpXEXIyeHhICJxJeNM9ggbDGJC/fWA9lc HEICSxkl5ryaA+V8ZpR4dGoHM0zHp4MTmSASyxglzrzYyA7hdDNJPHzbA1TFwcEmYCCx754t iCkioCcx4WokSAmzwAxGidNTzzGBDBIWcJA4/KAJbCiLgKrEj2kLGEFsXgF3idUXFjFBLJOT uHmuE6yGU8BD4tf2s6wggyQEetgk3u09zw5R5CLRMmcDC4QtLPHq+BaouIxEZ8dBJoiGdkaJ 7p2dUN0TgM6e/heqyl7i1M2rYOuYBfgkJm2bDvaBhACvREebEESJh8Tx423QQHKUuDbrDQvE x7MZJWbs2cI8gVF6ASPDKkaR1NLi3PTUYiO94sTc4tK8dL3k/NxNjMBIPf3v+McdjO9PWB1i FOBgVOLhTTDJjhJiTSwrrsw9xCjBwawkwmvGCRTiTUmsrEotyo8vKs1JLT7EKM3BoiTOaxvV FikkkJ5YkpqdmlqQWgSTZeLglGpgnD9J8YXgB5+Jk15ayYtl3Ik69CWgXpDpVXDbtukpYXf8 fse/dNlidzqjcnfEjjn5KdPmzr2i+O5gwp/21IVHK669cP6qcZFV+trZ+RHP9hs0pu5wV9j/ 3vhjwbH1wVv98x3tjmyTSTx1f371vfVp8b8eH7Xbf7lDRjlHwijI71nR7ttc9d/PFSixFGck GmoxFxUnAgAgabnj0AIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprALMWRmVeSWpSXmKPExsVy+t/xa7qnA7OjDDoOalrMvXuexWLl5CVM Fr3b7rFbnNh0kNniU4OUxZb939gtjvfuYLG4s6WPyYHD48CLheweT65tZvJ4v+8qm0ffllWM ASxRXDYpqTmZZalF+nYJXBmdz0oKLjhWTF3A2sC40riLkZNDQsBE4tPBiUwQtpjEhXvr2boY uTiEBJYwSsxbPZkFwullkpi8aDt7FyMHB5uAgcS+e7YgpoiAnsSEq5EgJcwCMxgl9szdxAoy SFjAQeLwgyZmEJtFQFXix7QFjCA2r4C7xOoLi6CWyUncPNcJVsMp4CHxa/tZsF4hoJonc+ex TWDkXcDIsIpRJLW0ODc9t9hQrzgxt7g0L10vOT93EyMwnLYd+7l5B+OljcGHGAU4GJV4eBNM sqOEWBPLiitzDzFKcDArifCacQKFeFMSK6tSi/Lji0pzUosPMUpzsCiJ8/buWR0pJJCeWJKa nZpakFoEk2Xi4JRqYPRymCHFVFa81/LIgmbWBx4ZIteOiBXv3Ngm/P/j2kjpk8E7Svy/nWjU 2Ps5bpvMW4cZAdOPrPDPFE0vYdAzOBrlVNLoWaj0YEHco2t8IjU8Wm7zd18oyLdwnLL+4fyd t/6rm2kkXTT6IFvkksB3SOHQ8fUh8xduuVEQ8LB+1vzK/FyrJ2HBMUosxRmJhlrMRcWJAAwE nTwjAgAA X-CMS-MailID: 20180126160531eucas1p2e972758feaca9f6d174e6399aca78c81 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180126160531eucas1p2e972758feaca9f6d174e6399aca78c81 X-RootMTR: 20180126160531eucas1p2e972758feaca9f6d174e6399aca78c81 References: <1516982720-26501-1-git-send-email-a.perevalov@samsung.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 210.118.77.12 Subject: [Qemu-devel] [PATCH v2] migration: change blocktime type to uint32_t 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: lvivier@redhat.com, quintela@redhat.com, ash.billore@samsung.com, f4bug@amsat.org, peterx@redhat.com, Alexey Perevalov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Initially int64_t was used, but on PowerPC architecture, clang doesn't have atomic_*_8 function, so it produces link time error. QEMU is working with time as with 64bit value, but by fact 32 bit is enough with CLOCK_REALTIME. In this case blocktime will keep only 1200 hours time interval. Signed-off-by: Alexey Perevalov Acked-by: Eric Blake --- hmp.c | 4 ++-- migration/postcopy-ram.c | 37 ++++++++++++++++++++----------------- migration/trace-events | 4 ++-- qapi/migration.json | 4 ++-- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/hmp.c b/hmp.c index c6bab53..3c376b3 100644 --- a/hmp.c +++ b/hmp.c @@ -265,7 +265,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) } =20 if (info->has_postcopy_blocktime) { - monitor_printf(mon, "postcopy blocktime: %" PRId64 "\n", + monitor_printf(mon, "postcopy blocktime: %u\n", info->postcopy_blocktime); } =20 @@ -273,7 +273,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) Visitor *v; char *str; v =3D string_output_visitor_new(false, &str); - visit_type_int64List(v, NULL, &info->postcopy_vcpu_blocktime, NULL= ); + visit_type_uint32List(v, NULL, &info->postcopy_vcpu_blocktime, NUL= L); visit_complete(v, &str); monitor_printf(mon, "postcopy vcpu blocktime: %s\n", str); g_free(str); diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 7814da5..bd08c24 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -63,14 +63,14 @@ struct PostcopyDiscardState { =20 typedef struct PostcopyBlocktimeContext { /* time when page fault initiated per vCPU */ - int64_t *page_fault_vcpu_time; + uint32_t *page_fault_vcpu_time; /* page address per vCPU */ uintptr_t *vcpu_addr; - int64_t total_blocktime; + uint32_t total_blocktime; /* blocktime per vCPU */ - int64_t *vcpu_blocktime; + uint32_t *vcpu_blocktime; /* point in time when last page fault was initiated */ - int64_t last_begin; + uint32_t last_begin; /* number of vCPU are suspended */ int smp_cpus_down; =20 @@ -99,22 +99,22 @@ static void migration_exit_cb(Notifier *n, void *data) static struct PostcopyBlocktimeContext *blocktime_context_new(void) { PostcopyBlocktimeContext *ctx =3D g_new0(PostcopyBlocktimeContext, 1); - ctx->page_fault_vcpu_time =3D g_new0(int64_t, smp_cpus); + ctx->page_fault_vcpu_time =3D g_new0(uint32_t, smp_cpus); ctx->vcpu_addr =3D g_new0(uintptr_t, smp_cpus); - ctx->vcpu_blocktime =3D g_new0(int64_t, smp_cpus); + ctx->vcpu_blocktime =3D g_new0(uint32_t, smp_cpus); =20 ctx->exit_notifier.notify =3D migration_exit_cb; qemu_add_exit_notifier(&ctx->exit_notifier); return ctx; } =20 -static int64List *get_vcpu_blocktime_list(PostcopyBlocktimeContext *ctx) +static uint32List *get_vcpu_blocktime_list(PostcopyBlocktimeContext *ctx) { - int64List *list =3D NULL, *entry =3D NULL; + uint32List *list =3D NULL, *entry =3D NULL; int i; =20 for (i =3D smp_cpus - 1; i >=3D 0; i--) { - entry =3D g_new0(int64List, 1); + entry =3D g_new0(uint32List, 1); entry->value =3D ctx->vcpu_blocktime[i]; entry->next =3D list; list =3D entry; @@ -145,7 +145,7 @@ void fill_destination_postcopy_migration_info(Migration= Info *info) info->postcopy_vcpu_blocktime =3D get_vcpu_blocktime_list(bc); } =20 -static uint64_t get_postcopy_total_blocktime(void) +static uint32_t get_postcopy_total_blocktime(void) { MigrationIncomingState *mis =3D migration_incoming_get_current(); PostcopyBlocktimeContext *bc =3D mis->blocktime_ctx; @@ -634,6 +634,7 @@ static void mark_postcopy_blocktime_begin(uintptr_t add= r, uint32_t ptid, MigrationIncomingState *mis =3D migration_incoming_get_current(); PostcopyBlocktimeContext *dc =3D mis->blocktime_ctx; int64_t now_ms; + uint32_t least_now; =20 if (!dc || ptid =3D=3D 0) { return; @@ -644,13 +645,14 @@ static void mark_postcopy_blocktime_begin(uintptr_t a= ddr, uint32_t ptid, } =20 now_ms =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + least_now =3D (uint32_t)now_ms; if (dc->vcpu_addr[cpu] =3D=3D 0) { atomic_inc(&dc->smp_cpus_down); } =20 - atomic_xchg__nocheck(&dc->last_begin, now_ms); - atomic_xchg__nocheck(&dc->page_fault_vcpu_time[cpu], now_ms); - atomic_xchg__nocheck(&dc->vcpu_addr[cpu], addr); + atomic_xchg(&dc->last_begin, least_now); + atomic_xchg(&dc->page_fault_vcpu_time[cpu], least_now); + atomic_xchg(&dc->vcpu_addr[cpu], addr); =20 /* check it here, not at the begining of the function, * due to, check could accur early than bitmap_set in @@ -699,20 +701,21 @@ static void mark_postcopy_blocktime_end(uintptr_t add= r) int i, affected_cpu =3D 0; int64_t now_ms; bool vcpu_total_blocktime =3D false; - int64_t read_vcpu_time; + uint32_t read_vcpu_time, least_now; =20 if (!dc) { return; } =20 now_ms =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + least_now =3D now_ms & 0xffffffff; =20 /* lookup cpu, to clear it, * that algorithm looks straighforward, but it's not * optimal, more optimal algorithm is keeping tree or hash * where key is address value is a list of */ for (i =3D 0; i < smp_cpus; i++) { - uint64_t vcpu_blocktime =3D 0; + uint32_t vcpu_blocktime =3D 0; =20 read_vcpu_time =3D atomic_fetch_add(&dc->page_fault_vcpu_time[i], = 0); if (atomic_fetch_add(&dc->vcpu_addr[i], 0) !=3D addr || @@ -720,7 +723,7 @@ static void mark_postcopy_blocktime_end(uintptr_t addr) continue; } atomic_xchg__nocheck(&dc->vcpu_addr[i], 0); - vcpu_blocktime =3D now_ms - read_vcpu_time; + vcpu_blocktime =3D least_now - read_vcpu_time; affected_cpu +=3D 1; /* we need to know is that mark_postcopy_end was due to * faulted page, another possible case it's prefetched @@ -735,7 +738,7 @@ static void mark_postcopy_blocktime_end(uintptr_t addr) =20 atomic_sub(&dc->smp_cpus_down, affected_cpu); if (vcpu_total_blocktime) { - dc->total_blocktime +=3D now_ms - atomic_fetch_add(&dc->last_begin= , 0); + dc->total_blocktime +=3D least_now - atomic_fetch_add(&dc->last_be= gin, 0); } trace_mark_postcopy_blocktime_end(addr, dc, dc->total_blocktime, affected_cpu); diff --git a/migration/trace-events b/migration/trace-events index 141e773..0defbc3 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -115,8 +115,8 @@ process_incoming_migration_co_end(int ret, int ps) "ret= =3D%d postcopy-state=3D%d" process_incoming_migration_co_postcopy_end_main(void) "" migration_set_incoming_channel(void *ioc, const char *ioctype) "ioc=3D%p i= octype=3D%s" migration_set_outgoing_channel(void *ioc, const char *ioctype, const char = *hostname) "ioc=3D%p ioctype=3D%s hostname=3D%s" -mark_postcopy_blocktime_begin(uint64_t addr, void *dd, int64_t time, int c= pu, int received) "addr: 0x%" PRIx64 ", dd: %p, time: %" PRId64 ", cpu: %d,= already_received: %d" -mark_postcopy_blocktime_end(uint64_t addr, void *dd, int64_t time, int aff= ected_cpu) "addr: 0x%" PRIx64 ", dd: %p, time: %" PRId64 ", affected_cpu: %= d" +mark_postcopy_blocktime_begin(uint64_t addr, void *dd, uint32_t time, int = cpu, int received) "addr: 0x%" PRIx64 ", dd: %p, time: %u, cpu: %d, already= _received: %d" +mark_postcopy_blocktime_end(uint64_t addr, void *dd, uint32_t time, int af= fected_cpu) "addr: 0x%" PRIx64 ", dd: %p, time: %u, affected_cpu: %d" =20 # migration/rdma.c qemu_rdma_accept_incoming_migration(void) "" diff --git a/qapi/migration.json b/qapi/migration.json index 70e7b67..ee55d7c 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -175,8 +175,8 @@ '*setup-time': 'int', '*cpu-throttle-percentage': 'int', '*error-desc': 'str', - '*postcopy-blocktime' : 'int64', - '*postcopy-vcpu-blocktime': ['int64']} } + '*postcopy-blocktime' : 'uint32', + '*postcopy-vcpu-blocktime': ['uint32']} } =20 ## # @query-migrate: --=20 2.7.4