From patchwork Sun Oct 27 14:21:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 13852665 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 6F6B8D13562 for ; Sun, 27 Oct 2024 14:23:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E9CF98D000B; Sun, 27 Oct 2024 10:23:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E4C238D0001; Sun, 27 Oct 2024 10:23:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C9E988D000B; Sun, 27 Oct 2024 10:23:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id AA5C58D0001 for ; Sun, 27 Oct 2024 10:23:07 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 695CB1A1C42 for ; Sun, 27 Oct 2024 14:22:28 +0000 (UTC) X-FDA: 82719598668.15.8094FFA Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf05.hostedemail.com (Postfix) with ESMTP id B73E0100004 for ; Sun, 27 Oct 2024 14:22:23 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=fcGU8E7n; spf=pass (imf05.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730038907; 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=Mjq6zdSNSWlDPgvZBL8m4liCS82S9MHPHsVhY49Am9o=; b=FfnU/PQBLFBnRiHleM9HsKql8ROZYXohE9YuaUIock2cb8JNov66+l7N9AkcGXc0LpS7Vd UsClKnz7RvO4ZgIe3rDbrLFVGjfnSLy0B5wF+ouMy5q4Ffs77xE65utZlYvlogxXUOR8K3 Zq3xNN5iQiorn1J7qu7PlXznzRDP20U= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=fcGU8E7n; spf=pass (imf05.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730038907; a=rsa-sha256; cv=none; b=CcX1m9d2KkJOwmAszuV4svR1W2OCd5vFJHnP5c7slVtw+teBFHxaoobKm1s8bJ/u0tOr9T w1MJucspitshBA1+lgpB+aIMXMXAElWfokR19GOi34qUaoBW5RKVgUM536aBPHo86wafTP R9DUyK+C35WReosMgNG4PRVW5BH0WTM= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 25857A40FAC; Sun, 27 Oct 2024 14:21:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30CB6C4CEC3; Sun, 27 Oct 2024 14:23:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730038985; bh=tSv2Q/UIDmsmBR/B+0LlfVehWktc2fzMNx0dgOtrb5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fcGU8E7nqAZ/TN3lckAgvc+gp+UfN38AiQA0fW96+skp6qRwatz6+Tp+Y9GZAXoZv 32gYhCzvwkTALLTPnjKbgOaQPHt8sGsNEdt9KJbNhKApAh7jv24SRFA3hGiLfrQYgb G/Po80vNtP9F8BeE8e4uWTkMLLm5fivWyKQHJxEIt/mCjmNIb97v/FnvfgqfoT4TTh rz7W2/MVey+NJeDPA+D1i7fdC/b2byuhn0NKXfgpQS+wRQ6AryyTiMSut6bA7FGvnc bh/vGMOJ+JsUoHC7zVNhazkcjoWtkM0V5Idz20gkDCG7oEUw/cZU4OFtBrphpw8Tfp o+KYa1jtD4fhg== From: Leon Romanovsky To: Jens Axboe , Jason Gunthorpe , Robin Murphy , Joerg Roedel , Will Deacon , Christoph Hellwig , Sagi Grimberg Cc: Keith Busch , Bjorn Helgaas , Logan Gunthorpe , Yishai Hadas , Shameer Kolothum , Kevin Tian , Alex Williamson , Marek Szyprowski , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , Andrew Morton , Jonathan Corbet , 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 Subject: [RFC PATCH 5/7] nvme-pci: remove struct nvme_descriptor Date: Sun, 27 Oct 2024 16:21:58 +0200 Message-ID: <31fe216877a270c00bc79cddace3a9f4b3ade50c.1730037261.git.leon@kernel.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: B73E0100004 X-Stat-Signature: 77jbc375b38xiwcbtfauysp4hydcu3d4 X-HE-Tag: 1730038943-598958 X-HE-Meta: U2FsdGVkX1+Calerz6KIrCtaWQKhspU3Rc3N7A8RHxJ3Uy2jyyH+3qALhCg3mTTQSuMVZdov3F0Fk2XwQ/QGs5qAYT1RD3SXpuaN4DJTf6MdbsRP9CfyS4hQzQoO3x9GMeBjXrFjQM1d62hs5ffk9CHerLjw43Bp4+3enWSuvsPliYJJuQprnM44f5tiUAXuynDb0GYh1PW9vxYf5pNQI6Pb2QT5oZwmDChnjISmY4fVt/SXLZqny1N2CYnUn1FTOo2BnqwKslDc+Zv1xTIgg9wL1xnjWD0j7a3G/RlbNsdxpzzAnX6J56Bk0KpQRpzRssrCG84ewochKWuRviCAa5EWYjyhAIl/Lq4JnnJgmoAPcH5SAfWFP0vOH+DBH9x9Qzle2lwzEeOuaYLL5CyUrxU8W+8Z7eNsm0igXV5DSEtA4azR8TwaySMknmv2f7fyV6B2NpwAPaTxVHg/0CXJUQwmiE51t6jiiE0BWwldkzv9w0LPw5MtvbitccLNDhAkp2qrdBI108A+tc3anPZJFKXL0admtYH58bWk3PUO683l7sjHnyZFb3T7roh83ToI4ps+w2WYYXAPPO/Bx6Cv7T3dr5Ph4/GeqIgx56mWid7dlQhcF+CKo2y9ixcXc90vc8TTrfF69Lso8c9lAez/6w+Bapw/VIzk8Knp5rYho0UC1B0w7d5dZxl6nZjWHvr9hqrxiz6GPAnODakIJuxUYPTvrahEMpOwG2ntvNWLIwD05P2wgxV53gdQ4/i0OmUrPNPS3lm3F3jcpogVlQwryDpxyPWlGFHg9BKgqw8COcGSlrtvbITtfkeiML4GMHBK4gB+BBaWsAUxN7GKRP4o4Mk/CWLJv3QTvzu/9FbewOWm4x/juCEqADvyr8cq1OO4iVAmvmPQ/N4NKhWzfzqveeMC1C6hIij4MnCLZXikKdJPgtHdWnvn5ydD8r90qgVL8rL/iMXaICUim/Bh/7L cz+t7yQA CwIL3sJ/r3/K9WkttFBcsQ1kYG6bs+eFiMpqnPbUFU3FrDAHsioMvwCvjfP3FbxY8QtLndArHeMfiURYBbuSGPY1HEm5C71Imow0+izMrjTdpXb+t3uivOJ5bZdwB4WNHoCNLgPUjhLuwxo9zF1MXHGJUx1RQhKPTttwvy5NkG1E6FfxeQVwkUGUh+cuQ0cTW/StfgRGERHcTcg6rmfqOPTwWqiBgtJjfiwCNf8COuru/BhsaKbenEqAfb5zFxCETPENr1cFpcIx5BAeYY9H10mN6gcypIbzHJ2DXjSVOaaVPdAsXagcNnN/wrJpRIGiWmtL2 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 Signed-off-by: Leon Romanovsky --- drivers/nvme/host/pci.c | 51 ++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 4b9fda0b1d9a..ba077a42cbba 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -43,7 +43,8 @@ */ #define NVME_MAX_KB_SZ 8192 #define NVME_MAX_SEGS 128 -#define NVME_MAX_NR_ALLOCATIONS 5 + +#define NVME_MAX_NR_DESCRIPTORS 5 static int use_threaded_interrupts; module_param(use_threaded_interrupts, int, 0444); @@ -216,28 +217,20 @@ 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; - union nvme_descriptor list[NVME_MAX_NR_ALLOCATIONS]; + void *descriptors[NVME_MAX_NR_DESCRIPTORS]; }; static inline unsigned int nvme_dbbuf_size(struct nvme_dev *dev) @@ -528,8 +521,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); @@ -551,11 +544,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); @@ -613,18 +606,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 (;;) { @@ -633,7 +626,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; @@ -703,19 +696,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); @@ -841,7 +834,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; ret = nvme_setup_cmd(req->q->queuedata, req); @@ -3626,7 +3619,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); }