Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/73996/?format=api
{ "id": 73996, "url": "http://patchwork.dpdk.org/api/patches/73996/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1594715212-29438-1-git-send-email-wangzhike@jd.com/", "project": { "id": 1, "url": "http://patchwork.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": "<1594715212-29438-1-git-send-email-wangzhike@jd.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1594715212-29438-1-git-send-email-wangzhike@jd.com", "date": "2020-07-14T08:26:52", "name": "[v4] net/pcap: support snaplen option to truncate packet", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "92489d767a3084f7497051363c09fb148266955c", "submitter": { "id": 873, "url": "http://patchwork.dpdk.org/api/people/873/?format=api", "name": "王志克", "email": "wangzhike@jd.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1594715212-29438-1-git-send-email-wangzhike@jd.com/mbox/", "series": [ { "id": 11014, "url": "http://patchwork.dpdk.org/api/series/11014/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=11014", "date": "2020-07-14T08:26:52", "name": "[v4] net/pcap: support snaplen option to truncate packet", "version": 4, "mbox": "http://patchwork.dpdk.org/series/11014/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/73996/comments/", "check": "fail", "checks": "http://patchwork.dpdk.org/api/patches/73996/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 4F2E0A0540;\n\tTue, 14 Jul 2020 10:27:02 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 0A5881D581;\n\tTue, 14 Jul 2020 10:27:01 +0200 (CEST)", "from m12-11.163.com (m12-11.163.com [220.181.12.11])\n by dpdk.org (Postfix) with ESMTP id 6687C1D570\n for <dev@dpdk.org>; Tue, 14 Jul 2020 10:26:59 +0200 (CEST)", "from localhost.localdomain (unknown [106.38.115.14])\n by smtp7 (Coremail) with SMTP id C8CowAAHTOVObA1frIElEA--.32882S2;\n Tue, 14 Jul 2020 16:26:57 +0800 (CST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com;\n s=s110527; h=From:Subject:Date:Message-Id; bh=3BC7ViRHBd/r3iMrus\n CIa+veFvkjKqB3Dug1Sl/Ww5Q=; b=LgR6T/2mN8t4kpwFst/zbgnNUXTQs5ieDZ\n NViYFrX1n3Am+SdY9vY3ll79iAjTYNOwXEGo88QKQrYatO05GH1/g7ingRNgJfnv\n Y+Fe8wK3LEBh1H2ExCnNnHmZBZFbxRuxZXu3olAO+YOKAy9Wbbjy8QDsO33a+cuD\n fp95SUPdg=", "From": "Zhike Wang <wangzhike@jd.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com, reshma.pattan@intel.com,\n Zhike Wang <wangzhike@jd.com>", "Date": "Tue, 14 Jul 2020 16:26:52 +0800", "Message-Id": "<1594715212-29438-1-git-send-email-wangzhike@jd.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1593758842-6306-1-git-send-email-wangzhike@jd.com>", "References": "<1593758842-6306-1-git-send-email-wangzhike@jd.com>", "X-CM-TRANSID": "C8CowAAHTOVObA1frIElEA--.32882S2", "X-Coremail-Antispam": "1Uf129KBjvJXoW3Jw45GF4xKr47Kr4UXr4rGrg_yoWfGFyrpr\n W7tayFyFWxJw47Jw13AF47Cr1fJw4xK3y2krs2ya4FvF1rWry7XF409rWYyrykC34Uuw43\n C39FqF17u3W2qrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2\n 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jwa93UUUUU=", "X-Originating-IP": "[106.38.115.14]", "X-CM-SenderInfo": "pzdqw6bntsiqqrwthudrp/1tbiGBJhulv2camAGgAAs+", "Subject": "[dpdk-dev] [PATCH v4] net/pcap: support snaplen option to truncate\n\tpacket", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Introduced \"snaplen=<length>\" option. It is convenient to truncate\nlarge packets to only capture necessary headers.\n\nSigned-off-by: Zhike Wang <wangzhike@jd.com>\n---\n app/pdump/main.c | 32 ++++++++++++++++++++++++++-\n doc/guides/rel_notes/release_20_08.rst | 4 ++++\n doc/guides/tools/pdump.rst | 5 ++++-\n drivers/net/pcap/rte_eth_pcap.c | 40 ++++++++++++++++++++++++++++++++--\n 4 files changed, 77 insertions(+), 4 deletions(-)", "diff": "diff --git a/app/pdump/main.c b/app/pdump/main.c\nindex c38c537..1f87310 100644\n--- a/app/pdump/main.c\n+++ b/app/pdump/main.c\n@@ -41,10 +41,12 @@\n #define PDUMP_RING_SIZE_ARG \"ring-size\"\n #define PDUMP_MSIZE_ARG \"mbuf-size\"\n #define PDUMP_NUM_MBUFS_ARG \"total-num-mbufs\"\n+#define PDUMP_SNAPLEN_ARG \"snaplen\"\n \n #define VDEV_NAME_FMT \"net_pcap_%s_%d\"\n #define VDEV_PCAP_ARGS_FMT \"tx_pcap=%s\"\n #define VDEV_IFACE_ARGS_FMT \"tx_iface=%s\"\n+#define VDEV_SNAPLEN_ARGS_FMT \"snaplen=%d\"\n #define TX_STREAM_SIZE 64\n \n #define MP_NAME \"pdump_pool_%d\"\n@@ -97,6 +99,7 @@ enum pdump_by {\n \tPDUMP_RING_SIZE_ARG,\n \tPDUMP_MSIZE_ARG,\n \tPDUMP_NUM_MBUFS_ARG,\n+\tPDUMP_SNAPLEN_ARG,\n \tNULL\n };\n \n@@ -116,6 +119,7 @@ struct pdump_tuples {\n \tuint32_t ring_size;\n \tuint16_t mbuf_data_size;\n \tuint32_t total_num_mbufs;\n+\tuint16_t snaplen;\n \n \t/* params for library API call */\n \tuint32_t dir;\n@@ -160,7 +164,8 @@ struct parse_val {\n \t\t\t\" tx-dev=<iface or pcap file>,\"\n \t\t\t\"[ring-size=<ring size>default:16384],\"\n \t\t\t\"[mbuf-size=<mbuf data size>default:2176],\"\n-\t\t\t\"[total-num-mbufs=<number of mbufs>default:65535]'\\n\",\n+\t\t\t\"[total-num-mbufs=<number of mbufs>default:65535],\"\n+\t\t\t\"[snaplen=<snap length>default:0, meaning no truncation]'\\n\",\n \t\t\tprgname);\n }\n \n@@ -370,6 +375,19 @@ struct parse_val {\n \t} else\n \t\tpt->total_num_mbufs = MBUFS_PER_POOL;\n \n+\t/* snaplen parsing and validation */\n+\tcnt1 = rte_kvargs_count(kvlist, PDUMP_SNAPLEN_ARG);\n+\tif (cnt1 == 1) {\n+\t\tv.min = 1;\n+\t\tv.max = UINT16_MAX;\n+\t\tret = rte_kvargs_process(kvlist, PDUMP_SNAPLEN_ARG,\n+\t\t\t\t\t\t&parse_uint_value, &v);\n+\t\tif (ret < 0)\n+\t\t\tgoto free_kvlist;\n+\t\tpt->snaplen = (uint16_t) v.val;\n+\t} else\n+\t\tpt->snaplen = 0;\n+\n \tnum_tuples++;\n \n free_kvlist:\n@@ -692,6 +710,9 @@ struct parse_val {\n \t\t\t\t VDEV_IFACE_ARGS_FMT, pt->rx_dev) :\n \t\t\tsnprintf(vdev_args, sizeof(vdev_args),\n \t\t\t\t VDEV_PCAP_ARGS_FMT, pt->rx_dev);\n+\t\t\tsnprintf(vdev_args + strlen(vdev_args),\n+\t\t\t\t sizeof(vdev_args) - strlen(vdev_args),\n+\t\t\t\t \",\"VDEV_SNAPLEN_ARGS_FMT, pt->snaplen);\n \t\t\tif (rte_eal_hotplug_add(\"vdev\", vdev_name,\n \t\t\t\t\t\tvdev_args) < 0) {\n \t\t\t\tcleanup_rings();\n@@ -722,6 +743,9 @@ struct parse_val {\n \t\t\t\t\t VDEV_IFACE_ARGS_FMT, pt->tx_dev) :\n \t\t\t\tsnprintf(vdev_args, sizeof(vdev_args),\n \t\t\t\t\t VDEV_PCAP_ARGS_FMT, pt->tx_dev);\n+\t\t\t\tsnprintf(vdev_args + strlen(vdev_args),\n+\t\t\t\t\t sizeof(vdev_args) - strlen(vdev_args),\n+\t\t\t\t\t \",\"VDEV_SNAPLEN_ARGS_FMT, pt->snaplen);\n \t\t\t\tif (rte_eal_hotplug_add(\"vdev\", vdev_name,\n \t\t\t\t\t\t\tvdev_args) < 0) {\n \t\t\t\t\tcleanup_rings();\n@@ -762,6 +786,9 @@ struct parse_val {\n \t\t\t\t VDEV_IFACE_ARGS_FMT, pt->rx_dev) :\n \t\t\tsnprintf(vdev_args, sizeof(vdev_args),\n \t\t\t\t VDEV_PCAP_ARGS_FMT, pt->rx_dev);\n+\t\t\tsnprintf(vdev_args + strlen(vdev_args),\n+\t\t\t\t sizeof(vdev_args) - strlen(vdev_args),\n+\t\t\t\t \",\"VDEV_SNAPLEN_ARGS_FMT, pt->snaplen);\n \t\t\tif (rte_eal_hotplug_add(\"vdev\", vdev_name,\n \t\t\t\t\t\tvdev_args) < 0) {\n \t\t\t\tcleanup_rings();\n@@ -799,6 +826,9 @@ struct parse_val {\n \t\t\t\t VDEV_IFACE_ARGS_FMT, pt->tx_dev) :\n \t\t\tsnprintf(vdev_args, sizeof(vdev_args),\n \t\t\t\t VDEV_PCAP_ARGS_FMT, pt->tx_dev);\n+\t\t\tsnprintf(vdev_args + strlen(vdev_args),\n+\t\t\t\t sizeof(vdev_args) - strlen(vdev_args),\n+\t\t\t\t \",\"VDEV_SNAPLEN_ARGS_FMT, pt->snaplen);\n \t\t\tif (rte_eal_hotplug_add(\"vdev\", vdev_name,\n \t\t\t\t\t\tvdev_args) < 0) {\n \t\t\t\tcleanup_rings();\ndiff --git a/doc/guides/rel_notes/release_20_08.rst b/doc/guides/rel_notes/release_20_08.rst\nindex 17d70e7..462c4f3 100644\n--- a/doc/guides/rel_notes/release_20_08.rst\n+++ b/doc/guides/rel_notes/release_20_08.rst\n@@ -171,6 +171,10 @@ New Features\n See the :doc:`../sample_app_ug/l2_forward_real_virtual` for more\n details of this parameter usage.\n \n+* **Added a devarg to truncate the dumped packets for PCAP vdev.**\n+\n+ A new devarg ``snaplen`` was introduced to allow users to truncate the\n+ dumped packets, and is convenient for capturing with large packet size.\n \n Removed Items\n -------------\ndiff --git a/doc/guides/tools/pdump.rst b/doc/guides/tools/pdump.rst\nindex 8a499c6..27b9102 100644\n--- a/doc/guides/tools/pdump.rst\n+++ b/doc/guides/tools/pdump.rst\n@@ -45,7 +45,8 @@ The tool has a number of command line options:\n tx-dev=<iface or pcap file>),\n [ring-size=<ring size>],\n [mbuf-size=<mbuf data size>],\n- [total-num-mbufs=<number of mbufs>]'\n+ [total-num-mbufs=<number of mbufs>],\n+ [snaplen=<snap length>]'\n \n The ``--multi`` command line option is optional argument. If passed, capture\n will be running on unique cores for all ``--pdump`` options. If ignored,\n@@ -114,6 +115,8 @@ default size 2176.\n Total number mbufs in mempool. This is used internally for mempool creation. This is an optional parameter with default\n value 65535.\n \n+``snaplen``:\n+Truncate snaplen bytes of data from each packet. This is an optional parameter with default value 0, meaning no truncation.\n \n Example\n -------\ndiff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c\nindex 668cbd1..0d2a4b3 100644\n--- a/drivers/net/pcap/rte_eth_pcap.c\n+++ b/drivers/net/pcap/rte_eth_pcap.c\n@@ -40,6 +40,7 @@\n #define ETH_PCAP_IFACE_ARG \"iface\"\n #define ETH_PCAP_PHY_MAC_ARG \"phy_mac\"\n #define ETH_PCAP_INFINITE_RX_ARG \"infinite_rx\"\n+#define ETH_PCAP_SNAPLEN_ARG \"snaplen\"\n \n #define ETH_PCAP_ARG_MAXLEN\t64\n \n@@ -86,6 +87,7 @@ struct pmd_internals {\n \tint single_iface;\n \tint phy_mac;\n \tunsigned int infinite_rx;\n+\tunsigned int snaplen;\n };\n \n struct pmd_process_private {\n@@ -114,6 +116,7 @@ struct pmd_devargs_all {\n \tunsigned int is_rx_pcap;\n \tunsigned int is_rx_iface;\n \tunsigned int infinite_rx;\n+\tunsigned int snaplen;\n };\n \n static const char *valid_arguments[] = {\n@@ -125,6 +128,7 @@ struct pmd_devargs_all {\n \tETH_PCAP_IFACE_ARG,\n \tETH_PCAP_PHY_MAC_ARG,\n \tETH_PCAP_INFINITE_RX_ARG,\n+\tETH_PCAP_SNAPLEN_ARG,\n \tNULL\n };\n \n@@ -322,11 +326,13 @@ struct pmd_devargs_all {\n \tpcap_dumper_t *dumper;\n \tunsigned char temp_data[RTE_ETH_PCAP_SNAPLEN];\n \tsize_t len, caplen;\n+\tstruct pmd_internals *internal;\n \n \tpp = rte_eth_devices[dumper_q->port_id].process_private;\n \tdumper = pp->tx_dumper[dumper_q->queue_id];\n+\tinternal = rte_eth_devices[dumper_q->port_id].data->dev_private;\n \n-\tif (dumper == NULL || nb_pkts == 0)\n+\tif (dumper == NULL || nb_pkts == 0 || internal == NULL)\n \t\treturn 0;\n \n \t/* writes the nb_pkts packets to the previously opened pcap file\n@@ -339,6 +345,9 @@ struct pmd_devargs_all {\n \t\t\tcaplen = sizeof(temp_data);\n \t\t}\n \n+\t\tif (caplen > internal->snaplen)\n+\t\t\tcaplen = internal->snaplen;\n+\n \t\tcalculate_timestamp(&header.ts);\n \t\theader.len = len;\n \t\theader.caplen = caplen;\n@@ -1083,6 +1092,21 @@ struct pmd_devargs_all {\n }\n \n static int\n+get_snaplen_arg(const char *key __rte_unused,\n+\t\tconst char *value, void *extra_args)\n+{\n+\tif (extra_args) {\n+\t\tunsigned int snaplen = (unsigned int)atoi(value);\n+\t\tunsigned int *snaplen_p = extra_args;\n+\n+\t\tif (snaplen == 0)\n+\t\t\tsnaplen = RTE_ETH_PCAP_SNAPLEN;\n+\t\t*snaplen_p = snaplen;\n+\t}\n+\treturn 0;\n+}\n+\n+static int\n pmd_init_internals(struct rte_vdev_device *vdev,\n \t\tconst unsigned int nb_rx_queues,\n \t\tconst unsigned int nb_tx_queues,\n@@ -1291,6 +1315,9 @@ struct pmd_devargs_all {\n \t/* store weather we are using a single interface for rx/tx or not */\n \tinternals->single_iface = single_iface;\n \n+\tif (devargs_all->is_tx_pcap)\n+\t\tinternals->snaplen = devargs_all->snaplen;\n+\n \tif (single_iface) {\n \t\tinternals->if_index = if_nametoindex(rx_queues->queue[0].name);\n \n@@ -1341,6 +1368,7 @@ struct pmd_devargs_all {\n \t\t.is_tx_pcap = 0,\n \t\t.is_tx_iface = 0,\n \t\t.infinite_rx = 0,\n+\t\t.snaplen = RTE_ETH_PCAP_SNAPLEN,\n \t};\n \n \tname = rte_vdev_device_name(dev);\n@@ -1464,6 +1492,13 @@ struct pmd_devargs_all {\n \tif (ret < 0)\n \t\tgoto free_kvlist;\n \n+\tif (devargs_all.is_tx_pcap) {\n+\t\tret = rte_kvargs_process(kvlist, ETH_PCAP_SNAPLEN_ARG,\n+\t\t\t\t&get_snaplen_arg, &devargs_all.snaplen);\n+\t\tif (ret < 0)\n+\t\t\tgoto free_kvlist;\n+\t}\n+\n \t/*\n \t * We check whether we want to open a TX stream to a real NIC,\n \t * a pcap file, or drop packets on tx\n@@ -1587,4 +1622,5 @@ struct pmd_devargs_all {\n \tETH_PCAP_TX_IFACE_ARG \"=<ifc> \"\n \tETH_PCAP_IFACE_ARG \"=<ifc> \"\n \tETH_PCAP_PHY_MAC_ARG \"=<int>\"\n-\tETH_PCAP_INFINITE_RX_ARG \"=<0|1>\");\n+\tETH_PCAP_INFINITE_RX_ARG \"=<0|1>\"\n+\tETH_PCAP_SNAPLEN_ARG \"=<int>\");\n", "prefixes": [ "v4" ] }