Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/12649/?format=api
http://patches.dpdk.org/api/patches/12649/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1462873202-3314-3-git-send-email-reshma.pattan@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1462873202-3314-3-git-send-email-reshma.pattan@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1462873202-3314-3-git-send-email-reshma.pattan@intel.com", "date": "2016-05-10T09:39:59", "name": "[dpdk-dev,PATCHv2,2/5] lib/librte_pdump: add new library for packet capturing support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "4996a100d0cfb5598b9fe6eca2947c461deed423", "submitter": { "id": 70, "url": "http://patches.dpdk.org/api/people/70/?format=api", "name": "Pattan, Reshma", "email": "reshma.pattan@intel.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1462873202-3314-3-git-send-email-reshma.pattan@intel.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/12649/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/12649/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 580809AA3;\n\tTue, 10 May 2016 11:40:12 +0200 (CEST)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby dpdk.org (Postfix) with ESMTP id 6492E9A8D\n\tfor <dev@dpdk.org>; Tue, 10 May 2016 11:40:07 +0200 (CEST)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby orsmga103.jf.intel.com with ESMTP; 10 May 2016 02:40:06 -0700", "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby fmsmga004.fm.intel.com with ESMTP; 10 May 2016 02:40:05 -0700", "from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com\n\t[10.237.217.46])\n\tby irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id\n\tu4A9e4ne003317; Tue, 10 May 2016 10:40:04 +0100", "from sivswdev02.ir.intel.com (localhost [127.0.0.1])\n\tby sivswdev02.ir.intel.com with ESMTP id u4A9e4pX003375;\n\tTue, 10 May 2016 10:40:04 +0100", "(from reshmapa@localhost)\n\tby sivswdev02.ir.intel.com with id u4A9e4e4003371;\n\tTue, 10 May 2016 10:40:04 +0100" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.24,604,1455004800\"; d=\"scan'208\";a=\"100401549\"", "From": "Reshma Pattan <reshma.pattan@intel.com>", "To": "dev@dpdk.org", "Cc": "Reshma Pattan <reshma.pattan@intel.com>", "Date": "Tue, 10 May 2016 10:39:59 +0100", "Message-Id": "<1462873202-3314-3-git-send-email-reshma.pattan@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "In-Reply-To": "<1462873202-3314-1-git-send-email-reshma.pattan@intel.com>", "References": "<1462532139-17848-1-git-send-email-reshma.pattan@intel.com>\n\t<1462873202-3314-1-git-send-email-reshma.pattan@intel.com>", "Subject": "[dpdk-dev] [PATCHv2 2/5] lib/librte_pdump: add new library for\n\tpacket capturing support", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Added new library for packet capturing support.\n\nAdded public api rte_pdump_init, applications should call\nthis as part of their application setup to have packet\ncapturing framework ready.\n\nAdded public api rte_pdump_uninit to un initialize the packet\ncapturing framework.\n\nAdded public apis rte_pdump_enable and rte_pdump_disable to\nenable and disable packet capturing on specific port and queue.\n\nAdded public apis rte_pdump_enable_by_deviceid and\nrte_pdump_disable_by_deviceid to enable and disable packet\ncapturing on a specific device (pci address or name) and queue.\n\nSigned-off-by: Reshma Pattan <reshma.pattan@intel.com>\n---\n MAINTAINERS | 4 +\n config/common_base | 5 +\n lib/Makefile | 1 +\n lib/librte_pdump/Makefile | 55 +++\n lib/librte_pdump/rte_pdump.c | 816 +++++++++++++++++++++++++++++++++\n lib/librte_pdump/rte_pdump.h | 186 ++++++++\n lib/librte_pdump/rte_pdump_version.map | 12 +\n mk/rte.app.mk | 1 +\n 8 files changed, 1080 insertions(+)\n create mode 100644 lib/librte_pdump/Makefile\n create mode 100644 lib/librte_pdump/rte_pdump.c\n create mode 100644 lib/librte_pdump/rte_pdump.h\n create mode 100644 lib/librte_pdump/rte_pdump_version.map", "diff": "diff --git a/MAINTAINERS b/MAINTAINERS\nindex 1953ea2..74140c7 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -428,6 +428,10 @@ F: app/test/test_reorder*\n F: examples/packet_ordering/\n F: doc/guides/sample_app_ug/packet_ordering.rst\n \n+Pdump\n+M: Reshma Pattan <reshma.pattan@intel.com>\n+F: lib/librte_pdump/\n+\n Hierarchical scheduler\n M: Cristian Dumitrescu <cristian.dumitrescu@intel.com>\n F: lib/librte_sched/\ndiff --git a/config/common_base b/config/common_base\nindex 35d38d9..b6ec35b 100644\n--- a/config/common_base\n+++ b/config/common_base\n@@ -472,6 +472,11 @@ CONFIG_RTE_LIBRTE_DISTRIBUTOR=y\n CONFIG_RTE_LIBRTE_REORDER=y\n \n #\n+# Compile the pdump library\n+#\n+CONFIG_RTE_LIBRTE_PDUMP=y\n+\n+#\n # Compile librte_port\n #\n CONFIG_RTE_LIBRTE_PORT=y\ndiff --git a/lib/Makefile b/lib/Makefile\nindex f254dba..ca7c02f 100644\n--- a/lib/Makefile\n+++ b/lib/Makefile\n@@ -57,6 +57,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PORT) += librte_port\n DIRS-$(CONFIG_RTE_LIBRTE_TABLE) += librte_table\n DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += librte_pipeline\n DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += librte_reorder\n+DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += librte_pdump\n \n ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y)\n DIRS-$(CONFIG_RTE_LIBRTE_KNI) += librte_kni\ndiff --git a/lib/librte_pdump/Makefile b/lib/librte_pdump/Makefile\nnew file mode 100644\nindex 0000000..af81a28\n--- /dev/null\n+++ b/lib/librte_pdump/Makefile\n@@ -0,0 +1,55 @@\n+# BSD LICENSE\n+#\n+# Copyright(c) 2016 Intel Corporation. All rights reserved.\n+# All rights reserved.\n+#\n+# Redistribution and use in source and binary forms, with or without\n+# modification, are permitted provided that the following conditions\n+# are met:\n+#\n+# * Redistributions of source code must retain the above copyright\n+# notice, this list of conditions and the following disclaimer.\n+# * Redistributions in binary form must reproduce the above copyright\n+# notice, this list of conditions and the following disclaimer in\n+# the documentation and/or other materials provided with the\n+# distribution.\n+# * Neither the name of Intel Corporation nor the names of its\n+# contributors may be used to endorse or promote products derived\n+# from this software without specific prior written permission.\n+#\n+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+# \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+include $(RTE_SDK)/mk/rte.vars.mk\n+\n+# library name\n+LIB = librte_pdump.a\n+\n+CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3\n+CFLAGS += -D_GNU_SOURCE\n+\n+EXPORT_MAP := rte_pdump_version.map\n+\n+LIBABIVER := 1\n+\n+# all source are stored in SRCS-y\n+SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) := rte_pdump.c\n+\n+# install this header file\n+SYMLINK-$(CONFIG_RTE_LIBRTE_PDUMP)-include := rte_pdump.h\n+\n+# this lib depends upon:\n+DEPDIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += lib/librte_mbuf\n+DEPDIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += lib/librte_eal\n+DEPDIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += lib/librte_ether\n+\n+include $(RTE_SDK)/mk/rte.lib.mk\ndiff --git a/lib/librte_pdump/rte_pdump.c b/lib/librte_pdump/rte_pdump.c\nnew file mode 100644\nindex 0000000..915cd37\n--- /dev/null\n+++ b/lib/librte_pdump/rte_pdump.c\n@@ -0,0 +1,816 @@\n+/*-\n+ * BSD LICENSE\n+ *\n+ * Copyright(c) 2016 Intel Corporation. All rights reserved.\n+ * All rights reserved.\n+ *\n+ * Redistribution and use in source and binary forms, with or without\n+ * modification, are permitted provided that the following conditions\n+ * are met:\n+ *\n+ * * Redistributions of source code must retain the above copyright\n+ * notice, this list of conditions and the following disclaimer.\n+ * * Redistributions in binary form must reproduce the above copyright\n+ * notice, this list of conditions and the following disclaimer in\n+ * the documentation and/or other materials provided with the\n+ * distribution.\n+ * * Neither the name of Intel Corporation nor the names of its\n+ * contributors may be used to endorse or promote products derived\n+ * from this software without specific prior written permission.\n+ *\n+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+ * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+ */\n+\n+#include <sys/socket.h>\n+#include <sys/un.h>\n+#include <sys/stat.h>\n+#include <unistd.h>\n+#include <sys/types.h>\n+#include <pthread.h>\n+#include <stdbool.h>\n+\n+#include <rte_memcpy.h>\n+#include <rte_mbuf.h>\n+#include <rte_ethdev.h>\n+#include <rte_lcore.h>\n+#include <rte_log.h>\n+#include <rte_errno.h>\n+#include <rte_pci.h>\n+\n+#include \"rte_pdump.h\"\n+\n+#define SOCKET_PATH_VAR_RUN \"/var/run/pdump_sockets\"\n+#define SOCKET_PATH_HOME \"HOME/pdump_sockets\"\n+#define SERVER_SOCKET \"%s/pdump_server_socket\"\n+#define CLIENT_SOCKET \"%s/pdump_client_socket_%d_%u\"\n+#define DEVICE_ID_SIZE 64\n+/* Macros for printing using RTE_LOG */\n+#define RTE_LOGTYPE_PDUMP RTE_LOGTYPE_USER1\n+\n+enum pdump_operation {\n+\tDISABLE = 1,\n+\tENABLE = 2\n+};\n+\n+enum pdump_socktype {\n+\tSERVER = 1,\n+\tCLIENT = 2\n+};\n+\n+enum pdump_version {\n+\tV1 = 1\n+};\n+\n+static pthread_t pdump_thread;\n+static int pdump_socket_fd;\n+\n+struct pdump_request {\n+\tuint16_t ver;\n+\tuint16_t op;\n+\tuint32_t dir;\n+\tunion pdump_data {\n+\t\tstruct enable_v1 {\n+\t\t\tchar device[DEVICE_ID_SIZE];\n+\t\t\tuint16_t queue;\n+\t\t\tstruct rte_ring *ring;\n+\t\t\tstruct rte_mempool *mp;\n+\t\t\tvoid *filter;\n+\t\t\tbool is_pci_or_name;\n+\t\t} en_v1;\n+\t\tstruct disable_v1 {\n+\t\t\tchar device[DEVICE_ID_SIZE];\n+\t\t\tuint16_t queue;\n+\t\t\tstruct rte_ring *ring;\n+\t\t\tstruct rte_mempool *mp;\n+\t\t\tvoid *filter;\n+\t\t\tbool is_pci_or_name;\n+\t\t} dis_v1;\n+\t} data;\n+};\n+\n+struct pdump_response {\n+\tuint16_t ver;\n+\tuint16_t res_op;\n+\tint32_t err_value;\n+};\n+\n+static struct pdump_rxtx_cbs {\n+\tstruct rte_ring *ring;\n+\tstruct rte_mempool *mp;\n+\tstruct rte_eth_rxtx_callback *cb;\n+\tvoid *filter;\n+} rx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT],\n+tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT];\n+\n+static inline int\n+pdump_pktmbuf_copy_data(struct rte_mbuf *seg, const struct rte_mbuf *m)\n+{\n+\tif (rte_pktmbuf_tailroom(seg) < m->data_len) {\n+\t\tRTE_LOG(ERR, PDUMP, \"User mempool: insufficient data_len of mbuf\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tseg->port = m->port;\n+\tseg->vlan_tci = m->vlan_tci;\n+\tseg->hash = m->hash;\n+\tseg->tx_offload = m->tx_offload;\n+\tseg->ol_flags = m->ol_flags;\n+\tseg->packet_type = m->packet_type;\n+\tseg->vlan_tci_outer = m->vlan_tci_outer;\n+\tseg->data_len = m->data_len;\n+\tseg->pkt_len = seg->data_len;\n+\trte_memcpy(rte_pktmbuf_mtod(seg, void *),\n+\t\t\trte_pktmbuf_mtod(m, void *),\n+\t\t\trte_pktmbuf_data_len(seg));\n+\n+\t__rte_mbuf_sanity_check(seg, 1);\n+\n+\treturn 0;\n+}\n+\n+static inline struct rte_mbuf *\n+pdump_pktmbuf_copy(struct rte_mbuf *m, struct rte_mempool *mp)\n+{\n+\tstruct rte_mbuf *m_dup, *seg, **prev;\n+\tuint32_t pktlen;\n+\tuint8_t nseg;\n+\n+\tm_dup = rte_pktmbuf_alloc(mp);\n+\tif (unlikely(m_dup == NULL))\n+\t\treturn NULL;\n+\n+\tseg = m_dup;\n+\tprev = &seg->next;\n+\tpktlen = m->pkt_len;\n+\tnseg = 0;\n+\n+\tdo {\n+\t\tnseg++;\n+\t\tif (pdump_pktmbuf_copy_data(seg, m) < 0) {\n+\t\t\trte_pktmbuf_free(m_dup);\n+\t\t\treturn NULL;\n+\t\t}\n+\t\t*prev = seg;\n+\t\tprev = &seg->next;\n+\t} while ((m = m->next) != NULL &&\n+\t\t\t(seg = rte_pktmbuf_alloc(mp)) != NULL);\n+\n+\t*prev = NULL;\n+\tm_dup->nb_segs = nseg;\n+\tm_dup->pkt_len = pktlen;\n+\n+\t/* Allocation of new indirect segment failed */\n+\tif (unlikely(seg == NULL)) {\n+\t\trte_pktmbuf_free(m_dup);\n+\t\treturn NULL;\n+\t}\n+\n+\t__rte_mbuf_sanity_check(m_dup, 1);\n+\treturn m_dup;\n+}\n+\n+static inline void\n+pdump_copy(struct rte_mbuf **pkts, uint16_t nb_pkts, void *user_params)\n+{\n+\tunsigned i;\n+\tint ring_enq;\n+\tuint16_t d_pkts = 0;\n+\tstruct rte_mbuf *dup_bufs[nb_pkts];\n+\tstruct pdump_rxtx_cbs *cbs;\n+\tstruct rte_ring *ring;\n+\tstruct rte_mempool *mp;\n+\tstruct rte_mbuf *p;\n+\n+\tcbs = user_params;\n+\tring = cbs->ring;\n+\tmp = cbs->mp;\n+\tfor (i = 0; i < nb_pkts; i++) {\n+\t\tp = pdump_pktmbuf_copy(pkts[i], mp);\n+\t\tif (p)\n+\t\t\tdup_bufs[d_pkts++] = p;\n+\t}\n+\n+\tring_enq = rte_ring_enqueue_burst(ring, (void *)dup_bufs, d_pkts);\n+\tif (unlikely(ring_enq < d_pkts)) {\n+\t\tRTE_LOG(DEBUG, PDUMP, \"only %d of packets enqueued to ring\\n\", ring_enq);\n+\t\tdo {\n+\t\t\trte_pktmbuf_free(dup_bufs[ring_enq]);\n+\t\t} while (++ring_enq < d_pkts);\n+\t}\n+}\n+\n+static uint16_t\n+pdump_rx(uint8_t port __rte_unused, uint16_t qidx __rte_unused,\n+\tstruct rte_mbuf **pkts, uint16_t nb_pkts, uint16_t max_pkts __rte_unused,\n+\tvoid *user_params)\n+{\n+\tpdump_copy(pkts, nb_pkts, user_params);\n+\treturn nb_pkts;\n+}\n+\n+static uint16_t\n+pdump_tx(uint8_t port __rte_unused, uint16_t qidx __rte_unused,\n+\t\tstruct rte_mbuf **pkts, uint16_t nb_pkts, void *user_params)\n+{\n+\tpdump_copy(pkts, nb_pkts, user_params);\n+\treturn nb_pkts;\n+}\n+\n+static int\n+pdump_get_dombdf(char *device_id, char *domBDF)\n+{\n+\tint ret;\n+\tstruct rte_pci_addr dev_addr = {0};\n+\n+\tret = eal_parse_pci_DomBDF(device_id, &dev_addr);\n+\tif (ret < 0)\n+\t\treturn -1;\n+\n+\tif (dev_addr.domain)\n+\t\tsnprintf(domBDF, DEVICE_ID_SIZE, \"%u:%u:%u.%u\", dev_addr.domain,\n+\t\t\tdev_addr.bus, dev_addr.devid, dev_addr.function);\n+\telse\n+\t\tsnprintf(domBDF, DEVICE_ID_SIZE, \"%u:%u.%u\", dev_addr.bus, dev_addr.devid,\n+\t\t\tdev_addr.function);\n+\n+\treturn 0;\n+}\n+\n+static int\n+pdump_regitser_callbacks(uint32_t dir, uint16_t end_q,\n+\t\t\tuint8_t port, uint16_t queue,\n+\t\t\tstruct rte_ring *ring, struct rte_mempool *mp,\n+\t\t\tuint16_t operation)\n+{\n+\n+\tuint16_t qid;\n+\tstruct pdump_rxtx_cbs *cbs = NULL;\n+\n+\tqid = (queue == RTE_PDUMP_ALL_QUEUES) ? 0 : queue;\n+\tfor (; qid < end_q; qid++) {\n+\t\tif ((dir & RTE_PDUMP_FLAG_RX) != 0)\n+\t\t\tcbs = &rx_cbs[port][qid];\n+\t\tif ((dir & RTE_PDUMP_FLAG_TX) != 0)\n+\t\t\tcbs = &tx_cbs[port][qid];\n+\t\tif (cbs && operation == ENABLE) {\n+\t\t\tif (cbs->cb) {\n+\t\t\t\tRTE_LOG(ERR, PDUMP,\n+\t\t\t\t\t\t\"failed to add callback for port=%d and \"\n+\t\t\t\t\t\t\"queue=%d, callback already exists\\n\",\n+\t\t\t\t\t\tport, qid);\n+\t\t\t\treturn -EEXIST;\n+\t\t\t}\n+\t\t\tcbs->ring = ring;\n+\t\t\tcbs->mp = mp;\n+\t\t\tif ((dir & RTE_PDUMP_FLAG_RX) != 0) {\n+\t\t\t\tcbs->cb = rte_eth_add_first_rx_callback(port, qid,\n+\t\t\t\t\t\t\t\t\tpdump_rx, cbs);\n+\t\t\t\tif (cbs->cb == NULL) {\n+\t\t\t\t\tRTE_LOG(ERR, PDUMP,\n+\t\t\t\t\t\t\"failed to add rx callback, errno=%d\\n\",\n+\t\t\t\t\t\trte_errno);\n+\t\t\t\t\treturn rte_errno;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tif ((dir & RTE_PDUMP_FLAG_TX) != 0) {\n+\t\t\t\tcbs->cb = rte_eth_add_tx_callback(port, qid, pdump_tx,\n+\t\t\t\t\t\t\t\t\tcbs);\n+\t\t\t\tif (cbs->cb == NULL) {\n+\t\t\t\t\tRTE_LOG(ERR, PDUMP,\n+\t\t\t\t\t\t\"failed to add tx callback, errno=%d\\n\",\n+\t\t\t\t\t\trte_errno);\n+\t\t\t\t\treturn rte_errno;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t\tif (cbs && operation == DISABLE) {\n+\t\t\tint ret;\n+\n+\t\t\tif (cbs->cb == NULL) {\n+\t\t\t\tRTE_LOG(ERR, PDUMP,\n+\t\t\t\t\t\t\"failed to delete non existing callback \"\n+\t\t\t\t\t\t\"for port=%d and queue=%d\\n\", port, qid);\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\t\t\tif ((dir & RTE_PDUMP_FLAG_RX) != 0) {\n+\t\t\t\tret = rte_eth_remove_rx_callback(port, qid, cbs->cb);\n+\t\t\t\tif (ret < 0) {\n+\t\t\t\t\tRTE_LOG(ERR, PDUMP,\n+\t\t\t\t\t\t\"failed to remove rx callback, errno=%d\\n\",\n+\t\t\t\t\t\trte_errno);\n+\t\t\t\t\treturn ret;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tif ((dir & RTE_PDUMP_FLAG_TX) != 0) {\n+\t\t\t\tret = rte_eth_remove_tx_callback(port, qid, cbs->cb);\n+\t\t\t\tif (ret < 0) {\n+\t\t\t\t\tRTE_LOG(ERR, PDUMP,\n+\t\t\t\t\t\t\"failed to remove tx callback, errno=%d\\n\",\n+\t\t\t\t\t\trte_errno);\n+\t\t\t\t\treturn ret;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tcbs->cb = NULL;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+set_pdump_rxtx_cbs(struct pdump_request *p)\n+{\n+\tuint16_t nb_rx_q, nb_tx_q = 0, end_q, queue;\n+\tuint8_t port;\n+\tint ret = 0;\n+\tuint32_t dir;\n+\tuint16_t operation;\n+\tstruct rte_ring *ring;\n+\tstruct rte_mempool *mp;\n+\tchar domBDF[DEVICE_ID_SIZE];\n+\n+\tdir = p->dir;\n+\toperation = p->op;\n+\tif (operation == ENABLE) {\n+\t\tif (p->data.en_v1.is_pci_or_name == true) {\n+\t\t\t/* check if device is pci address or name */\n+\t\t\tif (pdump_get_dombdf(p->data.en_v1.device, domBDF) == 0)\n+\t\t\t\tret = rte_eth_dev_get_port_by_name(domBDF, &port);\n+\t\t\telse\n+\t\t\t\tret = rte_eth_dev_get_port_by_name(p->data.en_v1.device,\n+\t\t\t\t\t\t\t\t\t&port);\n+\t\t\tif (ret < 0) {\n+\t\t\t\tRTE_LOG(ERR, PDUMP,\n+\t\t\t\t\t\"failed to get potid for device id=%s\\n\",\n+\t\t\t\t\tp->data.en_v1.device);\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\t\t} else /* if device is port id */\n+\t\t\tport = atoi(p->data.en_v1.device);\n+\t\tqueue = p->data.en_v1.queue;\n+\t\tring = p->data.en_v1.ring;\n+\t\tmp = p->data.en_v1.mp;\n+\t} else {\n+\t\tif (p->data.dis_v1.is_pci_or_name == true) {\n+\t\t\t/* check if device is pci address or name */\n+\t\t\tif (pdump_get_dombdf(p->data.dis_v1.device, domBDF) == 0)\n+\t\t\t\tret = rte_eth_dev_get_port_by_name(domBDF, &port);\n+\t\t\telse\n+\t\t\t\tret = rte_eth_dev_get_port_by_name(p->data.dis_v1.device,\n+\t\t\t\t\t\t\t\t\t&port);\n+\t\t\tif (ret < 0) {\n+\t\t\t\tRTE_LOG(ERR, PDUMP,\n+\t\t\t\t\t\"failed to get potid for device id=%s\\n\",\n+\t\t\t\t\tp->data.dis_v1.device);\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\t\t} else /* if device is port id */\n+\t\t\tport = atoi(p->data.dis_v1.device);\n+\t\tqueue = p->data.dis_v1.queue;\n+\t\tring = p->data.dis_v1.ring;\n+\t\tmp = p->data.dis_v1.mp;\n+\t}\n+\n+\t/* validation if packet capture is for all queues */\n+\tif (queue == RTE_PDUMP_ALL_QUEUES) {\n+\t\tstruct rte_eth_dev_info dev_info;\n+\n+\t\trte_eth_dev_info_get(port, &dev_info);\n+\t\tnb_rx_q = dev_info.nb_rx_queues;\n+\t\tnb_tx_q = dev_info.nb_tx_queues;\n+\t\tif (nb_rx_q == 0 && dir == RTE_PDUMP_FLAG_RX) {\n+\t\t\tRTE_LOG(ERR, PDUMP, \"number of rx queues cannot be 0\\n\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t\tif (nb_tx_q == 0 && dir == RTE_PDUMP_FLAG_TX) {\n+\t\t\tRTE_LOG(ERR, PDUMP, \"number of tx queues cannot be 0\\n\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t\tif ((nb_tx_q == 0 || nb_rx_q == 0) && dir == RTE_PDUMP_FLAG_RXTX) {\n+\t\t\tRTE_LOG(ERR, PDUMP, \"both tx&rx queues must be non zero\\n\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t}\n+\n+\t/* register RX callback for dir rx/rxtx */\n+\tif (dir == RTE_PDUMP_FLAG_RX || dir == RTE_PDUMP_FLAG_RXTX) {\n+\t\tend_q = (queue == RTE_PDUMP_ALL_QUEUES) ? nb_rx_q : queue + 1;\n+\t\tret = pdump_regitser_callbacks(RTE_PDUMP_FLAG_RX, end_q, port, queue,\n+\t\t\t\t\t\tring, mp, operation);\n+\t\tif (ret < 0)\n+\t\t\treturn ret;\n+\t}\n+\n+\t/* register TX callback for dir tx/rxtx */\n+\tif (dir == RTE_PDUMP_FLAG_TX || dir == RTE_PDUMP_FLAG_RXTX) {\n+\t\tend_q = (queue == RTE_PDUMP_ALL_QUEUES) ? nb_tx_q : queue + 1;\n+\t\tret = pdump_regitser_callbacks(RTE_PDUMP_FLAG_TX, end_q, port, queue,\n+\t\t\t\t\t\tring, mp, operation);\n+\t\tif (ret < 0)\n+\t\t\treturn ret;\n+\t}\n+\n+\treturn ret;\n+}\n+\n+/* get socket path (/var/run if root, $HOME otherwise) */\n+static void\n+pdump_get_socket_path(char *buffer, int bufsz, enum pdump_socktype type)\n+{\n+\tconst char *dir = SOCKET_PATH_VAR_RUN;\n+\tconst char *home_dir = getenv(SOCKET_PATH_HOME);\n+\n+\tif (getuid() != 0 && home_dir != NULL)\n+\t\tdir = home_dir;\n+\n+\tmkdir(dir, 700);\n+\tif (type == SERVER)\n+\t\tsnprintf(buffer, bufsz, SERVER_SOCKET, dir);\n+\telse\n+\t\tsnprintf(buffer, bufsz, CLIENT_SOCKET, dir, getpid(),\n+\t\t\t\trte_sys_gettid());\n+}\n+\n+static int\n+pdump_create_server_socket(void)\n+{\n+\tint ret, socket_fd;\n+\tstruct sockaddr_un addr;\n+\tsocklen_t addr_len;\n+\n+\tpdump_get_socket_path(addr.sun_path, sizeof(addr.sun_path), SERVER);\n+\taddr.sun_family = AF_UNIX;\n+\n+\t/* remove if file already exists */\n+\tunlink(addr.sun_path);\n+\n+\t/* set up a server socket */\n+\tsocket_fd = socket(AF_UNIX, SOCK_DGRAM, 0);\n+\tif (socket_fd < 0) {\n+\t\tRTE_LOG(ERR, PDUMP, \"Failed to create server socket: %s, %s:%d\\n\",\n+\t\t\tstrerror(errno), __func__, __LINE__);\n+\t\treturn -1;\n+\t}\n+\n+\taddr_len = sizeof(struct sockaddr_un);\n+\tret = bind(socket_fd, (struct sockaddr *) &addr, addr_len);\n+\tif (ret) {\n+\t\tRTE_LOG(ERR, PDUMP, \"Failed to bind to server socket: %s, %s:%d\\n\",\n+\t\t\tstrerror(errno), __func__, __LINE__);\n+\t\tclose(socket_fd);\n+\t\treturn -1;\n+\t}\n+\n+\t/* save the socket in local configuration */\n+\tpdump_socket_fd = socket_fd;\n+\n+\treturn 0;\n+}\n+\n+static __attribute__((noreturn)) void *\n+pdump_thread_main(__rte_unused void *arg)\n+{\n+\tstruct sockaddr_un cli_addr;\n+\tsocklen_t cli_len;\n+\tstruct pdump_request cli_req;\n+\tstruct pdump_response resp;\n+\tint n;\n+\tint ret = 0;\n+\n+\t/* host thread, never break out */\n+\tfor (;;) {\n+\t\t/* recv client requests */\n+\t\tcli_len = sizeof(cli_addr);\n+\t\tn = recvfrom(pdump_socket_fd, &cli_req, sizeof(struct pdump_request), 0,\n+\t\t\t\t(struct sockaddr *)&cli_addr, &cli_len);\n+\t\tif (n < 0) {\n+\t\t\tRTE_LOG(ERR, PDUMP, \"failed to recv from client:%s, %s:%d\\n\",\n+\t\t\t\t\tstrerror(errno), __func__, __LINE__);\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tret = set_pdump_rxtx_cbs(&cli_req);\n+\n+\t\tresp.ver = cli_req.ver;\n+\t\tresp.res_op = cli_req.op;\n+\t\tresp.err_value = ret;\n+\t\tn = sendto(pdump_socket_fd, &resp, sizeof(struct pdump_response),\n+\t\t\t0, (struct sockaddr *)&cli_addr, cli_len);\n+\t\tif (n < 0) {\n+\t\t\tRTE_LOG(ERR, PDUMP, \"failed to send to client:%s, %s:%d\\n\",\n+\t\t\t\t\tstrerror(errno), __func__, __LINE__);\n+\t\t}\n+\t}\n+}\n+\n+int\n+rte_pdump_init(void)\n+{\n+\tint ret = 0;\n+\tchar thread_name[RTE_MAX_THREAD_NAME_LEN];\n+\n+\tret = pdump_create_server_socket();\n+\tif (ret != 0) {\n+\t\tRTE_LOG(ERR, PDUMP, \"Failed to create server socket:%s:%d\\n\",\n+\t\t\t__func__, __LINE__);\n+\t\treturn -1;\n+\t}\n+\n+\t/* create the host thread to wait/handle pdump requests */\n+\tret = pthread_create(&pdump_thread, NULL, pdump_thread_main, NULL);\n+\tif (ret != 0) {\n+\t\tRTE_LOG(ERR, PDUMP, \"Failed to create the pdump thread:%s, %s:%d\\n\",\n+\t\t\tstrerror(errno), __func__, __LINE__);\n+\t\treturn -1;\n+\t}\n+\t/* Set thread_name for aid in debugging. */\n+\tsnprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, \"pdump-thread\");\n+\tret = rte_thread_setname(pdump_thread, thread_name);\n+\tif (ret != 0) {\n+\t\tRTE_LOG(DEBUG, PDUMP,\n+\t\t\t\t\"Failed to set thread name for pdump handling\\n\");\n+\t}\n+\n+\treturn 0;\n+}\n+\n+int\n+rte_pdump_uninit(void)\n+{\n+\tint ret;\n+\n+\tret = pthread_cancel(pdump_thread);\n+\tif (ret != 0) {\n+\t\tRTE_LOG(ERR, PDUMP, \"Failed to cancel the pdump thread:%s, %s:%d\\n\",\n+\t\t\tstrerror(errno), __func__, __LINE__);\n+\t\treturn -1;\n+\t}\n+\n+\tret = close(pdump_socket_fd);\n+\tif (ret != 0) {\n+\t\tRTE_LOG(ERR, PDUMP, \"Failed to close server socket: %s, %s:%d\\n\",\n+\t\t\tstrerror(errno), __func__, __LINE__);\n+\t\treturn -1;\n+\t}\n+\n+\tstruct sockaddr_un addr;\n+\n+\tpdump_get_socket_path(addr.sun_path, sizeof(addr.sun_path), SERVER);\n+\tret = unlink(addr.sun_path);\n+\tif (ret != 0) {\n+\t\tRTE_LOG(ERR, PDUMP, \"Failed to remove server socket addr: %s, %s:%d\\n\",\n+\t\t\tstrerror(errno), __func__, __LINE__);\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+pdump_create_client_socket(struct pdump_request *p)\n+{\n+\tint ret, socket_fd;\n+\tint pid;\n+\tint n;\n+\tstruct pdump_response server_resp;\n+\tstruct sockaddr_un addr, serv_addr, from;\n+\tsocklen_t addr_len, serv_len;\n+\n+\tpid = getpid();\n+\n+\tsocket_fd = socket(AF_UNIX, SOCK_DGRAM, 0);\n+\tif (socket_fd < 0) {\n+\t\tRTE_LOG(ERR, PDUMP, \"client socket(): %s:pid(%d):tid(%u), %s:%d\\n\",\n+\t\t\tstrerror(errno), pid, rte_sys_gettid(), __func__, __LINE__);\n+\t\tret = errno;\n+\t\treturn ret;\n+\t}\n+\n+\tpdump_get_socket_path(addr.sun_path, sizeof(addr.sun_path), CLIENT);\n+\taddr.sun_family = AF_UNIX;\n+\taddr_len = sizeof(struct sockaddr_un);\n+\n+\tdo {\n+\t\tret = bind(socket_fd, (struct sockaddr *) &addr, addr_len);\n+\t\tif (ret) {\n+\t\t\tRTE_LOG(ERR, PDUMP, \"client bind(): %s, %s:%d\\n\",\n+\t\t\t\t\tstrerror(errno), __func__, __LINE__);\n+\t\t\tret = errno;\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tserv_len = sizeof(struct sockaddr_un);\n+\t\tmemset(&serv_addr, 0, sizeof(serv_addr));\n+\t\tpdump_get_socket_path(serv_addr.sun_path, sizeof(serv_addr.sun_path),\n+\t\t\t\t\tSERVER);\n+\t\tserv_addr.sun_family = AF_UNIX;\n+\n+\t\tn = sendto(socket_fd, p, sizeof(struct pdump_request), 0,\n+\t\t\t\t(struct sockaddr *)&serv_addr, serv_len);\n+\t\tif (n < 0) {\n+\t\t\tRTE_LOG(ERR, PDUMP, \"failed to send to server:%s, %s:%d\\n\",\n+\t\t\t\t\tstrerror(errno), __func__, __LINE__);\n+\t\t\tret = errno;\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tn = recvfrom(socket_fd, &server_resp, sizeof(struct pdump_response), 0,\n+\t\t\t\t(struct sockaddr *)&from, &serv_len);\n+\t\tif (n < 0) {\n+\t\t\tRTE_LOG(ERR, PDUMP, \"failed to recv from server:%s, %s:%d\\n\",\n+\t\t\t\t\tstrerror(errno), __func__, __LINE__);\n+\t\t\tret = errno;\n+\t\t\tbreak;\n+\t\t}\n+\t\tret = server_resp.err_value;\n+\t} while (0);\n+\n+\tclose(socket_fd);\n+\tunlink(addr.sun_path);\n+\treturn ret;\n+}\n+\n+static int\n+pdump_validate_ring_mp(struct rte_ring *ring, struct rte_mempool *mp)\n+{\n+\tif (ring == NULL || mp == NULL) {\n+\t\tRTE_LOG(ERR, PDUMP, \"NULL ring or mempool are passed %s:%d\\n\",\n+\t\t\t__func__, __LINE__);\n+\t\trte_errno = EINVAL;\n+\t\treturn -1;\n+\t}\n+\tif (mp->flags & MEMPOOL_F_SP_PUT || mp->flags & MEMPOOL_F_SC_GET) {\n+\t\tRTE_LOG(ERR, PDUMP, \"mempool with either SP or SC settings\"\n+\t\t\t\" is not valid for pdump, should have MP and MC settings\\n\");\n+\t\trte_errno = EINVAL;\n+\t\treturn -1;\n+\t}\n+\tif (ring->prod.sp_enqueue || ring->cons.sc_dequeue) {\n+\t\tRTE_LOG(ERR, PDUMP, \"ring with either SP or SC settings\"\n+\t\t\t\" is not valid for pdump, should have MP and MC settings\\n\");\n+\t\trte_errno = EINVAL;\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+pdump_validate_dir(uint32_t dir)\n+{\n+\tif (dir != RTE_PDUMP_FLAG_RX && dir != RTE_PDUMP_FLAG_TX &&\n+\t\tdir != RTE_PDUMP_FLAG_RXTX) {\n+\t\tRTE_LOG(ERR, PDUMP, \"invalid direction, should be either rx/tx/rxtx\\n\");\n+\t\trte_errno = EINVAL;\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+pdump_validate_port(uint8_t port)\n+{\n+\tif (port >= RTE_MAX_ETHPORTS) {\n+\t\tRTE_LOG(ERR, PDUMP, \"Invalid port id %u, %s:%d\\n\", port,\n+\t\t\t__func__, __LINE__);\n+\t\trte_errno = EINVAL;\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+pdump_prepare_client_request(char *device, bool is_pci_or_name, uint16_t queue,\n+\t\t\t\tuint32_t dir,\n+\t\t\t\tuint16_t operation,\n+\t\t\t\tstruct rte_ring *ring,\n+\t\t\t\tstruct rte_mempool *mp,\n+\t\t\t\tvoid *filter)\n+{\n+\tint ret;\n+\tstruct pdump_request req = {.ver = 1,};\n+\n+\treq.dir = dir;\n+\treq.op = operation;\n+\tif ((operation & ENABLE) != 0) {\n+\t\tstrncpy(req.data.en_v1.device, device, strlen(device));\n+\t\treq.data.en_v1.is_pci_or_name = is_pci_or_name;\n+\t\treq.data.en_v1.queue = queue;\n+\t\treq.data.en_v1.ring = ring;\n+\t\treq.data.en_v1.mp = mp;\n+\t\treq.data.en_v1.filter = filter;\n+\t} else {\n+\t\tstrncpy(req.data.dis_v1.device, device, strlen(device));\n+\t\treq.data.dis_v1.is_pci_or_name = is_pci_or_name;\n+\t\treq.data.dis_v1.queue = queue;\n+\t\treq.data.dis_v1.ring = NULL;\n+\t\treq.data.dis_v1.mp = NULL;\n+\t\treq.data.dis_v1.filter = NULL;\n+\t}\n+\n+\tret = pdump_create_client_socket(&req);\n+\tif (ret < 0) {\n+\t\tRTE_LOG(ERR, PDUMP, \"client request for pdump enable/disable failed\\n\");\n+\t\trte_errno = ret;\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+int\n+rte_pdump_enable(uint8_t port, uint16_t queue, uint32_t dir,\n+\t\t\tstruct rte_ring *ring,\n+\t\t\tstruct rte_mempool *mp,\n+\t\t\tvoid *filter)\n+{\n+\n+\tint ret = 0;\n+\tchar device[DEVICE_ID_SIZE];\n+\n+\tret = pdump_validate_port(port);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\tret = pdump_validate_ring_mp(ring, mp);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\tpdump_validate_dir(dir);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tsnprintf(device, sizeof(device), \"%u\", port);\n+\tret = pdump_prepare_client_request(device, false, queue, dir,\n+\t\t\t\t\t\tENABLE, ring, mp, filter);\n+\n+\treturn ret;\n+}\n+\n+int\n+rte_pdump_enable_by_deviceid(char *device_id, uint16_t queue,\n+\t\t\t\tuint32_t dir,\n+\t\t\t\tstruct rte_ring *ring,\n+\t\t\t\tstruct rte_mempool *mp,\n+\t\t\t\tvoid *filter)\n+{\n+\tint ret = 0;\n+\n+\tret = pdump_validate_ring_mp(ring, mp);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\tret = pdump_validate_dir(dir);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tret = pdump_prepare_client_request(device_id, true, queue, dir,\n+\t\t\t\t\t\tENABLE, ring, mp, filter);\n+\n+\treturn ret;\n+}\n+\n+int\n+rte_pdump_disable(uint8_t port, uint16_t queue, uint32_t dir)\n+{\n+\tint ret = 0;\n+\tchar device[DEVICE_ID_SIZE];\n+\n+\tret = pdump_validate_port(port);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\tret = pdump_validate_dir(dir);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tsnprintf(device, sizeof(device), \"%u\", port);\n+\tret = pdump_prepare_client_request(device, false, queue, dir,\n+\t\t\t\t\t\tDISABLE, NULL, NULL, NULL);\n+\n+\treturn ret;\n+}\n+\n+int\n+rte_pdump_disable_by_deviceid(char *device_id, uint16_t queue,\n+\t\t\t\tuint32_t dir)\n+{\n+\tint ret = 0;\n+\n+\tret = pdump_validate_dir(dir);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tret = pdump_prepare_client_request(device_id, true, queue, dir,\n+\t\t\t\t\t\tDISABLE, NULL, NULL, NULL);\n+\n+\treturn ret;\n+}\ndiff --git a/lib/librte_pdump/rte_pdump.h b/lib/librte_pdump/rte_pdump.h\nnew file mode 100644\nindex 0000000..fcd02de\n--- /dev/null\n+++ b/lib/librte_pdump/rte_pdump.h\n@@ -0,0 +1,186 @@\n+/*-\n+ * BSD LICENSE\n+ *\n+ * Copyright(c) 2016 Intel Corporation. All rights reserved.\n+ * All rights reserved.\n+ *\n+ * Redistribution and use in source and binary forms, with or without\n+ * modification, are permitted provided that the following conditions\n+ * are met:\n+ *\n+ * * Redistributions of source code must retain the above copyright\n+ * notice, this list of conditions and the following disclaimer.\n+ * * Redistributions in binary form must reproduce the above copyright\n+ * notice, this list of conditions and the following disclaimer in\n+ * the documentation and/or other materials provided with the\n+ * distribution.\n+ * * Neither the name of Intel Corporation nor the names of its\n+ * contributors may be used to endorse or promote products derived\n+ * from this software without specific prior written permission.\n+ *\n+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+ * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+ */\n+\n+#ifndef _RTE_PDUMP_H_\n+#define _RTE_PDUMP_H_\n+\n+/**\n+ * @file\n+ * RTE pdump\n+ *\n+ * packet dump library to provide packet capturing support on dpdk.\n+ */\n+\n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n+\n+#define RTE_PDUMP_ALL_QUEUES UINT16_MAX\n+\n+enum {\n+\tRTE_PDUMP_FLAG_RX = 1, /* receive direction */\n+\tRTE_PDUMP_FLAG_TX = 2, /* transmit direction */\n+\t/* both receive and transmit directions */\n+\tRTE_PDUMP_FLAG_RXTX = (RTE_PDUMP_FLAG_RX|RTE_PDUMP_FLAG_TX)\n+};\n+\n+/**\n+ * Initialize packet capturing handling\n+ *\n+ * Creates pthread and server socket for handling clients\n+ * requests to enable/disable rxtx callbacks.\n+ *\n+ * @return\n+ * 0 on success, -1 on error\n+ */\n+int\n+rte_pdump_init(void);\n+\n+/**\n+ * Un initialize packet capturing handling\n+ *\n+ * Cancels pthread, close server socket, removes server socket address.\n+ *\n+ * @return\n+ * 0 on success, -1 on error\n+ */\n+int\n+rte_pdump_uninit(void);\n+\n+/**\n+ * Enables packet capturing on given port and queue.\n+ *\n+ * @param port\n+ * port on which packet capturing should be enabled.\n+ * @param queue\n+ * queue of a given port on which packet capturing should be enabled.\n+ * users should pass on value UINT16_MAX to enable packet capturing on all\n+ * queues of a given port.\n+ * @param dir\n+ * dir specifies RTE_PDUMP_FLAG_RX/RTE_PDUMP_FLAG_TX/RTE_PDUMP_FLAG_RXTX\n+ * on which packet capturing should be enabled for a given port and queue.\n+ * @param ring\n+ * ring on which captured packets will be enqueued for user.\n+ * @param mp\n+ * mempool on to which original packets will be mirrored or duplicated.\n+ * @param filter\n+ * place holder for packet filtering.\n+ *\n+ * @return\n+ * 0 on success, -1 on error, rte_errno is set accordingly.\n+ */\n+\n+int\n+rte_pdump_enable(uint8_t port, uint16_t queue, uint32_t dir,\n+\t\tstruct rte_ring *ring,\n+\t\tstruct rte_mempool *mp,\n+\t\tvoid *filter);\n+\n+/**\n+ * Disables packet capturing on given port and queue.\n+ *\n+ * @param port\n+ * port on which packet capturing should be disabled.\n+ * @param queue\n+ * queue of a given port on which packet capturing should be disabled.\n+ * users should pass on value UINT16_MAX to disable packet capturing on all\n+ * queues of a given port.\n+ * @param dir\n+ * dir specifies RTE_PDUMP_FLAG_RX/RTE_PDUMP_FLAG_TX/RTE_PDUMP_FLAG_RXTX\n+ * on which packet capturing should be enabled for a given port and queue.\n+ *\n+ * @return\n+ * 0 on success, -1 on error, rte_errno is set accordingly.\n+ */\n+\n+int\n+rte_pdump_disable(uint8_t port, uint16_t queue, uint32_t dir);\n+\n+/**\n+ * Enables packet capturing on given device id and queue.\n+ * device_id can be name or pci address of device.\n+ *\n+ * @param device_id\n+ * device id on which packet capturing should be enabled.\n+ * @param queue\n+ * queue of a given device id on which packet capturing should be enabled.\n+ * users should pass on value UINT16_MAX to enable packet capturing on all\n+ * queues of a given device id.\n+ * @param dir\n+ * dir specifies RTE_PDUMP_FLAG_RX/RTE_PDUMP_FLAG_TX/RTE_PDUMP_FLAG_RXTX\n+ * on which packet capturing should be enabled for a given port and queue.\n+ * @param ring\n+ * ring on which captured packets will be enqueued for user.\n+ * @param mp\n+ * mempool on to which original packets will be mirrored or duplicated.\n+ * @param filter\n+ * place holder for packet filtering.\n+ *\n+ * @return\n+ * 0 on success, -1 on error, rte_errno is set accordingly.\n+ */\n+\n+int\n+rte_pdump_enable_by_deviceid(char *device_id, uint16_t queue,\n+\t\t\t\tuint32_t dir,\n+\t\t\t\tstruct rte_ring *ring,\n+\t\t\t\tstruct rte_mempool *mp,\n+\t\t\t\tvoid *filter);\n+\n+/**\n+ * Disables packet capturing on given device_id and queue.\n+ * device_id can be name or pci address of device.\n+ *\n+ * @param device_id\n+ * pci address or name of the device on which packet capturing\n+ * should be disabled.\n+ * @param queue\n+ * queue of a given device on which packet capturing should be disabled.\n+ * users should pass on value UINT16_MAX to disable packet capturing on all\n+ * queues of a given device id.\n+ * @param dir\n+ * dir specifies RTE_PDUMP_FLAG_RX/RTE_PDUMP_FLAG_TX/RTE_PDUMP_FLAG_RXTX\n+ * on which packet capturing should be enabled for a given port and queue.\n+ *\n+ * @return\n+ * 0 on success, -1 on error, rte_errno is set accordingly.\n+ */\n+int\n+rte_pdump_disable_by_deviceid(char *device_id, uint16_t queue,\n+\t\t\t\tuint32_t dir);\n+\n+#ifdef __cplusplus\n+}\n+#endif\n+\n+#endif /* _RTE_PDUMP_H_ */\ndiff --git a/lib/librte_pdump/rte_pdump_version.map b/lib/librte_pdump/rte_pdump_version.map\nnew file mode 100644\nindex 0000000..3e744f3\n--- /dev/null\n+++ b/lib/librte_pdump/rte_pdump_version.map\n@@ -0,0 +1,12 @@\n+DPDK_16.07 {\n+\tglobal:\n+\n+\trte_pdump_disable;\n+\trte_pdump_disable_by_deviceid;\n+\trte_pdump_enable;\n+\trte_pdump_enable_by_deviceid;\n+\trte_pdump_init;\n+\trte_pdump_uninit;\n+\n+\tlocal: *;\n+};\ndiff --git a/mk/rte.app.mk b/mk/rte.app.mk\nindex c66e491..092d8d5 100644\n--- a/mk/rte.app.mk\n+++ b/mk/rte.app.mk\n@@ -61,6 +61,7 @@ _LDLIBS-y += --whole-archive\n \n _LDLIBS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += -lrte_distributor\n _LDLIBS-$(CONFIG_RTE_LIBRTE_REORDER) += -lrte_reorder\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_PDUMP) += -lrte_pdump\n \n ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y)\n _LDLIBS-$(CONFIG_RTE_LIBRTE_KNI) += -lrte_kni\n", "prefixes": [ "dpdk-dev", "PATCHv2", "2/5" ] }{ "id": 12649, "url": "