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

memory: replace all hardcoded 0x200000 with a define

Browse Source 
Makes the code slightly more readable.

Change-Id: Iebf8fb07bceacf433d4bdad0a30419a3faab7eee
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/439370
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Darek Stojaczyk 2019-01-07 13:05:17 +01:00 committed by Jim Harris
parent 3edc4db7a7
commit eecc6dc8e6
6 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ioat/ioat.c
View File

@ -617,8 +617,8 @@ spdk_ioat_submit_copy(struct spdk_ioat_chan *ioat, void *cb_arg, spdk_ioat_req_c
pdst_page = spdk_vtophys((void *)vdst_page, NULL); pdst_page = spdk_vtophys((void *)vdst_page, NULL);
} }
op_size = remaining; op_size = remaining;
op_size = spdk_min(op_size, (0x200000 - _2MB_OFFSET(vsrc))); op_size = spdk_min(op_size, (VALUE_2MB - _2MB_OFFSET(vsrc)));
op_size = spdk_min(op_size, (0x200000 - _2MB_OFFSET(vdst))); op_size = spdk_min(op_size, (VALUE_2MB - _2MB_OFFSET(vdst)));
op_size = spdk_min(op_size, ioat->max_xfer_size); op_size = spdk_min(op_size, ioat->max_xfer_size);
remaining -= op_size; remaining -= op_size;
@ -681,7 +681,7 @@ spdk_ioat_submit_fill(struct spdk_ioat_chan *ioat, void *cb_arg, spdk_ioat_req_c
while (remaining) { while (remaining) {
op_size = remaining; op_size = remaining;
op_size = spdk_min(op_size, (0x200000 - _2MB_OFFSET(vdst))); op_size = spdk_min(op_size, (VALUE_2MB - _2MB_OFFSET(vdst)));
op_size = spdk_min(op_size, ioat->max_xfer_size); op_size = spdk_min(op_size, ioat->max_xfer_size);
remaining -= op_size; remaining -= op_size;

3
lib/nvme/nvme_internal.h
View File

@ -56,6 +56,7 @@
#include "spdk_internal/assert.h" #include "spdk_internal/assert.h"
#include "spdk_internal/log.h" #include "spdk_internal/log.h"
#include "spdk_internal/memory.h"
extern pid_t g_spdk_nvme_pid; extern pid_t g_spdk_nvme_pid;
@ -137,7 +138,7 @@ extern pid_t g_spdk_nvme_pid;
/* We want to fit submission and completion rings each in a single 2MB /* We want to fit submission and completion rings each in a single 2MB
* hugepage to ensure physical address contiguity. * hugepage to ensure physical address contiguity.
*/ */
#define MAX_IO_QUEUE_ENTRIES (0x200000 / spdk_max( \ #define MAX_IO_QUEUE_ENTRIES (VALUE_2MB / spdk_max( \
sizeof(struct spdk_nvme_cmd), \ sizeof(struct spdk_nvme_cmd), \
sizeof(struct spdk_nvme_cpl))) sizeof(struct spdk_nvme_cpl)))

11
lib/nvme/nvme_pcie.c
View File

