Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1954402/?format=api
{ "id": 1954402, "url": "http://patchwork.ozlabs.org/api/patches/1954402/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1719776434-435013-11-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-11-git-send-email-steven.sistare@oracle.com>", "list_archive_url": null, "date": "2024-06-30T19:40:33", "name": "[V2,10/11] migration: cpr-exec save and load", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "e585494627b306d971eadc406c9123aa9d08ede5", "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-11-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/1954402/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1954402/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=V81i7Hi0;\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 4WC01N5JPnz1xpN\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 1 Jul 2024 05:42: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 <qemu-devel-bounces@nongnu.org>)\n\tid 1sO0QC-0000At-TC; Sun, 30 Jun 2024 15:41:12 -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 1sO0Px-0008Vc-Ql\n for qemu-devel@nongnu.org; Sun, 30 Jun 2024 15:40:58 -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 1sO0Pv-0004Pf-AM\n for qemu-devel@nongnu.org; Sun, 30 Jun 2024 15:40:57 -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 45UJDtaG021987;\n Sun, 30 Jun 2024 19:40:51 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 40296asg9q-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Sun, 30 Jun 2024 19:40:50 +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 45UI4VL7018993; Sun, 30 Jun 2024 19:40:49 GMT", "from pps.reinject (localhost [127.0.0.1])\n by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id\n 4028qc16ek-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Sun, 30 Jun 2024 19:40:49 +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 45UJeaSi014044;\n Sun, 30 Jun 2024 19:40:48 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-11; Sun, 30 Jun 2024 19:40:48 +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=b028g9TMxwjL28USZRQNrGWTPltZfSI206ZNnMeo+FE=; b=\n V81i7Hi0rFgrkpqkfcmY9IJ2tBsxa4ZD9ONcztXag4fvRq8MNWq2o4pxnYS454bx\n p2xkL+WQ+7crQHEJjsd30eTXjpcA/DTgrdPg8byljydCVdD8ASxiuqOEFS+VVtuy\n oL7m9dpmPw8OyBhznyRsRVIvmv9Zj2239M4d+eKs2H1jv2dxr8u72KvSGcASNtwF\n +KPPOtRxZDI1y7m4410VaXZG3+1iDLqvybdZAFeBQrAY/YXNKKwlQJFoc5XJcMM2\n i/AkxTiv+Tatrdfu/nnbkpIFJSUB4y8byjlSJlCQdi3LbLYCdFDthynahO7H5BD/\n wnTxWndv1NzzYRsPvRNHag==", "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 10/11] migration: cpr-exec save and load", "Date": "Sun, 30 Jun 2024 12:40:33 -0700", "Message-Id": "<1719776434-435013-11-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": "dfX4xSzsgK0SbDrY6mNJmAPiS-CwiTHy", "X-Proofpoint-ORIG-GUID": "dfX4xSzsgK0SbDrY6mNJmAPiS-CwiTHy", "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": "To preserve CPR state across exec, create a QEMUFile based on a memfd, and\nkeep the memfd open across exec. Save the value of the memfd in an\nenvironment variable so post-exec QEMU can find it.\n\nThese new functions are called in a subsequent patch.\n\nSigned-off-by: Steve Sistare <steven.sistare@oracle.com>\n---\n include/migration/cpr.h | 5 +++\n migration/cpr-exec.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++\n migration/meson.build | 1 +\n 3 files changed, 101 insertions(+)\n create mode 100644 migration/cpr-exec.c", "diff": "diff --git a/include/migration/cpr.h b/include/migration/cpr.h\nindex 42b4019..76d6ccb 100644\n--- a/include/migration/cpr.h\n+++ b/include/migration/cpr.h\n@@ -25,4 +25,9 @@ void cpr_resave_fd(const char *name, int id, int fd);\n int cpr_state_save(Error **errp);\n int cpr_state_load(Error **errp);\n \n+QEMUFile *cpr_exec_output(Error **errp);\n+QEMUFile *cpr_exec_input(Error **errp);\n+void cpr_exec_persist_state(QEMUFile *f);\n+bool cpr_exec_has_state(void);\n+void cpr_exec_unpersist_state(void);\n #endif\ndiff --git a/migration/cpr-exec.c b/migration/cpr-exec.c\nnew file mode 100644\nindex 0000000..5c40457\n--- /dev/null\n+++ b/migration/cpr-exec.c\n@@ -0,0 +1,95 @@\n+/*\n+ * Copyright (c) 2021-2024 Oracle and/or its affiliates.\n+ *\n+ * This work is licensed under the terms of the GNU GPL, version 2 or later.\n+ * See the COPYING file in the top-level directory.\n+ */\n+\n+#include \"qemu/osdep.h\"\n+#include \"qemu/cutils.h\"\n+#include \"qemu/memfd.h\"\n+#include \"qapi/error.h\"\n+#include \"io/channel-file.h\"\n+#include \"io/channel-socket.h\"\n+#include \"migration/cpr.h\"\n+#include \"migration/qemu-file.h\"\n+#include \"migration/misc.h\"\n+#include \"migration/vmstate.h\"\n+#include \"sysemu/runstate.h\"\n+\n+#define CPR_EXEC_STATE_NAME \"QEMU_CPR_EXEC_STATE\"\n+\n+static QEMUFile *qemu_file_new_fd_input(int fd, const char *name)\n+{\n+ g_autoptr(QIOChannelFile) fioc = qio_channel_file_new_fd(fd);\n+ QIOChannel *ioc = QIO_CHANNEL(fioc);\n+ qio_channel_set_name(ioc, name);\n+ return qemu_file_new_input(ioc);\n+}\n+\n+static QEMUFile *qemu_file_new_fd_output(int fd, const char *name)\n+{\n+ g_autoptr(QIOChannelFile) fioc = qio_channel_file_new_fd(fd);\n+ QIOChannel *ioc = QIO_CHANNEL(fioc);\n+ qio_channel_set_name(ioc, name);\n+ return qemu_file_new_output(ioc);\n+}\n+\n+void cpr_exec_persist_state(QEMUFile *f)\n+{\n+ QIOChannelFile *fioc = QIO_CHANNEL_FILE(qemu_file_get_ioc(f));\n+ int mfd = dup(fioc->fd);\n+ char val[16];\n+\n+ /* Remember mfd in environment for post-exec load */\n+ qemu_clear_cloexec(mfd);\n+ snprintf(val, sizeof(val), \"%d\", mfd);\n+ g_setenv(CPR_EXEC_STATE_NAME, val, 1);\n+}\n+\n+static int cpr_exec_find_state(void)\n+{\n+ const char *val = g_getenv(CPR_EXEC_STATE_NAME);\n+ int mfd;\n+\n+ assert(val);\n+ g_unsetenv(CPR_EXEC_STATE_NAME);\n+ assert(!qemu_strtoi(val, NULL, 10, &mfd));\n+ return mfd;\n+}\n+\n+bool cpr_exec_has_state(void)\n+{\n+ return g_getenv(CPR_EXEC_STATE_NAME) != NULL;\n+}\n+\n+void cpr_exec_unpersist_state(void)\n+{\n+ int mfd;\n+ const char *val = g_getenv(CPR_EXEC_STATE_NAME);\n+\n+ g_unsetenv(CPR_EXEC_STATE_NAME);\n+ assert(val);\n+ assert(!qemu_strtoi(val, NULL, 10, &mfd));\n+ close(mfd);\n+}\n+\n+QEMUFile *cpr_exec_output(Error **errp)\n+{\n+ int mfd = memfd_create(CPR_EXEC_STATE_NAME, 0);\n+\n+ if (mfd < 0) {\n+ error_setg_errno(errp, errno, \"memfd_create failed\");\n+ return NULL;\n+ }\n+\n+ return qemu_file_new_fd_output(mfd, CPR_EXEC_STATE_NAME);\n+}\n+\n+QEMUFile *cpr_exec_input(Error **errp)\n+{\n+ int mfd = cpr_exec_find_state();\n+\n+ lseek(mfd, 0, SEEK_SET);\n+ return qemu_file_new_fd_input(mfd, CPR_EXEC_STATE_NAME);\n+}\ndiff --git a/migration/meson.build b/migration/meson.build\nindex 87feb4c..dd1d315 100644\n--- a/migration/meson.build\n+++ b/migration/meson.build\n@@ -14,6 +14,7 @@ system_ss.add(files(\n 'channel.c',\n 'channel-block.c',\n 'cpr.c',\n+ 'cpr-exec.c',\n 'dirtyrate.c',\n 'exec.c',\n 'fd.c',\n", "prefixes": [ "V2", "10/11" ] }