bus/pci: use memseg walk instead of iteration

Reduce dependency on internal details of EAL memory subsystem, and
simplify code.

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Tested-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>
Tested-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Tested-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>

diff --git a/drivers/bus/pci/Makefile b/drivers/bus/pci/Makefile
index f3df1c4ce4c40964678203def30c2c5423288455..804a198d170e78907aa9f0af70374b8b5ac45980 100644 (file)
--- a/drivers/bus/pci/Makefile
+++ b/drivers/bus/pci/Makefile
@@ -49,6 +49,9 @@ CFLAGS += -I$(RTE_SDK)/drivers/bus/pci/$(SYSTEM)
 CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common
 CFLAGS += -I$(RTE_SDK)/lib/librte_eal/$(SYSTEM)app/eal
 
+# memseg walk is not part of stable API yet
+CFLAGS += -DALLOW_EXPERIMENTAL_API
+
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
 LDLIBS += -lrte_ethdev -lrte_pci
 

diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index abde64119f94abe6c3f0d7c3c91f1aa42fac08f3..6dda054a7e22d54a28e79c5c549d14671c75729e 100644 (file)
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -116,22 +116,24 @@ rte_pci_unmap_device(struct rte_pci_device *dev)
        }
 }
 
-void *
-pci_find_max_end_va(void)
+static int
+find_max_end_va(const struct rte_memseg *ms, void *arg)
 {
-       const struct rte_memseg *seg = rte_eal_get_physmem_layout();
-       const struct rte_memseg *last = seg;
-       unsigned i = 0;
+       void *end_va = RTE_PTR_ADD(ms->addr, ms->len);
+       void **max_va = arg;
 
-       for (i = 0; i < RTE_MAX_MEMSEG; i++, seg++) {
-               if (seg->addr == NULL)
-                       break;
+       if (*max_va < end_va)
+               *max_va = end_va;
+       return 0;
+}
 
-               if (seg->addr > last->addr)
-                       last = seg;
+void *
+pci_find_max_end_va(void)
+{
+       void *va = NULL;
 
-       }
-       return RTE_PTR_ADD(last->addr, last->len);
+       rte_memseg_walk(find_max_end_va, &va);
+       return va;
 }
 
 /* parse one line of the "resource" sysfs file (note that the 'line'

diff --git a/drivers/bus/pci/meson.build b/drivers/bus/pci/meson.build
index 12756a4d9e2b87bfc2900c8d70e3f4e0fe044dac..72939e598658186e06233f4324a8815ae779bc33 100644 (file)
--- a/drivers/bus/pci/meson.build
+++ b/drivers/bus/pci/meson.build
@@ -14,3 +14,6 @@ else
        sources += files('bsd/pci.c')
        includes += include_directories('bsd')
 endif
+
+# memseg walk is not part of stable API yet
+allow_experimental_apis = true