net/virtio: remove a redundant macro definition for ctrl vq

[dpdk.git] / lib / librte_mbuf / rte_mbuf.c

diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c
index d6675ec..937fd70 100644 (file)
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -134,7 +134,7 @@ rte_pktmbuf_init(struct rte_mempool *mp,
        /* start of buffer is after mbuf structure and priv data */
        m->priv_size = priv_size;
        m->buf_addr = (char *)m + mbuf_size;
-       m->buf_physaddr = rte_mempool_virt2phy(mp, m) + mbuf_size;
+       m->buf_iova = rte_mempool_virt2iova(m) + mbuf_size;
        m->buf_len = (uint16_t)buf_len;
 
        /* keep some headroom between start of buffer and data */
@@ -202,8 +202,7 @@ rte_pktmbuf_pool_create(const char *name, unsigned n,
 void
 rte_mbuf_sanity_check(const struct rte_mbuf *m, int is_header)
 {
-       const struct rte_mbuf *m_seg;
-       unsigned nb_segs;
+       unsigned int nb_segs, pkt_len;
 
        if (m == NULL)
                rte_panic("mbuf is NULL\n");
@@ -211,8 +210,8 @@ rte_mbuf_sanity_check(const struct rte_mbuf *m, int is_header)
        /* generic checks */
        if (m->pool == NULL)
                rte_panic("bad mbuf pool\n");
-       if (m->buf_physaddr == 0)
-               rte_panic("bad phys addr\n");
+       if (m->buf_iova == 0)
+               rte_panic("bad IO addr\n");
        if (m->buf_addr == NULL)
                rte_panic("bad virt addr\n");
 
@@ -224,14 +223,22 @@ rte_mbuf_sanity_check(const struct rte_mbuf *m, int is_header)
        if (is_header == 0)
                return;
 
+       /* data_len is supposed to be not more than pkt_len */
+       if (m->data_len > m->pkt_len)
+               rte_panic("bad data_len\n");
+
        nb_segs = m->nb_segs;
-       m_seg = m;
-       while (m_seg && nb_segs != 0) {
-               m_seg = m_seg->next;
-               nb_segs--;
-       }
-       if (nb_segs != 0)
+       pkt_len = m->pkt_len;
+
+       do {
+               nb_segs -= 1;
+               pkt_len -= m->data_len;
+       } while ((m = m->next) != NULL);
+
+       if (nb_segs)
                rte_panic("bad nb_segs\n");
+       if (pkt_len)
+               rte_panic("bad pkt_len\n");
 }
 
 /* dump a mbuf on console */
@@ -239,12 +246,12 @@ void
 rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)
 {
        unsigned int len;
-       unsigned nb_segs;
+       unsigned int nb_segs;
 
        __rte_mbuf_sanity_check(m, 1);
 
-       fprintf(f, "dump mbuf at %p, phys=%"PRIx64", buf_len=%u\n",
-              m, (uint64_t)m->buf_physaddr, (unsigned)m->buf_len);
+       fprintf(f, "dump mbuf at %p, iova=%"PRIx64", buf_len=%u\n",
+              m, (uint64_t)m->buf_iova, (unsigned)m->buf_len);
        fprintf(f, "  pkt_len=%"PRIu32", ol_flags=%"PRIx64", nb_segs=%u, "
               "in_port=%u\n", m->pkt_len, m->ol_flags,
               (unsigned)m->nb_segs, (unsigned)m->port);