Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1954405/?format=api
{ "id": 1954405, "url": "http://patchwork.ozlabs.org/api/patches/1954405/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1719776434-435013-7-git-send-email-steven.sistare@oracle.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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": "<1719776434-435013-7-git-send-email-steven.sistare@oracle.com>", "list_archive_url": null, "date": "2024-06-30T19:40:29", "name": "[V2,06/11] migration: fix mismatched GPAs during cpr", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "dd5b5dc4cf71ab04b10f7c5bd2e381c319c5a959", "submitter": { "id": 71906, "url": "http://patchwork.ozlabs.org/api/people/71906/?format=api", "name": "Steve Sistare", "email": "steven.sistare@oracle.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1719776434-435013-7-git-send-email-steven.sistare@oracle.com/mbox/", "series": [ { "id": 413181, "url": "http://patchwork.ozlabs.org/api/series/413181/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=413181", "date": "2024-06-30T19:40:26", "name": "Live update: cpr-exec", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/413181/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1954405/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1954405/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=oracle.com header.i=@oracle.com header.a=rsa-sha256\n header.s=corp-2023-11-20 header.b=BUaCgZX/;\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 4WC01v1MYMz1xpN\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 1 Jul 2024 05:42:27 +1000 (AEST)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1sO0QB-0000Ah-Aq; Sun, 30 Jun 2024 15:41:11 -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 <steven.sistare@oracle.com>)\n id 1sO0Pu-0008S6-DW\n for qemu-devel@nongnu.org; Sun, 30 Jun 2024 15:40:54 -0400", "from mx0a-00069f02.pphosted.com ([205.220.165.32])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <steven.sistare@oracle.com>)\n id 1sO0Pp-0004OO-Kc\n for qemu-devel@nongnu.org; Sun, 30 Jun 2024 15:40:51 -0400", "from pps.filterd (m0333521.ppops.net [127.0.0.1])\n by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id\n 45UJeY21019514;\n Sun, 30 Jun 2024 19:40:46 GMT", "from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com\n (iadpaimrmta02.appoci.oracle.com [147.154.18.20])\n by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40296asg9p-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Sun, 30 Jun 2024 19:40:45 +0000 (GMT)", "from pps.filterd\n (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1])\n by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19)\n with ESMTP id 45UFckWb018336; Sun, 30 Jun 2024 19:40:44 GMT", "from pps.reinject (localhost [127.0.0.1])\n by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id\n 4028qc16dv-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Sun, 30 Jun 2024 19:40:44 +0000", "from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com\n (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1])\n by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 45UJeaSa014044;\n Sun, 30 Jun 2024 19:40:43 GMT", "from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221])\n by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with\n ESMTP id 4028qc16cc-7; Sun, 30 Jun 2024 19:40:43 +0000" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=\n from:to:cc:subject:date:message-id:in-reply-to:references; s=\n corp-2023-11-20; bh=rHRV/raAz2FvaOpg5bcnOa8jzjLwVEUJugMChsrTwKY=; b=\n BUaCgZX/tkJ7r0n7WCGIv50nbcR3AFqypOAN5nHmjTDmWpd7xE+5GLffYqAN0FUd\n Go2VN4dM0UQ+bcDWqFMmC9oYDtrsvH9KQlMiOfuq8JGK2L1O0/N4j1CSbIA5jNsJ\n zIx5p55DVGxOiBkmO0Hh2hmJ3bNdnD9Q8iwe+5xNI8AwRuKy7fmWqHfVeE95s6mG\n hVaw8O4xwkTq4+iYu3fiGbL8sSVG757Hv5oSA/JgoK6xGEu9WjVoM0SF0HFpjBB+\n QCNtPEMc6VBfZ+YbYzdYW3RjtTB0Y7Mv9xFdU2QFI4FbZ0K7xE4XDid466rKjgST\n 0z2qUJrtB7e/NPJKrOKTtw==", "From": "Steve Sistare <steven.sistare@oracle.com>", "To": "qemu-devel@nongnu.org", "Cc": "Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>,\n David Hildenbrand <david@redhat.com>,\n Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,\n Eduardo Habkost <eduardo@habkost.net>,\n Philippe Mathieu-Daude <philmd@linaro.org>,\n Paolo Bonzini <pbonzini@redhat.com>,\n \"Daniel P. Berrange\" <berrange@redhat.com>,\n Markus Armbruster <armbru@redhat.com>,\n Steve Sistare <steven.sistare@oracle.com>", "Subject": "[PATCH V2 06/11] migration: fix mismatched GPAs during cpr", "Date": "Sun, 30 Jun 2024 12:40:29 -0700", "Message-Id": "<1719776434-435013-7-git-send-email-steven.sistare@oracle.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1719776434-435013-1-git-send-email-steven.sistare@oracle.com>", "References": "<1719776434-435013-1-git-send-email-steven.sistare@oracle.com>", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16\n definitions=2024-06-30_16,2024-06-28_01,2024-05-17_01", "X-Proofpoint-Spam-Details": "rule=notspam policy=default score=0 suspectscore=0\n malwarescore=0\n adultscore=0 bulkscore=0 mlxlogscore=999 phishscore=0 spamscore=0\n mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1\n engine=8.12.0-2406180000 definitions=main-2406300157", "X-Proofpoint-GUID": "BpDX3Ai9npk0ioyPus9WVjdZe8Pf9jCv", "X-Proofpoint-ORIG-GUID": "BpDX3Ai9npk0ioyPus9WVjdZe8Pf9jCv", "Received-SPF": "pass client-ip=205.220.165.32;\n envelope-from=steven.sistare@oracle.com; helo=mx0a-00069f02.pphosted.com", "X-Spam_score_int": "-20", "X-Spam_score": "-2.1", "X-Spam_bar": "--", "X-Spam_report": "(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=ham autolearn_force=no", "X-Spam_action": "no action", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "For new cpr modes, ramblock_is_ignored will always be true, because the\nmemory is preserved in place rather than copied. However, for an ignored\nblock, parse_ramblock currently requires that the received address of the\nblock must match the address of the statically initialized region on the\ntarget. This fails for a PCI rom block, because the memory region address\nis set when the guest writes to a BAR on the source, which does not occur\non the target, causing a \"Mismatched GPAs\" error during cpr migration.\n\nTo fix, unconditionally set the target's address to the source's address\nif the target region does not have an address yet.\n\nSigned-off-by: Steve Sistare <steven.sistare@oracle.com>\nReviewed-by: Fabiano Rosas <farosas@suse.de>\n---\n include/exec/memory.h | 12 ++++++++++++\n migration/ram.c | 15 +++++++++------\n system/memory.c | 10 ++++++++--\n 3 files changed, 29 insertions(+), 8 deletions(-)", "diff": "diff --git a/include/exec/memory.h b/include/exec/memory.h\nindex c26ede3..227169e 100644\n--- a/include/exec/memory.h\n+++ b/include/exec/memory.h\n@@ -811,6 +811,7 @@ struct MemoryRegion {\n bool ram_device;\n bool enabled;\n bool warning_printed; /* For reservations */\n+ bool has_addr;\n uint8_t vga_logging_count;\n MemoryRegion *alias;\n hwaddr alias_offset;\n@@ -2408,6 +2409,17 @@ void memory_region_set_enabled(MemoryRegion *mr, bool enabled);\n void memory_region_set_address(MemoryRegion *mr, hwaddr addr);\n \n /*\n+ * memory_region_set_address_only: set the address of a region.\n+ *\n+ * Same as memory_region_set_address, but without causing transaction side\n+ * effects.\n+ *\n+ * @mr: the region to be updated\n+ * @addr: new address, relative to container region\n+ */\n+void memory_region_set_address_only(MemoryRegion *mr, hwaddr addr);\n+\n+/*\n * memory_region_set_size: dynamically update the size of a region.\n *\n * Dynamically updates the size of a region.\ndiff --git a/migration/ram.c b/migration/ram.c\nindex edec1a2..eaf3151 100644\n--- a/migration/ram.c\n+++ b/migration/ram.c\n@@ -4059,12 +4059,15 @@ static int parse_ramblock(QEMUFile *f, RAMBlock *block, ram_addr_t length)\n }\n if (migrate_ignore_shared()) {\n hwaddr addr = qemu_get_be64(f);\n- if (migrate_ram_is_ignored(block) &&\n- block->mr->addr != addr) {\n- error_report(\"Mismatched GPAs for block %s \"\n- \"%\" PRId64 \"!= %\" PRId64, block->idstr,\n- (uint64_t)addr, (uint64_t)block->mr->addr);\n- return -EINVAL;\n+ if (migrate_ram_is_ignored(block)) {\n+ if (!block->mr->has_addr) {\n+ memory_region_set_address_only(block->mr, addr);\n+ } else if (block->mr->addr != addr) {\n+ error_report(\"Mismatched GPAs for block %s \"\n+ \"%\" PRId64 \"!= %\" PRId64, block->idstr,\n+ (uint64_t)addr, (uint64_t)block->mr->addr);\n+ return -EINVAL;\n+ }\n }\n }\n ret = rdma_block_notification_handle(f, block->idstr);\ndiff --git a/system/memory.c b/system/memory.c\nindex 28a837d..b7548bf 100644\n--- a/system/memory.c\n+++ b/system/memory.c\n@@ -2655,7 +2655,7 @@ static void memory_region_add_subregion_common(MemoryRegion *mr,\n for (alias = subregion->alias; alias; alias = alias->alias) {\n alias->mapped_via_alias++;\n }\n- subregion->addr = offset;\n+ memory_region_set_address_only(subregion, offset);\n memory_region_update_container_subregions(subregion);\n }\n \n@@ -2735,10 +2735,16 @@ static void memory_region_readd_subregion(MemoryRegion *mr)\n }\n }\n \n+void memory_region_set_address_only(MemoryRegion *mr, hwaddr addr)\n+{\n+ mr->addr = addr;\n+ mr->has_addr = true;\n+}\n+\n void memory_region_set_address(MemoryRegion *mr, hwaddr addr)\n {\n if (addr != mr->addr) {\n- mr->addr = addr;\n+ memory_region_set_address_only(mr, addr);\n memory_region_readd_subregion(mr);\n }\n }\n", "prefixes": [ "V2", "06/11" ] }