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 B2810803F6 for ; Tue, 17 Nov 2026 10:12:12 +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 6AHAB3nD007847; Tue, 17 Nov 2026 13:11:03 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHAB3nD007847 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="aGBLD1eB" Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHAAWg7007774 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 17 Nov 2026 13:10:32 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHAAWg7007774 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4a359b714f8so24140535e9.2 for ; Tue, 17 Nov 2026 02:10:32 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErEGxJOZbfpkwq7fiRgWlukGyTL6WkoN/DXC6OTYkeq4ZBUT0b8I7Owi/MLLCM7VIp18eqwJog==@openvz.org X-Gm-Message-State: APuU4Z/hIOszPspyZydbTyihqieBfxIP3My1Hyqe5D3KXYJ4dGQfVLF8 vHzVhoJMcnopzPNDuDI8pVAcDkan9gplwNMX09VlnEZTOcfi7FhVk3rez357E/h5Kl7uOt59jSz pppwMUJ2TIxPpRRs3nooYgQkjqTsSLvTlXUvt75zwq5qnHow5OM2WLg== X-Gm-Gg: AYBFou1rUyU7U/qVwS3LeCjQCT1ltqmb8E+Vg6LEROvJpMNE+gkT+M1U2Nx1n0NLZ5r RcXqaKI+JvYJe8T1NRD8k42sk8wFCUm3gW6vb6gOIrKc/b7XYvzFWHE/Zdt5sdQadnTqYuM8eYF BBU5QG8Yn4bLG/OywBkYswTbZAhY691Zsg75RbWq0VcfE/mTmxZa48bQihSzv271aVqgI9GKv0X 9MhkKxnpkZ0tW9E8odK3oajcqWqiLF5Fh2RIOwsjQM5fRuthJDz0yMiHQ5inNX6oiOkdPib73/2 s/2A6TtOOitJ6kaFm56d90QhegNNIl6hxBS/TPSWwCVE6XGGh8T7p2nLvGeZnXFTM9hkQ2ccn7h zzFvi3yHreoKI/jickrrKT3Ql12s= X-Received: by 2002:a05:600c:524a:b0:4bb:6cef:d14b with SMTP id 5b1f17b1804b1-4bb6cefd40dmr151515025e9.2.1794910231785; Tue, 17 Nov 2026 02:10:31 -0800 (PST) X-Received: by 2002:a05:600c:524a:b0:4bb:6cef:d14b with SMTP id 5b1f17b1804b1-4bb6cefd40dmr151514165e9.2.1794910231103; Tue, 17 Nov 2026 02:10:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794910231; cv=none; d=google.com; s=arc-20260327; b=DQDZvEJeql+N92lntrX0DteTEJu1xCae874OtkkQlKi3JfjK2qy0JgJqg1OqQI9h7d oafhCWe4EXmeniZldrq6Ak/i96vlPmwL7icb748Cc2W2QuLM5KRexyH80hkyE4UVAp3T Ugi5SMrErAmHQ8Twx3tmdlL7dRMXXwaSaujpjJUTLsWQx3jlH8Cog4mjCR8r0/ggHxVJ BC7FXEqRRTPxB4NgZBSCsU4Xqi8kAvrM2AEiaieuziCiA75OGdArVrQen7g/mRAYRxys Q6DF+ZfJ0UXtaqa3TDsUwtUqh/BlpLtG1KdUiMtmUCDueGXVrYFF3j/3+0w2fm2+anOj 3kFA== 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=Rtfvhn28D5Dbg0F6JGT0ER8iuZ3spLY+mS3k9wn5Kw8=; fh=CMILZ+goaghq6B4UpCDhf0EQp6kYD0LAlmOkUiVCOvs=; b=loHsP6UJeeQHl98et35YBMGHoGoL0pVq6dCKJo/ZHRHkDGz0tmclxfI+GPWUFjrOfe 6Eb6biZxyRmYDi1QV0q1aES04VPp0rbUONh/og0LJx+pGGEh+v/VG4LQiR3YHFMbx412 QNPMoj9FrgG3mGcc180E7jUIXvi3mEqk3QCLj8lnJknpCJUwsElCdMJAoJ0FaqYT4OiH QMy4es/CDZoBXrXrkTt5l+kJbIeV+YesSy3FpNYzewvJI0fdQh2yVbWtQGDKEbyIHPjN vdE8EHB11krhVl4uV+tUg/GnesWx8gi0gr67PWE7y6J4qVhEpIYOjdK3IVxkXJAeLxAg HzcA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=aGBLD1eB; 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 5b1f17b1804b1-4bb7aee3987si10120325e9.7.2026.11.17.02.10.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 02:10:31 -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=aGBLD1eB; 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=Rtfvhn28D5Dbg0F6JGT0ER8iuZ3spLY+mS3k9wn5Kw8=; b=aGBLD1eBf1of 0+jUBccMNd7jiDot9s8bnbYR/iz7knOo3MrR2+EjzYPNaIgtRJtsBnFcF5ZHnP6UZk92lIAUwklcL 4+FjC4JGMbh/uL22MiZoez+qf19b2Hw7RszcEjpNybVc6+fh8FeiK4PrgAhRajyOwxyXxPvkaRUwh NhS0QWcXVhFpGaBdKeLqnXb9RhCzGo5+WSTSpowj/EVFRX+NttG5wRfl280tEr7FhHIIO/OvO6hF7 cculZ5I0ydj9hF7SW4Xr12oNXR/86+NCXuLohilfxSyFgQJOPGFHEBhucebuRFZJLsmTGN+qQdOwv x+67MZ2OSZDi2mPTz3K2dw==; 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 1xTG4k-009Isp-1K; Tue, 17 Nov 2026 11:10:21 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Tue, 17 Nov 2026 11:10:26 +0100 Message-ID: <20261117101026.3071579-10-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261117101026.3071579-1-alexander.ivanov@virtuozzo.com> References: <20261117101026.3071579-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v2 9/9] drivers/vhost/blk: fix a hang on release after the vhost worker is killed 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 When the owner is killed, vhost_worker_killed() detaches the worker from the vqs. A bio completing after that fails to queue the completion work, so its request stays on llhead and is never removed from req_inflight. vhost_blk_flush() on release then waits forever and the process is stuck in D state. Any kill of a VM with I/O in flight can hit this. If the work cannot be queued, drop the completed requests right in the bio end_io: forget them without writing a status, as there is no guest left to see it. llist_del_all() makes sure a request is dropped once even if it races with the last run of the host kick handler. forget_request() can now run in irq context, so take flush_lock with interrupts disabled. The end_io may run in atomic context and the request buffers may be vmalloc'ed, so free them on release instead: a dropped request is the one left with ->inflight set. Once a request is on llhead, a concurrent consumer may forget it and let release free the request array and blk while the end_io is still using blk_vq. Keep the end_io tail in an RCU read-side section and wait for a grace period before freeing the requests. The same window existed before with the host kick handler as the consumer. https://virtuozzo.atlassian.net/browse/VSTOR-152175 Fixes: c57a98d65796 ("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 | 52 +++++++++++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/drivers/vhost/blk.c b/drivers/vhost/blk.c index b95358cdf3bc..b67255580031 100644 --- a/drivers/vhost/blk.c +++ b/drivers/vhost/blk.c @@ -146,6 +146,8 @@ static inline int vhost_blk_set_status(struct vhost_blk_req *req, u8 status) return 0; } +static void vhost_blk_drop_completed(struct vhost_blk_vq *blk_vq); + static void vhost_blk_req_done(struct bio *bio) { struct vhost_blk_req *req = bio->bi_private; @@ -168,8 +170,14 @@ 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; + + /* req and blk may be freed once req is on llhead */ + rcu_read_lock(); + llist_add(&req->llnode, &blk_vq->llhead); + if (!vhost_vq_work_queue(&blk_vq->vq, &blk_vq->work)) + vhost_blk_drop_completed(blk_vq); + rcu_read_unlock(); } } @@ -394,22 +402,34 @@ static inline void vhost_blk_bio_send(struct vhost_blk_req *req) static inline void note_request(struct vhost_blk_req *req) { - spin_lock(&req->blk->flush_lock); + spin_lock_irq(&req->blk->flush_lock); req->req_bin = req->blk->new_req_bin; atomic_inc(&req->blk->req_inflight[req->req_bin]); - spin_unlock(&req->blk->flush_lock); + spin_unlock_irq(&req->blk->flush_lock); } static inline void forget_request(struct vhost_blk_req *req) { struct vhost_blk *blk = req->blk; + unsigned long flags; int zero; - spin_lock(&blk->flush_lock); + spin_lock_irqsave(&blk->flush_lock, flags); zero = atomic_dec_and_test(&blk->req_inflight[req->req_bin]); if (zero && blk->during_flush) wake_up(&blk->flush_wait); - spin_unlock(&blk->flush_lock); + spin_unlock_irqrestore(&blk->flush_lock, flags); +} + +/* Called when the worker is killed: nobody will complete these to the guest */ +static void vhost_blk_drop_completed(struct vhost_blk_vq *blk_vq) +{ + struct vhost_blk_req *req, *tmp; + struct llist_node *llnode; + + llnode = llist_del_all(&blk_vq->llhead); + llist_for_each_entry_safe(req, tmp, llnode, llnode) + forget_request(req); } static int vhost_blk_req_submit(struct vhost_blk_req *req) @@ -688,12 +708,12 @@ static void vhost_blk_flush(struct vhost_blk *blk) { int flush_bin; - spin_lock(&blk->flush_lock); + spin_lock_irq(&blk->flush_lock); WARN_ON(blk->during_flush); blk->during_flush = 1; flush_bin = blk->new_req_bin; blk->new_req_bin = !blk->new_req_bin; - spin_unlock(&blk->flush_lock); + spin_unlock_irq(&blk->flush_lock); vhost_dev_flush(&blk->dev); /* @@ -707,15 +727,15 @@ static void vhost_blk_flush(struct vhost_blk *blk) */ wait_event(blk->flush_wait, !atomic_read(&blk->req_inflight[flush_bin])); - spin_lock(&blk->flush_lock); + spin_lock_irq(&blk->flush_lock); blk->during_flush = 0; - spin_unlock(&blk->flush_lock); + spin_unlock_irq(&blk->flush_lock); } static void vhost_blk_drop_backend(struct vhost_blk *blk) { struct vhost_virtqueue *vq; - int i; + int i, j; if (!blk->backend) return; @@ -729,10 +749,16 @@ 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++) { - kvfree(blk->vqs[i].req); - blk->vqs[i].req = NULL; + struct vhost_blk_vq *blk_vq = &blk->vqs[i]; + + for (j = 0; blk_vq->req && j < blk_vq->vq.num; j++) + if (blk_vq->req[j].inflight) + vhost_blk_req_cleanup(&blk_vq->req[j]); + kvfree(blk_vq->req); + blk_vq->req = NULL; } fput(blk->backend); -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel