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 3D5AAC369D3 for ; Wed, 23 Apr 2025 08:15:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E99516B009A; Wed, 23 Apr 2025 04:15:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E4EB36B009B; Wed, 23 Apr 2025 04:15:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C4CD16B009C; Wed, 23 Apr 2025 04:15:20 -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 A55C96B009A for ; Wed, 23 Apr 2025 04:15:20 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 349741C91A2 for ; Wed, 23 Apr 2025 08:15:21 +0000 (UTC) X-FDA: 83364598842.30.0C3C82B Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf09.hostedemail.com (Postfix) with ESMTP id 8EB8D140009 for ; Wed, 23 Apr 2025 08:15:19 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=NofN87+7; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf09.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 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=1745396119; 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=MS85NaosWAKNKR9xb8E7k3vS8m83WGXrFqwAaoOyGeQ2B8146T3b81zSXsnZQeQXe8pnQw nN3g5LIeGoedW7hnCzkbsvZNNhxZB+R2Wny4wY2BIWHRivluREtB5B8PhM8alf1yY52WVG OSmQEd1AlexI/0LnPxk4DqGF2Wl2cCs= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=NofN87+7; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf09.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745396119; a=rsa-sha256; cv=none; b=usG4poXpZHEv/heMG5k7BWtSVv1eOH1DFRHi/Y3frg+bpD7pfcYzHceJRszLx6VKRJpCVX GSLar/4wQSMq2YXk97OdWVAro5puxaEwwV64T49qd6A40ERtEOEg5dzzWYMrqHoxLMith9 H1sPnPeqp5EL7ReCUS9c1x2PttOm+wU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id D996EA4C26A; Wed, 23 Apr 2025 08:09:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD660C4CEE2; Wed, 23 Apr 2025 08:15:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745396118; bh=UaKpIS/gS7437zv6/V/pxWOCRAoH+oFaLCUvPin30s0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NofN87+72BCRSSQQNcJM7BnAk2/zp6n26RRmmzRKzNNDIDzDxf7x9j5or/AYNU3NK pxZ+GCa1hGpfisAiugTwi+s30cVTowRRzF/1wid4zBtcgQRZnnHxxgx2hoWugHNZoz xCnUujBt9y1ZYOOPmdxdDFKy7kWi6AWlMqXNpcdoL0nyM+ov6CJ9SL/tCEv79Sw3zI sTBN8T8ntAmWGbX/zDrhzgr3Ob/v12rI/qu53cABhfFLWgNW8I5lypNYJaUQZHWOse 5qAQ1z3cOS5zxFU6G6fBapgBmaFFGZIiAY1PiCSn29wsfzSdo6gXMqBwveI5EyFmNg EX76tiDXfWXCg== 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 v9 21/24] nvme-pci: remove struct nvme_descriptor Date: Wed, 23 Apr 2025 11:13:12 +0300 Message-ID: <25eefb156cc6f660a5df28b685545e6b7ec60426.1745394536.git.leon@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: jerbeze14mdtb57t5coftqw1h6cks1pj X-Rspamd-Queue-Id: 8EB8D140009 X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1745396119-704191 X-HE-Meta: U2FsdGVkX19xfK1UhNlVHhkAKbKL0eAZ84ihTCsCNklgFFweYMBMO32cZiGp6AuvoA+EfJ1icry8oEnhuTbqVLyNpEOeuAN34XDOBQoXk9aPZDjroRyoB917qQM5H048TToMVNtnGIlyXMUUEvdXdfRKwtinmxzZ4K3b6W22+2EQW1ErWvvFa5hfwh57dhLzJSUPMxSHrgNQJBxmJtueZPtsKR/7GvLkbiMG2pS626H6LA32ahy7XjJJaK6Zaj8Wv3ADO+oROMDMwokcHYnueCFAUjFlCfdI318S0u7kOSks/8tjfUHjB7g/+y1Q8F09VHOYpGB+u2+Iqv0C4DJkJ4hpEA0EcIQMhLQyNETAVBJALn11AcSXPEPpX+kUL+Z8qIDDxV7IVNMmggPbLg0nSYGJS2sBtZWpyhytMHKLIXAV/pdjprweyR4DUvo6o0hbqDIgY+5XHRvj1MLQwPkHaLiUaUXhWhlvoj+AIVIKQmb2NZZ20d2qiiF+vQFQ22pwy1v5LWswDbANstR1bwYDmM4ajiEf5Sx2HZba6MtiUyOYCsaBcaaPEU78wwRofpe81NCxALUCFrDUYTBsUGL8iyagUcEQIh7cyeSTBoBwxfdVMG0maWY7YsfPN40v8eZkmb3j6taBG3aNCCc4bJZkNhJMBzjsLxM+ket2gNqqcJOlMs4DME1SbDGEpzfskhHaGEZIvhLWckGqhcA9v4vAsyJ4kkBEnUB3863eYq/Rp19caWIWoHUMraT6aqEcAjFkFJeWBDHfofoIeONLJc5TWKSaPsFfQKSvj0UDuglETIeb+83SOItfIHm8IPuqN+RGm5SE/y1QYSMUmuLDxam56jEfIvLtkvi5bg9vmk/d1Al27cIJK1XPEha6pL/lueCLRad0c9ZzOG5aRLJgbBKNBmeL+58bMrsd5I8MbdSQn9qeBG6g2kdL0Ctp7JxS631JzQa+Jd1QPnf32nUvMMK Iapqg7qO CwKfl7biDLpoJsqNkgg60ObeuIK6PiNoWQC2020d6a8sYMbfXy0nRH22gEzM7ftP7JV8sFWxtxbkXHla8hBDP2hRktFnQKedN8cK+nYBMxVSwtWwoLj7CEuANnWOt5LRhk6DBL71Caqmc/laV2NAopaqw3NnACB1QJTP3oDwOy9ZQ3vkE8JgUdpXHKm0IVrTbCvm0/6xnk6mdskANx5G4E5E07JtkdD/Yu1R1AyS7xu/Cpnu8FT46ICakcgUnwk9KRvsW+hC7pK2b80Jqxpg2bOJiDz1esGsszCp8SJsJ5aY/ugB/cI4rycCxToqSBiyeM+MF 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