nvme-pci: factor the iod mempool creation into a helper
[ Upstream commit 081a7d958ce4b65f9aab6e70e65b0b2e0b92297c ] Add a helper to create the iod mempool. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Keith Busch <kbusch@kernel.org> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> Tested-by Gerd Bayer <gbayer@linxu.ibm.com> Stable-dep-of: dad651b2a44e ("nvme-pci: do not set the NUMA node of device if it has none") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
38f82cf860
commit
71357c751f
@@ -387,14 +387,6 @@ static int nvme_pci_npages_sgl(void)
|
|||||||
NVME_CTRL_PAGE_SIZE);
|
NVME_CTRL_PAGE_SIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t nvme_pci_iod_alloc_size(void)
|
|
||||||
{
|
|
||||||
size_t npages = max(nvme_pci_npages_prp(), nvme_pci_npages_sgl());
|
|
||||||
|
|
||||||
return sizeof(__le64 *) * npages +
|
|
||||||
sizeof(struct scatterlist) * NVME_MAX_SEGS;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int nvme_admin_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
|
static int nvme_admin_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
|
||||||
unsigned int hctx_idx)
|
unsigned int hctx_idx)
|
||||||
{
|
{
|
||||||
@@ -2557,6 +2549,22 @@ static void nvme_release_prp_pools(struct nvme_dev *dev)
|
|||||||
dma_pool_destroy(dev->prp_small_pool);
|
dma_pool_destroy(dev->prp_small_pool);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int nvme_pci_alloc_iod_mempool(struct nvme_dev *dev)
|
||||||
|
{
|
||||||
|
size_t npages = max(nvme_pci_npages_prp(), nvme_pci_npages_sgl());
|
||||||
|
size_t alloc_size = sizeof(__le64 *) * npages +
|
||||||
|
sizeof(struct scatterlist) * NVME_MAX_SEGS;
|
||||||
|
|
||||||
|
WARN_ON_ONCE(alloc_size > PAGE_SIZE);
|
||||||
|
dev->iod_mempool = mempool_create_node(1,
|
||||||
|
mempool_kmalloc, mempool_kfree,
|
||||||
|
(void *)alloc_size, GFP_KERNEL,
|
||||||
|
dev_to_node(dev->dev));
|
||||||
|
if (!dev->iod_mempool)
|
||||||
|
return -ENOMEM;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static void nvme_free_tagset(struct nvme_dev *dev)
|
static void nvme_free_tagset(struct nvme_dev *dev)
|
||||||
{
|
{
|
||||||
if (dev->tagset.tags)
|
if (dev->tagset.tags)
|
||||||
@@ -2854,7 +2862,6 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||||||
int node, result = -ENOMEM;
|
int node, result = -ENOMEM;
|
||||||
struct nvme_dev *dev;
|
struct nvme_dev *dev;
|
||||||
unsigned long quirks = id->driver_data;
|
unsigned long quirks = id->driver_data;
|
||||||
size_t alloc_size;
|
|
||||||
|
|
||||||
node = dev_to_node(&pdev->dev);
|
node = dev_to_node(&pdev->dev);
|
||||||
if (node == NUMA_NO_NODE)
|
if (node == NUMA_NO_NODE)
|
||||||
@@ -2899,21 +2906,9 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||||||
quirks |= NVME_QUIRK_SIMPLE_SUSPEND;
|
quirks |= NVME_QUIRK_SIMPLE_SUSPEND;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
result = nvme_pci_alloc_iod_mempool(dev);
|
||||||
* Double check that our mempool alloc size will cover the biggest
|
if (result)
|
||||||
* command we support.
|
|
||||||
*/
|
|
||||||
alloc_size = nvme_pci_iod_alloc_size();
|
|
||||||
WARN_ON_ONCE(alloc_size > PAGE_SIZE);
|
|
||||||
|
|
||||||
dev->iod_mempool = mempool_create_node(1, mempool_kmalloc,
|
|
||||||
mempool_kfree,
|
|
||||||
(void *) alloc_size,
|
|
||||||
GFP_KERNEL, node);
|
|
||||||
if (!dev->iod_mempool) {
|
|
||||||
result = -ENOMEM;
|
|
||||||
goto release_pools;
|
goto release_pools;
|
||||||
}
|
|
||||||
|
|
||||||
result = nvme_init_ctrl(&dev->ctrl, &pdev->dev, &nvme_pci_ctrl_ops,
|
result = nvme_init_ctrl(&dev->ctrl, &pdev->dev, &nvme_pci_ctrl_ops,
|
||||||
quirks);
|
quirks);
|
||||||
|
Reference in New Issue
Block a user