From nobody Mon Feb 9 17:22:55 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83F1933893E; Wed, 17 Dec 2025 09:41:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765964500; cv=none; b=HNVhroOVURER7M5PCFxnfUBELFcTILgt4zFsoLFih1JX8bEK99jf67aRIXRGUEBTjj0sMdb58Cx8FWQwofVMmUesQXmyqQzx4AAz7dbk1AChMiFztM2GnlwThu5pMSlHQ2P6/6/5ylv5PFTt41ntOLCepoeSFpIrx4ClbBtzOVY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765964500; c=relaxed/simple; bh=bhmUjCgORYgMLhD23jxTIthHkqK7rsSxHpOwfaP7JV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FrL4zMaucUrN9PGaARRvrlasgjeswI97xnwO6G13ysyYE7wclnTnRJU9ouZTvcI/CxE4geTQsPB5jAIFMt9ppGk1e3yxZsEiQamdpzWOLBr4aN151jE5KrBfmaDE5l179yJEcZ9x/+V/VStjyo6p+Te35dOkghCR7xPw1iG518M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bFDtizeV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bFDtizeV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44055C4CEFB; Wed, 17 Dec 2025 09:41:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765964499; bh=bhmUjCgORYgMLhD23jxTIthHkqK7rsSxHpOwfaP7JV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bFDtizeVSbnSht7m+d06svueBoFPM0X0UQfEp/6oNW+CjVu5JBy7pAFEP6SjnSN9X QmuwxSWlvF1MIskAkqrhBGRxLP5rBwK0U8FglsU/3/dE6+pfca2kahS1WgGfK9IPW6 BSGcjZ3+pLxrs8glq5JF/MisVi4LMa+cqebG8WgoeDGbbvhF3+fu+O8zkIoaiLUtke zCJ/9Ii/AmLy45XsGbyVL9VbNdh1yVpV/HdkbztsSwtKNNOHIeZpYCkDDA6/tI0IUC 8YeAC3XzIoDTbQwq6CWk7Ow+E3v2mHihE7yrkDhzyTRyGl8Jsmhr9kGzfHE4RP1aE6 /a7hjqy64Gb2w== From: Leon Romanovsky To: Jens Axboe , Keith Busch , Christoph Hellwig , Sagi Grimberg Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, Chaitanya Kulkarni Subject: [PATCH v3 1/2] nvme-pci: Use size_t for length fields to handle larger sizes Date: Wed, 17 Dec 2025 11:41:23 +0200 Message-ID: <20251217-nvme-phys-types-v3-1-f27fd1608f48@nvidia.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251217-nvme-phys-types-v3-0-f27fd1608f48@nvidia.com> References: <20251217-nvme-phys-types-v3-0-f27fd1608f48@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.15-dev-a6db3 Content-Transfer-Encoding: quoted-printable From: Leon Romanovsky This patch changes the length variables from unsigned int to size_t. Using size_t ensures that we can handle larger sizes, as size_t is always equal to or larger than the previously used u32 type. Originally, u32 was used because blk-mq-dma code evolved from scatter-gather implementation, which uses unsigned int to describe length. This change will also allow us to reuse the existing struct phys_vec in pla= ces that don't need scatter-gather. Signed-off-by: Leon Romanovsky Reviewed-by: Chaitanya Kulkarni --- block/blk-mq-dma.c | 8 ++++++-- drivers/nvme/host/pci.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/block/blk-mq-dma.c b/block/blk-mq-dma.c index fb018fffffdc..a2bedc8f8666 100644 --- a/block/blk-mq-dma.c +++ b/block/blk-mq-dma.c @@ -8,7 +8,7 @@ =20 struct phys_vec { phys_addr_t paddr; - u32 len; + size_t len; }; =20 static bool __blk_map_iter_next(struct blk_map_iter *iter) @@ -112,8 +112,8 @@ static bool blk_rq_dma_map_iova(struct request *req, st= ruct device *dma_dev, struct phys_vec *vec) { enum dma_data_direction dir =3D rq_dma_dir(req); - unsigned int mapped =3D 0; unsigned int attrs =3D 0; + size_t mapped =3D 0; int error; =20 iter->addr =3D state->addr; @@ -297,6 +297,8 @@ int __blk_rq_map_sg(struct request *rq, struct scatterl= ist *sglist, blk_rq_map_iter_init(rq, &iter); while (blk_map_iter_next(rq, &iter, &vec)) { *last_sg =3D blk_next_sg(last_sg, sglist); + + WARN_ON_ONCE(overflows_type(vec.len, unsigned int)); sg_set_page(*last_sg, phys_to_page(vec.paddr), vec.len, offset_in_page(vec.paddr)); nsegs++; @@ -417,6 +419,8 @@ int blk_rq_map_integrity_sg(struct request *rq, struct = scatterlist *sglist) =20 while (blk_map_iter_next(rq, &iter, &vec)) { sg =3D blk_next_sg(&sg, sglist); + + WARN_ON_ONCE(overflows_type(vec.len, unsigned int)); sg_set_page(sg, phys_to_page(vec.paddr), vec.len, offset_in_page(vec.paddr)); segments++; diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 0e4caeab739c..3b528369f545 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -290,14 +290,14 @@ struct nvme_iod { u8 flags; u8 nr_descriptors; =20 - unsigned int total_len; + size_t total_len; struct dma_iova_state dma_state; void *descriptors[NVME_MAX_NR_DESCRIPTORS]; struct nvme_dma_vec *dma_vecs; unsigned int nr_dma_vecs; =20 dma_addr_t meta_dma; - unsigned int meta_total_len; + size_t meta_total_len; struct dma_iova_state meta_dma_state; struct nvme_sgl_desc *meta_descriptor; }; --=20 2.51.1