From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202502 header.b=NUv14MMp; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 4033C5A0620 for ; Wed, 05 Feb 2025 11:52:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1738752712; bh=60HrG6xSFQQpMWvpSJsGCspHrJbILwdtzlcK6r+LU0g=; h=From:To:Subject:Date:In-Reply-To:References:From; b=NUv14MMpSfz7ZvBJfWwUI4Qb9mqOOLKpFHEsON01Ajh/LHpcDAbLtnJdKCSumZJIc GCknGfj85OxHBi3aGi+DVNBlEIdvBLDm4IZTcE3nlZKhy1WTcRh4sV2gAkiqOe9TRL TLg5Fz7xRCNAMB5dTh3UJUp/QYRi1m/WhlXmrD8r3IfVUPz/3nSjziPZMf8azBCy1H gC5Vau8lWKULjW5IiGiEaur2YtOPBxyAL8S2zD7Iopxhbc8H1tTRzKXUacJHYyjPlR delO+DCW2Nko+vRVJn9inMTyWbC8dAMcFCAD88ragwI4rA4/38gWhPKzpaBOmX1xK9 ExSIKbcUo/OLg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4Ynxr81xZGz4wyh; Wed, 5 Feb 2025 21:51:52 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v6 3/5] vhost_user: Make source quit after reporting migration state Date: Wed, 5 Feb 2025 21:51:57 +1100 Message-ID: <20250205105159.819680-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205105159.819680-1-david@gibson.dropbear.id.au> References: <20250205105159.819680-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: DZJILZZQ6KUVT5NF5CAYV7QWYGB2M6CD X-Message-ID-Hash: DZJILZZQ6KUVT5NF5CAYV7QWYGB2M6CD X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Stefano Brivio On migration, the source process asks passt-helper to set TCP sockets in repair mode, dumps the information we need to migrate connections, and closes them. At this point, we can't pass them back to passt-helper using SCM_RIGHTS, because they are closed, from that perspective, and sendmsg() will give us EBADF. But if we don't clear repair mode, the port they are bound to will not be available for binding in the target. Terminate once we're done with the migration and we reported the state. This is equivalent to clearing repair mode on the sockets we just closed. Signed-off-by: Stefano Brivio Message-ID: <20250205003904.2797491-6-sbrivio@redhat.com> --- vhost_user.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/vhost_user.c b/vhost_user.c index 63f745c4..8077f1d8 100644 --- a/vhost_user.c +++ b/vhost_user.c @@ -998,6 +998,8 @@ static bool vu_send_rarp_exec(struct vu_dev *vdev, return false; } +static bool quit_on_device_state = false; + /** * vu_set_device_state_fd_exec() - Set the device state migration channel * @vdev: vhost-user device @@ -1025,6 +1027,9 @@ static bool vu_set_device_state_fd_exec(struct vu_dev *vdev, migrate_request(vdev->context, msg->fds[0], direction == VHOST_USER_TRANSFER_STATE_DIRECTION_LOAD); + if (direction == VHOST_USER_TRANSFER_STATE_DIRECTION_SAVE) + quit_on_device_state = true; + /* We don't provide a new fd for the data transfer */ vmsg_set_reply_u64(msg, VHOST_USER_VRING_NOFD_MASK); @@ -1202,4 +1207,10 @@ void vu_control_handler(struct vu_dev *vdev, int fd, uint32_t events) if (reply_requested) vu_send_reply(fd, &msg); + + if (quit_on_device_state && + msg.hdr.request == VHOST_USER_CHECK_DEVICE_STATE) { + info("Migration complete, exiting"); + exit(EXIT_SUCCESS); + } } -- 2.48.1