{"id":1839915,"url":"http://patchwork.ozlabs.org/api/patches/1839915/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20230926185738.277351-16-david@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20230926185738.277351-16-david@redhat.com>","list_archive_url":null,"date":"2023-09-26T18:57:35","name":"[v4,15/18] virtio-mem: Update state to match bitmap as soon as it's been migrated","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"d53f12a85c7f901951cef3fea42b2fbb62310b3d","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/?format=json","name":"David Hildenbrand","email":"david@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20230926185738.277351-16-david@redhat.com/mbox/","series":[{"id":374991,"url":"http://patchwork.ozlabs.org/api/series/374991/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=374991","date":"2023-09-26T18:57:23","name":"virtio-mem: Expose device memory through multiple memslots","version":4,"mbox":"http://patchwork.ozlabs.org/series/374991/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1839915/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1839915/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=SGR2B77o;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4Rw8Hm2Fh4z1ynX\n\tfor ; Wed, 27 Sep 2023 05:02:12 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1qlDIA-0001yy-NZ; Tue, 26 Sep 2023 15:00:18 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1qlDHt-0001la-Uj\n for qemu-devel@nongnu.org; Tue, 26 Sep 2023 15:00:11 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.133.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1qlDHq-0003Fo-UW\n for qemu-devel@nongnu.org; Tue, 26 Sep 2023 15:00:00 -0400","from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])\n by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-86-yclTkQ33N6O_cZeOs2BOmA-1; Tue, 26 Sep 2023 14:59:52 -0400","from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com\n [10.11.54.4])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 46C3A3814581;\n Tue, 26 Sep 2023 18:59:52 +0000 (UTC)","from t14s.fritz.box (unknown [10.39.192.33])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 75CBD2026D4B;\n Tue, 26 Sep 2023 18:59:47 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1695754798;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=ntTc+iP8L3yWrsrYKBBm9BSj/8eg/GV85E1SzdVW1Ig=;\n b=SGR2B77oj0OHifHwCHGehZuV+PCjjYnjmGcVOjFL0cK6fN6cH6nZS8E28e61nTj8bqHj74\n gbjzDVbcgn7VooFoL8jw3d6EQ+95NhULT8InzYDu8UEiY0gOKmHkZTMBO2sp/bCQJNbq1J\n 0TxrZMbu6Yg48ITHvDVJMUZpDtWZQ70=","X-MC-Unique":"yclTkQ33N6O_cZeOs2BOmA-1","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Cc":"David Hildenbrand , Paolo Bonzini ,\n Igor Mammedov ,\n Xiao Guangrong ,\n \"Michael S. Tsirkin\" , Peter Xu ,\n\t=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ,\n Eduardo Habkost ,\n Marcel Apfelbaum ,\n Yanan Wang , Michal Privoznik ,\n\t=?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= ,\n Gavin Shan , Alex Williamson ,\n Stefan Hajnoczi ,\n \"Maciej S . Szmigiero\" , kvm@vger.kernel.org","Subject":"[PATCH v4 15/18] virtio-mem: Update state to match bitmap as soon as\n it's been migrated","Date":"Tue, 26 Sep 2023 20:57:35 +0200","Message-ID":"<20230926185738.277351-16-david@redhat.com>","In-Reply-To":"<20230926185738.277351-1-david@redhat.com>","References":"<20230926185738.277351-1-david@redhat.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.1 on 10.11.54.4","Received-SPF":"pass client-ip=170.10.133.124; envelope-from=david@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"12","X-Spam_score":"1.2","X-Spam_bar":"+","X-Spam_report":"(1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=no autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"It's cleaner and future-proof to just have other state that depends on the\nbitmap state to be updated as soon as possible when restoring the bitmap.\n\nSo factor out informing RamDiscardListener into a functon and call it in\ncase of early migration right after we restored the bitmap.\n\nSigned-off-by: David Hildenbrand \n---\n hw/virtio/virtio-mem.c | 26 +++++++++++++++++++++-----\n 1 file changed, 21 insertions(+), 5 deletions(-)","diff":"diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c\nindex 0b0e6c5090..0cf47df9cf 100644\n--- a/hw/virtio/virtio-mem.c\n+++ b/hw/virtio/virtio-mem.c\n@@ -984,9 +984,8 @@ static int virtio_mem_restore_unplugged(VirtIOMEM *vmem)\n virtio_mem_discard_range_cb);\n }\n \n-static int virtio_mem_post_load(void *opaque, int version_id)\n+static int virtio_mem_post_load_bitmap(VirtIOMEM *vmem)\n {\n- VirtIOMEM *vmem = VIRTIO_MEM(opaque);\n RamDiscardListener *rdl;\n int ret;\n \n@@ -1001,6 +1000,20 @@ static int virtio_mem_post_load(void *opaque, int version_id)\n return ret;\n }\n }\n+ return 0;\n+}\n+\n+static int virtio_mem_post_load(void *opaque, int version_id)\n+{\n+ VirtIOMEM *vmem = VIRTIO_MEM(opaque);\n+ int ret;\n+\n+ if (!vmem->early_migration) {\n+ ret = virtio_mem_post_load_bitmap(vmem);\n+ if (ret) {\n+ return ret;\n+ }\n+ }\n \n /*\n * If shared RAM is migrated using the file content and not using QEMU,\n@@ -1043,7 +1056,7 @@ static int virtio_mem_post_load_early(void *opaque, int version_id)\n int ret;\n \n if (!vmem->prealloc) {\n- return 0;\n+ goto post_load_bitmap;\n }\n \n /*\n@@ -1051,7 +1064,7 @@ static int virtio_mem_post_load_early(void *opaque, int version_id)\n * don't mess with preallocation and postcopy.\n */\n if (migrate_ram_is_ignored(rb)) {\n- return 0;\n+ goto post_load_bitmap;\n }\n \n /*\n@@ -1084,7 +1097,10 @@ static int virtio_mem_post_load_early(void *opaque, int version_id)\n return -EBUSY;\n }\n }\n- return 0;\n+\n+post_load_bitmap:\n+ /* Finally, update any other state to be consistent with the new bitmap. */\n+ return virtio_mem_post_load_bitmap(vmem);\n }\n \n typedef struct VirtIOMEMMigSanityChecks {\n","prefixes":["v4","15/18"]}