From nobody Sun Apr 28 16:31:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1564487333; cv=none; d=zoho.com; s=zohoarc; b=KmGx0sXc0dIpQW5yOyi7jF4LkEDrmBJCv7IDi9YmjnaH+OaYiswMeWC3fVoxrpxKfDpIBv+3DJoLIhjrcsbRSDxsg/VPLGxUU3apxkHry+BXbNiJRqCiZTuNqRzIuK1r9cgIMMjEuxBTaxfdBArWofBhI7J9G1hE09U9QsYvNpo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564487333; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=vqmPJ7kVAJ7MZu5pzznaa5+7zszQKEtYHCCXPil8gww=; b=Q29sRI8wBhx9TOpRW31lGbWYmUQTm8o6jCokix/SVgRw+XC/2B9eeKtRPMijoBwnqcqgMl/yWyi5b4kD/l46RU4Bh0s5m3rBS1YVOyYzUQ4gYjEqNv0rtZml+bCIO8DVFLMy+VJTRQjbymEgYXEPsnRUQzatB0gDvZRNgDEzf6c= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1564487333855183.69457238681252; Tue, 30 Jul 2019 04:48:53 -0700 (PDT) Received: from localhost ([::1]:59998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsQcb-0006cH-Lu for importer@patchew.org; Tue, 30 Jul 2019 07:48:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56414) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsQc6-00065u-JO for qemu-devel@nongnu.org; Tue, 30 Jul 2019 07:48:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsQc5-00028e-HM for qemu-devel@nongnu.org; Tue, 30 Jul 2019 07:48:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53878) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hsQc3-00021u-9Y; Tue, 30 Jul 2019 07:48:15 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9097C12BE; Tue, 30 Jul 2019 11:48:14 +0000 (UTC) Received: from localhost (ovpn-116-164.ams2.redhat.com [10.36.116.164]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 337C460BE5; Tue, 30 Jul 2019 11:48:14 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Tue, 30 Jul 2019 13:48:12 +0200 Message-Id: <20190730114812.10493-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 30 Jul 2019 11:48:14 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-4.1?] nvme: Limit blkshift to 12 (for 4 kB blocks) 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: Kevin Wolf , Fam Zheng , Maxim Levitsky , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Linux does not support blocks greater than 4 kB anyway, so we might as well limit blkshift to 12 and thus save us from some potential trouble. Reported-by: Peter Maydell Suggested-by: Maxim Levitsky Signed-off-by: Max Reitz Reviewed-by: Maxim Levitsky --- I won't be around for too long today, so I thought I'd just write a patch myself now. --- block/nvme.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/block/nvme.c b/block/nvme.c index c28755cc31..2c85713519 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -105,7 +105,7 @@ typedef struct { =20 uint64_t nsze; /* Namespace size reported by identify command */ int nsid; /* The namespace id to read/write data. */ - size_t blkshift; + int blkshift; =20 uint64_t max_transfer; bool plugged; @@ -420,7 +420,7 @@ static void nvme_identify(BlockDriverState *bs, int nam= espace, Error **errp) NvmeIdNs *idns; NvmeLBAF *lbaf; uint8_t *resp; - int r, hwsect_size; + int r; uint64_t iova; NvmeCmd cmd =3D { .opcode =3D NVME_ADM_CMD_IDENTIFY, @@ -474,11 +474,11 @@ static void nvme_identify(BlockDriverState *bs, int n= amespace, Error **errp) goto out; } =20 - hwsect_size =3D 1 << lbaf->ds; - - if (hwsect_size < BDRV_SECTOR_SIZE || hwsect_size > s->page_size) { - error_setg(errp, "Namespace has unsupported block size (%d)", - hwsect_size); + if (lbaf->ds < BDRV_SECTOR_BITS || lbaf->ds > 12 || + (1 << lbaf->ds) > s->page_size) + { + error_setg(errp, "Namespace has unsupported block size (2^%d)", + lbaf->ds); goto out; } =20 @@ -804,16 +804,16 @@ static int64_t nvme_getlength(BlockDriverState *bs) return s->nsze << s->blkshift; } =20 -static int64_t nvme_get_blocksize(BlockDriverState *bs) +static uint32_t nvme_get_blocksize(BlockDriverState *bs) { BDRVNVMeState *s =3D bs->opaque; - assert(s->blkshift >=3D BDRV_SECTOR_BITS); - return 1 << s->blkshift; + assert(s->blkshift >=3D BDRV_SECTOR_BITS && s->blkshift <=3D 12); + return UINT32_C(1) << s->blkshift; } =20 static int nvme_probe_blocksizes(BlockDriverState *bs, BlockSizes *bsz) { - int64_t blocksize =3D nvme_get_blocksize(bs); + uint32_t blocksize =3D nvme_get_blocksize(bs); bsz->phys =3D blocksize; bsz->log =3D blocksize; return 0; --=20 2.21.0