{"id":1954408,"url":"http://patchwork.ozlabs.org/api/patches/1954408/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1719776434-435013-6-git-send-email-steven.sistare@oracle.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":"<1719776434-435013-6-git-send-email-steven.sistare@oracle.com>","list_archive_url":null,"date":"2024-06-30T19:40:28","name":"[V2,05/11] physmem: preserve ram blocks for cpr","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ea4457d2309dc554a167ce5031ac37cb72d44c92","submitter":{"id":71906,"url":"http://patchwork.ozlabs.org/api/people/71906/?format=json","name":"Steve Sistare","email":"steven.sistare@oracle.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1719776434-435013-6-git-send-email-steven.sistare@oracle.com/mbox/","series":[{"id":413181,"url":"http://patchwork.ozlabs.org/api/series/413181/?format=json","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/1954408/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1954408/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 (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=T/nc/yS0;\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 4WC02X14HTz1xpN\n\tfor ; Mon, 1 Jul 2024 05:43:00 +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 1sO0QH-0000EZ-9V; Sun, 30 Jun 2024 15:41:17 -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 )\n id 1sO0Pu-0008SC-Ed\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 )\n id 1sO0Po-0004OF-6w\n for qemu-devel@nongnu.org; Sun, 30 Jun 2024 15:40:50 -0400","from pps.filterd (m0246629.ppops.net [127.0.0.1])\n by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id\n 45UJdPwI028776;\n Sun, 30 Jun 2024 19:40:44 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 402a591erd-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Sun, 30 Jun 2024 19:40:44 +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 45UEU59V018387; Sun, 30 Jun 2024 19:40:43 GMT","from pps.reinject (localhost [127.0.0.1])\n by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id\n 4028qc16dn-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Sun, 30 Jun 2024 19:40:43 +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 45UJeaSY014044;\n Sun, 30 Jun 2024 19:40:42 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-6; Sun, 30 Jun 2024 19:40:42 +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=LIBmEiC+D9GTXCGgocbHmU9iP3J5h3etyy3WxDqWsM8=; b=\n T/nc/yS0j9+J3xWkCXKvnA8AhFCbDMmDGs3RNBmvY4/JOpJbQSC9nE0TavUSv2qd\n 7JyH+vY67FDO7lwoK+UarT2rTo7wh8YRjxLus6Vk4zYzc2MaNqY+yamSjaxKA/jP\n Diz/dWxUiAkTy1tWQQi7tq0OEljdyH1LycY5fUoF4fMjHGhm2FGQLZ6pEbHQuB7T\n s/WuOHzh8BELQ4gQyTKTU6s3gxSH4QaqKWo4/z5G6462CVtMeZiegWOMu6W3Eg0v\n WvqM9Hk/L6bktpwCKULRHbtD0LJbZw7t1rvZbWU0GGSsXaKOWXulS67WyyNnyt+V\n ZXeLkX3AdK+u+jqDt0jU8g==","From":"Steve Sistare ","To":"qemu-devel@nongnu.org","Cc":"Peter Xu , Fabiano Rosas ,\n David Hildenbrand ,\n Marcel Apfelbaum ,\n Eduardo Habkost ,\n Philippe Mathieu-Daude ,\n Paolo Bonzini ,\n \"Daniel P. Berrange\" ,\n Markus Armbruster ,\n Steve Sistare ","Subject":"[PATCH V2 05/11] physmem: preserve ram blocks for cpr","Date":"Sun, 30 Jun 2024 12:40:28 -0700","Message-Id":"<1719776434-435013-6-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":"3RMlwOa6TIJr3HL8RT4KpdnV9-266g-2","X-Proofpoint-ORIG-GUID":"3RMlwOa6TIJr3HL8RT4KpdnV9-266g-2","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":"","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":"Save the memfd for anonymous ramblocks in CPR state, along with a name\nthat uniquely identifies it. The block's idstr is not yet set, so it\ncannot be used for this purpose. Find the saved memfd in new QEMU when\ncreating a block. QEMU hard-codes the length of some internally-created\nblocks, so to guard against that length changing, use lseek to get the\nactual length of an incoming memfd.\n\nSigned-off-by: Steve Sistare \n---\n system/physmem.c | 25 ++++++++++++++++++++++++-\n 1 file changed, 24 insertions(+), 1 deletion(-)","diff":"diff --git a/system/physmem.c b/system/physmem.c\nindex efe95ff..e37352e 100644\n--- a/system/physmem.c\n+++ b/system/physmem.c\n@@ -73,6 +73,7 @@\n \n #include \"qapi/qapi-types-migration.h\"\n #include \"migration/options.h\"\n+#include \"migration/cpr.h\"\n #include \"migration/vmstate.h\"\n \n #include \"qemu/range.h\"\n@@ -1641,6 +1642,19 @@ void qemu_ram_unset_idstr(RAMBlock *block)\n }\n }\n \n+static char *cpr_name(RAMBlock *block)\n+{\n+ MemoryRegion *mr = block->mr;\n+ const char *mr_name = memory_region_name(mr);\n+ g_autofree char *id = mr->dev ? qdev_get_dev_path(mr->dev) : NULL;\n+\n+ if (id) {\n+ return g_strdup_printf(\"%s/%s\", id, mr_name);\n+ } else {\n+ return g_strdup(mr_name);\n+ }\n+}\n+\n size_t qemu_ram_pagesize(RAMBlock *rb)\n {\n return rb->page_size;\n@@ -1836,13 +1850,17 @@ static void ram_block_add(RAMBlock *new_block, Error **errp)\n } else if (new_block->flags & RAM_SHARED) {\n size_t max_length = new_block->max_length;\n MemoryRegion *mr = new_block->mr;\n- const char *name = memory_region_name(mr);\n+ g_autofree char *name = cpr_name(new_block);\n \n new_block->mr->align = QEMU_VMALLOC_ALIGN;\n+ new_block->fd = cpr_find_fd(name, 0);\n \n if (new_block->fd == -1) {\n new_block->fd = qemu_memfd_create(name, max_length + mr->align,\n 0, 0, 0, errp);\n+ cpr_save_fd(name, 0, new_block->fd);\n+ } else {\n+ new_block->max_length = lseek(new_block->fd, 0, SEEK_END);\n }\n \n if (new_block->fd >= 0) {\n@@ -1852,6 +1870,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp)\n false, 0, errp);\n }\n if (!new_block->host) {\n+ cpr_delete_fd(name, 0);\n qemu_mutex_unlock_ramlist();\n return;\n }\n@@ -2162,6 +2181,8 @@ static void reclaim_ramblock(RAMBlock *block)\n \n void qemu_ram_free(RAMBlock *block)\n {\n+ g_autofree char *name = NULL;\n+\n if (!block) {\n return;\n }\n@@ -2172,6 +2193,8 @@ void qemu_ram_free(RAMBlock *block)\n }\n \n qemu_mutex_lock_ramlist();\n+ name = cpr_name(block);\n+ cpr_delete_fd(name, 0);\n QLIST_REMOVE_RCU(block, next);\n ram_list.mru_block = NULL;\n /* Write list before version */\n","prefixes":["V2","05/11"]}