From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id EFC81817C6 for ; Tue, 17 Nov 2026 10:10:30 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHA9EAt007714; Tue, 17 Nov 2026 13:09:16 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHA9EAt007714 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="OQuzVElX" Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHA98o6007696 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 17 Nov 2026 13:09:08 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHA98o6007696 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-4a3705ea6ccso716202f8f.2 for ; Tue, 17 Nov 2026 02:09:08 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErGPVNKMa9zJ7pxqek6ZNerSwSbnJi870YjIy/jUc0QCp8tNcPvvYz6L5qCJcckd27SVJpdKxQ==@openvz.org X-Gm-Message-State: APuU4Z94RsuXME15L0JHOg1dJ++uFje9Y/FGKOdNknH5jXkdIor7XBwK 15RLvdN6HQl9RCpI4u6jLBJ4putH7N0u9KmFCZB3LMsiv/gP+UrVaBeNhXGt2pJE2UMH5KUL8Tk 95OelY6WjzbqI/P8onklu6fK8xWN5kfZBqY270Blzm+uCmg714om5DA== X-Gm-Gg: AZFdTZercNcCmkOa0TeK8zs/riv8n3O4sbFV+qd74Xv+N0vuDJJhrwvGnngP3YyssgB 7MrS0+ZDNT/fBAGXwRS1i2XvSjeead4aWqIz4hvhsveDP/YAy/Ch0RemqNLOW+29PGIs+ZD1zxO GfdQOrJI6NYT6gEMZGGhTGU+WDGHlnsCGPbKGdy6I+5wcxfQuSNHrj+BmtQG9CquZeJV/Jk+Ofr OGVUoZFJEg+5kuiNM248eQpiee73iOCgiCzmt8v0gWwNTaZj6DRi8SPLx7qT+TYDvgljD+SipRZ N/57/7j5BugYXRZM4nD5ifzViF6OXxgiLbyFhIBAJaG1FEUv0p9lo/2nykC/+T9C+aKQoQ8QAeN lJjqVCaGckavm5IcU6i3GOqykZ1c= X-Received: by 2002:a05:6000:2c0b:b0:4a4:14db:2348 with SMTP id ffacd0b85a97d-4a414db26a6mr2839604f8f.35.1794910148235; Tue, 17 Nov 2026 02:09:08 -0800 (PST) X-Received: by 2002:a05:6000:2c0b:b0:4a4:14db:2348 with SMTP id ffacd0b85a97d-4a414db26a6mr2839572f8f.35.1794910147726; Tue, 17 Nov 2026 02:09:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794910147; cv=none; d=google.com; s=arc-20260327; b=hyDpMtpSXxAB0aFlI74vxKeIK/iXgRreHlZqwMeP64uwegzUoe9oJUP5aIlXANSCaU z6R0mqaiolNewT+cf2XXLlzc3OiOQbFbzHd16cElh+4Vy+KbL7KIDFlGKLg1exoudiRZ /Uu67Kuzc3NmS/bGQ+igIyRXxdYlCHx9/0NMOcwoiOseUcfFecSE8S8GmyIG+kQRpNhx WSKCgJXdaWoquek+Y5t34dxhuNCv0LMlUl1B8UULQ1PRBcavZH+1z8qBmo5dHp2ETqA6 eFJlnyVLokJgOYPneE3x3P9GsZlCwiBj/6vybuJ2OOwS2RPzr0u3950ofJJyxNISZNuF wjVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=2AZcK3PMrYs7YvhdFwKH9GsT9YNNekQmRuap2V6tfoo=; fh=CMILZ+goaghq6B4UpCDhf0EQp6kYD0LAlmOkUiVCOvs=; b=IvQi2nUCixsQ7FTp/y7kUldoGq3SzWkdSvQASo+ePYpNBEuBm9EM9SgHZuUPhn6NXG 50qQZALMCigUn3KCGTzuzltG4utLmnFH9Xfis7Y7n7qKlt1OmXfzrsB7j+tY22PVOxEP yG6w5rwkWp0hQYypKJz3cmCKcIeyoJw5I4IfcRcruvd9+oFHLKndxqzslYLIVfGptBqR hyCe9J+KylwV2KFmFm+5of6jqgEPiBOkLil3V7r+hhCFVuGrNxIU3C0HT3Fe2iu+V6oe 1lusWPE7N37NcfLEGhAXO2bOU6SBiqXiupkrRRLrcsAzTimvoyJJYCDk58L4h2p8TbiY 9Vmg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=OQuzVElX; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-4a528da1eb5si808424f8f.214.2026.11.17.02.09.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 02:09:07 -0800 (PST) Received-SPF: pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=OQuzVElX; spf=pass (google.com: domain of alexander.ivanov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.ivanov@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=2AZcK3PMrYs7YvhdFwKH9GsT9YNNekQmRuap2V6tfoo=; b=OQuzVElXMM1k io84z2mEOFbx0YyOKjmjZ2/J1kfSSsczWs1j7ot3L45ukBASsrAOWGr8jfQiX7zGrEeCHzSfu8+HJ 8mqJtTKBPfPRnKPsrVTXnJcYQiM5baMpUdjvCCxZ6kVuGiqbSeeh+b4ronipz3q1JBobraM702Uob tT/wddPnvx8MwaObs008aCJLwIwIwdT9dKNoChJWmPFWW1+iVSDrdj0VJ7LQIIUVEjmLNlfWrHRVp P2hggSN8riOX20bwX5ioha68itWmnSzzIpb/79qIfkpK+jjqfY9EcnlRKje+R/BWnvYr3IYBiTvsN bmSpyRPhwvz4keJUlp9PMA==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=sky) by relay.virtuozzo.com with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xTG3P-009Hhf-05; Tue, 17 Nov 2026 11:08:57 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Tue, 17 Nov 2026 11:09:03 +0100 Message-ID: <20261117100904.3071306-2-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261117100904.3071306-1-alexander.ivanov@virtuozzo.com> References: <20261117100904.3071306-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v3 1/2] drivers/vhost/blk: fix a flush hang on requests completed after worker kill X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org With vhost_task workers (not the default kthread ones), killing the owner makes vhost_worker_killed() detach the worker from the virtqueues and run only the work already queued. A request that completes after that is added to blk_vq->llhead, but vhost_vq_work_queue() returns false and queues nothing, so the request is never forgotten. req_inflight[] stays elevated and vhost_blk_flush() hangs uninterruptibly in release when the fd is closed. A request in flight at the kill is enough. Release such requests from a work item when the worker cannot be queued, as vhost-scsi does in vhost_scsi_drop_cmds(). The bio completion may run in interrupt context, where a request cannot be released: that takes vq->mutex, and flush_lock with plain spin_lock(). The guest is not answered, its memory is no longer reachable. Once the completion publishes the request, the request can be forgotten and vhost_blk_flush() can return while the completion is still queueing work into blk, which release then frees. Queue under rcu_read_lock() and wait for it with synchronize_rcu() in vhost_blk_drop_backend(), then flush the drop work before freeing the requests. https://virtuozzo.atlassian.net/browse/VSTOR-141684 Fixes: 1629db092dd7 ("drivers/vhost: vhost-blk accelerator for virtio-blk guests") Feature: vhost-blk: in-kernel accelerator for virtio-blk guests Signed-off-by: Alexander Ivanov --- drivers/vhost/blk.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/drivers/vhost/blk.c b/drivers/vhost/blk.c index b95358cdf3bc..eea8cca59cac 100644 --- a/drivers/vhost/blk.c +++ b/drivers/vhost/blk.c @@ -91,6 +91,7 @@ struct vhost_blk_vq { struct iovec iov[UIO_MAXIOV]; struct llist_head llhead; struct vhost_work work; + struct work_struct drop_work; }; struct vhost_blk { @@ -168,8 +169,13 @@ static void vhost_blk_req_done(struct bio *bio) } if (atomic_dec_and_test(&req->bio_nr)) { - llist_add(&req->llnode, &req->blk_vq->llhead); - vhost_vq_work_queue(&req->blk_vq->vq, &req->blk_vq->work); + struct vhost_blk_vq *blk_vq = req->blk_vq; + + rcu_read_lock(); + llist_add(&req->llnode, &blk_vq->llhead); + if (!vhost_vq_work_queue(&blk_vq->vq, &blk_vq->work)) + schedule_work(&blk_vq->drop_work); + rcu_read_unlock(); } } @@ -683,6 +689,24 @@ static void vhost_blk_handle_host_kick(struct vhost_work *work) mutex_unlock(&vq->mutex); } +static void vhost_blk_drop_reqs(struct work_struct *work) +{ + struct vhost_blk_vq *blk_vq; + struct vhost_blk_req *req, *tmp; + struct llist_node *llnode; + + blk_vq = container_of(work, struct vhost_blk_vq, drop_work); + + mutex_lock(&blk_vq->vq.mutex); + llnode = llist_del_all(&blk_vq->llhead); + llist_for_each_entry_safe(req, tmp, llnode, llnode) { + vhost_blk_req_cleanup(req); + req->inflight = false; + forget_request(req); + } + mutex_unlock(&blk_vq->vq.mutex); +} + /* It is forbidden to call more than one vhost_blk_flush() simultaneously */ static void vhost_blk_flush(struct vhost_blk *blk) { @@ -730,6 +754,10 @@ static void vhost_blk_drop_backend(struct vhost_blk *blk) vhost_blk_flush(blk); + synchronize_rcu(); + for (i = 0; i < VHOST_BLK_VQ_MAX; i++) + flush_work(&blk->vqs[i].drop_work); + for (i = 0; i < VHOST_BLK_VQ_MAX; i++) { kvfree(blk->vqs[i].req); blk->vqs[i].req = NULL; @@ -803,8 +831,10 @@ static int vhost_blk_open(struct inode *inode, struct file *file) VHOST_DEV_WEIGHT, VHOST_DEV_PKT_WEIGHT, true, NULL); file->private_data = blk; - for (i = 0; i < VHOST_BLK_VQ_MAX; i++) + for (i = 0; i < VHOST_BLK_VQ_MAX; i++) { vhost_work_init(&blk->vqs[i].work, vhost_blk_handle_host_kick); + INIT_WORK(&blk->vqs[i].drop_work, vhost_blk_drop_reqs); + } return ret; out_blk: -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel