mempool: rename addresses from physical to IOVA

[dpdk.git] / lib / librte_mempool / rte_mempool.c

diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c
index aad3294..7472f83 100644 (file)
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -128,7 +128,7 @@ static unsigned optimize_object_size(unsigned obj_size)
 }
 
 static void
-mempool_add_elem(struct rte_mempool *mp, void *obj, phys_addr_t physaddr)
+mempool_add_elem(struct rte_mempool *mp, void *obj, rte_iova_t iova)
 {
        struct rte_mempool_objhdr *hdr;
        struct rte_mempool_objtlr *tlr __rte_unused;
@@ -136,7 +136,7 @@ mempool_add_elem(struct rte_mempool *mp, void *obj, phys_addr_t physaddr)
        /* set mempool ptr in header */
        hdr = RTE_PTR_SUB(obj, sizeof(*hdr));
        hdr->mp = mp;
-       hdr->physaddr = physaddr;
+       hdr->iova = iova;
        STAILQ_INSERT_TAIL(&mp->elt_list, hdr, next);
        mp->populated_size++;
 
@@ -270,12 +270,12 @@ rte_mempool_xmem_size(uint32_t elt_num, size_t total_elt_sz, uint32_t pg_shift,
  */
 ssize_t
 rte_mempool_xmem_usage(__rte_unused void *vaddr, uint32_t elt_num,
-       size_t total_elt_sz, const phys_addr_t paddr[], uint32_t pg_num,
+       size_t total_elt_sz, const rte_iova_t iova[], uint32_t pg_num,
        uint32_t pg_shift, unsigned int flags)
 {
        uint32_t elt_cnt = 0;
-       phys_addr_t start, end;
-       uint32_t paddr_idx;
+       rte_iova_t start, end;
+       uint32_t iova_idx;
        size_t pg_sz = (size_t)1 << pg_shift;
        unsigned int mask;
 
@@ -284,15 +284,15 @@ rte_mempool_xmem_usage(__rte_unused void *vaddr, uint32_t elt_num,
                /* alignment need one additional object */
                elt_num += 1;
 
-       /* if paddr is NULL, assume contiguous memory */
-       if (paddr == NULL) {
+       /* if iova is NULL, assume contiguous memory */
+       if (iova == NULL) {
                start = 0;
                end = pg_sz * pg_num;
-               paddr_idx = pg_num;
+               iova_idx = pg_num;
        } else {
-               start = paddr[0];
-               end = paddr[0] + pg_sz;
-               paddr_idx = 1;
+               start = iova[0];
+               end = iova[0] + pg_sz;
+               iova_idx = 1;
        }
        while (elt_cnt < elt_num) {
 
@@ -300,15 +300,15 @@ rte_mempool_xmem_usage(__rte_unused void *vaddr, uint32_t elt_num,
                        /* enough contiguous memory, add an object */
                        start += total_elt_sz;
                        elt_cnt++;
-               } else if (paddr_idx < pg_num) {
+               } else if (iova_idx < pg_num) {
                        /* no room to store one obj, add a page */
-                       if (end == paddr[paddr_idx]) {
+                       if (end == iova[iova_idx]) {
                                end += pg_sz;
                        } else {
-                               start = paddr[paddr_idx];
-                               end = paddr[paddr_idx] + pg_sz;
+                               start = iova[iova_idx];
+                               end = iova[iova_idx] + pg_sz;
                        }
-                       paddr_idx++;
+                       iova_idx++;
 
                } else {
                        /* no more page, return how many elements fit */
@@ -316,7 +316,7 @@ rte_mempool_xmem_usage(__rte_unused void *vaddr, uint32_t elt_num,
                }
        }
 
-       return (size_t)paddr_idx << pg_shift;
+       return (size_t)iova_idx << pg_shift;
 }
 
 /* free a memchunk allocated with rte_memzone_reserve() */
@@ -402,7 +402,7 @@ rte_mempool_populate_phys(struct rte_mempool *mp, char *vaddr,
 
        memhdr->mp = mp;
        memhdr->addr = vaddr;
-       memhdr->phys_addr = paddr;
+       memhdr->iova = paddr;
        memhdr->len = len;
        memhdr->free_cb = free_cb;
        memhdr->opaque = opaque;
@@ -483,7 +483,7 @@ rte_mempool_populate_virt(struct rte_mempool *mp, char *addr,
        size_t len, size_t pg_sz, rte_mempool_memchunk_free_cb_t *free_cb,
        void *opaque)
 {
-       phys_addr_t paddr;
+       rte_iova_t iova;
        size_t off, phys_len;
        int ret, cnt = 0;
 
@@ -503,24 +503,24 @@ rte_mempool_populate_virt(struct rte_mempool *mp, char *addr,
        for (off = 0; off + pg_sz <= len &&
                     mp->populated_size < mp->size; off += phys_len) {
 
-               paddr = rte_mem_virt2iova(addr + off);
+               iova = rte_mem_virt2iova(addr + off);
 
-               if (paddr == RTE_BAD_PHYS_ADDR && rte_eal_has_hugepages()) {
+               if (iova == RTE_BAD_IOVA && rte_eal_has_hugepages()) {
                        ret = -EINVAL;
                        goto fail;
                }
 
                /* populate with the largest group of contiguous pages */
                for (phys_len = pg_sz; off + phys_len < len; phys_len += pg_sz) {
-                       phys_addr_t paddr_tmp;
+                       rte_iova_t iova_tmp;
 
-                       paddr_tmp = rte_mem_virt2iova(addr + off + phys_len);
+                       iova_tmp = rte_mem_virt2iova(addr + off + phys_len);
 
-                       if (paddr_tmp != paddr + phys_len)
+                       if (iova_tmp != iova + phys_len)
                                break;
                }
 
-               ret = rte_mempool_populate_phys(mp, addr + off, paddr,
+               ret = rte_mempool_populate_phys(mp, addr + off, iova,
                        phys_len, free_cb, opaque);
                if (ret < 0)
                        goto fail;
@@ -547,7 +547,7 @@ rte_mempool_populate_default(struct rte_mempool *mp)
        char mz_name[RTE_MEMZONE_NAMESIZE];
        const struct rte_memzone *mz;
        size_t size, total_elt_sz, align, pg_sz, pg_shift;
-       phys_addr_t paddr;
+       rte_iova_t iova;
        unsigned mz_id, n;
        unsigned int mp_flags;
        int ret;
@@ -599,13 +599,13 @@ rte_mempool_populate_default(struct rte_mempool *mp)
                }
 
                if (mp->flags & MEMPOOL_F_NO_PHYS_CONTIG)
-                       paddr = RTE_BAD_PHYS_ADDR;
+                       iova = RTE_BAD_IOVA;
                else
-                       paddr = mz->iova;
+                       iova = mz->iova;
 
                if (rte_eal_has_hugepages())
                        ret = rte_mempool_populate_phys(mp, mz->addr,
-                               paddr, mz->len,
+                               iova, mz->len,
                                rte_mempool_memchunk_mz_free,
                                (void *)(uintptr_t)mz);
                else
@@ -958,7 +958,7 @@ rte_mempool_xmem_create(const char *name, unsigned n, unsigned elt_size,
                rte_mempool_ctor_t *mp_init, void *mp_init_arg,
                rte_mempool_obj_cb_t *obj_init, void *obj_init_arg,
                int socket_id, unsigned flags, void *vaddr,
-               const phys_addr_t paddr[], uint32_t pg_num, uint32_t pg_shift)
+               const rte_iova_t iova[], uint32_t pg_num, uint32_t pg_shift)
 {
        struct rte_mempool *mp = NULL;
        int ret;
@@ -970,7 +970,7 @@ rte_mempool_xmem_create(const char *name, unsigned n, unsigned elt_size,
                        obj_init, obj_init_arg, socket_id, flags);
 
        /* check that we have both VA and PA */
-       if (paddr == NULL) {
+       if (iova == NULL) {
                rte_errno = EINVAL;
                return NULL;
        }
@@ -990,7 +990,7 @@ rte_mempool_xmem_create(const char *name, unsigned n, unsigned elt_size,
        if (mp_init)
                mp_init(mp, mp_init_arg);
 
-       ret = rte_mempool_populate_phys_tab(mp, vaddr, paddr, pg_num, pg_shift,
+       ret = rte_mempool_populate_phys_tab(mp, vaddr, iova, pg_num, pg_shift,
                NULL, NULL);
        if (ret < 0 || ret != (int)mp->size)
                goto fail;