RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 16:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44285 from fengchunsong/dpdk-rte-init

Browse Source 
msg/async/dpdk: handle DPDK initialization failure properly

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
This commit is contained in:
Kefu Chai 2021-12-26 20:04:40 +08:00 committed by GitHub
commit e8e49d3c82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/msg/async/dpdk/dpdk_rte.cc
View File

@ -137,17 +137,21 @@ namespace dpdk {
if (!rte_initialized) {
/* initialise the EAL for all */
int ret = rte_eal_init(cargs.size(), cargs.data());
if (ret < 0)
return;
if (ret < 0) {
std::unique_lock locker(lock);
done = true;
cond.notify_all();
return ret;
}
rte_initialized = true;
}
std::unique_lock<std::mutex> l(lock);
std::unique_lock locker(lock);
initialized = true;
done = true;
cond.notify_all();
while (!stopped) {
cond.wait(l, [this] { return !funcs.empty() || stopped; });
cond.wait(locker, [this] { return !funcs.empty() || stopped; });
if (!funcs.empty()) {
auto f = std::move(funcs.front());
funcs.pop_front();
@ -156,10 +160,9 @@ namespace dpdk {
}
}
});
std::unique_lock<std::mutex> l(lock);
while (!done)
cond.wait(l);
return 0;
std::unique_lock locker(lock);
cond.wait(locker, [&] { return done; });
return initialized ? 0 : -EIO;
}
size_t eal::mem_size(int num_cpus)