tailq: remove unneeded inclusions

[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 3e72a70..526b18d 100644 (file)
--- a/lib/librte_mbuf/rte_mbuf.c
+++ b/lib/librte_mbuf/rte_mbuf.c
@@ -2,6 +2,7 @@
  *   BSD LICENSE
  *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright 2014 6WIND S.A.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -47,7 +48,6 @@
 #include <rte_memory.h>
 #include <rte_memzone.h>
 #include <rte_launch.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
@@ -69,7 +69,9 @@ rte_ctrlmbuf_init(struct rte_mempool *mp,
                void *_m,
                __attribute__((unused)) unsigned i)
 {
+       struct rte_mbuf *m = _m;
        rte_pktmbuf_init(mp, opaque_arg, _m, i);
+       m->ol_flags |= CTRL_MBUF_FLAG;
 }
 
 /*
@@ -117,12 +119,12 @@ rte_pktmbuf_init(struct rte_mempool *mp,
        m->buf_len = (uint16_t)buf_len;
 
        /* keep some headroom between start of buffer and data */
-       m->pkt.data = (char*) m->buf_addr + RTE_MIN(RTE_PKTMBUF_HEADROOM, m->buf_len);
+       m->data_off = RTE_MIN(RTE_PKTMBUF_HEADROOM, (uint16_t)m->buf_len);
 
        /* init some constant fields */
        m->pool = mp;
-       m->pkt.nb_segs = 1;
-       m->pkt.in_port = 0xff;
+       m->nb_segs = 1;
+       m->port = 0xff;
 }
 
 /* do some sanity checks on a mbuf: panic if it fails */
@@ -143,20 +145,18 @@ rte_mbuf_sanity_check(const struct rte_mbuf *m, int is_header)
        if (m->buf_addr == NULL)
                rte_panic("bad virt addr\n");
 
-#ifdef RTE_MBUF_REFCNT
        uint16_t cnt = rte_mbuf_refcnt_read(m);
        if ((cnt == 0) || (cnt == UINT16_MAX))
                rte_panic("bad ref cnt\n");
-#endif
 
        /* nothing to check for sub-segments */
        if (is_header == 0)
                return;
 
-       nb_segs = m->pkt.nb_segs;
+       nb_segs = m->nb_segs;
        m_seg = m;
        while (m_seg && nb_segs != 0) {
-               m_seg = m_seg->pkt.next;
+               m_seg = m_seg->next;
                nb_segs--;
        }
        if (nb_segs != 0)
@@ -174,23 +174,75 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)
 
        fprintf(f, "dump mbuf at 0x%p, phys=%"PRIx64", buf_len=%u\n",
               m, (uint64_t)m->buf_physaddr, (unsigned)m->buf_len);
-       fprintf(f, "  pkt_len=%"PRIu32", ol_flags=%"PRIx16", nb_segs=%u, "
-              "in_port=%u\n", m->pkt.pkt_len, m->ol_flags,
-              (unsigned)m->pkt.nb_segs, (unsigned)m->pkt.in_port);
-       nb_segs = m->pkt.nb_segs;
+       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);
+       nb_segs = m->nb_segs;
 
        while (m && nb_segs != 0) {
                __rte_mbuf_sanity_check(m, 0);
 
                fprintf(f, "  segment at 0x%p, data=0x%p, data_len=%u\n",
-                      m, m->pkt.data, (unsigned)m->pkt.data_len);
+                       m, rte_pktmbuf_mtod(m, void *), (unsigned)m->data_len);
                len = dump_len;
-               if (len > m->pkt.data_len)
-                       len = m->pkt.data_len;
+               if (len > m->data_len)
+                       len = m->data_len;
                if (len != 0)
-                       rte_hexdump(f, NULL, m->pkt.data, len);
+                       rte_hexdump(f, NULL, rte_pktmbuf_mtod(m, void *), len);
                dump_len -= len;
-               m = m->pkt.next;
+               m = m->next;
                nb_segs --;
        }
 }
+
+/*
+ * Get the name of a RX offload flag. Must be kept synchronized with flag
+ * definitions in rte_mbuf.h.
+ */
+const char *rte_get_rx_ol_flag_name(uint64_t mask)
+{
+       switch (mask) {
+       case PKT_RX_VLAN_PKT: return "PKT_RX_VLAN_PKT";
+       case PKT_RX_RSS_HASH: return "PKT_RX_RSS_HASH";
+       case PKT_RX_FDIR: return "PKT_RX_FDIR";
+       case PKT_RX_L4_CKSUM_BAD: return "PKT_RX_L4_CKSUM_BAD";
+       case PKT_RX_IP_CKSUM_BAD: return "PKT_RX_IP_CKSUM_BAD";
+       /* case PKT_RX_EIP_CKSUM_BAD: return "PKT_RX_EIP_CKSUM_BAD"; */
+       /* case PKT_RX_OVERSIZE: return "PKT_RX_OVERSIZE"; */
+       /* case PKT_RX_HBUF_OVERFLOW: return "PKT_RX_HBUF_OVERFLOW"; */
+       /* case PKT_RX_RECIP_ERR: return "PKT_RX_RECIP_ERR"; */
+       /* case PKT_RX_MAC_ERR: return "PKT_RX_MAC_ERR"; */
+       case PKT_RX_IPV4_HDR: return "PKT_RX_IPV4_HDR";
+       case PKT_RX_IPV4_HDR_EXT: return "PKT_RX_IPV4_HDR_EXT";
+       case PKT_RX_IPV6_HDR: return "PKT_RX_IPV6_HDR";
+       case PKT_RX_IPV6_HDR_EXT: return "PKT_RX_IPV6_HDR_EXT";
+       case PKT_RX_IEEE1588_PTP: return "PKT_RX_IEEE1588_PTP";
+       case PKT_RX_IEEE1588_TMST: return "PKT_RX_IEEE1588_TMST";
+       case PKT_RX_TUNNEL_IPV4_HDR: return "PKT_RX_TUNNEL_IPV4_HDR";
+       case PKT_RX_TUNNEL_IPV6_HDR: return "PKT_RX_TUNNEL_IPV6_HDR";
+       default: return NULL;
+       }
+}
+
+/*
+ * Get the name of a TX offload flag. Must be kept synchronized with flag
+ * definitions in rte_mbuf.h.
+ */
+const char *rte_get_tx_ol_flag_name(uint64_t mask)
+{
+       switch (mask) {
+       case PKT_TX_VLAN_PKT: return "PKT_TX_VLAN_PKT";
+       case PKT_TX_IP_CKSUM: return "PKT_TX_IP_CKSUM";
+       case PKT_TX_TCP_CKSUM: return "PKT_TX_TCP_CKSUM";
+       case PKT_TX_SCTP_CKSUM: return "PKT_TX_SCTP_CKSUM";
+       case PKT_TX_UDP_CKSUM: return "PKT_TX_UDP_CKSUM";
+       case PKT_TX_IEEE1588_TMST: return "PKT_TX_IEEE1588_TMST";
+       case PKT_TX_TCP_SEG: return "PKT_TX_TCP_SEG";
+       case PKT_TX_IPV4: return "PKT_TX_IPV4";
+       case PKT_TX_IPV6: return "PKT_TX_IPV6";
+       case PKT_TX_OUTER_IP_CKSUM: return "PKT_TX_OUTER_IP_CKSUM";
+       case PKT_TX_OUTER_IPV4: return "PKT_TX_OUTER_IPV4";
+       case PKT_TX_OUTER_IPV6: return "PKT_TX_OUTER_IPV6";
+       default: return NULL;
+       }
+}