From nobody Tue Nov 18 04:26:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607362775; cv=none; d=zohomail.com; s=zohoarc; b=d/8+DmFDUZR0Y0w/CLISbQkRCk7ooRVKTdxtm4rKSK3i4vnOlLhyxLGkCTuFFNktdw0mrnJyf+FPKUTpHIUdXR0rrD1nRPnkaC33XlO8fQnNfHvSjK8llTI/jh35CEeg2a16KOK45DKVw1ayWxkNSYZ3UFI11rc+XYqwlFDHoWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607362775; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n7AHppB5qS0Cr4vxZqRqj01DvVFATiY+1OKAenycsvE=; b=kBFQNyYKfyHJflEJ2ivdnkJmVJrPB02Bqo65Jagxmmg3F6mn1Bdyg3mgb2/2n3ezCVe8lkVhLJQFdj39rpLMaansd+s6TgTt3NJbhTT3mf1lbgbEoRmTVcD0uJBu/qhyjuWF5PQqTvQUHtJXGggCt7C6a6rhCfjy4k5EDejeFLI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607362775972886.1208828989278; Mon, 7 Dec 2020 09:39:35 -0800 (PST) Received: from localhost ([::1]:53704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmKU2-0003Tz-Mg for importer@patchew.org; Mon, 07 Dec 2020 12:39:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmKGR-0001F1-Fe for qemu-devel@nongnu.org; Mon, 07 Dec 2020 12:25:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45024) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmKGO-00074F-C1 for qemu-devel@nongnu.org; Mon, 07 Dec 2020 12:25:30 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-279-gaoKWvg9OnuGl5UMQmfNFA-1; Mon, 07 Dec 2020 12:25:26 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E6E071842141; Mon, 7 Dec 2020 17:25:24 +0000 (UTC) Received: from localhost (ovpn-114-128.ams2.redhat.com [10.36.114.128]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53D1210016FE; Mon, 7 Dec 2020 17:25:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607361927; 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=n7AHppB5qS0Cr4vxZqRqj01DvVFATiY+1OKAenycsvE=; b=MQYrWt9akAPK9kM12cajKEtpq1Ko4JeMUuGP9AWrF8fbryC+AgpD44q5zR+Os7HymDye4P +OIHGA8ImRmlWBa1Rv3GkOEo9ezH+CLtvLs9EYL7hqpbkSMuZ6DKVj1y91D771NOVQ7TvT WjiQ5KWFN5rfpimiWaeWoHo6gP+yyHg= X-MC-Unique: gaoKWvg9OnuGl5UMQmfNFA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v2 10/12] block/export: port virtio-blk discard/write zeroes input validation Date: Mon, 7 Dec 2020 17:20:28 +0000 Message-Id: <20201207172030.251905-11-stefanha@redhat.com> In-Reply-To: <20201207172030.251905-1-stefanha@redhat.com> References: <20201207172030.251905-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Kevin Wolf , Thomas Huth , qemu-block@nongnu.org, Peter Maydell , "Michael S . Tsirkin" , Coiby Xu , Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Raphael Norwitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Validate discard/write zeroes the same way we do for virtio-blk. Some of these checks are mandated by the VIRTIO specification, others are internal to QEMU. Signed-off-by: Stefan Hajnoczi --- block/export/vhost-user-blk-server.c | 116 +++++++++++++++++++++------ 1 file changed, 93 insertions(+), 23 deletions(-) diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user= -blk-server.c index bb07f499c8..937bb5e9b4 100644 --- a/block/export/vhost-user-blk-server.c +++ b/block/export/vhost-user-blk-server.c @@ -29,6 +29,8 @@ =20 enum { VHOST_USER_BLK_NUM_QUEUES_DEFAULT =3D 1, + VHOST_USER_BLK_MAX_DISCARD_SECTORS =3D 32768, + VHOST_USER_BLK_MAX_WRITE_ZEROES_SECTORS =3D 32768, }; struct virtio_blk_inhdr { unsigned char status; @@ -65,30 +67,102 @@ static void vu_blk_req_complete(VuBlkReq *req) free(req); } =20 +static bool vu_blk_sect_range_ok(VuBlkExport *vexp, uint64_t sector, + size_t size) +{ + uint64_t nb_sectors =3D size >> BDRV_SECTOR_BITS; + uint64_t total_sectors; + + if (nb_sectors > BDRV_REQUEST_MAX_SECTORS) { + return false; + } + if ((sector << VIRTIO_BLK_SECTOR_BITS) % vexp->blk_size) { + return false; + } + blk_get_geometry(vexp->export.blk, &total_sectors); + if (sector > total_sectors || nb_sectors > total_sectors - sector) { + return false; + } + return true; +} + static int coroutine_fn -vu_blk_discard_write_zeroes(BlockBackend *blk, struct iovec *iov, +vu_blk_discard_write_zeroes(VuBlkExport *vexp, struct iovec *iov, uint32_t iovcnt, uint32_t type) { + BlockBackend *blk =3D vexp->export.blk; struct virtio_blk_discard_write_zeroes desc; - ssize_t size =3D iov_to_buf(iov, iovcnt, 0, &desc, sizeof(desc)); + ssize_t size; + uint64_t sector; + uint32_t num_sectors; + uint32_t max_sectors; + uint32_t flags; + int bytes; + + /* Only one desc is currently supported */ + if (unlikely(iov_size(iov, iovcnt) > sizeof(desc))) { + return VIRTIO_BLK_S_UNSUPP; + } + + size =3D iov_to_buf(iov, iovcnt, 0, &desc, sizeof(desc)); if (unlikely(size !=3D sizeof(desc))) { - error_report("Invalid size %zd, expect %zu", size, sizeof(desc)); - return -EINVAL; + error_report("Invalid size %zd, expected %zu", size, sizeof(desc)); + return VIRTIO_BLK_S_IOERR; } =20 - uint64_t range[2] =3D { le64_to_cpu(desc.sector) << 9, - le32_to_cpu(desc.num_sectors) << 9 }; - if (type =3D=3D VIRTIO_BLK_T_DISCARD) { - if (blk_co_pdiscard(blk, range[0], range[1]) =3D=3D 0) { - return 0; + sector =3D le64_to_cpu(desc.sector); + num_sectors =3D le32_to_cpu(desc.num_sectors); + flags =3D le32_to_cpu(desc.flags); + max_sectors =3D (type =3D=3D VIRTIO_BLK_T_WRITE_ZEROES) ? + VHOST_USER_BLK_MAX_WRITE_ZEROES_SECTORS : + VHOST_USER_BLK_MAX_DISCARD_SECTORS; + + /* This check ensures that 'bytes' fits in an int */ + if (unlikely(num_sectors > max_sectors)) { + return VIRTIO_BLK_S_IOERR; + } + + bytes =3D num_sectors << VIRTIO_BLK_SECTOR_BITS; + + if (unlikely(!vu_blk_sect_range_ok(vexp, sector, bytes))) { + return VIRTIO_BLK_S_IOERR; + } + + /* + * The device MUST set the status byte to VIRTIO_BLK_S_UNSUPP for disc= ard + * and write zeroes commands if any unknown flag is set. + */ + if (unlikely(flags & ~VIRTIO_BLK_WRITE_ZEROES_FLAG_UNMAP)) { + return VIRTIO_BLK_S_UNSUPP; + } + + if (type =3D=3D VIRTIO_BLK_T_WRITE_ZEROES) { + int blk_flags =3D 0; + + if (flags & VIRTIO_BLK_WRITE_ZEROES_FLAG_UNMAP) { + blk_flags |=3D BDRV_REQ_MAY_UNMAP; + } + + if (blk_co_pwrite_zeroes(blk, sector << VIRTIO_BLK_SECTOR_BITS, + bytes, blk_flags) =3D=3D 0) { + return VIRTIO_BLK_S_OK; + } + } else if (type =3D=3D VIRTIO_BLK_T_DISCARD) { + /* + * The device MUST set the status byte to VIRTIO_BLK_S_UNSUPP for + * discard commands if the unmap flag is set. + */ + if (unlikely(flags & VIRTIO_BLK_WRITE_ZEROES_FLAG_UNMAP)) { + return VIRTIO_BLK_S_UNSUPP; } - } else if (type =3D=3D VIRTIO_BLK_T_WRITE_ZEROES) { - if (blk_co_pwrite_zeroes(blk, range[0], range[1], 0) =3D=3D 0) { - return 0; + + if (blk_co_pdiscard(blk, sector << VIRTIO_BLK_SECTOR_BITS, + bytes) =3D=3D 0) { + return VIRTIO_BLK_S_OK; } } =20 - return -EINVAL; + return VIRTIO_BLK_S_IOERR; } =20 static void coroutine_fn vu_blk_virtio_process_req(void *opaque) @@ -177,19 +251,13 @@ static void coroutine_fn vu_blk_virtio_process_req(vo= id *opaque) } case VIRTIO_BLK_T_DISCARD: case VIRTIO_BLK_T_WRITE_ZEROES: { - int rc; - if (!vexp->writable) { req->in->status =3D VIRTIO_BLK_S_IOERR; break; } =20 - rc =3D vu_blk_discard_write_zeroes(blk, &elem->out_sg[1], out_num,= type); - if (rc =3D=3D 0) { - req->in->status =3D VIRTIO_BLK_S_OK; - } else { - req->in->status =3D VIRTIO_BLK_S_IOERR; - } + req->in->status =3D vu_blk_discard_write_zeroes(vexp, out_iov, out= _num, + type); break; } default: @@ -360,11 +428,13 @@ vu_blk_initialize_config(BlockDriverState *bs, config->min_io_size =3D cpu_to_le16(1); config->opt_io_size =3D cpu_to_le32(1); config->num_queues =3D cpu_to_le16(num_queues); - config->max_discard_sectors =3D cpu_to_le32(32768); + config->max_discard_sectors =3D + cpu_to_le32(VHOST_USER_BLK_MAX_DISCARD_SECTORS); config->max_discard_seg =3D cpu_to_le32(1); config->discard_sector_alignment =3D cpu_to_le32(blk_size >> VIRTIO_BLK_SECTOR_BITS); - config->max_write_zeroes_sectors =3D cpu_to_le32(32768); + config->max_write_zeroes_sectors + =3D cpu_to_le32(VHOST_USER_BLK_MAX_WRITE_ZEROES_SECTORS); config->max_write_zeroes_seg =3D cpu_to_le32(1); } =20 --=20 2.28.0