git: f502f8abe08b - stable/12 - nvme: change namei_request_zone into a malloc type
Warner Losh
imp at FreeBSD.org
Sat Jul 31 00:21:26 UTC 2021
The branch stable/12 has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=f502f8abe08b1b39ec3b53eeaadf7dfad8930574
commit f502f8abe08b1b39ec3b53eeaadf7dfad8930574
Author: Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2020-11-05 21:44:58 +0000
Commit: Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-07-31 00:02:52 +0000
nvme: change namei_request_zone into a malloc type
Both the size (128 bytes) and ephemeral nature of allocations make it a great
fit for malloc.
A dedicated zone unnecessarily avoids sharing buckets with 128-byte objects.
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D27103
(cherry picked from commit 71460dfcb275f0a2a20b39a332b0e1149c6e7e3f)
---
sys/dev/nvme/nvme.c | 5 -----
sys/dev/nvme/nvme_private.h | 5 ++---
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/sys/dev/nvme/nvme.c b/sys/dev/nvme/nvme.c
index 843aa80bb4fb..8e5bc11b35d4 100644
--- a/sys/dev/nvme/nvme.c
+++ b/sys/dev/nvme/nvme.c
@@ -49,7 +49,6 @@ struct nvme_consumer {
struct nvme_consumer nvme_consumer[NVME_MAX_CONSUMERS];
#define INVALID_CONSUMER_ID 0xFFFF
-uma_zone_t nvme_request_zone;
int32_t nvme_retry_count;
@@ -62,9 +61,6 @@ nvme_init(void)
{
uint32_t i;
- nvme_request_zone = uma_zcreate("nvme_request",
- sizeof(struct nvme_request), NULL, NULL, NULL, NULL, 0, 0);
-
for (i = 0; i < NVME_MAX_CONSUMERS; i++)
nvme_consumer[i].id = INVALID_CONSUMER_ID;
}
@@ -74,7 +70,6 @@ SYSINIT(nvme_register, SI_SUB_DRIVERS, SI_ORDER_SECOND, nvme_init, NULL);
static void
nvme_uninit(void)
{
- uma_zdestroy(nvme_request_zone);
}
SYSUNINIT(nvme_unregister, SI_SUB_DRIVERS, SI_ORDER_SECOND, nvme_uninit, NULL);
diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h
index 2e2c383f455f..39b5af66501f 100644
--- a/sys/dev/nvme/nvme_private.h
+++ b/sys/dev/nvme/nvme_private.h
@@ -104,7 +104,6 @@ MALLOC_DECLARE(M_NVME);
#define CACHE_LINE_SIZE (64)
#endif
-extern uma_zone_t nvme_request_zone;
extern int32_t nvme_retry_count;
extern bool nvme_verbose_cmd_dump;
@@ -488,7 +487,7 @@ _nvme_allocate_request(nvme_cb_fn_t cb_fn, void *cb_arg)
{
struct nvme_request *req;
- req = uma_zalloc(nvme_request_zone, M_NOWAIT | M_ZERO);
+ req = malloc(sizeof(*req), M_NVME, M_NOWAIT | M_ZERO);
if (req != NULL) {
req->cb_fn = cb_fn;
req->cb_arg = cb_arg;
@@ -550,7 +549,7 @@ nvme_allocate_request_ccb(union ccb *ccb, nvme_cb_fn_t cb_fn, void *cb_arg)
return (req);
}
-#define nvme_free_request(req) uma_zfree(nvme_request_zone, req)
+#define nvme_free_request(req) free(req, M_NVME)
void nvme_notify_async_consumers(struct nvme_controller *ctrlr,
const struct nvme_completion *async_cpl,
More information about the dev-commits-src-branches
mailing list