From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id DFD73C369D3 for ; Mon, 28 Apr 2025 09:24:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B36E56B00A0; Mon, 28 Apr 2025 05:24:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ADDF66B00A1; Mon, 28 Apr 2025 05:24:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 90B8D6B00A2; Mon, 28 Apr 2025 05:24:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 6E76B6B00A0 for ; Mon, 28 Apr 2025 05:24:10 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B971E5D8A8 for ; Mon, 28 Apr 2025 09:24:11 +0000 (UTC) X-FDA: 83382916302.19.1E140FE Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf27.hostedemail.com (Postfix) with ESMTP id 14E044000C for ; Mon, 28 Apr 2025 09:24:09 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="G/Ukn2zS"; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf27.hostedemail.com: domain of leon@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745832250; a=rsa-sha256; cv=none; b=ua4fhnHkWJOBNI8tbtfEuCIQJXZ66qTYf5jJLJza+E0cPJtRUKh8QgFxwTVwMPUZXWh9zK fn0cAng92vpnvWN2gthW/wreYL8xRzEqPrxBVKR5QWI7fKHGG594r5MQa9Ivzfn42IF/mG 3UcJobixeoPUMVLNLf/3uVdHlI/Eg1U= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="G/Ukn2zS"; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf27.hostedemail.com: domain of leon@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745832250; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=W6Sf5HF6wK2zSXMRmSetEddD6WjqlO4aIF9w7KgOU+8=; b=CVgyqLPXiIvNFq/VhPbD6WgDqIM38cxCwjfaNessBpJ7icnP7ncT8rJ9mMy1Yn1x96htAa dOIylcNBy5TtKNpe3Qt2RId/JWDQjxNUehNN1CUmtO+4Jr2GwILZ4ocuDeiJqih+TvgqV8 2QCphmsXTQwGigcvhtcU1rDvyCHIPkQ= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 1E8FD438EC; Mon, 28 Apr 2025 09:24:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32880C4CEF1; Mon, 28 Apr 2025 09:24:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745832249; bh=UaKpIS/gS7437zv6/V/pxWOCRAoH+oFaLCUvPin30s0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G/Ukn2zSIrjyDxxMBbuxC8G0NNgq427GlA1UdIt9h8WdAt09mSJLJAba2Uk1lLjdc hH7iI67XbyEfiLiAGReOTrPmgM+2w6SXxCJhYj0DC/2JppgeGqGcc8yp0T02GPKplm cxh7af7jGCCF9Z1YVpTA5n7AZuT01VsUpgTbUveUSNG0zsBx2D91spU8nHzbKdRJPk gcuUZzojGyQ2vTalz6AsYECS4vE2AKqovwQhgogBprkg3X9XO2QD386PwCYLTjClDm L2sa6AahrrOtplIHyeQQ0WtZk2mTFeZYNwAoQ0Zr4eUW7xrMGIsTElcXX97TUuMb9O RMHi0c0PYikjA== From: Leon Romanovsky To: Marek Szyprowski , Jens Axboe , Christoph Hellwig , Keith Busch Cc: Jake Edge , Jonathan Corbet , Jason Gunthorpe , Zhu Yanjun , Robin Murphy , Joerg Roedel , Will Deacon , Sagi Grimberg , Bjorn Helgaas , Logan Gunthorpe , Yishai Hadas , Shameer Kolothum , Kevin Tian , Alex Williamson , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Andrew Morton , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-rdma@vger.kernel.org, iommu@lists.linux.dev, linux-nvme@lists.infradead.org, linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org, Niklas Schnelle , Chuck Lever , Luis Chamberlain , Matthew Wilcox , Dan Williams , Kanchan Joshi , Chaitanya Kulkarni , Leon Romanovsky Subject: [PATCH v10 21/24] nvme-pci: remove struct nvme_descriptor Date: Mon, 28 Apr 2025 12:22:27 +0300 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 14E044000C X-Stat-Signature: fqeqo9onwwy4r47hqzcjwgi1inpko5fr X-Rspam-User: X-HE-Tag: 1745832249-59327 X-HE-Meta: U2FsdGVkX1/FSjQA4KfHRPupuUniKDqZYIMhbaQvUzlA7kztpq4sJD8siIUNBZBaUu64fIVeLBgBd6zKNL0/SWTYXsvfAFJTeQ+6I4Gb1EJvGT1YYaTY7deeV7K7pU3PLSbulgcUCBdaQ6TkLlx/LF4AVaaiTbeXVIIR6mu/DE1wIGHKg7MGcNBFb6BC/5RZkA3A6DxJlpIZ4rCH39834ulB5AgPWFQQCgLGxnW/z/jWpef4FDiB+vbf7vt1bZlurTcNHgWHLMs0DN86Bmkh/RjXz+b6ghxYHlvSzL67oCOOlu0x7E1kq1s9ckbvueG324p1w2Rj1zlLlaI5+QI9+7LHpOZVyBS/GM/ve8sC2uxQ9bVum9iOrmUV/GAQ4tVxcwxHFPoBpdDAsUF8L/B6iksv7QZNe46xUC9YcRihDby5fFpzPZQBN3xSUFx2mNjg3kQnDaPx+keGhSpiJt0Uu4fT7IViSWb1pEnwzyusNsA7HMyjWF0b/Gv1K0s9t9dF9VXDX5bNxorJUgv8akVkJHHjgWmd5uYDpqUrSNpXD5LTh+CltrHIYWfrB1ntaoUGKTo70lUFs7LZOPjDohkrtc2GfgdLM6SlJarfYYaupS2yl+ZMvmSLilQ6ncn1hAnj7yZ5D9t2WB5Gu/DfKndabpBqzZj4O0Bt6QsZw9Ffcal7uo0EglkIiF2owzFsXTpJVK9BO8/VRQ7ZK+2BpwxwZfEE7yZxY1dxNRCbBFj7updTaam601V+UYlWFLylGhQZPQDbTQEO3rV9OC2mSkk6FGiOn+yBgqszNQ0u1luXzU6rVY6WtEiB856DL1hzk0jFljJDUnFo49Xqg0CoLL6QCCd04HSGvJyDuVXurY308zpEb6mS7oEdo4yJ3audyOQ4UYE9CpCCyqeo6zQN4bR62CT5FJ5t83VkikGgLq7hv4xNHC2iyS6mJsXr5mlpYCg1FUlO1cFTeK/E9Gjkm8P pXrh1dK1 XzLsEtdWqk1dv4FOtli5+UGJJEBh/GeK+fNFSn34rymkp5FqS5xZuwCagKSaLlP6N8NwrFSgOdBZ9Ffhm5yFrRmA2VjNr5Fs7VxBHbcV7My/uXnORwOagxt+Cda4UFfakgL2ZtEOE4QnTdS5RPNPj40HnFFzf839IBKGqxa1ZOefmd4nPdCrYAEtyKOiz0cAxY1w2MY//UKdy2mYpXL6EVHXhME3FL0l8qKh9FUwPu11b5iws6ZwfcbwPUtpMHjnvEydNqYfeMReMx1U8PSINmod44CWLE2j5K68PBZDcg1ZTv0yEl+MBXfw6AhCjhaSylAzP X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Christoph Hellwig There is no real point in having a union of two pointer types here, just use a void pointer as we mix and match types between the arms of the union between the allocation and freeing side already. Also rename the nr_allocations field to nr_descriptors to better describe what it does. Signed-off-by: Christoph Hellwig Tested-by: Jens Axboe Signed-off-by: Leon Romanovsky --- drivers/nvme/host/pci.c | 57 +++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index b178d52eac1b..638e759b29ad 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -43,7 +43,7 @@ #define NVME_MAX_KB_SZ 8192 #define NVME_MAX_SEGS 128 #define NVME_MAX_META_SEGS 15 -#define NVME_MAX_NR_ALLOCATIONS 5 +#define NVME_MAX_NR_DESCRIPTORS 5 static int use_threaded_interrupts; module_param(use_threaded_interrupts, int, 0444); @@ -219,30 +219,22 @@ struct nvme_queue { struct completion delete_done; }; -union nvme_descriptor { - struct nvme_sgl_desc *sg_list; - __le64 *prp_list; -}; - /* * The nvme_iod describes the data in an I/O. - * - * The sg pointer contains the list of PRP/SGL chunk allocations in addition - * to the actual struct scatterlist. */ struct nvme_iod { struct nvme_request req; struct nvme_command cmd; bool aborted; - s8 nr_allocations; /* PRP list pool allocations. 0 means small - pool in use */ + /* # of PRP/SGL descriptors: (0 for small pool) */ + s8 nr_descriptors; unsigned int dma_len; /* length of single DMA segment mapping */ dma_addr_t first_dma; dma_addr_t meta_dma; struct sg_table sgt; struct sg_table meta_sgt; - union nvme_descriptor meta_list; - union nvme_descriptor list[NVME_MAX_NR_ALLOCATIONS]; + void *meta_list; + void *descriptors[NVME_MAX_NR_DESCRIPTORS]; }; static inline unsigned int nvme_dbbuf_size(struct nvme_dev *dev) @@ -544,8 +536,8 @@ static void nvme_free_prps(struct nvme_dev *dev, struct request *req) dma_addr_t dma_addr = iod->first_dma; int i; - for (i = 0; i < iod->nr_allocations; i++) { - __le64 *prp_list = iod->list[i].prp_list; + for (i = 0; i < iod->nr_descriptors; i++) { + __le64 *prp_list = iod->descriptors[i]; dma_addr_t next_dma_addr = le64_to_cpu(prp_list[last_prp]); dma_pool_free(dev->prp_page_pool, prp_list, dma_addr); @@ -567,11 +559,11 @@ static void nvme_unmap_data(struct nvme_dev *dev, struct request *req) dma_unmap_sgtable(dev->dev, &iod->sgt, rq_dma_dir(req), 0); - if (iod->nr_allocations == 0) - dma_pool_free(dev->prp_small_pool, iod->list[0].sg_list, + if (iod->nr_descriptors == 0) + dma_pool_free(dev->prp_small_pool, iod->descriptors[0], iod->first_dma); - else if (iod->nr_allocations == 1) - dma_pool_free(dev->prp_page_pool, iod->list[0].sg_list, + else if (iod->nr_descriptors == 1) + dma_pool_free(dev->prp_page_pool, iod->descriptors[0], iod->first_dma); else nvme_free_prps(dev, req); @@ -629,18 +621,18 @@ static blk_status_t nvme_pci_setup_prps(struct nvme_dev *dev, nprps = DIV_ROUND_UP(length, NVME_CTRL_PAGE_SIZE); if (nprps <= (256 / 8)) { pool = dev->prp_small_pool; - iod->nr_allocations = 0; + iod->nr_descriptors = 0; } else { pool = dev->prp_page_pool; - iod->nr_allocations = 1; + iod->nr_descriptors = 1; } prp_list = dma_pool_alloc(pool, GFP_ATOMIC, &prp_dma); if (!prp_list) { - iod->nr_allocations = -1; + iod->nr_descriptors = -1; return BLK_STS_RESOURCE; } - iod->list[0].prp_list = prp_list; + iod->descriptors[0] = prp_list; iod->first_dma = prp_dma; i = 0; for (;;) { @@ -649,7 +641,7 @@ static blk_status_t nvme_pci_setup_prps(struct nvme_dev *dev, prp_list = dma_pool_alloc(pool, GFP_ATOMIC, &prp_dma); if (!prp_list) goto free_prps; - iod->list[iod->nr_allocations++].prp_list = prp_list; + iod->descriptors[iod->nr_descriptors++] = prp_list; prp_list[0] = old_prp_list[i - 1]; old_prp_list[i - 1] = cpu_to_le64(prp_dma); i = 1; @@ -719,19 +711,19 @@ static blk_status_t nvme_pci_setup_sgls(struct nvme_dev *dev, if (entries <= (256 / sizeof(struct nvme_sgl_desc))) { pool = dev->prp_small_pool; - iod->nr_allocations = 0; + iod->nr_descriptors = 0; } else { pool = dev->prp_page_pool; - iod->nr_allocations = 1; + iod->nr_descriptors = 1; } sg_list = dma_pool_alloc(pool, GFP_ATOMIC, &sgl_dma); if (!sg_list) { - iod->nr_allocations = -1; + iod->nr_descriptors = -1; return BLK_STS_RESOURCE; } - iod->list[0].sg_list = sg_list; + iod->descriptors[0] = sg_list; iod->first_dma = sgl_dma; nvme_pci_sgl_set_seg(&cmd->dptr.sgl, sgl_dma, entries); @@ -870,7 +862,7 @@ static blk_status_t nvme_pci_setup_meta_sgls(struct nvme_dev *dev, goto out_unmap_sg; entries = iod->meta_sgt.nents; - iod->meta_list.sg_list = sg_list; + iod->meta_list = sg_list; iod->meta_dma = sgl_dma; cmnd->flags = NVME_CMD_SGL_METASEG; @@ -923,7 +915,7 @@ static blk_status_t nvme_prep_rq(struct nvme_dev *dev, struct request *req) blk_status_t ret; iod->aborted = false; - iod->nr_allocations = -1; + iod->nr_descriptors = -1; iod->sgt.nents = 0; iod->meta_sgt.nents = 0; @@ -1048,8 +1040,7 @@ static __always_inline void nvme_unmap_metadata(struct nvme_dev *dev, return; } - dma_pool_free(dev->prp_small_pool, iod->meta_list.sg_list, - iod->meta_dma); + dma_pool_free(dev->prp_small_pool, iod->meta_list, iod->meta_dma); dma_unmap_sgtable(dev->dev, &iod->meta_sgt, rq_dma_dir(req), 0); mempool_free(iod->meta_sgt.sgl, dev->iod_meta_mempool); } @@ -3801,7 +3792,7 @@ static int __init nvme_init(void) BUILD_BUG_ON(IRQ_AFFINITY_MAX_SETS < 2); BUILD_BUG_ON(NVME_MAX_SEGS > SGES_PER_PAGE); BUILD_BUG_ON(sizeof(struct scatterlist) * NVME_MAX_SEGS > PAGE_SIZE); - BUILD_BUG_ON(nvme_pci_npages_prp() > NVME_MAX_NR_ALLOCATIONS); + BUILD_BUG_ON(nvme_pci_npages_prp() > NVME_MAX_NR_DESCRIPTORS); return pci_register_driver(&nvme_driver); } -- 2.49.0