Adding upstream version 18.2.2.upstream/18.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 523 insertions, 0 deletions

diff --git a/src/seastar/dpdk/examples/cmdline/Makefile b/src/seastar/dpdk/examples/cmdline/Makefile
new file mode 100644
index 000000000..a03dfa8ee
--- /dev/null
+++ b/src/seastar/dpdk/examples/cmdline/Makefile
@@ -0,0 +1,62 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2014 Intel Corporation
+
+# binary name
+APP = cmdline
+
+# all source are stored in SRCS-y
+SRCS-y := main.c commands.c parse_obj_list.c
+
+# Build using pkg-config variables if possible
+$(shell pkg-config --exists libdpdk)
+ifeq ($(.SHELLSTATUS),0)
+
+all: shared
+.PHONY: shared static
+shared: build/$(APP)-shared
+	ln -sf $(APP)-shared build/$(APP)
+static: build/$(APP)-static
+	ln -sf $(APP)-static build/$(APP)
+
+PC_FILE := $(shell pkg-config --path libdpdk)
+CFLAGS += -O3 $(shell pkg-config --cflags libdpdk)
+LDFLAGS_SHARED = $(shell pkg-config --libs libdpdk)
+LDFLAGS_STATIC = -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk)
+
+build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
+	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
+
+build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build
+	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC)
+
+build:
+	@mkdir -p $@
+
+.PHONY: clean
+clean:
+	rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
+	rmdir --ignore-fail-on-non-empty build
+
+else
+
+ifeq ($(RTE_SDK),)
+$(error "Please define RTE_SDK environment variable")
+endif
+
+# Default target, detect a build directory, by looking for a path with a .config
+RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
+
+include $(RTE_SDK)/mk/rte.vars.mk
+
+# binary name
+APP = cmdline
+
+# all source are stored in SRCS-y
+SRCS-y := main.c commands.c parse_obj_list.c
+
+CFLAGS += -O3
+CFLAGS += $(WERROR_FLAGS)
+
+include $(RTE_SDK)/mk/rte.extapp.mk
+
+endif
diff --git a/src/seastar/dpdk/examples/cmdline/commands.c b/src/seastar/dpdk/examples/cmdline/commands.c
new file mode 100644
index 000000000..e96739f34
--- /dev/null
+++ b/src/seastar/dpdk/examples/cmdline/commands.c
@@ -0,0 +1,229 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation.
+ * Copyright (c) 2009, Olivier MATZ <zer0@droids-corp.org>
+ * All rights reserved.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <netinet/in.h>
+#include <termios.h>
+#ifndef __linux__
+	#ifdef __FreeBSD__
+		#include <sys/socket.h>
+	#else
+		#include <net/socket.h>
+	#endif
+#endif
+
+#include <cmdline_rdline.h>
+#include <cmdline_parse.h>
+#include <cmdline_parse_ipaddr.h>
+#include <cmdline_parse_num.h>
+#include <cmdline_parse_string.h>
+#include <cmdline.h>
+
+#include <rte_string_fns.h>
+
+#include "parse_obj_list.h"
+
+struct object_list global_obj_list;
+
+/* not defined under linux */
+#ifndef NIPQUAD
+#define NIPQUAD_FMT "%u.%u.%u.%u"
+#define NIPQUAD(addr)				\
+	(unsigned)((unsigned char *)&addr)[0],	\
+	(unsigned)((unsigned char *)&addr)[1],	\
+	(unsigned)((unsigned char *)&addr)[2],	\
+	(unsigned)((unsigned char *)&addr)[3]
+#endif
+
+#ifndef NIP6
+#define NIP6_FMT "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x"
+#define NIP6(addr)					\
+	(unsigned)((addr).s6_addr[0]),			\
+	(unsigned)((addr).s6_addr[1]),			\
+	(unsigned)((addr).s6_addr[2]),			\
+	(unsigned)((addr).s6_addr[3]),			\
+	(unsigned)((addr).s6_addr[4]),			\
+	(unsigned)((addr).s6_addr[5]),			\
+	(unsigned)((addr).s6_addr[6]),			\
+	(unsigned)((addr).s6_addr[7]),			\
+	(unsigned)((addr).s6_addr[8]),			\
+	(unsigned)((addr).s6_addr[9]),			\
+	(unsigned)((addr).s6_addr[10]),			\
+	(unsigned)((addr).s6_addr[11]),			\
+	(unsigned)((addr).s6_addr[12]),			\
+	(unsigned)((addr).s6_addr[13]),			\
+	(unsigned)((addr).s6_addr[14]),			\
+	(unsigned)((addr).s6_addr[15])
+#endif
+
+
+/**********************************************************/
+
+struct cmd_obj_del_show_result {
+	cmdline_fixed_string_t action;
+	struct object *obj;
+};
+
+static void cmd_obj_del_show_parsed(void *parsed_result,
+				    struct cmdline *cl,
+				    __attribute__((unused)) void *data)
+{
+	struct cmd_obj_del_show_result *res = parsed_result;
+	char ip_str[INET6_ADDRSTRLEN];
+
+	if (res->obj->ip.family == AF_INET)
+		snprintf(ip_str, sizeof(ip_str), NIPQUAD_FMT,
+			 NIPQUAD(res->obj->ip.addr.ipv4));
+	else
+		snprintf(ip_str, sizeof(ip_str), NIP6_FMT,
+			 NIP6(res->obj->ip.addr.ipv6));
+
+	if (strcmp(res->action, "del") == 0) {
+		SLIST_REMOVE(&global_obj_list, res->obj, object, next);
+		cmdline_printf(cl, "Object %s removed, ip=%s\n",
+			       res->obj->name, ip_str);
+		free(res->obj);
+	}
+	else if (strcmp(res->action, "show") == 0) {
+		cmdline_printf(cl, "Object %s, ip=%s\n",
+			       res->obj->name, ip_str);
+	}
+}
+
+cmdline_parse_token_string_t cmd_obj_action =
+	TOKEN_STRING_INITIALIZER(struct cmd_obj_del_show_result,
+				 action, "show#del");
+parse_token_obj_list_t cmd_obj_obj =
+	TOKEN_OBJ_LIST_INITIALIZER(struct cmd_obj_del_show_result, obj,
+				   &global_obj_list);
+
+cmdline_parse_inst_t cmd_obj_del_show = {
+	.f = cmd_obj_del_show_parsed,  /* function to call */
+	.data = NULL,      /* 2nd arg of func */
+	.help_str = "Show/del an object",
+	.tokens = {        /* token list, NULL terminated */
+		(void *)&cmd_obj_action,
+		(void *)&cmd_obj_obj,
+		NULL,
+	},
+};
+
+/**********************************************************/
+
+struct cmd_obj_add_result {
+	cmdline_fixed_string_t action;
+	cmdline_fixed_string_t name;
+	cmdline_ipaddr_t ip;
+};
+
+static void cmd_obj_add_parsed(void *parsed_result,
+			       struct cmdline *cl,
+			       __attribute__((unused)) void *data)
+{
+	struct cmd_obj_add_result *res = parsed_result;
+	struct object *o;
+	char ip_str[INET6_ADDRSTRLEN];
+
+	SLIST_FOREACH(o, &global_obj_list, next) {
+		if (!strcmp(res->name, o->name)) {
+			cmdline_printf(cl, "Object %s already exist\n", res->name);
+			return;
+		}
+		break;
+	}
+
+	o = malloc(sizeof(*o));
+	if (!o) {
+		cmdline_printf(cl, "mem error\n");
+		return;
+	}
+	strlcpy(o->name, res->name, sizeof(o->name));
+	o->ip = res->ip;
+	SLIST_INSERT_HEAD(&global_obj_list, o, next);
+
+	if (o->ip.family == AF_INET)
+		snprintf(ip_str, sizeof(ip_str), NIPQUAD_FMT,
+			 NIPQUAD(o->ip.addr.ipv4));
+	else
+		snprintf(ip_str, sizeof(ip_str), NIP6_FMT,
+			 NIP6(o->ip.addr.ipv6));
+
+	cmdline_printf(cl, "Object %s added, ip=%s\n",
+		       o->name, ip_str);
+}
+
+cmdline_parse_token_string_t cmd_obj_action_add =
+	TOKEN_STRING_INITIALIZER(struct cmd_obj_add_result, action, "add");
+cmdline_parse_token_string_t cmd_obj_name =
+	TOKEN_STRING_INITIALIZER(struct cmd_obj_add_result, name, NULL);
+cmdline_parse_token_ipaddr_t cmd_obj_ip =
+	TOKEN_IPADDR_INITIALIZER(struct cmd_obj_add_result, ip);
+
+cmdline_parse_inst_t cmd_obj_add = {
+	.f = cmd_obj_add_parsed,  /* function to call */
+	.data = NULL,      /* 2nd arg of func */
+	.help_str = "Add an object (name, val)",
+	.tokens = {        /* token list, NULL terminated */
+		(void *)&cmd_obj_action_add,
+		(void *)&cmd_obj_name,
+		(void *)&cmd_obj_ip,
+		NULL,
+	},
+};
+
+/**********************************************************/
+
+struct cmd_help_result {
+	cmdline_fixed_string_t help;
+};
+
+static void cmd_help_parsed(__attribute__((unused)) void *parsed_result,
+			    struct cmdline *cl,
+			    __attribute__((unused)) void *data)
+{
+	cmdline_printf(cl,
+		       "Demo example of command line interface in RTE\n\n"
+		       "This is a readline-like interface that can be used to\n"
+		       "debug your RTE application. It supports some features\n"
+		       "of GNU readline like completion, cut/paste, and some\n"
+		       "other special bindings.\n\n"
+		       "This demo shows how rte_cmdline library can be\n"
+		       "extended to handle a list of objects. There are\n"
+		       "3 commands:\n"
+		       "- add obj_name IP\n"
+		       "- del obj_name\n"
+		       "- show obj_name\n\n");
+}
+
+cmdline_parse_token_string_t cmd_help_help =
+	TOKEN_STRING_INITIALIZER(struct cmd_help_result, help, "help");
+
+cmdline_parse_inst_t cmd_help = {
+	.f = cmd_help_parsed,  /* function to call */
+	.data = NULL,      /* 2nd arg of func */
+	.help_str = "show help",
+	.tokens = {        /* token list, NULL terminated */
+		(void *)&cmd_help_help,
+		NULL,
+	},
+};
+
+
+/**********************************************************/
+/**********************************************************/
+/****** CONTEXT (list of instruction) */
+
+cmdline_parse_ctx_t main_ctx[] = {
+	(cmdline_parse_inst_t *)&cmd_obj_del_show,
+	(cmdline_parse_inst_t *)&cmd_obj_add,
+	(cmdline_parse_inst_t *)&cmd_help,
+	NULL,
+};
diff --git a/src/seastar/dpdk/examples/cmdline/commands.h b/src/seastar/dpdk/examples/cmdline/commands.h
new file mode 100644
index 000000000..791204547
--- /dev/null
+++ b/src/seastar/dpdk/examples/cmdline/commands.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#ifndef _COMMANDS_H_
+#define _COMMANDS_H_
+
+extern cmdline_parse_ctx_t main_ctx[];
+
+#endif /* _COMMANDS_H_ */
diff --git a/src/seastar/dpdk/examples/cmdline/main.c b/src/seastar/dpdk/examples/cmdline/main.c
new file mode 100644
index 000000000..f2f2e5a2f
--- /dev/null
+++ b/src/seastar/dpdk/examples/cmdline/main.c
@@ -0,0 +1,41 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation.
+ * Copyright (c) 2009, Olivier MATZ <zer0@droids-corp.org>
+ * All rights reserved.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <errno.h>
+#include <termios.h>
+#include <sys/queue.h>
+
+#include <cmdline_rdline.h>
+#include <cmdline_parse.h>
+#include <cmdline_socket.h>
+#include <cmdline.h>
+
+#include <rte_memory.h>
+#include <rte_eal.h>
+#include <rte_debug.h>
+
+#include "commands.h"
+
+int main(int argc, char **argv)
+{
+	int ret;
+	struct cmdline *cl;
+
+	ret = rte_eal_init(argc, argv);
+	if (ret < 0)
+		rte_panic("Cannot init EAL\n");
+
+	cl = cmdline_stdin_new(main_ctx, "example> ");
+	if (cl == NULL)
+		rte_panic("Cannot create cmdline instance\n");
+	cmdline_interact(cl);
+	cmdline_stdin_exit(cl);
+
+	return 0;
+}
diff --git a/src/seastar/dpdk/examples/cmdline/meson.build b/src/seastar/dpdk/examples/cmdline/meson.build
new file mode 100644
index 000000000..a8608c21a
--- /dev/null
+++ b/src/seastar/dpdk/examples/cmdline/meson.build
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Intel Corporation
+
+# meson file, for building this example as part of a main DPDK build.
+#
+# To build this example as a standalone application with an already-installed
+# DPDK instance, use 'make'
+
+sources = files(
+	'commands.c', 'main.c', 'parse_obj_list.c'
+)
diff --git a/src/seastar/dpdk/examples/cmdline/parse_obj_list.c b/src/seastar/dpdk/examples/cmdline/parse_obj_list.c
new file mode 100644
index 000000000..5d29f9d59
--- /dev/null
+++ b/src/seastar/dpdk/examples/cmdline/parse_obj_list.c
@@ -0,0 +1,112 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation.
+ * Copyright (c) 2009, Olivier MATZ <zer0@droids-corp.org>
+ * All rights reserved.
+ */
+
+#include <stdio.h>
+#include <inttypes.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <ctype.h>
+#include <string.h>
+#include <netinet/in.h>
+
+#include <cmdline_parse.h>
+#include <cmdline_parse_ipaddr.h>
+
+#include <rte_string_fns.h>
+
+#include "parse_obj_list.h"
+
+/* This file is an example of extension of libcmdline. It provides an
+ * example of objects stored in a list. */
+
+struct cmdline_token_ops token_obj_list_ops = {
+	.parse = parse_obj_list,
+	.complete_get_nb = complete_get_nb_obj_list,
+	.complete_get_elt = complete_get_elt_obj_list,
+	.get_help = get_help_obj_list,
+};
+
+int
+parse_obj_list(cmdline_parse_token_hdr_t *tk, const char *buf, void *res,
+	unsigned ressize)
+{
+	struct token_obj_list *tk2 = (struct token_obj_list *)tk;
+	struct token_obj_list_data *tkd = &tk2->obj_list_data;
+	struct object *o;
+	unsigned int token_len = 0;
+
+	if (*buf == 0)
+		return -1;
+
+	if (res && ressize < sizeof(struct object *))
+		return -1;
+
+	while(!cmdline_isendoftoken(buf[token_len]))
+		token_len++;
+
+	SLIST_FOREACH(o, tkd->list, next) {
+		if (token_len != strnlen(o->name, OBJ_NAME_LEN_MAX))
+			continue;
+		if (strncmp(buf, o->name, token_len))
+			continue;
+		break;
+	}
+	if (!o) /* not found */
+		return -1;
+
+	/* store the address of object in structure */
+	if (res)
+		*(struct object **)res = o;
+
+	return token_len;
+}
+
+int complete_get_nb_obj_list(cmdline_parse_token_hdr_t *tk)
+{
+	struct token_obj_list *tk2 = (struct token_obj_list *)tk;
+	struct token_obj_list_data *tkd = &tk2->obj_list_data;
+	struct object *o;
+	int ret = 0;
+
+	SLIST_FOREACH(o, tkd->list, next) {
+		ret ++;
+	}
+	return ret;
+}
+
+int complete_get_elt_obj_list(cmdline_parse_token_hdr_t *tk,
+			      int idx, char *dstbuf, unsigned int size)
+{
+	struct token_obj_list *tk2 = (struct token_obj_list *)tk;
+	struct token_obj_list_data *tkd = &tk2->obj_list_data;
+	struct object *o;
+	int i = 0;
+	unsigned len;
+
+	SLIST_FOREACH(o, tkd->list, next) {
+		if (i++ == idx)
+			break;
+	}
+	if (!o)
+		return -1;
+
+	len = strnlen(o->name, OBJ_NAME_LEN_MAX);
+	if ((len + 1) > size)
+		return -1;
+
+	if (dstbuf)
+		strlcpy(dstbuf, o->name, size);
+
+	return 0;
+}
+
+
+int get_help_obj_list(__attribute__((unused)) cmdline_parse_token_hdr_t *tk,
+		      char *dstbuf, unsigned int size)
+{
+	snprintf(dstbuf, size, "Obj-List");
+	return 0;
+}
diff --git a/src/seastar/dpdk/examples/cmdline/parse_obj_list.h b/src/seastar/dpdk/examples/cmdline/parse_obj_list.h
new file mode 100644
index 000000000..6516d3e2c
--- /dev/null
+++ b/src/seastar/dpdk/examples/cmdline/parse_obj_list.h
@@ -0,0 +1,58 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation.
+ * Copyright (c) 2009, Olivier MATZ <zer0@droids-corp.org>
+ * All rights reserved.
+ */
+
+#ifndef _PARSE_OBJ_LIST_H_
+#define _PARSE_OBJ_LIST_H_
+
+/* This file is an example of extension of libcmdline. It provides an
+ * example of objects stored in a list. */
+
+#include <sys/queue.h>
+#include <cmdline_parse.h>
+
+#define OBJ_NAME_LEN_MAX 64
+
+struct object {
+	SLIST_ENTRY(object) next;
+	char name[OBJ_NAME_LEN_MAX];
+	cmdline_ipaddr_t ip;
+};
+
+/* define struct object_list */
+SLIST_HEAD(object_list, object);
+
+/* data is a pointer to a list */
+struct token_obj_list_data {
+	struct object_list *list;
+};
+
+struct token_obj_list {
+	struct cmdline_token_hdr hdr;
+	struct token_obj_list_data obj_list_data;
+};
+typedef struct token_obj_list parse_token_obj_list_t;
+
+extern struct cmdline_token_ops token_obj_list_ops;
+
+int parse_obj_list(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res,
+	unsigned ressize);
+int complete_get_nb_obj_list(cmdline_parse_token_hdr_t *tk);
+int complete_get_elt_obj_list(cmdline_parse_token_hdr_t *tk, int idx,
+			      char *dstbuf, unsigned int size);
+int get_help_obj_list(cmdline_parse_token_hdr_t *tk, char *dstbuf, unsigned int size);
+
+#define TOKEN_OBJ_LIST_INITIALIZER(structure, field, obj_list_ptr)  \
+{								    \
+	.hdr = {						    \
+		.ops = &token_obj_list_ops,			    \
+		.offset = offsetof(structure, field),		    \
+	},							    \
+		.obj_list_data = {				    \
+		.list = obj_list_ptr,				    \
+	},							    \
+}
+
+#endif /* _PARSE_OBJ_LIST_H_ */