From nobody Wed Dec 17 21:51:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1656086295916698.6944365668814; Fri, 24 Jun 2022 08:58:15 -0700 (PDT) Received: from localhost ([::1]:55402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4lhG-0003rR-PP for importer@patchew.org; Fri, 24 Jun 2022 11:58:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4lRB-0006c4-HN for qemu-devel@nongnu.org; Fri, 24 Jun 2022 11:41:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:54966) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4lR4-0000sq-IB for qemu-devel@nongnu.org; Fri, 24 Jun 2022 11:41:37 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-549-_QiNI1ZYMJeDnprxxUaqxQ-1; Fri, 24 Jun 2022 11:41:26 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 12190811E76; Fri, 24 Jun 2022 15:41:26 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.194.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 71A95492C3B; Fri, 24 Jun 2022 15:41:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656085290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gMo78ojCSMGmbmI1yW+ZuWgCeRHhoUGJw6OfxYFgIh0=; b=erK/ZCgD4wbdwaZH36GXqYNqVtFyAXNn8QqH1LUsNNWo7j092aybpIEDoL/gk8XMq6X53B DNRuJmgs5Vy8hU2AYJIsKBqDJCAh81fus+GT0ER1zegyjSj5v8zfbu9nyCIsD1dVWUqb9O IlxwGyMzOQiCO2eftFsPuaEBFq67js8= X-MC-Unique: _QiNI1ZYMJeDnprxxUaqxQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL v2 13/20] libvduse: Add support for reconnecting Date: Fri, 24 Jun 2022 17:40:56 +0200 Message-Id: <20220624154103.185902-14-kwolf@redhat.com> In-Reply-To: <20220624154103.185902-1-kwolf@redhat.com> References: <20220624154103.185902-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1656086298083100001 Content-Type: text/plain; charset="utf-8" From: Xie Yongji To support reconnecting after restart or crash, VDUSE backend might need to resubmit inflight I/Os. This stores the metadata such as the index of inflight I/O's descriptors to a shm file so that VDUSE backend can restore them during reconnecting. Signed-off-by: Xie Yongji Message-Id: <20220523084611.91-9-xieyongji@bytedance.com> Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- subprojects/libvduse/libvduse.h | 12 ++ block/export/vduse-blk.c | 19 ++- subprojects/libvduse/libvduse.c | 235 +++++++++++++++++++++++++++++++- 3 files changed, 260 insertions(+), 6 deletions(-) diff --git a/subprojects/libvduse/libvduse.h b/subprojects/libvduse/libvdus= e.h index 6c2fe98213..32f19e7b48 100644 --- a/subprojects/libvduse/libvduse.h +++ b/subprojects/libvduse/libvduse.h @@ -173,6 +173,18 @@ int vduse_dev_update_config(VduseDev *dev, uint32_t si= ze, */ int vduse_dev_setup_queue(VduseDev *dev, int index, int max_size); =20 +/** + * vduse_set_reconnect_log_file: + * @dev: VDUSE device + * @file: filename of reconnect log + * + * Specify the file to store log for reconnecting. It should + * be called before vduse_dev_setup_queue(). + * + * Returns: 0 on success, -errno on failure. + */ +int vduse_set_reconnect_log_file(VduseDev *dev, const char *filename); + /** * vduse_dev_create_by_fd: * @fd: passed file descriptor diff --git a/block/export/vduse-blk.c b/block/export/vduse-blk.c index cab1904234..251d73c841 100644 --- a/block/export/vduse-blk.c +++ b/block/export/vduse-blk.c @@ -30,6 +30,7 @@ typedef struct VduseBlkExport { VirtioBlkHandler handler; VduseDev *dev; uint16_t num_queues; + char *recon_file; unsigned int inflight; } VduseBlkExport; =20 @@ -125,6 +126,8 @@ static void vduse_blk_enable_queue(VduseDev *dev, Vduse= Virtq *vq) =20 aio_set_fd_handler(vblk_exp->export.ctx, vduse_queue_get_fd(vq), true, on_vduse_vq_kick, NULL, NULL, NULL, vq); + /* Make sure we don't miss any kick afer reconnecting */ + eventfd_write(vduse_queue_get_fd(vq), 1); } =20 static void vduse_blk_disable_queue(VduseDev *dev, VduseVirtq *vq) @@ -306,6 +309,15 @@ static int vduse_blk_exp_create(BlockExport *exp, Bloc= kExportOptions *opts, return -ENOMEM; } =20 + vblk_exp->recon_file =3D g_strdup_printf("%s/vduse-blk-%s", + g_get_tmp_dir(), exp->id); + if (vduse_set_reconnect_log_file(vblk_exp->dev, vblk_exp->recon_file))= { + error_setg(errp, "failed to set reconnect log file"); + vduse_dev_destroy(vblk_exp->dev); + g_free(vblk_exp->recon_file); + return -EINVAL; + } + for (i =3D 0; i < num_queues; i++) { vduse_dev_setup_queue(vblk_exp->dev, i, queue_size); } @@ -324,11 +336,16 @@ static int vduse_blk_exp_create(BlockExport *exp, Blo= ckExportOptions *opts, static void vduse_blk_exp_delete(BlockExport *exp) { VduseBlkExport *vblk_exp =3D container_of(exp, VduseBlkExport, export); + int ret; =20 blk_remove_aio_context_notifier(exp->blk, blk_aio_attached, blk_aio_de= tach, vblk_exp); blk_set_dev_ops(exp->blk, NULL, NULL); - vduse_dev_destroy(vblk_exp->dev); + ret =3D vduse_dev_destroy(vblk_exp->dev); + if (ret !=3D -EBUSY) { + unlink(vblk_exp->recon_file); + } + g_free(vblk_exp->recon_file); } =20 static void vduse_blk_exp_request_shutdown(BlockExport *exp) diff --git a/subprojects/libvduse/libvduse.c b/subprojects/libvduse/libvdus= e.c index 78e1e5cf90..9a2bcec282 100644 --- a/subprojects/libvduse/libvduse.c +++ b/subprojects/libvduse/libvduse.c @@ -42,6 +42,8 @@ #define VDUSE_VQ_ALIGN 4096 #define MAX_IOVA_REGIONS 256 =20 +#define LOG_ALIGNMENT 64 + /* Round number down to multiple */ #define ALIGN_DOWN(n, m) ((n) / (m) * (m)) =20 @@ -52,6 +54,31 @@ #define unlikely(x) __builtin_expect(!!(x), 0) #endif =20 +typedef struct VduseDescStateSplit { + uint8_t inflight; + uint8_t padding[5]; + uint16_t next; + uint64_t counter; +} VduseDescStateSplit; + +typedef struct VduseVirtqLogInflight { + uint64_t features; + uint16_t version; + uint16_t desc_num; + uint16_t last_batch_head; + uint16_t used_idx; + VduseDescStateSplit desc[]; +} VduseVirtqLogInflight; + +typedef struct VduseVirtqLog { + VduseVirtqLogInflight inflight; +} VduseVirtqLog; + +typedef struct VduseVirtqInflightDesc { + uint16_t index; + uint64_t counter; +} VduseVirtqInflightDesc; + typedef struct VduseRing { unsigned int num; uint64_t desc_addr; @@ -74,6 +101,10 @@ struct VduseVirtq { bool ready; int fd; VduseDev *dev; + VduseVirtqInflightDesc *resubmit_list; + uint16_t resubmit_num; + uint64_t counter; + VduseVirtqLog *log; }; =20 typedef struct VduseIovaRegion { @@ -97,8 +128,36 @@ struct VduseDev { int fd; int ctrl_fd; void *priv; + void *log; }; =20 +static inline size_t vduse_vq_log_size(uint16_t queue_size) +{ + return ALIGN_UP(sizeof(VduseDescStateSplit) * queue_size + + sizeof(VduseVirtqLogInflight), LOG_ALIGNMENT); +} + +static void *vduse_log_get(const char *filename, size_t size) +{ + void *ptr =3D MAP_FAILED; + int fd; + + fd =3D open(filename, O_RDWR | O_CREAT, 0600); + if (fd =3D=3D -1) { + return MAP_FAILED; + } + + if (ftruncate(fd, size) =3D=3D -1) { + goto out; + } + + ptr =3D mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + +out: + close(fd); + return ptr; +} + static inline bool has_feature(uint64_t features, unsigned int fbit) { assert(fbit < 64); @@ -149,6 +208,105 @@ static int vduse_inject_irq(VduseDev *dev, int index) return ioctl(dev->fd, VDUSE_VQ_INJECT_IRQ, &index); } =20 +static int inflight_desc_compare(const void *a, const void *b) +{ + VduseVirtqInflightDesc *desc0 =3D (VduseVirtqInflightDesc *)a, + *desc1 =3D (VduseVirtqInflightDesc *)b; + + if (desc1->counter > desc0->counter && + (desc1->counter - desc0->counter) < VIRTQUEUE_MAX_SIZE * 2) { + return 1; + } + + return -1; +} + +static int vduse_queue_check_inflights(VduseVirtq *vq) +{ + int i =3D 0; + VduseDev *dev =3D vq->dev; + + vq->used_idx =3D le16toh(vq->vring.used->idx); + vq->resubmit_num =3D 0; + vq->resubmit_list =3D NULL; + vq->counter =3D 0; + + if (unlikely(vq->log->inflight.used_idx !=3D vq->used_idx)) { + if (vq->log->inflight.last_batch_head > VIRTQUEUE_MAX_SIZE) { + return -1; + } + + vq->log->inflight.desc[vq->log->inflight.last_batch_head].inflight= =3D 0; + + barrier(); + + vq->log->inflight.used_idx =3D vq->used_idx; + } + + for (i =3D 0; i < vq->log->inflight.desc_num; i++) { + if (vq->log->inflight.desc[i].inflight =3D=3D 1) { + vq->inuse++; + } + } + + vq->shadow_avail_idx =3D vq->last_avail_idx =3D vq->inuse + vq->used_i= dx; + + if (vq->inuse) { + vq->resubmit_list =3D calloc(vq->inuse, sizeof(VduseVirtqInflightD= esc)); + if (!vq->resubmit_list) { + return -1; + } + + for (i =3D 0; i < vq->log->inflight.desc_num; i++) { + if (vq->log->inflight.desc[i].inflight) { + vq->resubmit_list[vq->resubmit_num].index =3D i; + vq->resubmit_list[vq->resubmit_num].counter =3D + vq->log->inflight.desc[i].counter; + vq->resubmit_num++; + } + } + + if (vq->resubmit_num > 1) { + qsort(vq->resubmit_list, vq->resubmit_num, + sizeof(VduseVirtqInflightDesc), inflight_desc_compare); + } + vq->counter =3D vq->resubmit_list[0].counter + 1; + } + + vduse_inject_irq(dev, vq->index); + + return 0; +} + +static int vduse_queue_inflight_get(VduseVirtq *vq, int desc_idx) +{ + vq->log->inflight.desc[desc_idx].counter =3D vq->counter++; + + barrier(); + + vq->log->inflight.desc[desc_idx].inflight =3D 1; + + return 0; +} + +static int vduse_queue_inflight_pre_put(VduseVirtq *vq, int desc_idx) +{ + vq->log->inflight.last_batch_head =3D desc_idx; + + return 0; +} + +static int vduse_queue_inflight_post_put(VduseVirtq *vq, int desc_idx) +{ + vq->log->inflight.desc[desc_idx].inflight =3D 0; + + barrier(); + + vq->log->inflight.used_idx =3D vq->used_idx; + + return 0; +} + static void vduse_iova_remove_region(VduseDev *dev, uint64_t start, uint64_t last) { @@ -579,11 +737,24 @@ void *vduse_queue_pop(VduseVirtq *vq, size_t sz) unsigned int head; VduseVirtqElement *elem; VduseDev *dev =3D vq->dev; + int i; =20 if (unlikely(!vq->vring.avail)) { return NULL; } =20 + if (unlikely(vq->resubmit_list && vq->resubmit_num > 0)) { + i =3D (--vq->resubmit_num); + elem =3D vduse_queue_map_desc(vq, vq->resubmit_list[i].index, sz); + + if (!vq->resubmit_num) { + free(vq->resubmit_list); + vq->resubmit_list =3D NULL; + } + + return elem; + } + if (vduse_queue_empty(vq)) { return NULL; } @@ -611,6 +782,8 @@ void *vduse_queue_pop(VduseVirtq *vq, size_t sz) =20 vq->inuse++; =20 + vduse_queue_inflight_get(vq, head); + return elem; } =20 @@ -668,7 +841,9 @@ void vduse_queue_push(VduseVirtq *vq, const VduseVirtqE= lement *elem, unsigned int len) { vduse_queue_fill(vq, elem, len, 0); + vduse_queue_inflight_pre_put(vq, elem->index); vduse_queue_flush(vq, 1); + vduse_queue_inflight_post_put(vq, elem->index); } =20 static int vduse_queue_update_vring(VduseVirtq *vq, uint64_t desc_addr, @@ -747,12 +922,15 @@ static void vduse_queue_enable(VduseVirtq *vq) } =20 vq->fd =3D fd; - vq->shadow_avail_idx =3D vq->last_avail_idx =3D vq_info.split.avail_in= dex; - vq->inuse =3D 0; - vq->used_idx =3D 0; vq->signalled_used_valid =3D false; vq->ready =3D true; =20 + if (vduse_queue_check_inflights(vq)) { + fprintf(stderr, "Failed to check inflights for vq[%d]\n", vq->inde= x); + close(fd); + return; + } + dev->ops->enable_queue(dev, vq); } =20 @@ -802,11 +980,15 @@ static void vduse_dev_start_dataplane(VduseDev *dev) =20 static void vduse_dev_stop_dataplane(VduseDev *dev) { + size_t log_size =3D dev->num_queues * vduse_vq_log_size(VIRTQUEUE_MAX_= SIZE); int i; =20 for (i =3D 0; i < dev->num_queues; i++) { vduse_queue_disable(&dev->vqs[i]); } + if (dev->log) { + memset(dev->log, 0, log_size); + } dev->features =3D 0; vduse_iova_remove_region(dev, 0, ULONG_MAX); } @@ -915,6 +1097,30 @@ int vduse_dev_setup_queue(VduseDev *dev, int index, i= nt max_size) return -errno; } =20 + vduse_queue_enable(vq); + + return 0; +} + +int vduse_set_reconnect_log_file(VduseDev *dev, const char *filename) +{ + + size_t log_size =3D dev->num_queues * vduse_vq_log_size(VIRTQUEUE_MAX_= SIZE); + void *log; + int i; + + dev->log =3D log =3D vduse_log_get(filename, log_size); + if (log =3D=3D MAP_FAILED) { + fprintf(stderr, "Failed to get vduse log\n"); + return -EINVAL; + } + + for (i =3D 0; i < dev->num_queues; i++) { + dev->vqs[i].log =3D log; + dev->vqs[i].log->inflight.desc_num =3D VIRTQUEUE_MAX_SIZE; + log =3D (void *)((char *)log + vduse_vq_log_size(VIRTQUEUE_MAX_SIZ= E)); + } + return 0; } =20 @@ -959,6 +1165,12 @@ static int vduse_dev_init(VduseDev *dev, const char *= name, return -errno; } =20 + if (ioctl(fd, VDUSE_DEV_GET_FEATURES, &dev->features)) { + fprintf(stderr, "Failed to get features: %s\n", strerror(errno)); + close(fd); + return -errno; + } + dev_name =3D strdup(name); if (!dev_name) { close(fd); @@ -1003,6 +1215,12 @@ VduseDev *vduse_dev_create_by_fd(int fd, uint16_t nu= m_queues, return NULL; } =20 + if (ioctl(fd, VDUSE_DEV_GET_FEATURES, &dev->features)) { + fprintf(stderr, "Failed to get features: %s\n", strerror(errno)); + free(dev); + return NULL; + } + ret =3D vduse_dev_init_vqs(dev, num_queues); if (ret) { fprintf(stderr, "Failed to init vqs\n"); @@ -1102,7 +1320,7 @@ VduseDev *vduse_dev_create(const char *name, uint32_t= device_id, =20 ret =3D ioctl(ctrl_fd, VDUSE_CREATE_DEV, dev_config); free(dev_config); - if (ret < 0) { + if (ret && errno !=3D EEXIST) { fprintf(stderr, "Failed to create vduse device %s: %s\n", name, strerror(errno)); goto err_dev; @@ -1129,8 +1347,15 @@ err_ctrl: =20 int vduse_dev_destroy(VduseDev *dev) { - int ret =3D 0; + size_t log_size =3D dev->num_queues * vduse_vq_log_size(VIRTQUEUE_MAX_= SIZE); + int i, ret =3D 0; =20 + if (dev->log) { + munmap(dev->log, log_size); + } + for (i =3D 0; i < dev->num_queues; i++) { + free(dev->vqs[i].resubmit_list); + } free(dev->vqs); if (dev->fd >=3D 0) { close(dev->fd); --=20 2.35.3