New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

spdk: upgrade spdk to v16.12 #12734

Merged
merged 6 commits into from Jan 3, 2017

Conversation

Projects
None yet
3 participants
@liupan1111
Contributor

liupan1111 commented Jan 2, 2017

upgrade spdk to v16.12, upgrade dpdk to v16.11, and fix compilation issue.

liupan1111 added some commits Jan 1, 2017

dpdk: upgrade dpdk version to 16.11
Signed-off-by: Pan Liu <pan.liu@istuary.com>
spdk: upgrade spdk version to 16.12
Signed-off-by: Pan Liu <pan.liu@istuary.com>
dpdk: make compilation successful when use dpdk v16.11
Signed-off-by: Pan Liu <pan.liu@istuary.com>
spdk: fixed the compilation error for testcases when use spdk v16.12
Signed-off-by: Pan Liu <pan.liu@istuary.com>
os/bluestore: fixed compilation issue when use spdk v16.12
Signed-off-by: Pan Liu <pan.liu@istuary.com>
@liupan1111

This comment has been minimized.

Contributor

liupan1111 commented Jan 2, 2017

@yuyuyu101 @optimistyzy, please help take a look.

@optimistyzy

This comment has been minimized.

Contributor

optimistyzy commented Jan 2, 2017

should be merged to support new spdk version in NVMEDecvice.cc

@@ -223,6 +223,9 @@ class SharedDriverData {
}
~SharedDriverData() {
g_ceph_context->get_perfcounters_collection()->remove(logger);
if(!qpair) {

This comment has been minimized.

@yuyuyu101

yuyuyu101 Jan 2, 2017

Member

space after "if"

This comment has been minimized.

@liupan1111

liupan1111 Jan 2, 2017

Contributor

agree

return false;
}
}
return true;

This comment has been minimized.

@yuyuyu101

yuyuyu101 Jan 2, 2017

Member

how do we decide to use uio driver when removing above?

This comment has been minimized.

@optimistyzy

optimistyzy Jan 3, 2017

Contributor

The logic is in SPDK. We will either use VFIO or UIO, the logic is shown in scripts/setup.sh. For pci_access, the support is removed in current SPDK.

struct spdk_pci_device *pci_dev = NULL;
if (trid->trtype != SPDK_NVME_TRANSPORT_PCIE) {
// currently, only probe local nvme device.

This comment has been minimized.

@yuyuyu101

yuyuyu101 Jan 2, 2017

Member

plz log enough information

}
if (spdk_pci_addr_parse(&pci_addr, trid->traddr)) {
return false;

This comment has been minimized.

@yuyuyu101

yuyuyu101 Jan 2, 2017

Member

plz log enough information

}
pci_dev = spdk_pci_get_device(&pci_addr);
if (!pci_dev) {

This comment has been minimized.

@yuyuyu101

yuyuyu101 Jan 2, 2017

Member

plz log enough information

This comment has been minimized.

@liupan1111

liupan1111 Jan 2, 2017

Contributor

sure,thanks.

@@ -201,10 +198,13 @@ class SharedDriverData {
flush_lock("NVMEDevice::flush_lock"),
flush_waiters(0),
completed_op_seq(0), queue_op_seq(0) {
enum spdk_nvme_qprio qprio = SPDK_NVME_QPRIO_URGENT;

This comment has been minimized.

@yuyuyu101

yuyuyu101 Jan 2, 2017

Member

@optimistyzy it this "URGENT" properly used here?

This comment has been minimized.

@optimistyzy

optimistyzy Jan 3, 2017

Contributor

Yes, the default is URGENT(0). There are three values defined in SPDK, and the default priority is 0. It is correctly used in this scenario

@yuyuyu101

This comment has been minimized.

Member

yuyuyu101 commented Jan 2, 2017

good move

os/bluestore: add more useful log information in NVMEDevice.cc
Signed-off-by: Pan Liu <pan.liu@istuary.com>
@liupan1111

This comment has been minimized.

Contributor

liupan1111 commented Jan 3, 2017

@yuyuyu101 modified, please take a look, thanks!

@yuyuyu101 yuyuyu101 merged commit eb60e5f into ceph:master Jan 3, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@liupan1111 liupan1111 deleted the liupan1111:wip-fix-nvme-driver-compile-issue branch Jan 3, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment