RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19067 from tchaikov/wip-nvme-mgr-fixes

Browse Source 
bluestore/NVMEDevice: do not deference a dangling pointer

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
This commit is contained in:
Kefu Chai 2017-11-22 15:03:16 +08:00 committed by GitHub
commit 8723353f2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <strings.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@ -580,37 +581,9 @@ static void attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
int NVMEManager::try_get(const string &sn_tag, SharedDriverData **driver)
{
Mutex::Locker l(lock);
int r = 0;
unsigned long long core_value;
uint32_t core_num = 0;
int m_core_arg = -1;
uint32_t mem_size_arg = (uint32_t)g_conf->get_val<uint64_t>("bluestore_spdk_mem");
char *coremask_arg = (char *)(g_conf->get_val<std::string>("bluestore_spdk_coremask")).c_str();
if (sn_tag.empty()) {
r = -ENOENT;
derr << __func__ << " empty serial number: " << cpp_strerror(r) << dendl;
return r;
}
core_value = strtoll(coremask_arg, NULL, 16);
for (uint32_t i = 0; i < sizeof(long long) * 8; i++) {
bool tmp = (core_value >> i) & 0x1;
if (tmp) {
core_num += 1;
// select the least signficant bit as the master core
if(m_core_arg < 0) {
m_core_arg = i;
}
}
}
// at least one core is needed for using spdk
if (core_num < 1) {
r = -ENOENT;
derr << __func__ << " invalid spdk coremask, at least one core is needed: "
<< cpp_strerror(r) << dendl;
return r;
derr << __func__ << " empty serial number" << dendl;
return -ENOENT;
}
for (auto &&it : shared_driver_datas) {
@ -620,6 +593,27 @@ int NVMEManager::try_get(const string &sn_tag, SharedDriverData **driver)
}
}
auto coremask_arg = g_conf->get_val<std::string>("bluestore_spdk_coremask");
int m_core_arg = -1;
try {
auto core_value = stoull(coremask_arg, nullptr, 16);
m_core_arg = ffsll(core_value);
} catch (const std::logic_error& e) {
derr << __func__ << " invalid bluestore_spdk_coremask: "
<< coremask_arg << dendl;
return -EINVAL;
}
// at least one core is needed for using spdk
if (m_core_arg == 0) {
derr << __func__ << " invalid bluestore_spdk_coremask, "
<< "at least one core is needed" << dendl;
return -ENOENT;
}
m_core_arg -= 1;
uint32_t mem_size_arg = (uint32_t)g_conf->get_val<uint64_t>("bluestore_spdk_mem");
if (!init) {
init = true;
dpdk_thread = std::thread(
@ -629,7 +623,7 @@ int NVMEManager::try_get(const string &sn_tag, SharedDriverData **driver)
spdk_env_opts_init(&opts);
opts.name = "nvme-device-manager";
opts.core_mask = coremask_arg;
opts.core_mask = coremask_arg.c_str();
opts.master_core = m_core_arg;
opts.mem_size = mem_size_arg;
spdk_env_init(&opts);