Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/41708/?format=api
{ "id": 41708, "url": "http://patchwork.dpdk.org/api/patches/41708/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20180627163123.135686-14-jasvinder.singh@intel.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": "<20180627163123.135686-14-jasvinder.singh@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180627163123.135686-14-jasvinder.singh@intel.com", "date": "2018-06-27T16:31:13", "name": "[v3,13/23] net/softnic: add connection agent", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c1ffe0bb94d5935a725ed5435caeed62411a7c72", "submitter": { "id": 285, "url": "http://patchwork.dpdk.org/api/people/285/?format=api", "name": "Jasvinder Singh", "email": "jasvinder.singh@intel.com" }, "delegate": { "id": 10018, "url": "http://patchwork.dpdk.org/api/users/10018/?format=api", "username": "cristian_dumitrescu", "first_name": "Cristian", "last_name": "Dumitrescu", "email": "cristian.dumitrescu@intel.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20180627163123.135686-14-jasvinder.singh@intel.com/mbox/", "series": [ { "id": 270, "url": "http://patchwork.dpdk.org/api/series/270/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=270", "date": "2018-06-27T16:31:01", "name": "[v3,01/23] net/softnic: restructuring", "version": 3, "mbox": "http://patchwork.dpdk.org/series/270/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/41708/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/41708/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 6892B1C1CE;\n\tWed, 27 Jun 2018 18:32:09 +0200 (CEST)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n\tby dpdk.org (Postfix) with ESMTP id E1BE21C12A\n\tfor <dev@dpdk.org>; Wed, 27 Jun 2018 18:31:42 +0200 (CEST)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t27 Jun 2018 09:31:42 -0700", "from silpixa00381635.ir.intel.com (HELO\n\tsilpixa00381635.ger.corp.intel.com) ([10.237.222.149])\n\tby fmsmga005.fm.intel.com with ESMTP; 27 Jun 2018 09:31:41 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.51,279,1526367600\"; d=\"scan'208\";a=\"240789689\"", "From": "Jasvinder Singh <jasvinder.singh@intel.com>", "To": "dev@dpdk.org", "Cc": "cristian.dumitrescu@intel.com,\n\tbernard.iremonger@intel.com", "Date": "Wed, 27 Jun 2018 17:31:13 +0100", "Message-Id": "<20180627163123.135686-14-jasvinder.singh@intel.com>", "X-Mailer": "git-send-email 2.9.3", "In-Reply-To": "<20180627163123.135686-1-jasvinder.singh@intel.com>", "References": "<20180615165224.25004-2-jasvinder.singh@intel.com>\n\t<20180627163123.135686-1-jasvinder.singh@intel.com>", "Subject": "[dpdk-dev] [PATCH v3 13/23] net/softnic: add connection agent", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Add connection agent to enable connectivity with external agen\n(e.g. telnet, netcat, Python script, etc).\n\nSigned-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>\nSigned-off-by: Jasvinder Singh <jasvinder.singh@intel.com>\n---\n config/common_base | 2 +-\n config/common_linuxapp | 1 +\n drivers/net/softnic/Makefile | 12 +-\n drivers/net/softnic/conn.c | 332 +++++++++++++++++++++\n drivers/net/softnic/conn.h | 49 +++\n drivers/net/softnic/rte_eth_softnic.c | 79 ++++-\n drivers/net/softnic/rte_eth_softnic.h | 16 +\n drivers/net/softnic/rte_eth_softnic_internals.h | 3 +\n ...nic_version.map => rte_eth_softnic_version.map} | 6 +\n 9 files changed, 496 insertions(+), 4 deletions(-)\n create mode 100644 drivers/net/softnic/conn.c\n create mode 100644 drivers/net/softnic/conn.h\n rename drivers/net/softnic/{rte_pmd_softnic_version.map => rte_eth_softnic_version.map} (52%)", "diff": "diff --git a/config/common_base b/config/common_base\nindex fcf3a1f..5ee514e 100644\n--- a/config/common_base\n+++ b/config/common_base\n@@ -426,7 +426,7 @@ CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16\n #\n # Compile SOFTNIC PMD\n #\n-CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y\n+CONFIG_RTE_LIBRTE_PMD_SOFTNIC=n\n \n #\n # Compile the TAP PMD\ndiff --git a/config/common_linuxapp b/config/common_linuxapp\nindex daa49d4..37e8f69 100644\n--- a/config/common_linuxapp\n+++ b/config/common_linuxapp\n@@ -17,6 +17,7 @@ CONFIG_RTE_LIBRTE_VHOST_NUMA=y\n CONFIG_RTE_LIBRTE_PMD_VHOST=y\n CONFIG_RTE_LIBRTE_IFC_PMD=y\n CONFIG_RTE_LIBRTE_PMD_AF_PACKET=y\n+CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y\n CONFIG_RTE_LIBRTE_PMD_TAP=y\n CONFIG_RTE_LIBRTE_AVP_PMD=y\n CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD=y\ndiff --git a/drivers/net/softnic/Makefile b/drivers/net/softnic/Makefile\nindex cb95414..a9045f0 100644\n--- a/drivers/net/softnic/Makefile\n+++ b/drivers/net/softnic/Makefile\n@@ -16,7 +16,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring\n LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_sched\n LDLIBS += -lrte_bus_vdev\n \n-EXPORT_MAP := rte_pmd_softnic_version.map\n+EXPORT_MAP := rte_eth_softnic_version.map\n \n LIBABIVER := 1\n \n@@ -34,10 +34,20 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_pipeline.c\n SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_thread.c\n SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_cli.c\n SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += parser.c\n+SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += conn.c\n \n #\n # Export include files\n #\n SYMLINK-y-include += rte_eth_softnic.h\n \n+ifneq ($(CONFIG_RTE_EXEC_ENV),\"linuxapp\")\n+$(info Softnic PMD can only operate in a linuxapp environment, \\\n+please change the definition of the RTE_TARGET environment variable)\n+all:\n+clean:\n+else\n+\n include $(RTE_SDK)/mk/rte.lib.mk\n+\n+endif\ndiff --git a/drivers/net/softnic/conn.c b/drivers/net/softnic/conn.c\nnew file mode 100644\nindex 0000000..f34fbac\n--- /dev/null\n+++ b/drivers/net/softnic/conn.c\n@@ -0,0 +1,332 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2010-2018 Intel Corporation\n+ */\n+\n+#include <string.h>\n+#include <stdlib.h>\n+#include <stdio.h>\n+#include <unistd.h>\n+#include <sys/types.h>\n+\n+#define __USE_GNU\n+#include <sys/socket.h>\n+\n+#include <sys/epoll.h>\n+#include <netinet/in.h>\n+#include <arpa/inet.h>\n+#include <errno.h>\n+\n+#include \"conn.h\"\n+\n+#define MSG_CMD_TOO_LONG \"Command too long.\"\n+\n+struct conn {\n+\tchar *welcome;\n+\tchar *prompt;\n+\tchar *buf;\n+\tchar *msg_in;\n+\tchar *msg_out;\n+\tsize_t buf_size;\n+\tsize_t msg_in_len_max;\n+\tsize_t msg_out_len_max;\n+\tsize_t msg_in_len;\n+\tint fd_server;\n+\tint fd_client_group;\n+\tconn_msg_handle_t msg_handle;\n+\tvoid *msg_handle_arg;\n+};\n+\n+struct conn *\n+conn_init(struct conn_params *p)\n+{\n+\tstruct sockaddr_in server_address;\n+\tstruct conn *conn;\n+\tint fd_server, fd_client_group, status;\n+\n+\tmemset(&server_address, 0, sizeof(server_address));\n+\n+\t/* Check input arguments */\n+\tif (p == NULL ||\n+\t\tp->welcome == NULL ||\n+\t\tp->prompt == NULL ||\n+\t\tp->addr == NULL ||\n+\t\tp->buf_size == 0 ||\n+\t\tp->msg_in_len_max == 0 ||\n+\t\tp->msg_out_len_max == 0 ||\n+\t\tp->msg_handle == NULL)\n+\t\treturn NULL;\n+\n+\tstatus = inet_aton(p->addr, &server_address.sin_addr);\n+\tif (status == 0)\n+\t\treturn NULL;\n+\n+\t/* Memory allocation */\n+\tconn = calloc(1, sizeof(struct conn));\n+\tif (conn == NULL)\n+\t\treturn NULL;\n+\n+\tconn->welcome = calloc(1, CONN_WELCOME_LEN_MAX + 1);\n+\tconn->prompt = calloc(1, CONN_PROMPT_LEN_MAX + 1);\n+\tconn->buf = calloc(1, p->buf_size);\n+\tconn->msg_in = calloc(1, p->msg_in_len_max + 1);\n+\tconn->msg_out = calloc(1, p->msg_out_len_max + 1);\n+\n+\tif (conn->welcome == NULL ||\n+\t\tconn->prompt == NULL ||\n+\t\tconn->buf == NULL ||\n+\t\tconn->msg_in == NULL ||\n+\t\tconn->msg_out == NULL) {\n+\t\tconn_free(conn);\n+\t\treturn NULL;\n+\t}\n+\n+\t/* Server socket */\n+\tserver_address.sin_family = AF_INET;\n+\tserver_address.sin_port = htons(p->port);\n+\n+\tfd_server = socket(AF_INET,\n+\t\tSOCK_STREAM | SOCK_NONBLOCK,\n+\t\t0);\n+\tif (fd_server == -1) {\n+\t\tconn_free(conn);\n+\t\treturn NULL;\n+\t}\n+\n+\tstatus = bind(fd_server,\n+\t\t(struct sockaddr *)&server_address,\n+\t\tsizeof(server_address));\n+\tif (status == -1) {\n+\t\tconn_free(conn);\n+\t\tclose(fd_server);\n+\t\treturn NULL;\n+\t}\n+\n+\tstatus = listen(fd_server, 16);\n+\tif (status == -1) {\n+\t\tconn_free(conn);\n+\t\tclose(fd_server);\n+\t\treturn NULL;\n+\t}\n+\n+\t/* Client group */\n+\tfd_client_group = epoll_create(1);\n+\tif (fd_client_group == -1) {\n+\t\tconn_free(conn);\n+\t\tclose(fd_server);\n+\t\treturn NULL;\n+\t}\n+\n+\t/* Fill in */\n+\tstrncpy(conn->welcome, p->welcome, CONN_WELCOME_LEN_MAX);\n+\tstrncpy(conn->prompt, p->prompt, CONN_PROMPT_LEN_MAX);\n+\tconn->buf_size = p->buf_size;\n+\tconn->msg_in_len_max = p->msg_in_len_max;\n+\tconn->msg_out_len_max = p->msg_out_len_max;\n+\tconn->msg_in_len = 0;\n+\tconn->fd_server = fd_server;\n+\tconn->fd_client_group = fd_client_group;\n+\tconn->msg_handle = p->msg_handle;\n+\tconn->msg_handle_arg = p->msg_handle_arg;\n+\n+\treturn conn;\n+}\n+\n+void\n+conn_free(struct conn *conn)\n+{\n+\tif (conn == NULL)\n+\t\treturn;\n+\n+\tif (conn->fd_client_group)\n+\t\tclose(conn->fd_client_group);\n+\n+\tif (conn->fd_server)\n+\t\tclose(conn->fd_server);\n+\n+\tfree(conn->msg_out);\n+\tfree(conn->msg_in);\n+\tfree(conn->prompt);\n+\tfree(conn->welcome);\n+\tfree(conn);\n+}\n+\n+int\n+conn_poll_for_conn(struct conn *conn)\n+{\n+\tstruct sockaddr_in client_address;\n+\tstruct epoll_event event;\n+\tsocklen_t client_address_length;\n+\tint fd_client, status;\n+\n+\t/* Check input arguments */\n+\tif (conn == NULL)\n+\t\treturn -1;\n+\n+\t/* Server socket */\n+\tclient_address_length = sizeof(client_address);\n+\tfd_client = accept4(conn->fd_server,\n+\t\t(struct sockaddr *)&client_address,\n+\t\t&client_address_length,\n+\t\tSOCK_NONBLOCK);\n+\tif (fd_client == -1) {\n+\t\tif (errno == EAGAIN || errno == EWOULDBLOCK)\n+\t\t\treturn 0;\n+\n+\t\treturn -1;\n+\t}\n+\n+\t/* Client group */\n+\tevent.events = EPOLLIN | EPOLLRDHUP | EPOLLHUP;\n+\tevent.data.fd = fd_client;\n+\n+\tstatus = epoll_ctl(conn->fd_client_group,\n+\t\tEPOLL_CTL_ADD,\n+\t\tfd_client,\n+\t\t&event);\n+\tif (status == -1) {\n+\t\tclose(fd_client);\n+\t\treturn -1;\n+\t}\n+\n+\t/* Client */\n+\tstatus = write(fd_client,\n+\t\tconn->welcome,\n+\t\tstrlen(conn->welcome));\n+\tif (status == -1) {\n+\t\tclose(fd_client);\n+\t\treturn -1;\n+\t}\n+\n+\tstatus = write(fd_client,\n+\t\tconn->prompt,\n+\t\tstrlen(conn->prompt));\n+\tif (status == -1) {\n+\t\tclose(fd_client);\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+data_event_handle(struct conn *conn,\n+\tint fd_client)\n+{\n+\tssize_t len, i, status;\n+\n+\t/* Read input message */\n+\n+\tlen = read(fd_client,\n+\t\tconn->buf,\n+\t\tconn->buf_size);\n+\tif (len == -1) {\n+\t\tif (errno == EAGAIN || errno == EWOULDBLOCK)\n+\t\t\treturn 0;\n+\n+\t\treturn -1;\n+\t}\n+\tif (len == 0)\n+\t\treturn 0;\n+\n+\t/* Handle input messages */\n+\tfor (i = 0; i < len; i++) {\n+\t\tif (conn->buf[i] == '\\n') {\n+\t\t\tsize_t n;\n+\n+\t\t\tconn->msg_in[conn->msg_in_len] = 0;\n+\t\t\tconn->msg_out[0] = 0;\n+\n+\t\t\tconn->msg_handle(conn->msg_in,\n+\t\t\t\tconn->msg_out,\n+\t\t\t\tconn->msg_out_len_max,\n+\t\t\t\tconn->msg_handle_arg);\n+\n+\t\t\tn = strlen(conn->msg_out);\n+\t\t\tif (n) {\n+\t\t\t\tstatus = write(fd_client,\n+\t\t\t\t\tconn->msg_out,\n+\t\t\t\t\tn);\n+\t\t\t\tif (status == -1)\n+\t\t\t\t\treturn status;\n+\t\t\t}\n+\n+\t\t\tconn->msg_in_len = 0;\n+\t\t} else if (conn->msg_in_len < conn->msg_in_len_max) {\n+\t\t\tconn->msg_in[conn->msg_in_len] = conn->buf[i];\n+\t\t\tconn->msg_in_len++;\n+\t\t} else {\n+\t\t\tstatus = write(fd_client,\n+\t\t\t\tMSG_CMD_TOO_LONG,\n+\t\t\t\tstrlen(MSG_CMD_TOO_LONG));\n+\t\t\tif (status == -1)\n+\t\t\t\treturn status;\n+\n+\t\t\tconn->msg_in_len = 0;\n+\t\t}\n+\t}\n+\n+\t/* Write prompt */\n+\tstatus = write(fd_client,\n+\t\tconn->prompt,\n+\t\tstrlen(conn->prompt));\n+\tif (status == -1)\n+\t\treturn status;\n+\n+\treturn 0;\n+}\n+\n+static int\n+control_event_handle(struct conn *conn,\n+\tint fd_client)\n+{\n+\tint status;\n+\n+\tstatus = epoll_ctl(conn->fd_client_group,\n+\t\tEPOLL_CTL_DEL,\n+\t\tfd_client,\n+\t\tNULL);\n+\tif (status == -1)\n+\t\treturn -1;\n+\n+\tstatus = close(fd_client);\n+\tif (status == -1)\n+\t\treturn -1;\n+\n+\treturn 0;\n+}\n+\n+int\n+conn_poll_for_msg(struct conn *conn)\n+{\n+\tstruct epoll_event event;\n+\tint fd_client, status, status_data = 0, status_control = 0;\n+\n+\t/* Check input arguments */\n+\tif (conn == NULL)\n+\t\treturn -1;\n+\n+\t/* Client group */\n+\tstatus = epoll_wait(conn->fd_client_group,\n+\t\t&event,\n+\t\t1,\n+\t\t0);\n+\tif (status == -1)\n+\t\treturn -1;\n+\tif (status == 0)\n+\t\treturn 0;\n+\n+\tfd_client = event.data.fd;\n+\n+\t/* Data available */\n+\tif (event.events & EPOLLIN)\n+\t\tstatus_data = data_event_handle(conn, fd_client);\n+\n+\t/* Control events */\n+\tif (event.events & (EPOLLRDHUP | EPOLLERR | EPOLLHUP))\n+\t\tstatus_control = control_event_handle(conn, fd_client);\n+\n+\tif (status_data || status_control)\n+\t\treturn -1;\n+\n+\treturn 0;\n+}\ndiff --git a/drivers/net/softnic/conn.h b/drivers/net/softnic/conn.h\nnew file mode 100644\nindex 0000000..c82eb8f\n--- /dev/null\n+++ b/drivers/net/softnic/conn.h\n@@ -0,0 +1,49 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2010-2018 Intel Corporation\n+ */\n+\n+#ifndef __INCLUDE_CONN_H__\n+#define __INCLUDE_CONN_H__\n+\n+#include <stdint.h>\n+\n+struct conn;\n+\n+#ifndef CONN_WELCOME_LEN_MAX\n+#define CONN_WELCOME_LEN_MAX 1024\n+#endif\n+\n+#ifndef CONN_PROMPT_LEN_MAX\n+#define CONN_PROMPT_LEN_MAX 16\n+#endif\n+\n+typedef void (*conn_msg_handle_t)(char *msg_in,\n+\tchar *msg_out,\n+\tsize_t msg_out_len_max,\n+\tvoid *arg);\n+\n+struct conn_params {\n+\tconst char *welcome;\n+\tconst char *prompt;\n+\tconst char *addr;\n+\tuint16_t port;\n+\tsize_t buf_size;\n+\tsize_t msg_in_len_max;\n+\tsize_t msg_out_len_max;\n+\tconn_msg_handle_t msg_handle;\n+\tvoid *msg_handle_arg;\n+};\n+\n+struct conn *\n+conn_init(struct conn_params *p);\n+\n+void\n+conn_free(struct conn *conn);\n+\n+int\n+conn_poll_for_conn(struct conn *conn);\n+\n+int\n+conn_poll_for_msg(struct conn *conn);\n+\n+#endif\ndiff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c\nindex aed3acd..ed72648 100644\n--- a/drivers/net/softnic/rte_eth_softnic.c\n+++ b/drivers/net/softnic/rte_eth_softnic.c\n@@ -19,8 +19,6 @@\n #include \"rte_eth_softnic_internals.h\"\n \n #define PMD_PARAM_FIRMWARE \"firmware\"\n-#define PMD_PARAM_CPU_ID \"cpu_id\"\n-#define PMD_PARAM_SCRIPT \"script\"\n #define PMD_PARAM_CONN_PORT \"conn_port\"\n #define PMD_PARAM_CPU_ID \"cpu_id\"\n #define PMD_PARAM_TM_N_QUEUES \"tm_n_queues\"\n@@ -31,6 +29,7 @@\n \n static const char *pmd_valid_args[] = {\n \tPMD_PARAM_FIRMWARE,\n+\tPMD_PARAM_CONN_PORT,\n \tPMD_PARAM_CPU_ID,\n \tPMD_PARAM_TM_N_QUEUES,\n \tPMD_PARAM_TM_QSIZE0,\n@@ -40,6 +39,25 @@ static const char *pmd_valid_args[] = {\n \tNULL\n };\n \n+static const char welcome[] =\n+\t\"\\n\"\n+\t\"Welcome to Soft NIC!\\n\"\n+\t\"\\n\";\n+\n+static const char prompt[] = \"softnic> \";\n+\n+struct conn_params conn_params_default = {\n+\t.welcome = welcome,\n+\t.prompt = prompt,\n+\t.addr = \"0.0.0.0\",\n+\t.port = 0,\n+\t.buf_size = 1024 * 1024,\n+\t.msg_in_len_max = 1024,\n+\t.msg_out_len_max = 1024 * 1024,\n+\t.msg_handle = cli_process,\n+\t.msg_handle_arg = NULL,\n+};\n+\n static const struct rte_eth_dev_info pmd_dev_info = {\n \t.min_rx_bufsize = 0,\n \t.max_rx_pktlen = UINT32_MAX,\n@@ -239,6 +257,21 @@ pmd_init(struct pmd_params *params)\n \t\treturn NULL;\n \t}\n \n+\tif (params->conn_port) {\n+\t\tstruct conn_params conn_params;\n+\n+\t\tmemcpy(&conn_params, &conn_params_default, sizeof(conn_params));\n+\t\tconn_params.port = p->params.conn_port;\n+\t\tconn_params.msg_handle_arg = p;\n+\n+\t\tp->conn = conn_init(&conn_params);\n+\t\tif (p->conn == NULL) {\n+\t\t\tthread_free(p);\n+\t\t\trte_free(p);\n+\t\t\treturn NULL;\n+\t\t}\n+\t}\n+\n \treturn p;\n }\n \n@@ -248,6 +281,9 @@ pmd_free(struct pmd_internals *p)\n \tif (p == NULL)\n \t\treturn;\n \n+\tif (p->params.conn_port)\n+\t\tconn_free(p->conn);\n+\n \tthread_free(p);\n \tpipeline_free(p);\n \ttable_action_profile_free(p);\n@@ -327,6 +363,17 @@ get_uint32(const char *key __rte_unused, const char *value, void *extra_args)\n }\n \n static int\n+get_uint16(const char *key __rte_unused, const char *value, void *extra_args)\n+{\n+\tif (!value || !extra_args)\n+\t\treturn -EINVAL;\n+\n+\t*(uint16_t *)extra_args = strtoull(value, NULL, 0);\n+\n+\treturn 0;\n+}\n+\n+static int\n pmd_parse_args(struct pmd_params *p, const char *params)\n {\n \tstruct rte_kvargs *kvlist;\n@@ -354,6 +401,14 @@ pmd_parse_args(struct pmd_params *p, const char *params)\n \t\t\tgoto out_free;\n \t}\n \n+\t/* Connection listening port (optional) */\n+\tif (rte_kvargs_count(kvlist, PMD_PARAM_CONN_PORT) == 1) {\n+\t\tret = rte_kvargs_process(kvlist, PMD_PARAM_CONN_PORT,\n+\t\t\t&get_uint16, &p->conn_port);\n+\t\tif (ret < 0)\n+\t\t\tgoto out_free;\n+\t}\n+\n \t/* CPU ID (optional) */\n \tif (rte_kvargs_count(kvlist, PMD_PARAM_CPU_ID) == 1) {\n \t\tret = rte_kvargs_process(kvlist, PMD_PARAM_CPU_ID,\n@@ -477,6 +532,7 @@ static struct rte_vdev_driver pmd_softnic_drv = {\n RTE_PMD_REGISTER_VDEV(net_softnic, pmd_softnic_drv);\n RTE_PMD_REGISTER_PARAM_STRING(net_softnic,\n \tPMD_PARAM_FIRMWARE \"=<string> \"\n+\tPMD_PARAM_CONN_PORT \"=<uint16> \"\n \tPMD_PARAM_CPU_ID \"=<uint32> \"\n \tPMD_PARAM_TM_N_QUEUES \"=<uint32> \"\n \tPMD_PARAM_TM_QSIZE0 \"=<uint32> \"\n@@ -494,3 +550,22 @@ pmd_softnic_init_log(void)\n \tif (pmd_softnic_logtype >= 0)\n \t\trte_log_set_level(pmd_softnic_logtype, RTE_LOG_NOTICE);\n }\n+\n+int\n+rte_pmd_softnic_manage(uint16_t port_id)\n+{\n+\tstruct rte_eth_dev *dev = &rte_eth_devices[port_id];\n+\tstruct pmd_internals *softnic;\n+\n+#ifdef RTE_LIBRTE_ETHDEV_DEBUG\n+\tRTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, 0);\n+#endif\n+\n+\tsoftnic = dev->data->dev_private;\n+\n+\tconn_poll_for_conn(softnic->conn);\n+\n+\tconn_poll_for_msg(softnic->conn);\n+\n+\treturn 0;\n+}\ndiff --git a/drivers/net/softnic/rte_eth_softnic.h b/drivers/net/softnic/rte_eth_softnic.h\nindex 98b0828..048dfe6 100644\n--- a/drivers/net/softnic/rte_eth_softnic.h\n+++ b/drivers/net/softnic/rte_eth_softnic.h\n@@ -16,6 +16,11 @@ extern \"C\" {\n #define SOFTNIC_FIRMWARE \"firmware.cli\"\n #endif\n \n+/** TCP connection port (0 = no connectivity). */\n+#ifndef SOFTNIC_CONN_PORT\n+#define SOFTNIC_CONN_PORT 0\n+#endif\n+\n /** NUMA node ID. */\n #ifndef SOFTNIC_CPU_ID\n #define SOFTNIC_CPU_ID 0\n@@ -42,6 +47,17 @@ extern \"C\" {\n int\n rte_pmd_softnic_run(uint16_t port_id);\n \n+/**\n+ * Soft NIC manage.\n+ *\n+ * @param port_id\n+ * Port ID of the Soft NIC device.\n+ * @return\n+ * Zero on success, error code otherwise.\n+ */\n+int __rte_experimental\n+rte_pmd_softnic_manage(uint16_t port_id);\n+\n #ifdef __cplusplus\n }\n #endif\ndiff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/softnic/rte_eth_softnic_internals.h\nindex 5d38f2f..155450e 100644\n--- a/drivers/net/softnic/rte_eth_softnic_internals.h\n+++ b/drivers/net/softnic/rte_eth_softnic_internals.h\n@@ -22,6 +22,7 @@\n #include <rte_tm_driver.h>\n \n #include \"rte_eth_softnic.h\"\n+#include \"conn.h\"\n \n #define NAME_SIZE 64\n \n@@ -32,6 +33,7 @@\n struct pmd_params {\n \tconst char *name;\n \tconst char *firmware;\n+\tuint16_t conn_port;\n \tuint32_t cpu_id;\n \n \t/** Traffic Management (TM) */\n@@ -488,6 +490,7 @@ struct pmd_internals {\n \t\tstruct tm_internals tm; /**< Traffic Management */\n \t} soft;\n \n+\tstruct conn *conn;\n \tstruct mempool_list mempool_list;\n \tstruct swq_list swq_list;\n \tstruct link_list link_list;\ndiff --git a/drivers/net/softnic/rte_pmd_softnic_version.map b/drivers/net/softnic/rte_eth_softnic_version.map\nsimilarity index 52%\nrename from drivers/net/softnic/rte_pmd_softnic_version.map\nrename to drivers/net/softnic/rte_eth_softnic_version.map\nindex fb2cb68..bc44b06 100644\n--- a/drivers/net/softnic/rte_pmd_softnic_version.map\n+++ b/drivers/net/softnic/rte_eth_softnic_version.map\n@@ -5,3 +5,9 @@ DPDK_17.11 {\n \n \tlocal: *;\n };\n+\n+EXPERIMENTAL {\n+\tglobal:\n+\n+\trte_pmd_softnic_manage;\n+};\n", "prefixes": [ "v3", "13/23" ] }