From: Christoph Hellwig <hch@lst.de>
To: Keith Busch <kbusch@kernel.org>, Christoph Hellwig <hch@lst.de>,
Sagi Grimberg <sagi@grimberg.me>
Cc: Caleb Sander Mateos <csander@purestorage.com>,
Leon Romanovsky <leon@kernel.org>,
linux-nvme@lists.infradead.org
Subject: [PATCH 6/7] nvme-pci: add a symolic name for the small pool size
Date: Tue, 13 May 2025 09:00:22 +0200 [thread overview]
Message-ID: <20250513070025.830930-7-hch@lst.de> (raw)
In-Reply-To: <20250513070025.830930-1-hch@lst.de>
From: Leon Romanovsky <leon@kernel.org>
Open coding magic numbers in multiple places is never a good idea.
Signed-off-by: Leon Romanovsky <leon@kernel.org>
[hch: split from a larger patch]
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/nvme/host/pci.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 16e2ce25da83..5396fe30eb94 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -37,6 +37,8 @@
#define SGES_PER_PAGE (NVME_CTRL_PAGE_SIZE / sizeof(struct nvme_sgl_desc))
+#define NVME_SMALL_POOL_SIZE 256
+
/*
* These can be higher, but we need to ensure that any command doesn't
* require an sg allocation that needs more than a page of data.
@@ -407,7 +409,7 @@ static struct nvme_descriptor_pools *
nvme_setup_descriptor_pools(struct nvme_dev *dev, unsigned numa_node)
{
struct nvme_descriptor_pools *pools = &dev->descriptor_pools[numa_node];
- size_t small_align = 256;
+ size_t small_align = NVME_SMALL_POOL_SIZE;
if (pools->small)
return pools; /* already initialized */
@@ -422,7 +424,7 @@ nvme_setup_descriptor_pools(struct nvme_dev *dev, unsigned numa_node)
/* Optimisation for I/Os between 4k and 128k */
pools->small = dma_pool_create_node("nvme descriptor 256", dev->dev,
- 256, small_align, 0, numa_node);
+ NVME_SMALL_POOL_SIZE, small_align, 0, numa_node);
if (!pools->small) {
dma_pool_destroy(pools->large);
pools->large = NULL;
@@ -689,7 +691,7 @@ static blk_status_t nvme_pci_setup_prps(struct nvme_queue *nvmeq,
}
if (DIV_ROUND_UP(length, NVME_CTRL_PAGE_SIZE) <=
- 256 / sizeof(__le64))
+ NVME_SMALL_POOL_SIZE / sizeof(__le64))
iod->flags |= IOD_SMALL_DESCRIPTOR;
prp_list = dma_pool_alloc(nvme_dma_pool(nvmeq, iod), GFP_ATOMIC,
@@ -774,7 +776,7 @@ static blk_status_t nvme_pci_setup_sgls(struct nvme_queue *nvmeq,
return BLK_STS_OK;
}
- if (entries <= 256 / sizeof(*sg_list))
+ if (entries <= NVME_SMALL_POOL_SIZE / sizeof(*sg_list))
iod->flags |= IOD_SMALL_DESCRIPTOR;
sg_list = dma_pool_alloc(nvme_dma_pool(nvmeq, iod), GFP_ATOMIC,
--
2.47.2
next prev parent reply other threads:[~2025-05-13 7:00 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-13 7:00 misc cleanups for nvme-pci Christoph Hellwig
2025-05-13 7:00 ` [PATCH 1/7] nvme-pci: don't try to use SGLs for metadata on the admin queue Christoph Hellwig
2025-05-13 7:28 ` Leon Romanovsky
2025-05-13 7:39 ` Christoph Hellwig
2025-05-13 7:45 ` Leon Romanovsky
2025-05-13 7:47 ` Christoph Hellwig
2025-05-13 7:51 ` Leon Romanovsky
2025-05-13 7:00 ` [PATCH 2/7] nvme-pci: store aborted state in flags variable Christoph Hellwig
2025-05-13 14:13 ` Kanchan Joshi/Kanchan Joshi
2025-05-14 0:44 ` Caleb Sander Mateos
2025-05-14 5:06 ` Christoph Hellwig
2025-05-13 7:00 ` [PATCH 3/7] nvme-pci: remove struct nvme_descriptor Christoph Hellwig
2025-05-13 14:15 ` Kanchan Joshi/Kanchan Joshi
2025-05-14 1:07 ` Caleb Sander Mateos
2025-05-14 5:15 ` Christoph Hellwig
2025-05-13 7:00 ` [PATCH 4/7] nvme-pci: rename the descriptor pools Christoph Hellwig
2025-05-13 7:35 ` Leon Romanovsky
2025-05-13 14:16 ` Kanchan Joshi/Kanchan Joshi
2025-05-14 1:03 ` Caleb Sander Mateos
2025-05-13 7:00 ` [PATCH 5/7] nvme-pci: use a better encoding for small prp pool allocations Christoph Hellwig
2025-05-13 7:39 ` Leon Romanovsky
2025-05-13 7:40 ` Christoph Hellwig
2025-05-13 7:49 ` Leon Romanovsky
2025-05-13 14:49 ` Kanchan Joshi/Kanchan Joshi
2025-05-13 15:06 ` Keith Busch
2025-05-14 5:12 ` Christoph Hellwig
2025-05-14 13:06 ` Keith Busch
2025-05-14 14:00 ` Christoph Hellwig
2025-05-14 17:48 ` Caleb Sander Mateos
2025-05-14 17:47 ` Caleb Sander Mateos
2025-05-13 7:00 ` Christoph Hellwig [this message]
2025-05-13 14:51 ` [PATCH 6/7] nvme-pci: add a symolic name for the small pool size Kanchan Joshi/Kanchan Joshi
2025-05-14 18:24 ` Caleb Sander Mateos
2025-05-13 7:00 ` [PATCH 7/7] nvme-pci: use struct_size for allocation struct nvme_dev Christoph Hellwig
2025-05-13 7:20 ` Leon Romanovsky
2025-05-13 14:54 ` Kanchan Joshi/Kanchan Joshi
2025-05-14 18:28 ` Caleb Sander Mateos
2025-05-13 15:34 ` misc cleanups for nvme-pci Keith Busch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250513070025.830930-7-hch@lst.de \
--to=hch@lst.de \
--cc=csander@purestorage.com \
--cc=kbusch@kernel.org \
--cc=leon@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox