d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nvme_manage: sort devices by PCI address

Browse Source 
This way, they are listed in a consistent order across runs.

Change-Id: Ie920f4e0c2763efb6c1d2856b5ed0f57ecbe48c8
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-03-04 16:08:14 -07:00
parent ce13ccf8b0
commit 2e61a144dd
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
examples/nvme/nvme_manage/nvme_manage.c
View File

@ -34,6 +34,7 @@
#include <stdbool.h>
#include <unistd.h>
#include <inttypes.h>
#include <stdlib.h>
#include <rte_config.h>
#include <rte_malloc.h>
@ -59,6 +60,35 @@ static int num_devs = 0;
#define foreach_dev(iter) \
for (iter = devs; iter - devs < num_devs; iter++)
static uint64_t
get_pci_addr(struct spdk_pci_device *pci_dev)
{
uint64_t cmp;
cmp = (uint64_t)spdk_pci_device_get_domain(pci_dev) << 24;
cmp |= (uint64_t)spdk_pci_device_get_bus(pci_dev) << 16;
cmp |= (uint64_t)spdk_pci_device_get_dev(pci_dev) << 8;
cmp |= (uint64_t)spdk_pci_device_get_func(pci_dev);
return cmp;
}
static int
cmp_devs(const void *ap, const void *bp)
{
const struct dev *a = ap, *b = bp;
uint64_t cmp_a = get_pci_addr(a->pci_dev);
uint64_t cmp_b = get_pci_addr(b->pci_dev);
if (cmp_a < cmp_b) {
return -1;
} else if (cmp_a > cmp_b) {
return 1;
} else {
return 0;
}
}
static struct dev *
get_controller(void)
{
@ -403,6 +433,8 @@ int main(int argc, char **argv)
return 1;
}
qsort(devs, num_devs, sizeof(devs[0]), cmp_devs);
if (num_devs) {
rc = spdk_nvme_register_io_thread();
if (rc != 0)