From patchwork Fri Apr 18 06:47:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 14056850 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 90007C369C9 for ; Fri, 18 Apr 2025 06:49:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BF1C6280120; Fri, 18 Apr 2025 02:49:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B9F52280121; Fri, 18 Apr 2025 02:49:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9AA1A280120; Fri, 18 Apr 2025 02:49:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 71B5928011E for ; Fri, 18 Apr 2025 02:49:33 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 607E3AF7A8 for ; Fri, 18 Apr 2025 06:49:34 +0000 (UTC) X-FDA: 83346238668.28.3F2875E Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf21.hostedemail.com (Postfix) with ESMTP id AB7C51C0004 for ; Fri, 18 Apr 2025 06:49:32 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=hryUJfy8; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf21.hostedemail.com: domain of leon@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744958972; a=rsa-sha256; cv=none; b=QbxrgyIDk8pQgZ4a64ES8k43Ct0QQEbGNR0a5iWQstV3PxVW2M5igTm9vkf7P8qDkmuu4L WLD6Fi3LmF8mUqUQ8mpT96hAz8iRWHStfyf9XvVBpRfw3q1oXQDv1CsgZQNOOY90BxUz0/ rRIWw3f1ScR77wBGvQzxEOsIySF0XoA= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=hryUJfy8; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf21.hostedemail.com: domain of leon@kernel.org designates 139.178.84.217 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=1744958972; 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=5OMOd1kUr6mqKCiwcLofyu7hr5KO5UZQZt3XmgYyVOU=; b=6Km2wWjSez8hm0o0UXVS9+c2LFwTtVdPaX0MW/Ub/Mz7aoOvRXsgjhJ+i27ctBwyvyNrdS 5KSrrpyO0Ft2CaPDdTd8OWCDMFAoV0KZl1YY84REby2pV3aOE0CP6X9nbYbJaG4JQXxrdx fddkr4WyPUL+7vYr4VxkQy9W/CZ3RTI= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id CF7735C5A66; Fri, 18 Apr 2025 06:47:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E028BC4CEE2; Fri, 18 Apr 2025 06:49:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744958971; bh=dzm3I2stn/rnoMY31OBCo5UJufKUUvzj9CfHJN76ddI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hryUJfy8PA4RFjXgzkxnJwg2vE4zWyLHXnqwDiqEb0GBnbF2npwJkiAV3mMUcJbUu i0m1ct/DkymX5kO8+evnd0O/oTuSVkJpNlgts/2n7itaNfdrXdl4RSAugBdvtLS/gb ohUp/b4uOGss3mwN4TPTllyhfIQY6ZiGwffvcGxYxi+rKYsRDYp2olXHELMczizQ/E +3tJhg+YbmBAoB4aMNl+41kTY/W8IPuEkg6XU9Stn+9mSLT65WWX5Xy4KjvDFijJd5 l0vOAWyvMk0fVhVvD3rXfMgXOJPNr2/4RdBe62llV3Ug5jqLlLSXBX/ebWDfhUZt9x 4VIk5TQ7pBrrw== 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?b?SsOpcsO0bWUgR2xp?= =?utf-8?b?c3Nl?= , 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 v8 21/24] nvme-pci: remove struct nvme_descriptor Date: Fri, 18 Apr 2025 09:47:51 +0300 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: AB7C51C0004 X-Stat-Signature: 14jboww9r8mhjixjpqh7cefqf197c8mf X-Rspam-User: X-HE-Tag: 1744958972-694226 X-HE-Meta: U2FsdGVkX19t3QrQwFm3KycueHJs2acrXl0d/Bl4JYb7V17H561Z/P+l6tWtrh1vwkN2awk77ML9OdWa4TT2n8kzAQWYMZRwJr+AOI4O4/Bat12PeR23NrKy66VeI3clO/8UScWOUv0S49b01T0MFG+WwrfSYMggsi08l95eB0LrTecWtEEwY46cBucr1OTywmney8DdE/JKGmBDQ5k13UvXG5nOfUnH7g8FTpZM8k6El5SIphj9KNXvryvhFp3tP0PD0QEsqWEK5ty3FoT4RQRmEfio2OTY1HuVoladThf/A+Tf/PifcOlUzzQL7PqnEAu0TX7/WJNGMJUv5Y8/RotDhl5CwG4wDuw38J/aR50sVzYCtZsWFmOiicjI/iMFRivzYSmxQqhH8w0weNAykF2hGFm8rH/m1btcbyu1nfyReyk8B3nfYDlj2ERdLAFRxKax3BGNuUyO3gSkmzH190xMThB56yCQjXwVYVC1us/xVysCX49pL/4jeCTV4kL9dbyIIYYOJ3XIt8L8iyJC8U7HaaOxHVhEnpuwRFq4YdXPR9ryJlGArXLbQsCyzRGaV1VMLpKJ//xxiQ+6q42P90DgWOybnt33Go4Obi9lc8yrjKqYj5M7izM5zKkIDDb2wp7j56ZxecHzOAwW7bDKC/6AJCiMKYHUDKD9PYve+sFVO8As/ONqKfcyIxKouXvDvMipKdKE9jzfFefWhvRKtTVOR8xohzFAN7J446+kyqVqF3LcN3CNHOXTlMduNHM6450MTh9vJBsyltiwEl6ylfE0NmbN14X4oOodKC3gKnVQW5dcvntpHp2ejBOP92aG/N00wjnQGppa79DU7k0TmRKQJZfT76qYpMvhQvX8Gn2DvLbE/6+f/khEeBBTkghbr9pICPaIHRBPDvncVpUH1TASjTU9zXhZuYo16CpPBy1SEQ+tVJNBMFb+lv7dtZmGI3/6LamdRw+8qFZnxMX wUV/mPhY 5lFcfRWvGbS4fZD22RpjVsfh1I3LANSiuUAq1qcthlzAVxUwH5zdQX0pvDTaMi/WbmLmV8Cbj22Z7RRucsQj3JRefGaKVxm2d939t/MnMxnLF4BaY5r3lmIQyQK/CL+vkdv9snH85C0OLHo8Bn+/kPP5xsxMwSxGWA2uZdz99vlMpVaMeqWa7zc2HaIZVwPUbIoV3iT9W+Fe7MyFFE2Z0Y1deIhV2iS9VhZ4wr51McpW3lKQi47CLOzKGYUZLDVgs4e5fW553o7AsNA2Deu6qZioZ9GcSrjSqtRpWzVjFfY81mMlnRW2KAcoFLtkJrvEwX7Sc 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: Chaitanya Kulkarni 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); }