RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-31 07:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12812 from optimistyzy/16_0

Browse Source 
NVMEDevice: fix bug in data_buf_next_sge

Reviewed-by: Haomai Wang <haomai@xsky.com>
This commit is contained in:
Haomai Wang 2017-01-08 13:17:37 +08:00 committed by GitHub
commit e3c54bc8eb
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,16 +315,16 @@ static int data_buf_next_sge(void *cb_arg, void **address, uint32_t *length)
if (t->io_request.cur_seg_left) {
*length = t->io_request.cur_seg_left;
*address = (void *)(rte_malloc_virt2phy(addr) + data_buffer_size - t->io_request.cur_seg_left);
*address = (void *)((uint64_t)addr + data_buffer_size - t->io_request.cur_seg_left);
if (t->io_request.cur_seg_idx == t->io_request.nseg - 1) {
uint64_t tail = t->len % data_buffer_size;
if (tail) {
*address = (void *)(rte_malloc_virt2phy(addr) + tail - t->io_request.cur_seg_left);
*address = (void *)((uint64_t)addr + tail - t->io_request.cur_seg_left);
}
}
t->io_request.cur_seg_left = 0;
} else {
*address = (void *)rte_malloc_virt2phy(addr);
*address = addr;
*length = data_buffer_size;
if (t->io_request.cur_seg_idx == t->io_request.nseg - 1) {
uint64_t tail = t->len % data_buffer_size;
@ -375,8 +375,7 @@ void SharedDriverData::_aio_thread()
if (data_buf_mempool.empty()) {
for (uint16_t i = 0; i < data_buffer_default_num; i++) {
void *b = rte_malloc_socket(
"nvme_data_buffer", data_buffer_size, CEPH_PAGE_SIZE, rte_socket_id());
void *b = spdk_zmalloc(data_buffer_size, CEPH_PAGE_SIZE, NULL);
if (!b) {
derr << __func__ << " failed to create memory pool for nvme data buffer" << dendl;
assert(b);