From: Xueming Li <xuemingl@mellanox.com>
To: Jingjing Wu <jingjing.wu@intel.com>
Cc: Xueming Li <xuemingl@mellanox.com>, dev@dpdk.org
Subject: [dpdk-dev] [RFC PATCH 2/2] app/testpmd: add scapy command as pkt template
Date: Thu, 19 Oct 2017 22:06:49 +0800 [thread overview]
Message-ID: <20171019140649.26668-3-xuemingl@mellanox.com> (raw)
In-Reply-To: <20171019140649.26668-1-xuemingl@mellanox.com>
Invoke scapy to generate packet templates for each queue of specific
port, command format:
scapy <port> <pattern>
Example:
scapy 0 Ether()/IP()/GRE()/IP()/UDP(dport=(2,5))/"cool"
Signed-off-by: Xueming Li <xuemingl@mellanox.com>
---
app/test-pmd/Makefile | 5 +++
app/test-pmd/cmdline.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++-
config/common_base | 2 +
3 files changed, 105 insertions(+), 1 deletion(-)
diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile
index 2c50f68a9..220be17f2 100644
--- a/app/test-pmd/Makefile
+++ b/app/test-pmd/Makefile
@@ -91,6 +91,11 @@ endif
endif
+ifeq ($(CONFIG_RTE_TEST_PMD_SCAPY),y)
+LDLIBS += -l$(CONFIG_RTE_PYTHON)
+CFLAGS += -I/usr/include/$(CONFIG_RTE_PYTHON)
+endif
+
CFLAGS_cmdline.o := -D_GNU_SOURCE
include $(RTE_SDK)/mk/rte.app.mk
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index bb01e989a..b6df7ea75 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -33,6 +33,9 @@
*/
#include <stdarg.h>
+#ifdef RTE_TEST_PMD_SCAPY
+#include <Python.h>
+#endif
#include <errno.h>
#include <stdio.h>
#include <stdint.h>
@@ -48,7 +51,6 @@
#endif
#endif
#include <netinet/in.h>
-
#include <sys/queue.h>
#include <rte_common.h>
@@ -15391,6 +15393,98 @@ cmdline_parse_inst_t cmd_load_from_file = {
},
};
+#ifdef RTE_TEST_PMD_SCAPY
+/* Common result structure for file commands */
+struct cmd_scapy_result {
+ cmdline_fixed_string_t scapy;
+ portid_t port;
+ cmdline_fixed_string_t pattern;
+};
+
+/* Common CLI fields for file commands */
+cmdline_parse_token_string_t cmd_scapy_cmd =
+ TOKEN_STRING_INITIALIZER(struct cmd_scapy_result, scapy, "scapy");
+cmdline_parse_token_num_t cmd_scapy_port =
+ TOKEN_NUM_INITIALIZER(struct cmd_scapy_result, port, UINT16);
+cmdline_parse_token_string_t cmd_scapy_pattern =
+ TOKEN_STRING_INITIALIZER(struct cmd_scapy_result, pattern, NULL);
+
+static void
+cmd_scapy_parsed(
+ void *parsed_result,
+ __attribute__((unused)) struct cmdline *cl,
+ __attribute__((unused)) void *data)
+{
+ struct cmd_scapy_result *res = parsed_result;
+ PyObject *mod, *gdict, *ldict, *list, *item;
+ int i, socket;
+ int len = 0;
+ struct rte_mbuf *mbuf;
+ char str[sizeof(res->pattern) + 128];
+
+ socket = rte_eth_dev_socket_id(res->port);
+ /* Clean port templates */
+ for (i = 0; i < RTE_MAX_QUEUES_PER_PORT; i++)
+ if (pkt_templ[res->port][i])
+ rte_mbuf_raw_free(pkt_templ[res->port][i]);
+ /* Invoke scapy */
+ Py_Initialize();
+ if (!Py_IsInitialized())
+ goto err;
+ if (PyRun_SimpleString("import sys;from scapy.all import *"))
+ goto err;
+ mod = PyImport_AddModule("__main__");
+ if (!mod)
+ goto err;
+ gdict = PyModule_GetDict(mod);
+ ldict = PyDict_New();
+ if (!gdict || !ldict)
+ goto err;
+ snprintf(str, sizeof(str), "p = %s;r = [str(x) for x in p];\n",
+ res->pattern);
+ PyRun_String(str, Py_file_input, gdict, ldict);
+ list = PyDict_GetItem(ldict, PyString_FromString("r"));
+ if (!list)
+ goto err;
+ for (i = 0; i < PyList_Size(list) && i < RTE_MAX_QUEUES_PER_PORT; i++) {
+ item = PyList_GET_ITEM(list, i);
+ /* allocate mbuf & copy raw pkt */
+ mbuf = rte_mbuf_raw_alloc(mbuf_pool_find(socket));
+ if (!mbuf)
+ goto end;
+ rte_memcpy(rte_pktmbuf_mtod_offset(mbuf, void *, 0),
+ PyString_AsString(item),
+ PyString_Size(item));
+ len = PyString_Size(item);
+ mbuf->data_len = len > TXONLY_DEF_PACKET_LEN ?
+ len : TXONLY_DEF_PACKET_LEN;
+ pkt_templ[res->port][i] = mbuf;
+ }
+ if (len > TXONLY_DEF_PACKET_LEN)
+ printf("%d templates saved, size: %d\n", i, len);
+ else
+ printf("%d templates saved, size: %d -> %d\n", i, len,
+ TXONLY_DEF_PACKET_LEN);
+ goto end;
+err:
+ printf("Error!\n");
+end:
+ Py_Finalize();
+}
+
+cmdline_parse_inst_t cmd_scapy = {
+ .f = cmd_scapy_parsed,
+ .data = NULL,
+ .help_str = "scapy <port> Ether()/IP()/GRE()/IP()/UDP(dport=(2,5))/\"cool\"",
+ .tokens = {
+ (void *)&cmd_scapy_cmd,
+ (void *)&cmd_scapy_port,
+ (void *)&cmd_scapy_pattern,
+ NULL,
+ },
+};
+#endif
+
/* ******************************************************************************** */
/* list of instructions */
@@ -15399,6 +15493,9 @@ cmdline_parse_ctx_t main_ctx[] = {
(cmdline_parse_inst_t *)&cmd_help_long,
(cmdline_parse_inst_t *)&cmd_quit,
(cmdline_parse_inst_t *)&cmd_load_from_file,
+#ifdef RTE_TEST_PMD_SCAPY
+ (cmdline_parse_inst_t *)&cmd_scapy,
+#endif
(cmdline_parse_inst_t *)&cmd_showport,
(cmdline_parse_inst_t *)&cmd_showqueue,
(cmdline_parse_inst_t *)&cmd_showportall,
diff --git a/config/common_base b/config/common_base
index d9471e806..4abb6f2e1 100644
--- a/config/common_base
+++ b/config/common_base
@@ -785,6 +785,8 @@ CONFIG_RTE_APP_TEST_RESOURCE_TAR=n
CONFIG_RTE_TEST_PMD=y
CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES=n
CONFIG_RTE_TEST_PMD_RECORD_BURST_STATS=n
+CONFIG_RTE_TEST_PMD_SCAPY=y
+CONFIG_RTE_PYTHON=python2.7
#
# Compile the crypto performance application
--
2.13.3
next prev parent reply other threads:[~2017-10-19 14:07 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-19 14:06 [dpdk-dev] [RFC PATCH 0/2] using scapy to generate packet templates Xueming Li
2017-10-19 14:06 ` [dpdk-dev] [RFC PATCH 1/2] app/testpmd: add packet template Xueming Li
2017-12-05 4:43 ` [dpdk-dev] [RFC v1 00/11] scapy/python extension Xueming Li
2017-12-05 4:45 ` Xueming Li
2017-12-05 4:48 ` Xueming Li
2017-12-05 4:55 ` Xueming Li
2017-12-05 6:14 ` Xueming(Steven) Li
2017-12-05 5:00 ` Xueming Li
2017-12-05 5:03 ` [dpdk-dev] [RFC v1 00/11] scappy/pythoon extension Xueming Li
2017-12-05 5:04 ` [dpdk-dev] [RFC v1 00/11] scapy/python extension Xueming Li
2017-12-10 23:16 ` Wiles, Keith
2019-01-10 13:06 ` Eelco Chaudron
2019-01-16 13:24 ` Xueming(Steven) Li
2017-12-08 8:22 ` [dpdk-dev] [RFC v1 0/9] " Xueming Li
2017-12-08 8:22 ` [dpdk-dev] [RFC v1 1/9] lib/cmdline: add echo support in batch loading from file Xueming Li
2017-12-08 8:22 ` [dpdk-dev] [RFC v1 2/9] app/testpmd: support command echo in CLI batch loading Xueming Li
2017-12-08 8:22 ` [dpdk-dev] [RFC v1 3/9] test: update batch loading test Xueming Li
2017-12-08 8:22 ` [dpdk-dev] [RFC v1 4/9] lib/python: add embedded python lib Xueming Li
2017-12-08 8:22 ` [dpdk-dev] [RFC v1 5/9] app/testpmd: add python command Xueming Li
2017-12-08 8:22 ` [dpdk-dev] [RFC v1 6/9] app/testpmd: add pktgen forwarding engine Xueming Li
2017-12-08 8:22 ` [dpdk-dev] [RFC v1 7/9] app/testpmd: add pktgen engine scapy commands Xueming Li
2017-12-08 8:22 ` [dpdk-dev] [RFC v1 8/9] test/expect: add expect test scripts Xueming Li
2017-12-08 8:22 ` [dpdk-dev] [RFC v1 9/9] doc/scapy: add scapy how-to guide Xueming Li
2017-10-19 14:06 ` Xueming Li [this message]
2017-10-19 15:21 ` [dpdk-dev] [RFC PATCH 0/2] using scapy to generate packet templates Van Haaren, Harry
2017-10-21 16:04 ` Xueming(Steven) Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171019140649.26668-3-xuemingl@mellanox.com \
--to=xuemingl@mellanox.com \
--cc=dev@dpdk.org \
--cc=jingjing.wu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).