From nobody Sun Feb 8 21:47:13 2026 Received: from mail-il1-f227.google.com (mail-il1-f227.google.com [209.85.166.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D5C0262FC8 for ; Tue, 22 Apr 2025 22:10:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745359808; cv=none; b=esNMETzEnqzW7gH1sBmU+qC3sVTXplYMQ7zLVglxIY8O8rt72XUi4BMdMHwGu8DAoL6Of0YIEFmaiT5vKTYAWpDvsgKeW3fQCEv/ylnF6YXAsMazMJSaXQz8aiWmtuBrxESbePSwBdyflTfGTN7kUC0qYj7LrdKZybtY4om+SHU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745359808; c=relaxed/simple; bh=e8fHS9J27wXbppZ/tKuMYxHo4Ji9gCZcS0/WhhY24vI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hXXmnLCM4roLIv0mlcfunNBUPXz/gq2B/q735d7mWrGti4niv8mCNehEwpVgsVHtMV2tc6KQMQnFe7vwTxwniNBD4xvpQqINbAl1tm52g2VrdfEq3N+2AW8zQ0nGt7KSQEm6cyonRTiCTlIciaBbx/L/YxdC4G4P6mBUGwgbyzg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=bQ+BHfTc; arc=none smtp.client-ip=209.85.166.227 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="bQ+BHfTc" Received: by mail-il1-f227.google.com with SMTP id e9e14a558f8ab-3d44ebf518cso1867235ab.0 for ; Tue, 22 Apr 2025 15:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1745359805; x=1745964605; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=++esc3uXgAvfAB+lpuA22G1/oTR1JRPmWb67bwlXmoA=; b=bQ+BHfTc1DUbSnSw+52E69llAvSGeyMbJBYS4Zx+t/6qYURSAcddNcfRVNdgmgOSNG oR1IczEcw91DRwg0MrjmGXxe/dUwfQx+DRGZuPBUFXfENroRpBPJo3mVMQ83Y1okEz8B SmrHDZXkYjSdYz+lPmbhW8YkqLFA94E/dPRmioD0/bKn3W7cNaUMBR38jQ1Q7WNIaFwk R9MYz6ev1xApeQGHeIcsM8yDh2SwYhraHJMiJ1Y40b2RiRsh+8ym7SjDSSxVI4GvBWcx pBAvo6VLI+v1n6PvhQcAsxmh/tPvZN4GDm82kyu6L6iV/UnGOqiIXWGBbDcCrOfZAt7i XTew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745359805; x=1745964605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=++esc3uXgAvfAB+lpuA22G1/oTR1JRPmWb67bwlXmoA=; b=kPBOo0/DvpnUn9Ekt0OUErujkU8dfl43xI94E/7sSS9wS2AvqcemLWsGB+Q7PTAW81 pOBHB531IClZUEujizUc6ZEpmF2m1dr0Zbj9VVL4QW7vRwTPcXQ4E05BSRsIVucW8hbn SH4U9mqlvdlgvyFa1U8GEDr3ilC7z9Kt4yLO0/xDErU6Lslv84uhZXghZJIvvSh6oSy+ L5amPX+X1YTqP/Fbx4r7/yKkf17lRJn0avcAC2jlSeK9PxkCJXocZPnOZaUUDceBQ82o HPdDLZWufPKjj/BkATE6qekLYU2LMkZZLDSXYJZq6iVybKu/X3LjZ4EmfR88bF9S0tBY 3Vaw== X-Forwarded-Encrypted: i=1; AJvYcCXH+sSUf1Hh7SJP3AgQCP/T+ltwn2QDSjDYc1BXQzuEFUgnJtr+xPVtd6ju138cEiH88RBgRuYcoEXTA/4=@vger.kernel.org X-Gm-Message-State: AOJu0YzjqMIHsh8kTAhuJ1zN8oALy+f3XlQHwvJtYJaUTPusu4MV9xV4 qbOAR1IFtBxwamcWkB6Xbtc4rYJBi0I6NFFZb4Tb/3dEbKHi7opjLE9zIcN1RtOWWdv4YRids9o ZgotWY0P3V037WPXyQ0RxdLqZMDZuZWByWHq7swS/ELsauQNS X-Gm-Gg: ASbGnctlCum45JBt1vl+2LvhiB3wKBFlmv46nwuPjADp5BYwGsNQfxGX8NtXmjD1VEn 86dYSEF7mBqxLPf6xLymWXH3ROG3YFa1G7pni7QaYDNlgpnNuSW3lnrf7V91Q1yLBthjSfxdh6f HQodAV2H9Vr+15ScJ/MoWF7VP86SZplH76RXTGhaNx0sq6vHE0j3bOa/NfvzRC2fq6aGkqqe3OF qKF4PKOPMnIEYbm+Jfa9w2yMaamqm/iNXhF8/vjU8whElog+jBhXQw1GlbOdlgPGXOUdEtYPk2C UWhV1uwLaqQhRc+Q2VCbiPE6qaq/MA== X-Google-Smtp-Source: AGHT+IFWOB8MGwiyr92rLomhRhd1eT0wZqfcwwCPR8ekz6+L8OmLpyi7tnN7ap9fq8/HJzc34IggmybJsqBi X-Received: by 2002:a05:6e02:154e:b0:3d9:207f:658c with SMTP id e9e14a558f8ab-3d927107f64mr2986925ab.0.1745359805346; Tue, 22 Apr 2025 15:10:05 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id e9e14a558f8ab-3d92758f997sm164245ab.5.2025.04.22.15.10.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 15:10:05 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (unknown [IPv6:2620:125:9007:640:ffff::418a]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 0829B34045E; Tue, 22 Apr 2025 16:10:05 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 05CDFE41D69; Tue, 22 Apr 2025 16:10:05 -0600 (MDT) From: Caleb Sander Mateos To: Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg , Andrew Morton Cc: Kanchan Joshi , linux-nvme@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH v5 3/3] nvme/pci: make PRP list DMA pools per-NUMA-node Date: Tue, 22 Apr 2025 16:09:52 -0600 Message-ID: <20250422220952.2111584-4-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250422220952.2111584-1-csander@purestorage.com> References: <20250422220952.2111584-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" NVMe commands with more than 4 KB of data allocate PRP list pages from the per-nvme_device dma_pool prp_page_pool or prp_small_pool. Each call to dma_pool_alloc() and dma_pool_free() takes the per-dma_pool spinlock. These device-global spinlocks are a significant source of contention when many CPUs are submitting to the same NVMe devices. On a workload issuing 32 KB reads from 16 CPUs (8 hypertwin pairs) across 2 NUMA nodes to 23 NVMe devices, we observed 2.4% of CPU time spent in _raw_spin_lock_irqsave called from dma_pool_alloc and dma_pool_free. Ideally, the dma_pools would be per-hctx to minimize contention. But that could impose considerable resource costs in a system with many NVMe devices and CPUs. As a compromise, allocate per-NUMA-node PRP list DMA pools. Map each nvme_queue to the set of DMA pools corresponding to its device and its hctx's NUMA node. This reduces the _raw_spin_lock_irqsave overhead by about half, to 1.2%. Preventing the sharing of PRP list pages across NUMA nodes also makes them cheaper to initialize. Link: https://lore.kernel.org/linux-nvme/CADUfDZqa=3DOOTtTTznXRDmBQo1WrFcDw= 1hBA7XwM7hzJ-hpckcA@mail.gmail.com/T/#u Signed-off-by: Caleb Sander Mateos Reviewed-by: Kanchan Joshi Reviewed-by: Sagi Grimberg Reviewed-by: Keith Busch --- drivers/nvme/host/pci.c | 144 +++++++++++++++++++++++----------------- 1 file changed, 84 insertions(+), 60 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 642890ddada5..2c554bb7f984 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -16,10 +16,11 @@ #include #include #include #include #include +#include #include #include #include #include #include @@ -110,21 +111,24 @@ struct nvme_queue; =20 static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown); static void nvme_delete_io_queues(struct nvme_dev *dev); static void nvme_update_attrs(struct nvme_dev *dev); =20 +struct nvme_prp_dma_pools { + struct dma_pool *large; + struct dma_pool *small; +}; + /* * Represents an NVM Express device. Each nvme_dev is a PCI function. */ struct nvme_dev { struct nvme_queue *queues; struct blk_mq_tag_set tagset; struct blk_mq_tag_set admin_tagset; u32 __iomem *dbs; struct device *dev; - struct dma_pool *prp_page_pool; - struct dma_pool *prp_small_pool; unsigned online_queues; unsigned max_qid; unsigned io_queues[HCTX_MAX_TYPES]; unsigned int num_vecs; u32 q_depth; @@ -160,10 +164,11 @@ struct nvme_dev { struct nvme_host_mem_buf_desc *host_mem_descs; void **host_mem_desc_bufs; unsigned int nr_allocated_queues; unsigned int nr_write_queues; unsigned int nr_poll_queues; + struct nvme_prp_dma_pools prp_pools[]; }; =20 static int io_queue_depth_set(const char *val, const struct kernel_param *= kp) { return param_set_uint_minmax(val, kp, NVME_PCI_MIN_QUEUE_SIZE, @@ -189,10 +194,11 @@ static inline struct nvme_dev *to_nvme_dev(struct nvm= e_ctrl *ctrl) * An NVM Express queue. Each device has at least two (one for admin * commands and one for I/O commands). */ struct nvme_queue { struct nvme_dev *dev; + struct nvme_prp_dma_pools prp_pools; spinlock_t sq_lock; void *sq_cmds; /* only used for poll queues: */ spinlock_t cq_poll_lock ____cacheline_aligned_in_smp; struct nvme_completion *cqes; @@ -395,18 +401,67 @@ static int nvme_pci_npages_prp(void) unsigned max_bytes =3D (NVME_MAX_KB_SZ * 1024) + NVME_CTRL_PAGE_SIZE; unsigned nprps =3D DIV_ROUND_UP(max_bytes, NVME_CTRL_PAGE_SIZE); return DIV_ROUND_UP(8 * nprps, NVME_CTRL_PAGE_SIZE - 8); } =20 +static struct nvme_prp_dma_pools * +nvme_setup_prp_pools(struct nvme_dev *dev, unsigned numa_node) +{ + struct nvme_prp_dma_pools *prp_pools =3D &dev->prp_pools[numa_node]; + size_t small_align =3D 256; + + if (prp_pools->small) + return prp_pools; /* already initialized */ + + prp_pools->large =3D dma_pool_create_node("prp list page", dev->dev, + NVME_CTRL_PAGE_SIZE, + NVME_CTRL_PAGE_SIZE, 0, + numa_node); + if (!prp_pools->large) + return ERR_PTR(-ENOMEM); + + if (dev->ctrl.quirks & NVME_QUIRK_DMAPOOL_ALIGN_512) + small_align =3D 512; + + /* Optimisation for I/Os between 4k and 128k */ + prp_pools->small =3D dma_pool_create_node("prp list 256", dev->dev, + 256, small_align, 0, numa_node); + if (!prp_pools->small) { + dma_pool_destroy(prp_pools->large); + prp_pools->large =3D NULL; + return ERR_PTR(-ENOMEM); + } + + return prp_pools; +} + +static void nvme_release_prp_pools(struct nvme_dev *dev) +{ + unsigned i; + + for (i =3D 0; i < nr_node_ids; i++) { + struct nvme_prp_dma_pools *prp_pools =3D &dev->prp_pools[i]; + + dma_pool_destroy(prp_pools->large); + dma_pool_destroy(prp_pools->small); + } +} + static int nvme_init_hctx(struct blk_mq_hw_ctx *hctx, void *data, unsigned= qid) { struct nvme_dev *dev =3D to_nvme_dev(data); struct nvme_queue *nvmeq =3D &dev->queues[qid]; + struct nvme_prp_dma_pools *prp_pools; struct blk_mq_tags *tags; =20 tags =3D qid ? dev->tagset.tags[qid - 1] : dev->admin_tagset.tags[0]; WARN_ON(tags !=3D hctx->tags); + prp_pools =3D nvme_setup_prp_pools(dev, hctx->numa_node); + if (IS_ERR(prp_pools)) + return PTR_ERR(prp_pools); + + nvmeq->prp_pools =3D *prp_pools; hctx->driver_data =3D nvmeq; return 0; } =20 static int nvme_admin_init_hctx(struct blk_mq_hw_ctx *hctx, void *data, @@ -536,27 +591,28 @@ static inline bool nvme_pci_use_sgls(struct nvme_dev = *dev, struct request *req, if (!sgl_threshold || avg_seg_size < sgl_threshold) return nvme_req(req)->flags & NVME_REQ_USERCMD; return true; } =20 -static void nvme_free_prps(struct nvme_dev *dev, struct request *req) +static void nvme_free_prps(struct nvme_queue *nvmeq, struct request *req) { const int last_prp =3D NVME_CTRL_PAGE_SIZE / sizeof(__le64) - 1; struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); dma_addr_t dma_addr =3D iod->first_dma; int i; =20 for (i =3D 0; i < iod->nr_allocations; i++) { __le64 *prp_list =3D iod->list[i].prp_list; dma_addr_t next_dma_addr =3D le64_to_cpu(prp_list[last_prp]); =20 - dma_pool_free(dev->prp_page_pool, prp_list, dma_addr); + dma_pool_free(nvmeq->prp_pools.large, prp_list, dma_addr); dma_addr =3D next_dma_addr; } } =20 -static void nvme_unmap_data(struct nvme_dev *dev, struct request *req) +static void nvme_unmap_data(struct nvme_dev *dev, struct nvme_queue *nvmeq, + struct request *req) { struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); =20 if (iod->dma_len) { dma_unmap_page(dev->dev, iod->first_dma, iod->dma_len, @@ -567,17 +623,17 @@ static void nvme_unmap_data(struct nvme_dev *dev, str= uct request *req) WARN_ON_ONCE(!iod->sgt.nents); =20 dma_unmap_sgtable(dev->dev, &iod->sgt, rq_dma_dir(req), 0); =20 if (iod->nr_allocations =3D=3D 0) - dma_pool_free(dev->prp_small_pool, iod->list[0].sg_list, + dma_pool_free(nvmeq->prp_pools.small, iod->list[0].sg_list, iod->first_dma); else if (iod->nr_allocations =3D=3D 1) - dma_pool_free(dev->prp_page_pool, iod->list[0].sg_list, + dma_pool_free(nvmeq->prp_pools.large, iod->list[0].sg_list, iod->first_dma); else - nvme_free_prps(dev, req); + nvme_free_prps(nvmeq, req); mempool_free(iod->sgt.sgl, dev->iod_mempool); } =20 static void nvme_print_sgl(struct scatterlist *sgl, int nents) { @@ -591,11 +647,11 @@ static void nvme_print_sgl(struct scatterlist *sgl, i= nt nents) i, &phys, sg->offset, sg->length, &sg_dma_address(sg), sg_dma_len(sg)); } } =20 -static blk_status_t nvme_pci_setup_prps(struct nvme_dev *dev, +static blk_status_t nvme_pci_setup_prps(struct nvme_queue *nvmeq, struct request *req, struct nvme_rw_command *cmnd) { struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); struct dma_pool *pool; int length =3D blk_rq_payload_bytes(req); @@ -627,14 +683,14 @@ static blk_status_t nvme_pci_setup_prps(struct nvme_d= ev *dev, goto done; } =20 nprps =3D DIV_ROUND_UP(length, NVME_CTRL_PAGE_SIZE); if (nprps <=3D (256 / 8)) { - pool =3D dev->prp_small_pool; + pool =3D nvmeq->prp_pools.small; iod->nr_allocations =3D 0; } else { - pool =3D dev->prp_page_pool; + pool =3D nvmeq->prp_pools.large; iod->nr_allocations =3D 1; } =20 prp_list =3D dma_pool_alloc(pool, GFP_ATOMIC, &prp_dma); if (!prp_list) { @@ -672,11 +728,11 @@ static blk_status_t nvme_pci_setup_prps(struct nvme_d= ev *dev, done: cmnd->dptr.prp1 =3D cpu_to_le64(sg_dma_address(iod->sgt.sgl)); cmnd->dptr.prp2 =3D cpu_to_le64(iod->first_dma); return BLK_STS_OK; free_prps: - nvme_free_prps(dev, req); + nvme_free_prps(nvmeq, req); return BLK_STS_RESOURCE; bad_sgl: WARN(DO_ONCE(nvme_print_sgl, iod->sgt.sgl, iod->sgt.nents), "Invalid SGL for payload:%d nents:%d\n", blk_rq_payload_bytes(req), iod->sgt.nents); @@ -697,11 +753,11 @@ static void nvme_pci_sgl_set_seg(struct nvme_sgl_desc= *sge, sge->addr =3D cpu_to_le64(dma_addr); sge->length =3D cpu_to_le32(entries * sizeof(*sge)); sge->type =3D NVME_SGL_FMT_LAST_SEG_DESC << 4; } =20 -static blk_status_t nvme_pci_setup_sgls(struct nvme_dev *dev, +static blk_status_t nvme_pci_setup_sgls(struct nvme_queue *nvmeq, struct request *req, struct nvme_rw_command *cmd) { struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); struct dma_pool *pool; struct nvme_sgl_desc *sg_list; @@ -717,14 +773,14 @@ static blk_status_t nvme_pci_setup_sgls(struct nvme_d= ev *dev, nvme_pci_sgl_set_data(&cmd->dptr.sgl, sg); return BLK_STS_OK; } =20 if (entries <=3D (256 / sizeof(struct nvme_sgl_desc))) { - pool =3D dev->prp_small_pool; + pool =3D nvmeq->prp_pools.small; iod->nr_allocations =3D 0; } else { - pool =3D dev->prp_page_pool; + pool =3D nvmeq->prp_pools.large; iod->nr_allocations =3D 1; } =20 sg_list =3D dma_pool_alloc(pool, GFP_ATOMIC, &sgl_dma); if (!sg_list) { @@ -784,16 +840,16 @@ static blk_status_t nvme_setup_sgl_simple(struct nvme= _dev *dev, } =20 static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *re= q, struct nvme_command *cmnd) { + struct nvme_queue *nvmeq =3D req->mq_hctx->driver_data; struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); blk_status_t ret =3D BLK_STS_RESOURCE; int rc; =20 if (blk_rq_nr_phys_segments(req) =3D=3D 1) { - struct nvme_queue *nvmeq =3D req->mq_hctx->driver_data; struct bio_vec bv =3D req_bvec(req); =20 if (!is_pci_p2pdma_page(bv.bv_page)) { if (!nvme_pci_metadata_use_sgls(dev, req) && (bv.bv_offset & (NVME_CTRL_PAGE_SIZE - 1)) + @@ -824,13 +880,13 @@ static blk_status_t nvme_map_data(struct nvme_dev *de= v, struct request *req, ret =3D BLK_STS_TARGET; goto out_free_sg; } =20 if (nvme_pci_use_sgls(dev, req, iod->sgt.nents)) - ret =3D nvme_pci_setup_sgls(dev, req, &cmnd->rw); + ret =3D nvme_pci_setup_sgls(nvmeq, req, &cmnd->rw); else - ret =3D nvme_pci_setup_prps(dev, req, &cmnd->rw); + ret =3D nvme_pci_setup_prps(nvmeq, req, &cmnd->rw); if (ret !=3D BLK_STS_OK) goto out_unmap_sg; return BLK_STS_OK; =20 out_unmap_sg: @@ -841,10 +897,11 @@ static blk_status_t nvme_map_data(struct nvme_dev *de= v, struct request *req, } =20 static blk_status_t nvme_pci_setup_meta_sgls(struct nvme_dev *dev, struct request *req) { + struct nvme_queue *nvmeq =3D req->mq_hctx->driver_data; struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); struct nvme_rw_command *cmnd =3D &iod->cmd.rw; struct nvme_sgl_desc *sg_list; struct scatterlist *sgl, *sg; unsigned int entries; @@ -864,11 +921,11 @@ static blk_status_t nvme_pci_setup_meta_sgls(struct n= vme_dev *dev, rc =3D dma_map_sgtable(dev->dev, &iod->meta_sgt, rq_dma_dir(req), DMA_ATTR_NO_WARN); if (rc) goto out_free_sg; =20 - sg_list =3D dma_pool_alloc(dev->prp_small_pool, GFP_ATOMIC, &sgl_dma); + sg_list =3D dma_pool_alloc(nvmeq->prp_pools.small, GFP_ATOMIC, &sgl_dma); if (!sg_list) goto out_unmap_sg; =20 entries =3D iod->meta_sgt.nents; iod->meta_list.sg_list =3D sg_list; @@ -946,11 +1003,11 @@ static blk_status_t nvme_prep_rq(struct nvme_dev *de= v, struct request *req) =20 nvme_start_request(req); return BLK_STS_OK; out_unmap_data: if (blk_rq_nr_phys_segments(req)) - nvme_unmap_data(dev, req); + nvme_unmap_data(dev, req->mq_hctx->driver_data, req); out_free_cmd: nvme_cleanup_cmd(req); return ret; } =20 @@ -1036,10 +1093,11 @@ static void nvme_queue_rqs(struct rq_list *rqlist) nvme_submit_cmds(nvmeq, &submit_list); *rqlist =3D requeue_list; } =20 static __always_inline void nvme_unmap_metadata(struct nvme_dev *dev, + struct nvme_queue *nvmeq, struct request *req) { struct nvme_iod *iod =3D blk_mq_rq_to_pdu(req); =20 if (!iod->meta_sgt.nents) { @@ -1047,11 +1105,11 @@ static __always_inline void nvme_unmap_metadata(str= uct nvme_dev *dev, rq_integrity_vec(req).bv_len, rq_dma_dir(req)); return; } =20 - dma_pool_free(dev->prp_small_pool, iod->meta_list.sg_list, + dma_pool_free(nvmeq->prp_pools.small, iod->meta_list.sg_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); } =20 @@ -1059,14 +1117,14 @@ static __always_inline void nvme_pci_unmap_rq(struc= t request *req) { struct nvme_queue *nvmeq =3D req->mq_hctx->driver_data; struct nvme_dev *dev =3D nvmeq->dev; =20 if (blk_integrity_rq(req)) - nvme_unmap_metadata(dev, req); + nvme_unmap_metadata(dev, nvmeq, req); =20 if (blk_rq_nr_phys_segments(req)) - nvme_unmap_data(dev, req); + nvme_unmap_data(dev, nvmeq, req); } =20 static void nvme_pci_complete_rq(struct request *req) { nvme_pci_unmap_rq(req); @@ -2839,39 +2897,10 @@ static int nvme_disable_prepare_reset(struct nvme_d= ev *dev, bool shutdown) return -EBUSY; nvme_dev_disable(dev, shutdown); return 0; } =20 -static int nvme_setup_prp_pools(struct nvme_dev *dev) -{ - size_t small_align =3D 256; - - dev->prp_page_pool =3D dma_pool_create("prp list page", dev->dev, - NVME_CTRL_PAGE_SIZE, - NVME_CTRL_PAGE_SIZE, 0); - if (!dev->prp_page_pool) - return -ENOMEM; - - if (dev->ctrl.quirks & NVME_QUIRK_DMAPOOL_ALIGN_512) - small_align =3D 512; - - /* Optimisation for I/Os between 4k and 128k */ - dev->prp_small_pool =3D dma_pool_create("prp list 256", dev->dev, - 256, small_align, 0); - if (!dev->prp_small_pool) { - dma_pool_destroy(dev->prp_page_pool); - return -ENOMEM; - } - return 0; -} - -static void nvme_release_prp_pools(struct nvme_dev *dev) -{ - dma_pool_destroy(dev->prp_page_pool); - dma_pool_destroy(dev->prp_small_pool); -} - static int nvme_pci_alloc_iod_mempool(struct nvme_dev *dev) { size_t meta_size =3D sizeof(struct scatterlist) * (NVME_MAX_META_SEGS + 1= ); size_t alloc_size =3D sizeof(struct scatterlist) * NVME_MAX_SEGS; =20 @@ -3182,11 +3211,12 @@ static struct nvme_dev *nvme_pci_alloc_dev(struct p= ci_dev *pdev, unsigned long quirks =3D id->driver_data; int node =3D dev_to_node(&pdev->dev); struct nvme_dev *dev; int ret =3D -ENOMEM; =20 - dev =3D kzalloc_node(sizeof(*dev), GFP_KERNEL, node); + dev =3D kzalloc_node(sizeof(*dev) + nr_node_ids * sizeof(*dev->prp_pools), + GFP_KERNEL, node); if (!dev) return ERR_PTR(-ENOMEM); INIT_WORK(&dev->ctrl.reset_work, nvme_reset_work); mutex_init(&dev->shutdown_lock); =20 @@ -3257,17 +3287,13 @@ static int nvme_probe(struct pci_dev *pdev, const s= truct pci_device_id *id) =20 result =3D nvme_dev_map(dev); if (result) goto out_uninit_ctrl; =20 - result =3D nvme_setup_prp_pools(dev); - if (result) - goto out_dev_unmap; - result =3D nvme_pci_alloc_iod_mempool(dev); if (result) - goto out_release_prp_pools; + goto out_dev_unmap; =20 dev_info(dev->ctrl.device, "pci function %s\n", dev_name(&pdev->dev)); =20 result =3D nvme_pci_enable(dev); if (result) @@ -3339,12 +3365,10 @@ static int nvme_probe(struct pci_dev *pdev, const s= truct pci_device_id *id) nvme_dbbuf_dma_free(dev); nvme_free_queues(dev, 0); out_release_iod_mempool: mempool_destroy(dev->iod_mempool); mempool_destroy(dev->iod_meta_mempool); -out_release_prp_pools: - nvme_release_prp_pools(dev); out_dev_unmap: nvme_dev_unmap(dev); out_uninit_ctrl: nvme_uninit_ctrl(&dev->ctrl); out_put_ctrl: --=20 2.45.2