From 6b70715fa03f6ff31540d853791182d144c91f9b Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Wed, 9 Feb 2022 19:21:04 +0000 Subject: [PATCH] nvme: add NVME_INIT_REQUEST macro This macro will be used in an upcoming patch that needs to construct an nvme_request structure outside of the standard nvme_allocate() routines. Examined x86 optimized assembly with this patch, and there is no change. Signed-off-by: Jim Harris Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11513 (master) (cherry picked from commit 56618eacb93713489fb7d253cdd719117342cbdb) Change-Id: I0f6b8500e06b56edc33f437f351536cf857d13d3 Signed-off-by: Krzysztof Karas Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12467 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- lib/nvme/nvme_internal.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/lib/nvme/nvme_internal.h b/lib/nvme/nvme_internal.h index eb4f23d88..299087790 100644 --- a/lib/nvme/nvme_internal.h +++ b/lib/nvme/nvme_internal.h @@ -1245,6 +1245,17 @@ typedef int (*spdk_nvme_parse_ana_log_page_cb)( int nvme_ctrlr_parse_ana_log_page(struct spdk_nvme_ctrlr *ctrlr, spdk_nvme_parse_ana_log_page_cb cb_fn, void *cb_arg); +#define NVME_INIT_REQUEST(req, _cb_fn, _cb_arg, _payload, _payload_size, _md_size) \ + do { \ + req->cb_fn = _cb_fn; \ + req->cb_arg = _cb_arg; \ + req->payload = _payload; \ + req->payload_size = _payload_size; \ + req->md_size = _md_size; \ + req->pid = g_spdk_nvme_pid; \ + req->submit_tick = 0; \ + } while (0); + static inline struct nvme_request * nvme_allocate_request(struct spdk_nvme_qpair *qpair, const struct nvme_payload *payload, uint32_t payload_size, uint32_t md_size, @@ -1272,13 +1283,7 @@ nvme_allocate_request(struct spdk_nvme_qpair *qpair, */ memset(req, 0, offsetof(struct nvme_request, payload_size)); - req->cb_fn = cb_fn; - req->cb_arg = cb_arg; - req->payload = *payload; - req->payload_size = payload_size; - req->md_size = md_size; - req->pid = g_spdk_nvme_pid; - req->submit_tick = 0; + NVME_INIT_REQUEST(req, cb_fn, cb_arg, *payload, payload_size, md_size); return req; }