RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 01:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

bluestore,NVMeDevice: update NVMeDevice code due to SPDK upgrade

Browse Source 
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
This commit is contained in:
Ziye Yang 2017-08-09 11:50:45 +08:00
parent 8a09edd196
commit 96ae9d861a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/os/bluestore/NVMEDevice.cc
View File

@ -139,7 +139,7 @@ class SharedDriverQueueData {
flush_waiters(0),
completed_op_seq(0), queue_op_seq(0) {
qpair = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, SPDK_NVME_QPRIO_URGENT);
qpair = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, NULL, SPDK_NVME_QPRIO_URGENT);
PerfCountersBuilder b(g_ceph_context, string("NVMEDevice-AIOThread-"+stringify(this)),
l_bluestore_nvmedevice_first, l_bluestore_nvmedevice_last);
b.add_time_avg(l_bluestore_nvmedevice_aio_write_lat, "aio_write_lat", "Average write completing latency");
@ -443,7 +443,7 @@ void SharedDriverQueueData::_aio_thread()
if (data_buf_mempool.empty()) {
for (uint16_t i = 0; i < data_buffer_default_num; i++) {
void *b = spdk_zmalloc(data_buffer_size, CEPH_PAGE_SIZE, NULL);
void *b = spdk_dma_zmalloc(data_buffer_size, CEPH_PAGE_SIZE, NULL);
if (!b) {
derr << __func__ << " failed to create memory pool for nvme data buffer" << dendl;
assert(b);
@ -749,8 +749,8 @@ int NVMEManager::try_get(const string &sn_tag, SharedDriverData **driver)
spdk_env_opts_init(&opts);
opts.name = "ceph-osd";
opts.core_mask = coremask_arg;
opts.dpdk_master_core = m_core_arg;
opts.dpdk_mem_size = mem_size_arg;
opts.master_core = m_core_arg;
opts.mem_size = mem_size_arg;
spdk_env_init(&opts);
spdk_nvme_retry_count = g_ceph_context->_conf->bdev_nvme_retry_count;

2
src/spdk

@ -1 +1 @@
Subproject commit 5742e9b9e782b9666e10c9224389e4d015c3cdee
Subproject commit 7b7f2aa6854745caf6e2803133043132ca400285