pdump: use mbuf copy function

[dpdk.git] / lib / librte_pdump / rte_pdump.c

diff --git a/lib/librte_pdump/rte_pdump.c b/lib/librte_pdump/rte_pdump.c
index 6c3a885..7816c72 100644 (file)
--- a/lib/librte_pdump/rte_pdump.c
+++ b/lib/librte_pdump/rte_pdump.c
@@ -64,73 +64,6 @@ static struct pdump_rxtx_cbs {
 } rx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT],
 tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT];
 
-static inline int
-pdump_pktmbuf_copy_data(struct rte_mbuf *seg, const struct rte_mbuf *m)
-{
-       if (rte_pktmbuf_tailroom(seg) < m->data_len) {
-               RTE_LOG(ERR, PDUMP,
-                       "User mempool: insufficient data_len of mbuf\n");
-               return -EINVAL;
-       }
-
-       seg->port = m->port;
-       seg->vlan_tci = m->vlan_tci;
-       seg->hash = m->hash;
-       seg->tx_offload = m->tx_offload;
-       seg->ol_flags = m->ol_flags;
-       seg->packet_type = m->packet_type;
-       seg->vlan_tci_outer = m->vlan_tci_outer;
-       seg->data_len = m->data_len;
-       seg->pkt_len = seg->data_len;
-       rte_memcpy(rte_pktmbuf_mtod(seg, void *),
-                       rte_pktmbuf_mtod(m, void *),
-                       rte_pktmbuf_data_len(seg));
-
-       return 0;
-}
-
-static inline struct rte_mbuf *
-pdump_pktmbuf_copy(struct rte_mbuf *m, struct rte_mempool *mp)
-{
-       struct rte_mbuf *m_dup, *seg, **prev;
-       uint32_t pktlen;
-       uint16_t nseg;
-
-       m_dup = rte_pktmbuf_alloc(mp);
-       if (unlikely(m_dup == NULL))
-               return NULL;
-
-       seg = m_dup;
-       prev = &seg->next;
-       pktlen = m->pkt_len;
-       nseg = 0;
-
-       do {
-               nseg++;
-               if (pdump_pktmbuf_copy_data(seg, m) < 0) {
-                       if (seg != m_dup)
-                               rte_pktmbuf_free_seg(seg);
-                       rte_pktmbuf_free(m_dup);
-                       return NULL;
-               }
-               *prev = seg;
-               prev = &seg->next;
-       } while ((m = m->next) != NULL &&
-                       (seg = rte_pktmbuf_alloc(mp)) != NULL);
-
-       *prev = NULL;
-       m_dup->nb_segs = nseg;
-       m_dup->pkt_len = pktlen;
-
-       /* Allocation of new indirect segment failed */
-       if (unlikely(seg == NULL)) {
-               rte_pktmbuf_free(m_dup);
-               return NULL;
-       }
-
-       __rte_mbuf_sanity_check(m_dup, 1);
-       return m_dup;
-}
 
 static inline void
 pdump_copy(struct rte_mbuf **pkts, uint16_t nb_pkts, void *user_params)
@@ -148,7 +81,7 @@ pdump_copy(struct rte_mbuf **pkts, uint16_t nb_pkts, void *user_params)
        ring = cbs->ring;
        mp = cbs->mp;
        for (i = 0; i < nb_pkts; i++) {
-               p = pdump_pktmbuf_copy(pkts[i], mp);
+               p = rte_pktmbuf_copy(pkts[i], mp, 0, UINT32_MAX);
                if (p)
                        dup_bufs[d_pkts++] = p;
        }
@@ -333,7 +266,14 @@ set_pdump_rxtx_cbs(const struct pdump_request *p)
        if (queue == RTE_PDUMP_ALL_QUEUES) {
                struct rte_eth_dev_info dev_info;
 
-               rte_eth_dev_info_get(port, &dev_info);
+               ret = rte_eth_dev_info_get(port, &dev_info);
+               if (ret != 0) {
+                       RTE_LOG(ERR, PDUMP,
+                               "Error during getting device (port %u) info: %s\n",
+                               port, strerror(-ret));
+                       return ret;
+               }
+
                nb_rx_q = dev_info.nb_rx_queues;
                nb_tx_q = dev_info.nb_tx_queues;
                if (nb_rx_q == 0 && flags & RTE_PDUMP_FLAG_RX) {
@@ -406,9 +346,12 @@ pdump_server(const struct rte_mp_msg *mp_msg, const void *peer)
 }
 
 int
-rte_pdump_init(const char *path __rte_unused)
+rte_pdump_init(void)
 {
-       return rte_mp_action_register(PDUMP_MP, pdump_server);
+       int ret = rte_mp_action_register(PDUMP_MP, pdump_server);
+       if (ret && rte_errno != ENOTSUP)
+               return -1;
+       return 0;
 }
 
 int
@@ -501,15 +444,15 @@ pdump_prepare_client_request(char *device, uint16_t queue,
        req->flags = flags;
        req->op = operation;
        if ((operation & ENABLE) != 0) {
-               snprintf(req->data.en_v1.device,
-                        sizeof(req->data.en_v1.device), "%s", device);
+               strlcpy(req->data.en_v1.device, device,
+                       sizeof(req->data.en_v1.device));
                req->data.en_v1.queue = queue;
                req->data.en_v1.ring = ring;
                req->data.en_v1.mp = mp;
                req->data.en_v1.filter = filter;
        } else {
-               snprintf(req->data.dis_v1.device,
-                        sizeof(req->data.dis_v1.device), "%s", device);
+               strlcpy(req->data.dis_v1.device, device,
+                       sizeof(req->data.dis_v1.device));
                req->data.dis_v1.queue = queue;
                req->data.dis_v1.ring = NULL;
                req->data.dis_v1.mp = NULL;
@@ -616,10 +559,3 @@ rte_pdump_disable_by_deviceid(char *device_id, uint16_t queue,
 
        return ret;
 }
-
-int
-rte_pdump_set_socket_dir(const char *path __rte_unused,
-                        enum rte_pdump_socktype type __rte_unused)
-{
-       return 0;
-}