From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (unknown [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 1B3EB802A5 for ; Wed, 21 Oct 2026 08:47:56 +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 69L8kcox015304; Wed, 21 Oct 2026 11:46:39 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69L8kcox015304 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="JYvJYvTL" Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69L8kJxr015257 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Wed, 21 Oct 2026 11:46:19 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69L8kJxr015257 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4a0284121c6so4407515e9.3 for ; Wed, 21 Oct 2026 01:46:19 -0700 (PDT) X-Gm-Message-State: AFq9FYJTVFY+s2qZazmw3Si0W5y3hOVKdTI4Iyj4Zz4vxwKBaCDENvi/ xHnkFJRh9+z9KEhqA7/vKPjPQWRS+XgCJZmS9YPDgRcUPfNLLI8pKxDLvEbmWB3ScM8/yniT9Hl 4dNEItm+nwgiNc+bI75wDLq2j+wJoKmol/hRMcq9ZSQzWMdVVfSG/Zw== X-Gm-Gg: AYBFou2KxcUAfrEt4iEwrDGCdYPJW6lTWhssvyEQceb4BO0F3fs5P1Rk96wV99FK6E9 Y+EjS4/J4l8zlaWLva0vE67Df5AhWZ0fPYx5wXhOwbjGnMME8jYXo+ZpVF6tMeYFp8mdJPgcnAy TbGAdSJVkF5m27u1hxQP90GlyjOj6IvcuG4z8biCwrJql4nrGAHQCYQCdixpPnuV6f9+oEDF5OZ C7qTJwlyYTBuqJLVf0puQJjXEo8c85HoA6MsG/bZxpl2DqsLK/XOQCxx5r+n1yTADL+T8ukimH7 ah464A4xpdyGZKa3atumksRwxyvEWE37kn6j0Pdo5GzUUdTpvQu0n13EeMRmGywyrMghu1yPcTC NsZWv1LiCpOGa902kTWriC8CxDu8= X-Received: by 2002:a05:600c:3547:b0:4a1:dadf:9876 with SMTP id 5b1f17b1804b1-4a1fdd24cebmr27244515e9.23.1792572378862; Wed, 21 Oct 2026 01:46:18 -0700 (PDT) X-Received: by 2002:a05:600c:3547:b0:4a1:dadf:9876 with SMTP id 5b1f17b1804b1-4a1fdd24cebmr27244005e9.23.1792572378367; Wed, 21 Oct 2026 01:46:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1792572378; cv=none; d=google.com; s=arc-20260327; b=H9DmWHGX3MiK40QhNjUK5RAtzi5IxvPlvelSb9hx25RlgHvZWPWX8azl0X7OvpnZlA pYyOFYy4ApUKvKr5YSZIZw1AzI+lNbAKWimnoBVpkQDHnecf8u4xP2hmp8T+kdI6W2yW jLtuWKYvCB2S4qRCzmgbbGWewO9P3bsb3NQAGjmB/URY98lc9kR/s/SR8iDL8nSE/KTn vrPgJSlWcuQ7WHu5s5E9QuoLRuBFXdYk3eY6nD4Treey2rebUdguOufNvM+3QEICY17Y wYwjm27hdzzuIzc9XWX7YEGfYWOWtgK5uNe1LQ0iZ3OhLEudcmWMHOOLfKpA2XJAis8z yDXw== 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=3aoimfqMtg5on98opmRGEbJl3TW4k8/o5XAqf3ZjQcs=; fh=G2JGoeUCR4a/A0TH0K3bHnuxqhe+kjaX7a5tGdksR6A=; b=epSSmv8X6ChUhIO3BcPfjO/L5fMW7wbgw62kqmzWidMmPBleu6YQLBAoatP/C7vsZl rQwkNYZJ882E4xkRZoIL2AYXq+IkdB4bfi7asTPa4eJFmQJUxar/5nqoeL2DXOACky+P x+cRFi328S5jCk+dXVnGnO2Y4rscyznnUBJ+icycKzBiXgql3uQSTJjpUNMwHIYuSNQP z19GQpd3fydN5u2JNSR92mMyJVGuPS2WLpJTJd6W65RdQzWUI1qskz1kx2nQVXAnoqpZ A9hTBH3sXOjRwr+VIENQsnFe+cGNYsyIBWG8IZt0RkC0JzpdNcz2MZB92NiV4qWTou9x pqSw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=JYvJYvTL; 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-48e25846b3dsi3705617f8f.135.2026.10.21.01.46.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2026 01:46:18 -0700 (PDT) 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=JYvJYvTL; 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=3aoimfqMtg5on98opmRGEbJl3TW4k8/o5XAqf3ZjQcs=; b=JYvJYvTL2421 6mLTRFZRpjgQYT2T+/4lqhEylfpKPVs1kWS+aWw5QKYkUeN1ljy1FakHlcofYq3DQK6mxO7ywxAWJ QI6b03WM/nsMlkXw2MTdOc9KkLIXleWp9Yioo80sWu3bSO9/oUAcn/v6JN777gyDhDL9X+sGiUyg0 1/q2iTPAubiZVUsuCGbKy0Qf3aBKrs8aou1bdxdGTdCj07gIhPu56hFvJLk6CQapKkHRWwT+IAV8o qu+G0omC6OBd9wy7zpYmFINqQHcyjF004feNAAKwrBzPRpS4LEqoJ6/dv9cRDvUhzXNucPKWmN5Ya wMIPZ8ODoWQks7vPiWduDg==; 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 1xJRu6-00HAlf-2X; Wed, 21 Oct 2026 10:46:17 +0200 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Date: Wed, 21 Oct 2026 10:46:10 +0200 Message-ID: <20261021084610.1476738-4-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261021084610.1476738-1-alexander.ivanov@virtuozzo.com> References: <20261021084610.1476738-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 3/3] drivers/vhost/blk: take req->len from one side of the descriptor chain 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 req->len covered the whole descriptor chain, so both readable and writable data buffers became the payload. A read wrote disk data into device-readable buffers and reported them as used, a write sent the guest's writable buffers to disk. Take write data only from the readable part and the payload of other requests only from the writable part, as QEMU does. Read the status byte from the end of the writable part. Complete a read or write with VIRTIO_BLK_S_IOERR if its payload is empty, above ALIGN_DOWN(INT_MAX, SECTOR_SIZE) or, for a write, not a multiple of SECTOR_SIZE. Such requests used to fail in bio setup or hit a WARN_ONCE() and leave the guest request hanging. Drop the now unreachable WARN_ONCE(). https://virtuozzo.atlassian.net/browse/VSTOR-142755 Fixes: 1629db092dd7 ("drivers/vhost: vhost-blk accelerator for virtio-blk guests") Fixes: 02ce37f62707 ("vhost-blk: add bounce-buffer for non-aligned requests") Feature: vhost-blk: in-kernel accelerator for virtio-blk guests Signed-off-by: Alexander Ivanov --- drivers/vhost/blk.c | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/drivers/vhost/blk.c b/drivers/vhost/blk.c index 94317a5f2cb6..3448910f9046 100644 --- a/drivers/vhost/blk.c +++ b/drivers/vhost/blk.c @@ -277,12 +277,6 @@ static int vhost_blk_bio_make(struct vhost_blk_req *req, if (unlikely(req->bi_opf & REQ_PREFLUSH)) return vhost_blk_bio_make_simple(req, bdev); - if (req->bi_opf == REQ_OP_WRITE && !IS_ALIGNED(req->len, SECTOR_SIZE)) { - WARN_ONCE(1, "vhost-blk: write requests with unaligned len" - " are not supported, len = %zu", req->len); - return -EINVAL; - } - /* * Requests with unaligned io vectors are not supported by underlined * block device, let's use an aligned intermediary "bounce buffer" to @@ -450,10 +444,10 @@ static int vhost_blk_req_handle(struct vhost_virtqueue *vq, struct vhost_blk *blk = container_of(vq->dev, struct vhost_blk, dev); struct vhost_blk_vq *blk_vq = container_of(vq, struct vhost_blk_vq, vq); struct vhost_blk_req *req; - u16 total_iov_nr = out + in; + struct iovec *data_iov, *st; struct iov_iter iter; size_t in_len; - int ret, len; + int ret, len, data_nr; u32 type; u8 status; @@ -470,14 +464,37 @@ static int vhost_blk_req_handle(struct vhost_virtqueue *vq, if (in_len < sizeof(status) || in_len > INT_MAX) return -EINVAL; - req->len = iov_length(vq->iov, total_iov_nr) - sizeof(status); - req->iov_nr = move_iovec(vq->iov, req->iov, req->len, total_iov_nr, + /* The status is the last byte of the device-writable part */ + for (st = vq->iov + out + in - 1; !st->iov_len; st--) + ; + st->iov_len -= sizeof(status); + req->status[0].iov_base = st->iov_base + st->iov_len; + req->status[0].iov_len = sizeof(status); + + if (type == VIRTIO_BLK_T_OUT) { + data_iov = vq->iov; + data_nr = out; + } else { + data_iov = vq->iov + out; + data_nr = in; + } + + req->len = iov_length(data_iov, data_nr); + + if ((type == VIRTIO_BLK_T_IN || type == VIRTIO_BLK_T_OUT) && + (!req->len || req->len > ALIGN_DOWN(INT_MAX, SECTOR_SIZE) || + (type == VIRTIO_BLK_T_OUT && !IS_ALIGNED(req->len, SECTOR_SIZE)))) { + ret = vhost_blk_set_status(req, VIRTIO_BLK_S_IOERR); + if (!ret) + vhost_add_used_and_signal(&blk->dev, vq, head, sizeof(status)); + return ret; + } + + req->iov_nr = move_iovec(data_iov, req->iov, req->len, data_nr, ARRAY_SIZE(blk_vq->iov)); req->bb = NULL; - ret = move_iovec(vq->iov, req->status, sizeof(status), total_iov_nr, - ARRAY_SIZE(req->status)); - if (ret < 0 || req->iov_nr < 0) + if (req->iov_nr < 0) return -EINVAL; switch (type) { -- 2.53.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel