From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=N+2zeMNZ; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTP id E2AD15A0274 for ; Thu, 19 Dec 2024 12:25:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734607515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hBCrjgh/HOzLmy6xXD0vbCsbfoJmAHPBC3cDniIYGgw=; b=N+2zeMNZvk8Ne9zKupzf5rScWnHZoilIoLf9lviLfTxfon9+51Gywx3ycbe9cJC6R+mnT5 p8v3AUYbr+1v4r3T6gW98+vRsg2XB3pK4zXoEY3nAAgJIDnN141R+RjIaiiXAlYwzDBN/N enhkX+8jvcYD0g5hmDmNpeOk4siFJU8= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-615-bwALa1zdOzqA2vQbbIy-gA-1; Thu, 19 Dec 2024 06:14:15 -0500 X-MC-Unique: bwALa1zdOzqA2vQbbIy-gA-1 X-Mimecast-MFC-AGG-ID: bwALa1zdOzqA2vQbbIy-gA Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DA89619560A6 for ; Thu, 19 Dec 2024 11:14:14 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.39.193.37]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EBECE19560A2; Thu, 19 Dec 2024 11:14:13 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH 8/9] vhost-user: add VHOST_USER_SET_DEVICE_STATE_FD command Date: Thu, 19 Dec 2024 12:13:59 +0100 Message-ID: <20241219111400.2352110-9-lvivier@redhat.com> In-Reply-To: <20241219111400.2352110-1-lvivier@redhat.com> References: <20241219111400.2352110-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: JCsNnRhM5vSC_CdVCF4LiucsEi0DJHxH_TjnfSgVJ-E_1734606855 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: HV6PSL5AKQQ6HLZYHBFGLL3Y5ODVCMDJ X-Message-ID-Hash: HV6PSL5AKQQ6HLZYHBFGLL3Y5ODVCMDJ X-MailFrom: lvivier@redhat.com 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 CC: Laurent Vivier 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: Set the file descriptor to use to transfer the backend device state during migration. Signed-off-by: Laurent Vivier --- epoll_type.h | 2 ++ passt.c | 4 +++ vhost_user.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++- virtio.h | 2 ++ vu_common.c | 49 +++++++++++++++++++++++++++++++ vu_common.h | 1 + 6 files changed, 138 insertions(+), 1 deletion(-) diff --git a/epoll_type.h b/epoll_type.h index f3ef41584757..fd9eac392f77 100644 --- a/epoll_type.h +++ b/epoll_type.h @@ -40,6 +40,8 @@ enum epoll_type { EPOLL_TYPE_VHOST_CMD, /* vhost-user kick event socket */ EPOLL_TYPE_VHOST_KICK, + /* vhost-user migration socket */ + EPOLL_TYPE_VHOST_MIGRATION, EPOLL_NUM_TYPES, }; diff --git a/passt.c b/passt.c index 957f3d0f4ddc..25d9823739cf 100644 --- a/passt.c +++ b/passt.c @@ -75,6 +75,7 @@ char *epoll_type_str[] = { [EPOLL_TYPE_TAP_LISTEN] = "listening qemu socket", [EPOLL_TYPE_VHOST_CMD] = "vhost-user command socket", [EPOLL_TYPE_VHOST_KICK] = "vhost-user kick socket", + [EPOLL_TYPE_VHOST_MIGRATION] = "vhost-user migration socket", }; static_assert(ARRAY_SIZE(epoll_type_str) == EPOLL_NUM_TYPES, "epoll_type_str[] doesn't match enum epoll_type"); @@ -356,6 +357,9 @@ loop: case EPOLL_TYPE_VHOST_KICK: vu_kick_cb(c.vdev, ref, &now); break; + case EPOLL_TYPE_VHOST_MIGRATION: + vu_migrate(c.vdev, eventmask); + break; default: /* Can't happen */ ASSERT(0); diff --git a/vhost_user.c b/vhost_user.c index 90c46d5b89fd..11b0b447850d 100644 --- a/vhost_user.c +++ b/vhost_user.c @@ -981,6 +981,78 @@ static bool vu_set_vring_enable_exec(struct vu_dev *vdev, return false; } +/** + * vu_set_migration_watch() -- Add the migration file descriptor to + * to the passt epoll file descriptor + * @vdev: vhost-user device + * @fd: File descriptor to add + * @direction: Direction of the migration (save or load backend state) + */ +static void vu_set_migration_watch(const struct vu_dev *vdev, int fd, + int direction) +{ + union epoll_ref ref = { + .type = EPOLL_TYPE_VHOST_MIGRATION, + .fd = fd, + }; + struct epoll_event ev = { 0 }; + + ev.data.u64 = ref.u64; + switch (direction) { + case VHOST_USER_TRANSFER_STATE_DIRECTION_SAVE: + ev.events = EPOLLOUT; + break; + case VHOST_USER_TRANSFER_STATE_DIRECTION_LOAD: + ev.events = EPOLLIN; + break; + default: + ASSERT(0); + } + + epoll_ctl(vdev->context->epollfd, EPOLL_CTL_ADD, ref.fd, &ev); +} + +/** + * vu_set_device_state_fd_exec() -- Set the device state migration channel + * @vdev: vhost-user device + * @vmsg: vhost-user message + * + * Return: True as the reply contains 0 to indicate success + * and set bit 8 as we don't provide our own fd. + */ +static bool vu_set_device_state_fd_exec(struct vu_dev *vdev, + struct vhost_user_msg *msg) +{ + unsigned int direction = msg->payload.transfer_state.direction; + unsigned int phase = msg->payload.transfer_state.phase; + + if (msg->fd_num != 1) + die("Invalid device_state_fd message"); + + if (phase != VHOST_USER_TRANSFER_STATE_PHASE_STOPPED) + die("Invalid device_state_fd phase: %d", phase); + + if (direction != VHOST_USER_TRANSFER_STATE_DIRECTION_SAVE && + direction != VHOST_USER_TRANSFER_STATE_DIRECTION_LOAD) + die("Invalide device_state_fd direction: %d", direction); + + if (vdev->device_state_fd != -1) { + vu_remove_watch(vdev, vdev->device_state_fd); + close(vdev->device_state_fd); + } + + vdev->device_state_fd = msg->fds[0]; + vdev->device_state_result = -1; + vu_set_migration_watch(vdev, vdev->device_state_fd, direction); + + debug("Got device_state_fd: %d", vdev->device_state_fd); + + /* We don't provide a new fd for the data transfer */ + vmsg_set_reply_u64(msg, VHOST_USER_VRING_NOFD_MASK); + + return true; +} + /** * vu_check_device_state_exec() -- Return device state migration result * @vdev: vhost-user device @@ -1019,6 +1091,7 @@ void vu_init(struct ctx *c) } c->vdev->log_table = NULL; c->vdev->log_call_fd = -1; + c->vdev->device_state_fd = -1; c->vdev->device_state_result = -1; } @@ -1069,7 +1142,12 @@ void vu_cleanup(struct vu_dev *vdev) vu_close_log(vdev); - vdev->device_state_result = -1; + if (vdev->device_state_fd != -1) { + vu_remove_watch(vdev, vdev->device_state_fd); + close(vdev->device_state_fd); + vdev->device_state_fd = -1; + vdev->device_state_result = -1; + } } /** @@ -1100,6 +1178,7 @@ static bool (*vu_handle[VHOST_USER_MAX])(struct vu_dev *vdev, [VHOST_USER_SET_VRING_CALL] = vu_set_vring_call_exec, [VHOST_USER_SET_VRING_ERR] = vu_set_vring_err_exec, [VHOST_USER_SET_VRING_ENABLE] = vu_set_vring_enable_exec, + [VHOST_USER_SET_DEVICE_STATE_FD] = vu_set_device_state_fd_exec, [VHOST_USER_CHECK_DEVICE_STATE] = vu_check_device_state_exec, }; diff --git a/virtio.h b/virtio.h index 512ec1bedcd3..7bef2d274acd 100644 --- a/virtio.h +++ b/virtio.h @@ -106,6 +106,7 @@ struct vu_dev_region { * @log_call_fd: Eventfd to report logging update * @log_size: Size of the logging memory region * @log_table: Base of the logging memory region + * @device_state_fd: Device state migration channel * @device_state_result: Device state migration result */ struct vu_dev { @@ -118,6 +119,7 @@ struct vu_dev { int log_call_fd; uint64_t log_size; uint8_t *log_table; + int device_state_fd; int device_state_result; }; diff --git a/vu_common.c b/vu_common.c index 16e7e76a07f3..3142b585c29f 100644 --- a/vu_common.c +++ b/vu_common.c @@ -281,3 +281,52 @@ err: return -1; } + +/** + * vu_migrate() -- Send/receive passt insternal state to/from QEMU + * @vdev: vhost-user device + * @events: epoll events + */ +void vu_migrate(struct vu_dev *vdev, uint32_t events) +{ + int ret; + + /* TODO: collect/set passt internal state + * and use vdev->device_state_fd to send/receive it + */ + debug("vu_migrate fd %d events %x", vdev->device_state_fd, events); + if (events & EPOLLOUT) { + debug("Saving backend state"); + + /* send some stuff */ + ret = write(vdev->device_state_fd, "PASST", 6); + /* value to be returned by VHOST_USER_CHECK_DEVICE_STATE */ + vdev->device_state_result = ret == -1 ? -1 : 0; + /* Closing the file descriptor signals the end of transfer */ + epoll_ctl(vdev->context->epollfd, EPOLL_CTL_DEL, + vdev->device_state_fd, NULL); + close(vdev->device_state_fd); + vdev->device_state_fd = -1; + } else if (events & EPOLLIN) { + char buf[6]; + + debug("Loading backend state"); + /* read some stuff */ + ret = read(vdev->device_state_fd, buf, sizeof(buf)); + /* value to be returned by VHOST_USER_CHECK_DEVICE_STATE */ + if (ret != sizeof(buf)) { + vdev->device_state_result = -1; + } else { + ret = strncmp(buf, "PASST", sizeof(buf)); + vdev->device_state_result = ret == 0 ? 0 : -1; + } + } else if (events & EPOLLHUP) { + debug("Closing migration channel"); + + /* The end of file signals the end of the transfer. */ + epoll_ctl(vdev->context->epollfd, EPOLL_CTL_DEL, + vdev->device_state_fd, NULL); + close(vdev->device_state_fd); + vdev->device_state_fd = -1; + } +} diff --git a/vu_common.h b/vu_common.h index bd70faf3e226..d56c021ab0f9 100644 --- a/vu_common.h +++ b/vu_common.h @@ -57,4 +57,5 @@ void vu_flush(const struct vu_dev *vdev, struct vu_virtq *vq, void vu_kick_cb(struct vu_dev *vdev, union epoll_ref ref, const struct timespec *now); int vu_send_single(const struct ctx *c, const void *buf, size_t size); +void vu_migrate(struct vu_dev *vdev, uint32_t events); #endif /* VU_COMMON_H */ -- 2.47.1