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

nvme: inline nvme_pcie_vtophys

Browse Source 
The inline function can also be used in the coming submit request
function.

Change-Id: If4a5511001e6586dbce0978298beddc537f54d8b
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8173
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Changpeng Liu 2021-06-04 16:07:05 +08:00 committed by Tomasz Zawadzki
parent b69827a394
commit 5e4fe0adc8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/nvme/nvme_pcie_common.c
View File

@ -43,11 +43,11 @@
__thread struct nvme_pcie_ctrlr *g_thread_mmio_ctrlr = NULL; __thread struct nvme_pcie_ctrlr *g_thread_mmio_ctrlr = NULL;
static uint64_t static inline uint64_t
nvme_pcie_vtophys(struct spdk_nvme_ctrlr *ctrlr, const void *buf) nvme_pcie_vtophys(struct spdk_nvme_ctrlr *ctrlr, const void *buf, uint64_t *size)
{ {
if (spdk_likely(ctrlr->trid.trtype == SPDK_NVME_TRANSPORT_PCIE)) { if (spdk_likely(ctrlr->trid.trtype == SPDK_NVME_TRANSPORT_PCIE)) {
return spdk_vtophys(buf, NULL); return spdk_vtophys(buf, size);
} else { } else {
/* vfio-user address translation with IOVA=VA mode */ /* vfio-user address translation with IOVA=VA mode */
return (uint64_t)(uintptr_t)buf; return (uint64_t)(uintptr_t)buf;
@ -187,7 +187,7 @@ nvme_pcie_qpair_construct(struct spdk_nvme_qpair *qpair,
assert(pqpair->sq_vaddr != NULL); assert(pqpair->sq_vaddr != NULL);
pqpair->cmd_bus_addr = sq_paddr; pqpair->cmd_bus_addr = sq_paddr;
} else { } else {
pqpair->cmd_bus_addr = nvme_pcie_vtophys(ctrlr, pqpair->cmd); pqpair->cmd_bus_addr = nvme_pcie_vtophys(ctrlr, pqpair->cmd, NULL);
if (pqpair->cmd_bus_addr == SPDK_VTOPHYS_ERROR) { if (pqpair->cmd_bus_addr == SPDK_VTOPHYS_ERROR) {
SPDK_ERRLOG("spdk_vtophys(pqpair->cmd) failed\n"); SPDK_ERRLOG("spdk_vtophys(pqpair->cmd) failed\n");
return -EFAULT; return -EFAULT;
@ -210,7 +210,7 @@ nvme_pcie_qpair_construct(struct spdk_nvme_qpair *qpair,
assert(pqpair->cq_vaddr != NULL); assert(pqpair->cq_vaddr != NULL);
pqpair->cpl_bus_addr = cq_paddr; pqpair->cpl_bus_addr = cq_paddr;
} else { } else {
pqpair->cpl_bus_addr = nvme_pcie_vtophys(ctrlr, pqpair->cpl); pqpair->cpl_bus_addr = nvme_pcie_vtophys(ctrlr, pqpair->cpl, NULL);
if (pqpair->cpl_bus_addr == SPDK_VTOPHYS_ERROR) { if (pqpair->cpl_bus_addr == SPDK_VTOPHYS_ERROR) {
SPDK_ERRLOG("spdk_vtophys(pqpair->cpl) failed\n"); SPDK_ERRLOG("spdk_vtophys(pqpair->cpl) failed\n");
return -EFAULT; return -EFAULT;
@ -238,7 +238,7 @@ nvme_pcie_qpair_construct(struct spdk_nvme_qpair *qpair,
for (i = 0; i < num_trackers; i++) { for (i = 0; i < num_trackers; i++) {
tr = &pqpair->tr[i]; tr = &pqpair->tr[i];
nvme_qpair_construct_tracker(tr, i, nvme_pcie_vtophys(ctrlr, tr)); nvme_qpair_construct_tracker(tr, i, nvme_pcie_vtophys(ctrlr, tr, NULL));
TAILQ_INSERT_HEAD(&pqpair->free_tr, tr, tq_list); TAILQ_INSERT_HEAD(&pqpair->free_tr, tr, tq_list);
} }