ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: add NVME_INIT_REQUEST macro

Browse Source 
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 <james.r.harris@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11513 (master)

(cherry picked from commit 56618eacb9)
Change-Id: I0f6b8500e06b56edc33f437f351536cf857d13d3
Signed-off-by: Krzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12467
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
This commit is contained in:
Jim Harris 2022-02-09 19:21:04 +00:00 committed by Keith Lucas
parent c10889dc78
commit 6b70715fa0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/nvme/nvme_internal.h
View File

@ -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, int nvme_ctrlr_parse_ana_log_page(struct spdk_nvme_ctrlr *ctrlr,
spdk_nvme_parse_ana_log_page_cb cb_fn, void *cb_arg); 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 * static inline struct nvme_request *
nvme_allocate_request(struct spdk_nvme_qpair *qpair, nvme_allocate_request(struct spdk_nvme_qpair *qpair,
const struct nvme_payload *payload, uint32_t payload_size, uint32_t md_size, 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)); memset(req, 0, offsetof(struct nvme_request, payload_size));
req->cb_fn = cb_fn; NVME_INIT_REQUEST(req, cb_fn, cb_arg, *payload, payload_size, md_size);
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;
return req; return req;
} }