@ -42,8 +42,6 @@
#include "nvme_internal.h" #include "nvme_internal.h"
#include "nvme_uevent.h" #include "nvme_uevent.h"
#include "spdk_internal/memory.h"
/* /*
* Number of completion queue entries to process before ringing the * Number of completion queue entries to process before ringing the
* completion queue doorbell. * completion queue doorbell.
@ -516,9 +514,8 @@ nvme_pcie_ctrlr_map_cmb(struct nvme_pcie_ctrlr *pctrlr)
goto exit; goto exit;
} }
mem_register_start = (((uintptr_t)pctrlr->cmb_bar_virt_addr + offset + 0x1fffff) & ~(0x200000 - 1)); mem_register_start = _2MB_PAGE((uintptr_t)pctrlr->cmb_bar_virt_addr + offset + VALUE_2MB - 1);
mem_register_end = ((uintptr_t)pctrlr->cmb_bar_virt_addr + offset + pctrlr->cmb_size); mem_register_end = _2MB_PAGE((uintptr_t)pctrlr->cmb_bar_virt_addr + offset + pctrlr->cmb_size);
mem_register_end &= ~(uint64_t)(0x200000 - 1);
pctrlr->cmb_mem_register_addr = (void *)mem_register_start; pctrlr->cmb_mem_register_addr = (void *)mem_register_start;
pctrlr->cmb_mem_register_size = mem_register_end - mem_register_start; pctrlr->cmb_mem_register_size = mem_register_end - mem_register_start;
@ -977,7 +974,7 @@ nvme_pcie_qpair_construct(struct spdk_nvme_qpair *qpair)
volatile uint32_t *doorbell_base; volatile uint32_t *doorbell_base;
uint64_t offset; uint64_t offset;
uint16_t num_trackers; uint16_t num_trackers;
size_t page_align = 0x200000; size_t page_align = VALUE_2MB;
uint32_t flags = SPDK_MALLOC_DMA; uint32_t flags = SPDK_MALLOC_DMA;
/* /*
@ -1827,7 +1824,7 @@ nvme_pcie_qpair_build_hw_sgl_request(struct spdk_nvme_qpair *qpair, struct nvme_
return -1; return -1;
} }
length = spdk_min(remaining_user_sge_len, 0x200000 - _2MB_OFFSET(virt_addr)); length = spdk_min(remaining_user_sge_len, VALUE_2MB - _2MB_OFFSET(virt_addr));
remaining_user_sge_len -= length; remaining_user_sge_len -= length;
virt_addr += length; virt_addr += length;

4
lib/vhost/vhost.c
View File

@ -479,7 +479,7 @@ spdk_vhost_vring_desc_to_iov(struct spdk_vhost_session *vsession, struct iovec *
SPDK_ERRLOG("gpa_to_vva(%p) == NULL\n", (void *)payload); SPDK_ERRLOG("gpa_to_vva(%p) == NULL\n", (void *)payload);
return -1; return -1;
} }
to_boundary = 0x200000 - _2MB_OFFSET(payload); to_boundary = VALUE_2MB - _2MB_OFFSET(payload);
if (spdk_likely(remaining <= to_boundary)) { if (spdk_likely(remaining <= to_boundary)) {
len = remaining; len = remaining;
} else { } else {
@ -496,7 +496,7 @@ spdk_vhost_vring_desc_to_iov(struct spdk_vhost_session *vsession, struct iovec *
if (vva + len != (uintptr_t)rte_vhost_gpa_to_vva(vsession->mem, payload + len)) { if (vva + len != (uintptr_t)rte_vhost_gpa_to_vva(vsession->mem, payload + len)) {
break; break;
} }
len += spdk_min(remaining - len, 0x200000); len += spdk_min(remaining - len, VALUE_2MB);
} }
} }
iov[*iov_index].iov_base = (void *)vva; iov[*iov_index].iov_base = (void *)vva;

5
lib/virtio/virtio_pci.c
View File

@ -38,6 +38,7 @@
#include "spdk/env.h" #include "spdk/env.h"
#include "spdk_internal/virtio.h" #include "spdk_internal/virtio.h"
#include "spdk_internal/memory.h"
struct virtio_hw { struct virtio_hw {
uint8_t use_msix; uint8_t use_msix;
@ -268,11 +269,11 @@ modern_setup_queue(struct virtio_dev *dev, struct virtqueue *vq)
* only a single hugepage (2MB). As of Virtio 1.0, the queue size * only a single hugepage (2MB). As of Virtio 1.0, the queue size
* always falls within this limit. * always falls within this limit.
*/ */
if (vq->vq_ring_size > 0x200000) { if (vq->vq_ring_size > VALUE_2MB) {
return -ENOMEM; return -ENOMEM;
} }
queue_mem = spdk_dma_zmalloc(vq->vq_ring_size, 0x200000, &queue_mem_phys_addr); queue_mem = spdk_dma_zmalloc(vq->vq_ring_size, VALUE_2MB, &queue_mem_phys_addr);
if (queue_mem == NULL) { if (queue_mem == NULL) {
return -ENOMEM; return -ENOMEM;
} }

6
test/nvme/e2edp/nvme_dp.c
View File

@ -42,6 +42,8 @@
#include "spdk/crc16.h" #include "spdk/crc16.h"
#include "spdk/endian.h" #include "spdk/endian.h"
#include "spdk_internal/memory.h"
#define MAX_DEVS 64 #define MAX_DEVS 64
#define DATA_PATTERN 0x5A #define DATA_PATTERN 0x5A
@ -146,7 +148,7 @@ static uint32_t dp_guard_check_extended_lba_test(struct spdk_nvme_ns *ns, struct
return 0; return 0;
} }
req->lba = 0x200000; req->lba = VALUE_2MB;
req->use_extended_lba = true; req->use_extended_lba = true;
req->use_sgl = true; req->use_sgl = true;
req->buf_size = (sector_size + md_size) * req->lba_count; req->buf_size = (sector_size + md_size) * req->lba_count;
@ -232,7 +234,7 @@ static uint32_t dp_without_pract_extended_lba_test(struct spdk_nvme_ns *ns, stru
return 0; return 0;
} }
req->lba = 0x200000; req->lba = VALUE_2MB;
req->use_extended_lba = true; req->use_extended_lba = true;
req->metadata = NULL; req->metadata = NULL;
pi = (struct spdk_nvme_protection_info *)(req->contig + sector_size + md_size - 8); pi = (struct spdk_nvme_protection_info *)(req->contig + sector_size + md_size - 8);