[dpdk-dev] fail to bind '82541GI Gigabit Ethernet Controller' to IGB_UIO driver
Hi Sim, 2014-05-14 18:44, Helmut Sim: > I made the required change in order to support the 82541GI chipset and I > was able to bind it successfully to the igb_uio Don't hesitate to submit a patch after having validated that it's working well. Thanks -- Thomas
[dpdk-dev] [PATCH 0/2]
two timer bugs fixed lib/librte_timer/rte_timer.c | 21 ++--- lib/librte_timer/rte_timer.h |7 ++- 2 files changed, 16 insertions(+), 12 deletions(-) -- 1.7.9.5
[dpdk-dev] [PATCH 1/2] timer bug fix
Description: when going running, the
pending count is not incremented.
Fix: decremend
pending when going running. Then, if periodic,
increment, if one shot - do nothing
Signed-off-by: Vadim Suraev
---
lib/librte_timer/rte_timer.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c
index a3d5cca..f98e904 100755
--- a/lib/librte_timer/rte_timer.c
+++ b/lib/librte_timer/rte_timer.c
@@ -173,7 +173,7 @@ timer_set_running_state(struct rte_timer *tim)
/* timer is not pending anymore */
if (prev_status.state != RTE_TIMER_PENDING)
return -1;
-
+ __TIMER_STAT_ADD(pending, -1);
/* here, we know that timer is stopped or pending,
* mark it atomically as beeing configured */
status.state = RTE_TIMER_RUNNING;
@@ -555,7 +555,6 @@ void rte_timer_manage(void)
if (tim->period == 0) {
/* remove from done list and mark timer as stopped */
- __TIMER_STAT_ADD(pending, -1);
status.state = RTE_TIMER_STOP;
status.owner = RTE_TIMER_NO_OWNER;
rte_wmb();
@@ -564,6 +563,7 @@ void rte_timer_manage(void)
else {
/* keep it in list and mark timer as pending */
status.state = RTE_TIMER_PENDING;
+ __TIMER_STAT_ADD(pending, 1);
status.owner = (int16_t)lcore_id;
rte_wmb();
tim->status.u32 = status.u32;
--
1.7.9.5
[dpdk-dev] [PATCH 2/2] timer bug fix
Description: while running a periodic timer's callback, if another
timer is manipulated, the updated flag is raised
preventing the periodic timer to reload.
Fix: move
updated flag from priv_timer to rte_timer stucture (one
per core)
Signed-off-by: Vadim Suraev
---
lib/librte_timer/rte_timer.c | 17 -
lib/librte_timer/rte_timer.h |7 ++-
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c
index f98e904..0cc5fa9 100755
--- a/lib/librte_timer/rte_timer.c
+++ b/lib/librte_timer/rte_timer.c
@@ -58,11 +58,6 @@ LIST_HEAD(rte_timer_list, rte_timer);
struct priv_timer {
struct rte_timer pending_head; /**< dummy timer instance to head up
list */
rte_spinlock_t list_lock; /**< lock to protect list access */
-
- /** per-core variable that true if a timer was updated on this
-* core since last reset of the variable */
- int updated;
-
/** track the current depth of the skiplist */
unsigned curr_skiplist_depth;
@@ -107,10 +102,14 @@ void
rte_timer_init(struct rte_timer *tim)
{
union rte_timer_status status;
+ unsigned lcore_id;
status.state = RTE_TIMER_STOP;
status.owner = RTE_TIMER_NO_OWNER;
tim->status.u32 = status.u32;
+ for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id ++) {
+ tim->updated[lcore_id] = 0;
+ }
}
/*
@@ -378,7 +377,7 @@ __rte_timer_reset(struct rte_timer *tim, uint64_t expire,
return -1;
__TIMER_STAT_ADD(reset, 1);
- priv_timer[lcore_id].updated = 1;
+ tim->updated[lcore_id] = 1;
/* remove it from list */
if (prev_status.state == RTE_TIMER_PENDING) {
@@ -453,7 +452,7 @@ rte_timer_stop(struct rte_timer *tim)
return -1;
__TIMER_STAT_ADD(stop, 1);
- priv_timer[lcore_id].updated = 1;
+ tim->updated[lcore_id] = 1;
/* remove it from list */
if (prev_status.state == RTE_TIMER_PENDING) {
@@ -541,7 +540,7 @@ void rte_timer_manage(void)
rte_spinlock_unlock(&priv_timer[lcore_id].list_lock);
- priv_timer[lcore_id].updated = 0;
+ tim->updated[lcore_id] = 0;
/* execute callback function with list unlocked */
tim->f(tim, tim->arg);
@@ -550,7 +549,7 @@ void rte_timer_manage(void)
/* the timer was stopped or reloaded by the callback
* function, we have nothing to do here */
- if (priv_timer[lcore_id].updated == 1)
+ if (tim->updated[lcore_id] == 1)
continue;
if (tim->period == 0) {
diff --git a/lib/librte_timer/rte_timer.h b/lib/librte_timer/rte_timer.h
index c5f936b..235dfd6 100755
--- a/lib/librte_timer/rte_timer.h
+++ b/lib/librte_timer/rte_timer.h
@@ -129,6 +129,10 @@ struct rte_timer
uint64_t period; /**< Period of timer (0 if not periodic). */
rte_timer_cb_t *f; /**< Callback function. */
void *arg; /**< Argument to callback function. */
+/** per-core variable that true if a timer was updated on this
+* core since last reset of the variable */
+ int updated[RTE_MAX_LCORE];
+
};
@@ -142,7 +146,8 @@ struct rte_timer
{{RTE_TIMER_STOP, RTE_TIMER_NO_OWNER}}, \
0, \
NULL, \
- NULL, \
+ NULL, \
+ {0}, \
}
#else
/**
--
1.7.9.5
[dpdk-dev] [PATCH v3] app/testpmd: list forwarding engines
On 05/15/2014 06:08 PM, Thomas Monjalon wrote:
> Having a function to list forwarding engines helps to show them
> in cli help and in parameters usage witout duplicating code.
>
> Signed-off-by: Thomas Monjalon
> ---
> app/test-pmd/cmdline.c| 52
> +++
> app/test-pmd/config.c | 19 +
> app/test-pmd/parameters.c | 3 ++-
> app/test-pmd/testpmd.h| 1 +
> 4 files changed, 52 insertions(+), 23 deletions(-)
>
> changes in v2:
> - factorize also contextual help
> changes in v3:
> - remove useless loop
>
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index 7becedc..c6a417a 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -294,17 +294,9 @@ static void cmd_help_long_parsed(void *parsed_result,
> "bit 3 - insert sctp checksum offload if set\n"
> "Please check the NIC datasheet for HW limits.\n\n"
>
> -#ifdef RTE_LIBRTE_IEEE1588
> - "set fwd
> (io|mac|mac_retry|rxonly|txonly|csum|ieee1588)\n"
> - "Set IO, MAC, MAC_RETRY, RXONLY, CSUM or TXONLY or
> ieee1588"
> - " packet forwarding mode.\n\n"
> + "set fwd (%s)\n"
> + "Set packet forwarding mode.\n\n"
>
> -#else
> - "set fwd (io|mac|mac_retry|rxonly|txonly|csum)\n"
> - "Set IO, MAC, MAC_RETRY, RXONLY, CSUM or TXONLY
> packet"
> - " forwarding mode.\n\n"
> -
> -#endif
> "mac_addr add (port_id) (XX:XX:XX:XX:XX:XX)\n"
> "Add a MAC address on port_id.\n\n"
>
> @@ -398,6 +390,7 @@ static void cmd_help_long_parsed(void *parsed_result,
> " using the lowest port on the NIC.\n\n"
> #endif
>
> + , list_pkt_forwarding_modes()
> );
> }
>
> @@ -2688,22 +2681,12 @@ cmdline_parse_token_string_t cmd_setfwd_fwd =
> TOKEN_STRING_INITIALIZER(struct cmd_set_fwd_mode_result, fwd, "fwd");
> cmdline_parse_token_string_t cmd_setfwd_mode =
> TOKEN_STRING_INITIALIZER(struct cmd_set_fwd_mode_result, mode,
> -#ifdef RTE_LIBRTE_IEEE1588
> -
> "io#mac#mac_retry#rxonly#txonly#csum#ieee1588");
> -#else
> - "io#mac#mac_retry#rxonly#txonly#csum");
> -#endif
> + "" /* defined at init */);
>
> cmdline_parse_inst_t cmd_set_fwd_mode = {
> .f = cmd_set_fwd_mode_parsed,
> .data = NULL,
> -#ifdef RTE_LIBRTE_IEEE1588
> - .help_str = "set fwd io|mac|mac_retry|rxonly|txonly|csum|ieee1588 - set
> IO, MAC,"
> - " MAC_RETRY, RXONLY, TXONLY, CSUM or IEEE1588 packet forwarding mode",
> -#else
> - .help_str = "set fwd io|mac|mac_retry|rxonly|txonly|csum - set IO, MAC,"
> - " MAC_RETRY, RXONLY, CSUM or TXONLY packet forwarding mode",
> -#endif
> + .help_str = NULL, /* defined at init */
> .tokens = {
> (void *)&cmd_setfwd_set,
> (void *)&cmd_setfwd_fwd,
> @@ -2712,6 +2695,28 @@ cmdline_parse_inst_t cmd_set_fwd_mode = {
> },
> };
>
> +static void cmd_set_fwd_mode_init(void)
> +{
> + char *modes, *c;
> + static char token[128];
> + static char help[256];
> + cmdline_parse_token_string_t *token_struct;
> +
> + modes = list_pkt_forwarding_modes();
> + rte_snprintf(help, sizeof help, "set fwd %s - "
> + "set packet forwarding mode", modes);
> + cmd_set_fwd_mode.help_str = help;
> +
> + /* string token separator is # */
> + for (c = token; *modes != '\0'; modes++)
> + if (*modes == '|')
> + *c++ = '#';
> + else
> + *c++ = *modes;
> + token_struct =
> (cmdline_parse_token_string_t*)cmd_set_fwd_mode.tokens[2];
> + token_struct->string_data.str = token;
> +}
> +
> /* *** SET BURST TX DELAY TIME RETRY NUMBER *** */
> struct cmd_set_burst_tx_retry_result {
> cmdline_fixed_string_t set;
> @@ -5198,6 +5203,9 @@ prompt(void)
> {
> struct cmdline *cl;
>
> + /* initialize non-constant commands */
> + cmd_set_fwd_mode_init();
> +
> cl = cmdline_stdin_new(main_ctx, "testpmd> ");
> if (cl == NULL) {
> return;
> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
> index d0e21b7..41326fe 100644
> --- a/app/test-pmd/config.c
> +++ b/app/test-pmd/config.c
> @@ -1231,6 +1231,25 @@ set_tx_pkt_segments(unsigned *seg_lengths, unsigned
> nb_segs)
> tx_pkt_nb_segs = (uint8_t) nb_segs;
> }
>
> +char*
> +list_pkt_forwarding_modes(void)
> +{
> + static char fwd_modes[128] = "";
> + const char *separator = "|";
> + struct fwd_engine *fwd_eng;
> + unsigned i = 0;
> +
> + if (strlen (fwd_modes) == 0) {
> + while ((fwd_eng = fwd_engines[i++]) != NULL) {
> + strcat(fwd_mod
[dpdk-dev] [PATCH v3 0/6] examples: add a new makefile to build all examples
This patch series adds a makefile to build all examples supported
by the configuration. It helps to check that all examples compile
after a dpdk modification.
After applying the patches, it is possible to build all examples for
given targets, given the installation directory:
# first, install the x86_64-default-linuxapp-gcc in
# ${RTE_SDK}/x86_64-default-linuxapp-gcc directory
user at droids:~/dpdk.org$ make install T=x86_64-default-linuxapp-gcc
# build examples for this new installation in
# ${RTE_SDK}/examples directory
user at droids:~/dpdk.org$ make examples T=x86_64-default-linuxapp-gcc
Or directly from examples directory:
user at droids:~/dpdk.org$ cd examples
user at droids:~/dpdk.org/examples$ make RTE_SDK=${PWD}/.. \
RTE_TARGET=x86_64-default-linuxapp-gcc
Changes included in v3:
- use x86_64-default-linuxapp-gcc instead of x86_64-ivshmem-linuxapp-gcc
for default RTE_TARGET of multi_process example (was a bad copy/paste).
- replace ifndef by ?=
- fix when O= is a relative directory
- exit if the installation directory does not exist
Changes included in v2:
- do not build kni example if CONFIG_RTE_LIBRTE_KNI is not set
- fix rte.extsubdir.mk when there are several levels of subdirectories
- allow to build examples directly from dpdk root directory
- explain in commit logs that it requires an install directory
Olivier Matz (6):
mk: introduce rte.extsubdir.mk
examples: use rte.extsubdir.mk to process subdirectories
examples: add a makefile to build all examples
examples: fix qos_sched makefile
examples: fix netmap_compat example
mk: add "make examples" target in root makefile
doc/build-sdk-quick.txt | 14 +++--
examples/Makefile| 68
examples/l2fwd-ivshmem/Makefile | 9 +--
examples/multi_process/Makefile | 16 +++--
examples/multi_process/client_server_mp/Makefile | 15 ++---
examples/netmap_compat/bridge/Makefile | 5 +-
examples/qos_sched/Makefile | 2 -
examples/quota_watermark/Makefile| 12 +---
mk/rte.extsubdir.mk | 53
mk/rte.sdkexamples.mk| 79
mk/rte.sdkroot.mk| 4 ++
11 files changed, 233 insertions(+), 44 deletions(-)
create mode 100644 examples/Makefile
create mode 100644 mk/rte.extsubdir.mk
create mode 100644 mk/rte.sdkexamples.mk
--
1.9.2
[dpdk-dev] [PATCH v3 1/6] mk: introduce rte.extsubdir.mk
This makefile can be included by a project that needs to build several applications or libraries that are located in different directories. Signed-off-by: Olivier Matz --- mk/rte.extsubdir.mk | 53 + 1 file changed, 53 insertions(+) create mode 100644 mk/rte.extsubdir.mk diff --git a/mk/rte.extsubdir.mk b/mk/rte.extsubdir.mk new file mode 100644 index 000..f50f006 --- /dev/null +++ b/mk/rte.extsubdir.mk @@ -0,0 +1,53 @@ +# BSD LICENSE +# +# Copyright(c) 2014 6WIND S.A. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of 6WIND S.A. nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +MAKEFLAGS += --no-print-directory + +# output directory +O ?= . +BASE_OUTPUT ?= $(O) +CUR_SUBDIR ?= . + +.PHONY: all +all: $(DIRS-y) + +.PHONY: clean +clean: $(DIRS-y) + +.PHONY: $(DIRS-y) +$(DIRS-y): + @echo "== $@" + $(Q)$(MAKE) -C $(@) \ + M=$(CURDIR)/$(@)/Makefile \ + O=$(BASE_OUTPUT)/$(CUR_SUBDIR)/$(@)/$(RTE_TARGET) \ + BASE_OUTPUT=$(BASE_OUTPUT) \ + CUR_SUBDIR=$(CUR_SUBDIR)/$(@) \ + S=$(CURDIR)/$(@) \ + $(filter-out $(DIRS-y),$(MAKECMDGOALS)) -- 1.9.2
[dpdk-dev] [PATCH v3 2/6] examples: use rte.extsubdir.mk to process subdirectories
Signed-off-by: Olivier Matz --- examples/l2fwd-ivshmem/Makefile | 9 + examples/multi_process/Makefile | 16 +++- examples/multi_process/client_server_mp/Makefile | 15 ++- examples/quota_watermark/Makefile| 12 +++- 4 files changed, 17 insertions(+), 35 deletions(-) diff --git a/examples/l2fwd-ivshmem/Makefile b/examples/l2fwd-ivshmem/Makefile index 7286b37..df59ed8 100644 --- a/examples/l2fwd-ivshmem/Makefile +++ b/examples/l2fwd-ivshmem/Makefile @@ -37,14 +37,7 @@ endif RTE_TARGET ?= x86_64-ivshmem-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -unexport RTE_SRCDIR RTE_OUTPUT RTE_EXTMK DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += host guest -.PHONY: all clean $(DIRS-y) - -all: $(DIRS-y) -clean: $(DIRS-y) - -$(DIRS-y): - $(MAKE) -C $@ $(MAKECMDGOALS) +include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/multi_process/Makefile b/examples/multi_process/Makefile index ba96a7e..5e01f9a 100644 --- a/examples/multi_process/Makefile +++ b/examples/multi_process/Makefile @@ -33,15 +33,13 @@ ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif -include $(RTE_SDK)/mk/rte.vars.mk -unexport RTE_SRCDIR RTE_OUTPUT RTE_EXTMK - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += $(wildcard *_mp) +# Default target, can be overriden by command line or environment +RTE_TARGET ?= x86_64-default-linuxapp-gcc -.PHONY: all clean $(DIRS-y) +include $(RTE_SDK)/mk/rte.vars.mk -all: $(DIRS-y) -clean: $(DIRS-y) +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += client_server_mp +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += simple_mp +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += symmetric_mp -$(DIRS-y): - $(MAKE) -C $@ $(MAKECMDGOALS) +include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/multi_process/client_server_mp/Makefile b/examples/multi_process/client_server_mp/Makefile index 24d31b0..d2046ba 100644 --- a/examples/multi_process/client_server_mp/Makefile +++ b/examples/multi_process/client_server_mp/Makefile @@ -33,15 +33,12 @@ ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") endif -include $(RTE_SDK)/mk/rte.vars.mk -unexport RTE_SRCDIR RTE_OUTPUT RTE_EXTMK - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += $(wildcard mp_*) +# Default target, can be overriden by command line or environment +RTE_TARGET ?= x86_64-default-linuxapp-gcc -.PHONY: all clean $(DIRS-y) +include $(RTE_SDK)/mk/rte.vars.mk -all: $(DIRS-y) -clean: $(DIRS-y) +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += mp_client +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += mp_server -$(DIRS-y): - $(MAKE) -C $@ $(MAKECMDGOALS) +include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/quota_watermark/Makefile b/examples/quota_watermark/Makefile index 5596dcc..e4d54c2 100644 --- a/examples/quota_watermark/Makefile +++ b/examples/quota_watermark/Makefile @@ -37,14 +37,8 @@ endif RTE_TARGET ?= x86_64-default-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -unexport RTE_SRCDIR RTE_OUTPUT RTE_EXTMK -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += $(wildcard qw*) +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += qw +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += qwctl -.PHONY: all clean $(DIRS-y) - -all: $(DIRS-y) -clean: $(DIRS-y) - -$(DIRS-y): - $(MAKE) -C $@ $(MAKECMDGOALS) +include $(RTE_SDK)/mk/rte.extsubdir.mk -- 1.9.2
[dpdk-dev] [PATCH v3 3/6] examples: add a makefile to build all examples
It is now possible to build all examples by doing the following:
user at droids:~/dpdk.org$ cd examples
user at droids:~/dpdk.org/examples$ make RTE_SDK=${PWD}/.. \
RTE_TARGET=x86_64-default-linuxapp-gcc
Signed-off-by: Olivier Matz
---
examples/Makefile | 68 +++
1 file changed, 68 insertions(+)
create mode 100644 examples/Makefile
diff --git a/examples/Makefile b/examples/Makefile
new file mode 100644
index 000..5e36c92
--- /dev/null
+++ b/examples/Makefile
@@ -0,0 +1,68 @@
+# BSD LICENSE
+#
+# Copyright(c) 2014 6WIND S.A.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of 6WIND S.A. nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ifeq ($(RTE_SDK),)
+$(error "Please define RTE_SDK environment variable")
+endif
+
+# Default target, can be overriden by command line or environment
+RTE_TARGET ?= x86_64-default-linuxapp-gcc
+
+include $(RTE_SDK)/mk/rte.vars.mk
+
+DIRS-y += cmdline
+ifneq ($(ICP_ROOT),)
+DIRS-y += dpdk_qat
+endif
+DIRS-y += exception_path
+DIRS-y += helloworld
+DIRS-y += ip_reassembly
+DIRS-$(CONFIG_RTE_MBUF_SCATTER_GATHER) += ipv4_frag
+DIRS-$(CONFIG_RTE_MBUF_SCATTER_GATHER) += ipv4_multicast
+DIRS-$(CONFIG_RTE_LIBRTE_KNI) += kni
+DIRS-y += l2fwd
+DIRS-$(CONFIG_RTE_LIBRTE_IVSHMEM) += l2fwd-ivshmem
+DIRS-y += l3fwd
+DIRS-y += l3fwd-power
+DIRS-y += l3fwd-vf
+DIRS-y += link_status_interrupt
+DIRS-y += load_balancer
+DIRS-y += multi_process
+DIRS-y += netmap_compat/bridge
+DIRS-$(CONFIG_RTE_LIBRTE_METER) += qos_meter
+DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += qos_sched
+DIRS-y += quota_watermark
+DIRS-y += timer
+DIRS-y += vhost
+DIRS-$(CONFIG_RTE_LIBRTE_XEN_DOM0) += vhost_xen
+DIRS-y += vmdq
+DIRS-y += vmdq_dcb
+
+include $(RTE_SDK)/mk/rte.extsubdir.mk
--
1.9.2
[dpdk-dev] [PATCH v3 4/6] examples: fix qos_sched makefile
The example does not compile as the linker complains about duplicated symbols. Remove -lsched from LDLIBS, it is already present in rte.app.mk and added by the DPDK framework automatically. Signed-off-by: Olivier Matz --- examples/qos_sched/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile index b91fe37..9366efe 100755 --- a/examples/qos_sched/Makefile +++ b/examples/qos_sched/Makefile @@ -54,6 +54,4 @@ CFLAGS += $(WERROR_FLAGS) CFLAGS_args.o := -D_GNU_SOURCE CFLAGS_cfg_file.o := -D_GNU_SOURCE -LDLIBS += -lrte_sched - include $(RTE_SDK)/mk/rte.extapp.mk -- 1.9.2
[dpdk-dev] [PATCH v3 5/6] examples: fix netmap_compat example
It is not allowed to reference a an absolute file name in SRCS-y. A VPATH has to be used, else the dependencies won't be checked properly. Signed-off-by: Olivier Matz --- examples/netmap_compat/bridge/Makefile | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/netmap_compat/bridge/Makefile b/examples/netmap_compat/bridge/Makefile index 74feb1e..ebc6b1c 100644 --- a/examples/netmap_compat/bridge/Makefile +++ b/examples/netmap_compat/bridge/Makefile @@ -41,9 +41,12 @@ include $(RTE_SDK)/mk/rte.vars.mk # binary name APP = bridge +# for compat_netmap.c +VPATH := $(SRCDIR)/../lib + # all source are stored in SRCS-y SRCS-y := bridge.c -SRCS-y += $(SRCDIR)/../lib/compat_netmap.c +SRCS-y += compat_netmap.c CFLAGS += -O3 -I$(SRCDIR)/../lib -I$(SRCDIR)/../netmap CFLAGS += $(WERROR_FLAGS) -- 1.9.2
[dpdk-dev] [PATCH v3 6/6] mk: add "make examples" target in root makefile
It is now possible to build all projects from the examples/ directory
using one command from root directory.
Some illustration of what is possible:
- build examples in the DPDK tree for one target
# install the x86_64-default-linuxapp-gcc in
# ${RTE_SDK}/x86_64-default-linuxapp-gcc directory
user at droids:~/dpdk.org$ make install T=x86_64-default-linuxapp-gcc
# build examples for this new installation in
# ${RTE_SDK}/examples directory
user at droids:~/dpdk.org$ make examples T=x86_64-default-linuxapp-gcc
- build examples outside DPDK tree for several targets
# install all targets matching x86_64-*-linuxapp-gcc in
# ${RTE_SDK}/x86_64-*-linuxapp-gcc directories
user at droids:~/dpdk.org$ make install T=x86_64-*-linuxapp-gcc
# build examples for these installations in /tmp/foobar
user at droids:~/dpdk.org$ make examples T=x86_64-*-linuxapp-gcc O=/tmp/foobar
Signed-off-by: Olivier Matz
---
doc/build-sdk-quick.txt | 14 +
mk/rte.sdkexamples.mk | 77 +
mk/rte.sdkroot.mk | 4 +++
3 files changed, 89 insertions(+), 6 deletions(-)
create mode 100644 mk/rte.sdkexamples.mk
diff --git a/doc/build-sdk-quick.txt b/doc/build-sdk-quick.txt
index 8989a32..d768c44 100644
--- a/doc/build-sdk-quick.txt
+++ b/doc/build-sdk-quick.txt
@@ -1,12 +1,14 @@
Basic build
make config T=x86_64-default-linuxapp-gcc && make
Build commands
- config get configuration from target template (T=)
- all same as build (default rule)
- build build in a configured directory
- clean remove files but keep configuration
- install build many targets (wildcard allowed) and install in DESTDIR
- uninstall remove all installed targets
+ config get configuration from target template (T=)
+ all same as build (default rule)
+ buildbuild in a configured directory
+ cleanremove files but keep configuration
+ install build many targets (wildcard allowed) and install in
DESTDIR
+ uninstallremove all installed targets
+ examples build examples for given targets (T=)
+ examples_clean clean examples for given targets (T=)
Build variables
EXTRA_CPPFLAGS preprocessor options
EXTRA_CFLAGS compiler options
diff --git a/mk/rte.sdkexamples.mk b/mk/rte.sdkexamples.mk
new file mode 100644
index 000..111ce91
--- /dev/null
+++ b/mk/rte.sdkexamples.mk
@@ -0,0 +1,77 @@
+# BSD LICENSE
+#
+# Copyright(c) 2014 6WIND S.A.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of 6WIND S.A. nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# examples application are seen as external applications which are
+# not part of SDK.
+BUILDING_RTE_SDK :=
+export BUILDING_RTE_SDK
+
+# Build directory is given with O=
+O ?= $(RTE_SDK)/examples
+
+# Target for which examples should be built.
+T ?= *
+
+# list all available configurations
+EXAMPLES_CONFIGS := $(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\
+ $(wildcard $(RTE_SRCDIR)/config/defconfig_$(T)))
+EXAMPLES_TARGETS := $(addsuffix _examples,\
+ $(filter-out %~,$(EXAMPLES_CONFIGS)))
+
+.PHONY: examples
+examples: $(EXAMPLES_TARGETS)
+
+%_examples:
+ @echo == Build examples for $*
+ $(Q)if [ ! -d "${RTE_SDK}/${*}" ]; then \
+ echo "Target ${*} does not exist in ${RTE_SDK}/${*}." ; \
+ echo -n "Please install DPDK first (make insta
[dpdk-dev] [PATCH v2 0/5] allow to dynamically change RSS configuration
This set of patches allows to dynamically get and set the RSS configuration of a port: - rss functions (IPv4/IPv6//UDP/TCP ...) - rss hash key Changes included in v2: - Rename functions "rss_hash_conf_update" to "rss_hash_update" - In RSS hash update functions of igb and ixgbe PMDs, add tests that do not allow RSS to be dynamically enabled or disabled. -- Ivan Boule Ivan Boule (5): ethdev: check RX queue indices in RETA config against number of queues ethdev: allow to set RSS hash computation flags and/or key app/testpmd: configure RSS without restart ethdev: allow to get RSS hash functions and key app/testpmd: allow to configure RSS hash key app/test-pmd/cmdline.c | 177 +++--- app/test-pmd/config.c | 93 ++ app/test-pmd/testpmd.h |3 + lib/librte_ether/rte_ethdev.c | 47 - lib/librte_ether/rte_ethdev.h | 47 + lib/librte_pmd_e1000/e1000_ethdev.h |6 ++ lib/librte_pmd_e1000/igb_ethdev.c |2 + lib/librte_pmd_e1000/igb_rxtx.c | 175 ++ lib/librte_pmd_ixgbe/ixgbe_ethdev.c |2 + lib/librte_pmd_ixgbe/ixgbe_ethdev.h |6 ++ lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 178 --- 11 files changed, 645 insertions(+), 91 deletions(-) -- 1.7.10.4
[dpdk-dev] [PATCH v2 1/5] ethdev: check RX queue indices in RETA config against number of queues
Each entry of the RSS redirection table (RETA) of igb and ixgbe ports
contains a 4-bit RX queue index, thus imposing RSS RX queue indices to
be strictly lower than 16.
In addition, if a RETA entry is configured with a RX queue index that is
strictly lower than 16, but is greater or equal to the number of RX queues
of the port, then all input packets whose RSS hash value indexes that RETA
entry are silently dropped by the NIC.
Make the function rte_eth_dev_rss_reta_update() check that RX queue indices
that are supplied in the reta_conf argument are strictly lower than
ETH_RSS_RETA_MAX_QUEUE (16) and are strictly lower than the number of
RX queues of the port.
Signed-off-by: Ivan Boule
---
lib/librte_ether/rte_ethdev.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index a5727dd..473c98b 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1501,6 +1501,7 @@ int
rte_eth_dev_rss_reta_update(uint8_t port_id, struct rte_eth_rss_reta
*reta_conf)
{
struct rte_eth_dev *dev;
+ uint16_t max_rxq;
uint8_t i,j;
if (port_id >= nb_ports) {
@@ -1514,10 +1515,13 @@ rte_eth_dev_rss_reta_update(uint8_t port_id, struct
rte_eth_rss_reta *reta_conf)
return (-EINVAL);
}
+ dev = &rte_eth_devices[port_id];
+ max_rxq = (dev->data->nb_rx_queues <= ETH_RSS_RETA_MAX_QUEUE) ?
+ dev->data->nb_rx_queues : ETH_RSS_RETA_MAX_QUEUE;
if (reta_conf->mask_lo != 0) {
for (i = 0; i < ETH_RSS_RETA_NUM_ENTRIES/2; i++) {
if ((reta_conf->mask_lo & (1ULL << i)) &&
- (reta_conf->reta[i] >= ETH_RSS_RETA_MAX_QUEUE))
{
+ (reta_conf->reta[i] >= max_rxq)) {
PMD_DEBUG_TRACE("RETA hash index output"
"configration for port=%d,invalid"
"queue=%d\n",port_id,reta_conf->reta[i]);
@@ -1533,7 +1537,7 @@ rte_eth_dev_rss_reta_update(uint8_t port_id, struct
rte_eth_rss_reta *reta_conf)
/* Check if the max entry >= 128 */
if ((reta_conf->mask_hi & (1ULL << i)) &&
- (reta_conf->reta[j] >= ETH_RSS_RETA_MAX_QUEUE))
{
+ (reta_conf->reta[j] >= max_rxq)) {
PMD_DEBUG_TRACE("RETA hash index output"
"configration for port=%d,invalid"
"queue=%d\n",port_id,reta_conf->reta[j]);
@@ -1543,8 +1547,6 @@ rte_eth_dev_rss_reta_update(uint8_t port_id, struct
rte_eth_rss_reta *reta_conf)
}
}
- dev = &rte_eth_devices[port_id];
-
FUNC_PTR_OR_ERR_RET(*dev->dev_ops->reta_update, -ENOTSUP);
return (*dev->dev_ops->reta_update)(dev, reta_conf);
}
--
1.7.10.4
[dpdk-dev] [PATCH v2 3/5] app/testpmd: configure RSS without restart
The function cmd_config_rss_parsed() associated with the command
"port config rss all" required to first stop all ports, in order to
then entirely re-configure all ports with the new RSS hash computation
parameters.
Use now the new function rte_eth_dev_rss_hash_conf_update() that dynamically
only changes the RSS hash computation parameters of a port, without needing
to previously stop the port.
Signed-off-by: Ivan Boule
---
app/test-pmd/cmdline.c | 20
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 9cc680f..407a2b9 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -1145,26 +1145,22 @@ cmd_config_rss_parsed(void *parsed_result,
__attribute__((unused)) void *data)
{
struct cmd_config_rss *res = parsed_result;
-
- if (!all_ports_stopped()) {
- printf("Please stop all ports first\n");
- return;
- }
+ struct rte_eth_rss_conf rss_conf;
+ uint8_t i;
if (!strcmp(res->value, "ip"))
- rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6;
+ rss_conf.rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6;
else if (!strcmp(res->value, "udp"))
- rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6 | ETH_RSS_IPV4_UDP;
+ rss_conf.rss_hf = ETH_RSS_IPV4_UDP | ETH_RSS_IPV6_UDP;
else if (!strcmp(res->value, "none"))
- rss_hf = 0;
+ rss_conf.rss_hf = 0;
else {
printf("Unknown parameter\n");
return;
}
-
- init_port_config();
-
- cmd_reconfig_device_queue(RTE_PORT_ALL, 1, 1);
+ rss_conf.rss_key = NULL;
+ for (i = 0; i < rte_eth_dev_count(); i++)
+ rte_eth_dev_rss_hash_update(i, &rss_conf);
}
cmdline_parse_token_string_t cmd_config_rss_port =
--
1.7.10.4
[dpdk-dev] [PATCH v2 2/5] ethdev: allow to set RSS hash computation flags and/or key
1) Add a new function "rss_hash_update" in the PMD API to dynamically
update the RSS flags and/or the RSS key used by a NIC to compute the RSS
hash of input packets.
The new function uses the existing data structure "rte_eth_rss_conf" for
the argument that contains the new hash flags and/or the new hash key to
use.
2) Add the ixgbe-specific function "ixgbe_dev_rss_hash_update" and the
igb-specific function "eth_igb_rss_hash_update" to update the RSS
hash configuration of ixgbe and igb controllers respectively.
Before changing anything, these 2 functions check that the update RSS
operation does not attempt to disable RSS, if RSS was enabled at port
initialization time, or does not attempt to enable RSS, if RSS was
disabled at port initialization time.
Note:
Configuring the RSS hash flags and the RSS key used by a NIC consists in
updating appropriate PCI registers of the NIC.
These operations have been manually tested with the interactive commands
"write reg" and "write regbit" of the testpmd application.
Signed-off-by: Ivan Boule
---
lib/librte_ether/rte_ethdev.c | 22 ++
lib/librte_ether/rte_ethdev.h | 24 +++
lib/librte_pmd_e1000/e1000_ethdev.h |3 +
lib/librte_pmd_e1000/igb_ethdev.c |1 +
lib/librte_pmd_e1000/igb_rxtx.c | 123 +++---
lib/librte_pmd_ixgbe/ixgbe_ethdev.c |1 +
lib/librte_pmd_ixgbe/ixgbe_ethdev.h |3 +
lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 125 +--
8 files changed, 227 insertions(+), 75 deletions(-)
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 473c98b..91375a1 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1572,6 +1572,28 @@ rte_eth_dev_rss_reta_query(uint8_t port_id, struct
rte_eth_rss_reta *reta_conf)
}
int
+rte_eth_dev_rss_hash_update(uint8_t port_id, struct rte_eth_rss_conf *rss_conf)
+{
+ struct rte_eth_dev *dev;
+ uint16_t rss_hash_protos;
+
+ if (port_id >= nb_ports) {
+ PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
+ return (-ENODEV);
+ }
+ rss_hash_protos = rss_conf->rss_hf;
+ if ((rss_hash_protos != 0) &&
+ ((rss_hash_protos & ETH_RSS_PROTO_MASK) == 0)) {
+ PMD_DEBUG_TRACE("Invalid rss_hash_protos=0x%x\n",
+ rss_hash_protos);
+ return (-EINVAL);
+ }
+ dev = &rte_eth_devices[port_id];
+ FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rss_hash_update, -ENOTSUP);
+ return (*dev->dev_ops->rss_hash_update)(dev, rss_conf);
+}
+
+int
rte_eth_led_on(uint8_t port_id)
{
struct rte_eth_dev *dev;
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index dea7471..efb421a 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -331,6 +331,8 @@ struct rte_eth_rss_conf {
#define ETH_RSS_IPV4_UDP0x0040 /**< IPv4/UDP packet. */
#define ETH_RSS_IPV6_UDP0x0080 /**< IPv6/UDP packet. */
#define ETH_RSS_IPV6_UDP_EX 0x0100 /**< IPv6/UDP with extension headers. */
+
+#define ETH_RSS_PROTO_MASK 0x01FF /**< Mask of valid RSS hash protocols */
/* Definitions used for redirection table entry size */
#define ETH_RSS_RETA_NUM_ENTRIES 128
#define ETH_RSS_RETA_MAX_QUEUE 16
@@ -966,6 +968,10 @@ typedef int (*reta_query_t)(struct rte_eth_dev *dev,
struct rte_eth_rss_reta *reta_conf);
/**< @internal Query RSS redirection table on an Ethernet device */
+typedef int (*rss_hash_update_t)(struct rte_eth_dev *dev,
+struct rte_eth_rss_conf *rss_conf);
+/**< @internal Update RSS hash configuration of an Ethernet device */
+
typedef int (*eth_dev_led_on_t)(struct rte_eth_dev *dev);
/**< @internal Turn on SW controllable LED on an Ethernet device */
@@ -1153,6 +1159,8 @@ struct eth_dev_ops {
bypass_wd_reset_t bypass_wd_reset;
#endif
+ /** Configure RSS hash protocols. */
+ rss_hash_update_t rss_hash_update;
};
/**
@@ -2859,6 +2867,22 @@ int rte_eth_dev_bypass_wd_timeout_show(uint8_t port,
uint32_t *wd_timeout);
*/
int rte_eth_dev_bypass_wd_reset(uint8_t port);
+ /**
+ * Configuration of Receive Side Scaling hash computation of Ethernet device.
+ *
+ * @param port
+ * The port identifier of the Ethernet device.
+ * @param rss_conf
+ * The new configuration to use for RSS hash computation on the port.
+ * @return
+ * - (0) if successful.
+ * - (-ENODEV) if port identifier is invalid.
+ * - (-ENOTSUP) if hardware doesn't support.
+ * - (-EINVAL) if bad parameter.
+ */
+int rte_eth_dev_rss_hash_update(uint8_t port_id,
+ struct rte_eth_rss_conf *rss_conf);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/librte_pmd_e1000/e1000_ethdev.h
b/lib/librte_pmd_e1000/e1000_ethdev.h
index d09064e..d9dc8d1 100644
--- a/lib/librte_pmd_e1000/e1000_ethdev.h
[dpdk-dev] [PATCH v2 4/5] ethdev: allow to get RSS hash functions and key
1) Add a new function "rss_hash_conf_get" in the PMD API to retrieve the
current configuration of the RSS functions and/or of the RSS key used
by a NIC to compute the RSS hash of input packets.
The new function uses the existing data structure "rte_eth_rss_conf" for
returning the RSS hash configuration.
2) Add the ixgbe-specific function "ixgbe_dev_rss_hash_conf_get" and the
igb-specific function "eth_igb_rss_hash_conf_get" to retrieve the RSS
hash configuration of ixgbe and igb controllers respectively.
3) Add the command "show port X rss-hash [key]" in the testpmd application
to display the RSS hash configuration of port X.
Signed-off-by: Ivan Boule
---
app/test-pmd/cmdline.c | 63 +
app/test-pmd/config.c | 65 +++
app/test-pmd/testpmd.h |2 ++
lib/librte_ether/rte_ethdev.c | 15
lib/librte_ether/rte_ethdev.h | 23 +
lib/librte_pmd_e1000/e1000_ethdev.h |3 ++
lib/librte_pmd_e1000/igb_ethdev.c |1 +
lib/librte_pmd_e1000/igb_rxtx.c | 52
lib/librte_pmd_ixgbe/ixgbe_ethdev.c |3 +-
lib/librte_pmd_ixgbe/ixgbe_ethdev.h |3 ++
lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 53
11 files changed, 282 insertions(+), 1 deletion(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 407a2b9..0b6749c 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -182,6 +182,10 @@ static void cmd_help_long_parsed(void *parsed_result,
"show port (info|stats|fdir|stat_qmap) (port_id|all)\n"
"Display information for port_id, or all.\n\n"
+ "show port rss-hash [key]\n"
+ "Display the RSS hash functions and RSS hash key"
+ " of port X\n\n"
+
"clear port (info|stats|fdir|stat_qmap) (port_id|all)\n"
"Clear information for port_id, or all.\n\n"
@@ -1364,6 +1368,63 @@ cmdline_parse_inst_t cmd_showport_reta = {
},
};
+/* *** Show RSS hash configuration *** */
+struct cmd_showport_rss_hash {
+ cmdline_fixed_string_t show;
+ cmdline_fixed_string_t port;
+ uint8_t port_id;
+ cmdline_fixed_string_t rss_hash;
+ cmdline_fixed_string_t key; /* optional argument */
+};
+
+static void cmd_showport_rss_hash_parsed(void *parsed_result,
+ __attribute__((unused)) struct cmdline *cl,
+ void *show_rss_key)
+{
+ struct cmd_showport_rss_hash *res = parsed_result;
+
+ port_rss_hash_conf_show(res->port_id, show_rss_key != NULL);
+}
+
+cmdline_parse_token_string_t cmd_showport_rss_hash_show =
+ TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, show, "show");
+cmdline_parse_token_string_t cmd_showport_rss_hash_port =
+ TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, port, "port");
+cmdline_parse_token_num_t cmd_showport_rss_hash_port_id =
+ TOKEN_NUM_INITIALIZER(struct cmd_showport_rss_hash, port_id, UINT8);
+cmdline_parse_token_string_t cmd_showport_rss_hash_rss_hash =
+ TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, rss_hash,
+"rss-hash");
+cmdline_parse_token_string_t cmd_showport_rss_hash_rss_key =
+ TOKEN_STRING_INITIALIZER(struct cmd_showport_rss_hash, key, "key");
+
+cmdline_parse_inst_t cmd_showport_rss_hash = {
+ .f = cmd_showport_rss_hash_parsed,
+ .data = NULL,
+ .help_str = "show port X rss-hash (X = port number)\n",
+ .tokens = {
+ (void *)&cmd_showport_rss_hash_show,
+ (void *)&cmd_showport_rss_hash_port,
+ (void *)&cmd_showport_rss_hash_port_id,
+ (void *)&cmd_showport_rss_hash_rss_hash,
+ NULL,
+ },
+};
+
+cmdline_parse_inst_t cmd_showport_rss_hash_key = {
+ .f = cmd_showport_rss_hash_parsed,
+ .data = "show_rss_key",
+ .help_str = "show port X rss-hash key (X = port number)\n",
+ .tokens = {
+ (void *)&cmd_showport_rss_hash_show,
+ (void *)&cmd_showport_rss_hash_port,
+ (void *)&cmd_showport_rss_hash_port_id,
+ (void *)&cmd_showport_rss_hash_rss_hash,
+ (void *)&cmd_showport_rss_hash_rss_key,
+ NULL,
+ },
+};
+
/* *** Configure DCB *** */
struct cmd_config_dcb {
cmdline_fixed_string_t port;
@@ -5259,6 +5320,8 @@ cmdline_parse_ctx_t main_ctx[] = {
(cmdline_parse_inst_t *)&cmd_set_mirror_mask,
(cmdline_parse_inst_t *)&cmd_set_mirror_link,
(cmdline_parse_inst_t *)&cmd_reset_mirror_rule,
+ (cmdline_parse_inst_t *)&cmd_showport_rss_hash,
+ (cmdline_parse_inst_t *)&cmd_showport_rss_hash_key,
(cmdline_parse_inst_t *)&cmd_dump,
(cmdline_par
[dpdk-dev] [PATCH v2 5/5] app/testpmd: allow to configure RSS hash key
Add the command "port config X rss-hash-key key" in the 'testpmd'
application to configure the RSS hash key used to compute the RSS
hash of input [IP] packets received on port X.
Signed-off-by: Ivan Boule
---
app/test-pmd/cmdline.c | 96 +++-
app/test-pmd/config.c | 28 ++
app/test-pmd/testpmd.h |1 +
3 files changed, 124 insertions(+), 1 deletion(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 0b6749c..7b4f090 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -1192,6 +1192,99 @@ cmdline_parse_inst_t cmd_config_rss = {
},
};
+/* *** configure rss hash key *** */
+struct cmd_config_rss_hash_key {
+ cmdline_fixed_string_t port;
+ cmdline_fixed_string_t config;
+ uint8_t port_id;
+ cmdline_fixed_string_t rss_hash_key;
+ cmdline_fixed_string_t key;
+};
+
+#define RSS_HASH_KEY_LENGTH 40
+static uint8_t
+hexa_digit_to_value(char hexa_digit)
+{
+ if ((hexa_digit >= '0') && (hexa_digit <= '9'))
+ return (uint8_t) (hexa_digit - '0');
+ if ((hexa_digit >= 'a') && (hexa_digit <= 'f'))
+ return (uint8_t) ((hexa_digit - 'a') + 10);
+ if ((hexa_digit >= 'A') && (hexa_digit <= 'F'))
+ return (uint8_t) ((hexa_digit - 'A') + 10);
+ /* Invalid hexa digit */
+ return 0xFF;
+}
+
+static uint8_t
+parse_and_check_key_hexa_digit(char *key, int idx)
+{
+ uint8_t hexa_v;
+
+ hexa_v = hexa_digit_to_value(key[idx]);
+ if (hexa_v == 0xFF)
+ printf("invalid key: character %c at position %d is not a "
+ "valid hexa digit\n", key[idx], idx);
+ return hexa_v;
+}
+
+static void
+cmd_config_rss_hash_key_parsed(void *parsed_result,
+ __attribute__((unused)) struct cmdline *cl,
+ __attribute__((unused)) void *data)
+{
+ struct cmd_config_rss_hash_key *res = parsed_result;
+ uint8_t hash_key[RSS_HASH_KEY_LENGTH];
+ uint8_t xdgt0;
+ uint8_t xdgt1;
+ int i;
+
+ /* Check the length of the RSS hash key */
+ if (strlen(res->key) != (RSS_HASH_KEY_LENGTH * 2)) {
+ printf("key length: %d invalid - key must be a string of %d"
+ "hexa-decimal numbers\n", (int) strlen(res->key),
+ RSS_HASH_KEY_LENGTH * 2);
+ return;
+ }
+ /* Translate RSS hash key into binary representation */
+ for (i = 0; i < RSS_HASH_KEY_LENGTH; i++) {
+ xdgt0 = parse_and_check_key_hexa_digit(res->key, (i * 2));
+ if (xdgt0 == 0xFF)
+ return;
+ xdgt1 = parse_and_check_key_hexa_digit(res->key, (i * 2) + 1);
+ if (xdgt1 == 0xFF)
+ return;
+ hash_key[i]= (uint8_t) ((xdgt0 * 16) + xdgt1);
+ }
+ port_rss_hash_key_update(res->port_id, hash_key);
+}
+
+cmdline_parse_token_string_t cmd_config_rss_hash_key_port =
+ TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, port, "port");
+cmdline_parse_token_string_t cmd_config_rss_hash_key_config =
+ TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, config,
+"config");
+cmdline_parse_token_string_t cmd_config_rss_hash_key_port_id =
+ TOKEN_NUM_INITIALIZER(struct cmd_config_rss_hash_key, port_id, UINT8);
+cmdline_parse_token_string_t cmd_config_rss_hash_key_rss_hash_key =
+ TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key,
+rss_hash_key, "rss-hash-key");
+cmdline_parse_token_string_t cmd_config_rss_hash_key_value =
+ TOKEN_STRING_INITIALIZER(struct cmd_config_rss_hash_key, key, NULL);
+
+cmdline_parse_inst_t cmd_config_rss_hash_key = {
+ .f = cmd_config_rss_hash_key_parsed,
+ .data = NULL,
+ .help_str = "port config X rss-hash-key 80 hexa digits",
+ .tokens = {
+ (void *)&cmd_config_rss_hash_key_port,
+ (void *)&cmd_config_rss_hash_key_config,
+ (void *)&cmd_config_rss_hash_key_port_id,
+ (void *)&cmd_config_rss_hash_key_rss_hash_key,
+ (void *)&cmd_config_rss_hash_key_value,
+ NULL,
+ },
+};
+
/* *** Configure RSS RETA *** */
struct cmd_config_rss_reta {
cmdline_fixed_string_t port;
@@ -1413,7 +1506,7 @@ cmdline_parse_inst_t cmd_showport_rss_hash = {
cmdline_parse_inst_t cmd_showport_rss_hash_key = {
.f = cmd_showport_rss_hash_parsed,
- .data = "show_rss_key",
+ .data = (void *)1,
.help_str = "show port X rss-hash key (X = port number)\n",
.tokens = {
(void *)&cmd_showport_rss_hash_show,
@@ -5322,6 +5415,7 @@ cmdline_parse_ctx_t main_ctx[] = {
(cmdline_parse_inst_t *)&cmd_reset_mirror_rule,
(cmdline_parse_inst_t *)&cmd_showport_rss_hash,
(cmdline_parse_inst
[dpdk-dev] [PATCH RFC 11/11] ixgbe/mbuf: add TSO support
Hi Konstantin, On 05/15/2014 06:30 PM, Ananyev, Konstantin wrote: > With the current DPDK implementation the upper code would still be different > for TCP checksum (without segmentation) and TCP segmentation: > different flags in mbuf, with TSO you need to setup l4_len and mss fields > inside mbuf, with just checksum - you don't. You are right on this point. > Plus, as I said, it is a bit confusing to calculate PSD csum once in the > stack and then re-calculate in PMD. > Again - unnecessary slowdown. > So why not just have get_ipv4_psd_sum() and get_ipv4_psd_tso_sum() inside > testpmd/csumonly.c and call them accordingly? Yes, recalculating the pseudo-header checksum without the ip_len is a slow down. This slow down should however be compared to the operation in progress. When you do TSO, you are generally transmitting a large TCP packet (several KB), and the cost of the TCP stack is probably much higher than fixing the checksum. But that's not the main argument: my idea was to choose the proper API that will reduce the slow down for most cases. Let's take the case of a future vnic pmd driver supporting an emulation of TSO. In this case, the calculation of the pseudo header is also an unnecessary slowdown. Also, some other hardware I've seen don't need to calculate a different pseudo header checksum when doing TSO. Last argument, the way Linux works is the same that what I've implemented. See in linux ixgbe driver [1] at line 6461, there is a call to csum_tcpudp_magic() which reprocesses the checksum without the ip_len. On the other hand, that's true that today ixgbe is the only hardware supporting TSO in DPDK. The pragmatic approach could be to choose the API that gives the best performance with what we have (the ixgbe driver). I'm ok with this approach if we accept to reconsider the API (and maybe modifying it) when another PMD supporting TSO will be implemented. > About potential future problem with NICs that implement TX > checksum/segmentation offloads in a different manner - yeh that's true... > I think at the final point all that logic could be hidden inside some > function at rte_ethdev level, something like: rte_eth_dev_prep_tx(portid, > mbuf[], num). I don't see the real difference between: rte_eth_dev_prep_tx(portid, mbuf[], num) rte_eth_dev_tx(portid, mbuf[], num) and: rte_eth_dev_tx(portid, mbuf[], num) /* the tx does the cksum job */ And the second is faster because there is only one pointer dereference. > So, based on mbuf TX offload flags and device type, it would do necessary > modifications inside the packet. > But that's future discussion, I suppose. To me, it's not an option to fill that the network stack fills the mbuf differently depending on the device type. For instance, when doing ethernet bonding or bridging, the stack may not know which physical device will be used at the end. So the API to enable TSO on a packet has to be the same whatever the device. If fixing the checksum in the PMD is an unnecessary slowdown, forcing the network stack to check what has to be filled in the mbuf depending on the device type also has a cost. > For now, I still think we need to keep pseudo checksum calculations out of > PMD code. To me, there are 2 options: 1/ Update patch to calculate the pseudo header without the ip_len when doing TSO. In this case the API is mapped on ixgbe behavior, probably providing the best performance today. If another PMD comes in the future, this API may change to something more generic. 2/ Try to define a generic API today, accepting that the first driver that supports TSO is a bit slower, but reducing the risks of changing the API for TSO in the future. I'm fine with both options. Regards, Olivier [1] http://lxr.free-electrons.com/source/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c?v=3.14#L6434
[dpdk-dev] [PATCH 3/5] mempool: add walk iterator
Hi Stephen,
> +void rte_mempool_walk(void (*func)(const struct rte_mempool *, void *),
> + void *arg)
> +{
> + struct rte_mempool *mp = NULL;
> + struct rte_mempool_list *mempool_list;
> +
> + if ((mempool_list =
> + RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_MEMPOOL, rte_mempool_list)) ==
> NULL) {
> + rte_errno = E_RTE_NO_TAILQ;
> + return;
> + }
At the first read, I thought it was better to return -E_RTE_NO_TAILQ
instead of returning void and setting rte_errno. But it seems it's the
usage, for instance in rte_ring_list_dump().
Acked-by: Olivier Matz
[dpdk-dev] [PATCH 4/5] memzone: add iterator function
> When doing diagnostic function, it is useful to have a ability > to iterate over all memzones. > > Signed-off-by: Stephen Hemminger Acked-by: Olivier Matz
[dpdk-dev] [PATCH v2] malloc: fix malloc and free linear complexity
Problems with lib rte_malloc:
1. Rte_malloc searches a heap's entire free list looking for
the best fit, resulting in linear complexity.
2. Heaps store free blocks in a singly-linked list, resulting
in linear complexity when rte_free needs to remove an
adjacent block.
3. The library inserts and removes free blocks with ad hoc,
in-line code, rather than using linked-list functions or
macros.
This patch addresses those problems as follows:
1. Replace single free list with a handful of free lists.
Each free list contains blocks of a specified size range,
for example:
list[0]: (0 , 2^7]
list[1]: (2^7 , 2^9]
list[2]: (2^9 , 2^11]
list[3]: (2^11, 2^13]
list[4]: (2^13, MAX_SIZE]
When allocating a block, start at the first list that can
contain a big enough block. Search subsequent lists, if
necessary. Terminate the search as soon as we find a block
that is big enough.
2. Use doubly-linked lists, so that we can remove free blocks
in constant time.
3. Use BSD LIST macros, as defined in sys/queue.h and the
QUEUE(3) man page.
Signed-off-by: Robert Sanford
---
lib/librte_eal/common/include/rte_malloc_heap.h |6 +-
lib/librte_malloc/malloc_elem.c | 121 +++
lib/librte_malloc/malloc_elem.h | 17 +++-
lib/librte_malloc/malloc_heap.c | 67 ++---
4 files changed, 128 insertions(+), 83 deletions(-)
diff --git a/lib/librte_eal/common/include/rte_malloc_heap.h
b/lib/librte_eal/common/include/rte_malloc_heap.h
index 5e139cf..1f5d653 100644
--- a/lib/librte_eal/common/include/rte_malloc_heap.h
+++ b/lib/librte_eal/common/include/rte_malloc_heap.h
@@ -35,14 +35,18 @@
#define _RTE_MALLOC_HEAP_H_
#include
+#include
#include
+/* Number of free lists per heap, grouped by size. */
+#define RTE_HEAP_NUM_FREELISTS 5
+
/**
* Structure to hold malloc heap
*/
struct malloc_heap {
rte_spinlock_t lock;
- struct malloc_elem * volatile free_head;
+ LIST_HEAD(, malloc_elem) free_head[RTE_HEAP_NUM_FREELISTS];
unsigned mz_count;
unsigned alloc_count;
size_t total_size;
diff --git a/lib/librte_malloc/malloc_elem.c b/lib/librte_malloc/malloc_elem.c
index f0da640..13cd5d3 100644
--- a/lib/librte_malloc/malloc_elem.c
+++ b/lib/librte_malloc/malloc_elem.c
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
@@ -60,7 +61,8 @@ malloc_elem_init(struct malloc_elem *elem,
{
elem->heap = heap;
elem->mz = mz;
- elem->prev = elem->next_free = NULL;
+ elem->prev = NULL;
+ memset(&elem->free_list, 0, sizeof(elem->free_list));
elem->state = ELEM_FREE;
elem->size = size;
elem->pad = 0;
@@ -125,14 +127,71 @@ split_elem(struct malloc_elem *elem, struct malloc_elem
*split_pt)
}
/*
+ * Given an element size, compute its freelist index.
+ * We free an element into the freelist containing similarly-sized elements.
+ * We try to allocate elements starting with the freelist containing
+ * similarly-sized elements, and if necessary, we search freelists
+ * containing larger elements.
+ *
+ * Example element size ranges for a heap with five free lists:
+ * heap->free_head[0] - (0 , 2^7]
+ * heap->free_head[1] - (2^7 , 2^9]
+ * heap->free_head[2] - (2^9 , 2^11]
+ * heap->free_head[3] - (2^11, 2^13]
+ * heap->free_head[4] - (2^13, MAX_SIZE]
+ */
+size_t
+malloc_elem_free_list_index(size_t size)
+{
+#define MALLOC_MINSIZE_LOG2 7
+#define MALLOC_LOG2_INCREMENT 2
+
+ size_t log2;
+ size_t index;
+
+ if (size <= (1UL << MALLOC_MINSIZE_LOG2))
+ return 0;
+
+ /* Find next power of 2 >= size. */
+ log2 = sizeof(size) * 8 - __builtin_clzl(size-1);
+
+ /* Compute freelist index, based on log2(size). */
+ index = (log2 - MALLOC_MINSIZE_LOG2 + MALLOC_LOG2_INCREMENT - 1) /
+ MALLOC_LOG2_INCREMENT;
+
+ return (index <= RTE_HEAP_NUM_FREELISTS-1?
+ index: RTE_HEAP_NUM_FREELISTS-1);
+}
+
+/*
+ * Add the specified element to its heap's free list.
+ */
+void
+malloc_elem_free_list_insert(struct malloc_elem *elem)
+{
+ size_t idx = malloc_elem_free_list_index(elem->size -
MALLOC_ELEM_HEADER_LEN);
+
+ elem->state = ELEM_FREE;
+ LIST_INSERT_HEAD(&elem->heap->free_head[idx], elem, free_list);
+}
+
+/*
+ * Remove the specified element from its heap's free list.
+ */
+static void
+elem_free_list_remove(struct malloc_elem *elem)
+{
+ LIST_REMOVE(elem, free_list);
+}
+
+/*
* reserve a block of data in an existing malloc_elem. If the malloc_elem
* is much larger than the data block requested, we split the element in two.
* This function is only called from malloc_heap_alloc so parameter checking
* is not done here, as it's done there previously.
*/
struct malloc_elem *
-malloc_elem_alloc(struct malloc_elem *elem, size_t size,
-
[dpdk-dev] [PATCH] [VIRTIO] Support multiple queues feature in DPDK based virtio-net frontend.
This patch support multiple queues feature in DPDK based virtio-net frontend.
It firstly gets max queue number of virtio-net from virtio pci configuration
and then send command to negotiate the queue numer with backend;
when receiving and transmiting packets, negotiated multiple virtio-net queues
can serve that;
To utilize this featrue, the backend also need support mulitiple queues feature
and enable it.
Signed-off-by: Ouyang Changchun
---
lib/librte_pmd_virtio/virtio_ethdev.c | 326 --
lib/librte_pmd_virtio/virtio_ethdev.h | 10 +-
lib/librte_pmd_virtio/virtio_pci.h| 4 +-
lib/librte_pmd_virtio/virtio_rxtx.c | 79 +---
lib/librte_pmd_virtio/virtqueue.h | 61 +--
5 files changed, 388 insertions(+), 92 deletions(-)
diff --git a/lib/librte_pmd_virtio/virtio_ethdev.c
b/lib/librte_pmd_virtio/virtio_ethdev.c
index c6a1df5..a3616ea 100644
--- a/lib/librte_pmd_virtio/virtio_ethdev.c
+++ b/lib/librte_pmd_virtio/virtio_ethdev.c
@@ -80,6 +80,9 @@ static void virtio_dev_stats_get(struct rte_eth_dev *dev,
struct rte_eth_stats *
static void virtio_dev_stats_reset(struct rte_eth_dev *dev);
static void virtio_dev_free_mbufs(struct rte_eth_dev *dev);
+static int virtio_dev_queue_stats_mapping_set(__rte_unused struct rte_eth_dev
*eth_dev,
+__rte_unused uint16_t queue_id, __rte_unused uint8_t stat_idx, __rte_unused
uint8_t is_rx);
+
/*
* The set of PCI devices this driver supports
*/
@@ -91,6 +94,130 @@ static struct rte_pci_id pci_id_virtio_map[] = {
{ .vendor_id = 0, /* sentinel */ },
};
+static int
+virtio_send_command(struct virtqueue* vq, struct virtio_pmd_ctrl* ctrl,
+ int* dlen, int pkt_num)
+{
+ uint32_t head = vq->vq_desc_head_idx, i;
+ int k, sum = 0;
+ virtio_net_ctrl_ack status = ~0;
+ struct virtio_pmd_ctrl result;
+
+ ctrl->status = status;
+
+ if (!vq->hw->cvq) {
+ PMD_INIT_LOG(ERR, "%s(): Control queue is "
+"not supported by this device.\n", __func__);
+ return -1;
+ }
+
+ PMD_INIT_LOG(DEBUG, "vq->vq_desc_head_idx = %d, status = %d,
vq->hw->cvq = %p \n"
+ "vq = %p \n", vq->vq_desc_head_idx, status, vq->hw->cvq, vq);
+
+ if ((vq->vq_free_cnt < ((uint32_t)pkt_num + 2)) || (pkt_num < 1)) {
+ return -1;
+ }
+
+ memcpy(vq->virtio_net_hdr_mz->addr, ctrl, sizeof(struct
virtio_pmd_ctrl));
+
+ /*
+* Format is enforced in qemu code:
+* One TX packet for header;
+* At least one TX packet per argument;
+* One RX packet for ACK.
+*/
+ vq->vq_ring.desc[head].flags = VRING_DESC_F_NEXT;
+ vq->vq_ring.desc[head].addr = vq->virtio_net_hdr_mz->phys_addr;
+ vq->vq_ring.desc[head].len = sizeof(struct virtio_net_ctrl_hdr);
+ vq->vq_free_cnt--;
+ i = vq->vq_ring.desc[head].next;
+
+ for (k = 0; k < pkt_num; k++) {
+ vq->vq_ring.desc[i].flags = VRING_DESC_F_NEXT;
+ vq->vq_ring.desc[i].addr = vq->virtio_net_hdr_mz->phys_addr +
+ sizeof(struct virtio_net_ctrl_hdr) +
sizeof(ctrl->status) + sizeof(uint8_t)*sum;
+ vq->vq_ring.desc[i].len = dlen[k];
+ sum += dlen[k];
+ vq->vq_free_cnt--;
+ i = vq->vq_ring.desc[i].next;
+ }
+
+ vq->vq_ring.desc[i].flags = VRING_DESC_F_WRITE;
+ vq->vq_ring.desc[i].addr = vq->virtio_net_hdr_mz->phys_addr +
sizeof(struct virtio_net_ctrl_hdr);
+ vq->vq_ring.desc[i].len = sizeof(ctrl->status);
+ vq->vq_free_cnt--;
+
+ vq->vq_desc_head_idx = vq->vq_ring.desc[i].next;
+
+ vq_update_avail_ring(vq, head);
+ vq_update_avail_idx(vq);
+
+ PMD_INIT_LOG(DEBUG, "vq->vq_queue_index = %d \n", vq->vq_queue_index);
+
+ virtqueue_notify(vq);
+
+ while (vq->vq_used_cons_idx == vq->vq_ring.used->idx) {
+ usleep(100);
+ }
+
+ while (vq->vq_used_cons_idx != vq->vq_ring.used->idx) {
+ uint32_t idx, desc_idx, used_idx;
+ struct vring_used_elem *uep;
+
+ rmb();
+
+ used_idx = (uint32_t)(vq->vq_used_cons_idx & (vq->vq_nentries -
1));
+ uep = &vq->vq_ring.used->ring[used_idx];
+ idx = (uint32_t) uep->id;
+ desc_idx = idx;
+
+ while (vq->vq_ring.desc[desc_idx].flags & VRING_DESC_F_NEXT) {
+ desc_idx = vq->vq_ring.desc[desc_idx].next;
+ vq->vq_free_cnt++;
+ }
+
+ vq->vq_ring.desc[desc_idx].next = vq->vq_desc_head_idx;
+ vq->vq_desc_head_idx = idx;
+
+ vq->vq_used_cons_idx++;
+ vq->vq_free_cnt++;
+ }
+
+ PMD_INIT_LOG(DEBUG, "vq->vq_free_cnt=%d\nvq->vq_desc_head_idx=%d\n",
+ vq->vq_free_cnt, vq->vq_desc_head_idx);
+
+ memcpy(&result, vq->virtio_net_hdr_mz-
[dpdk-dev] [PATCH 0/6] Extensions to test-pmd
Hi Cyril, 2014-04-03 10:30, Cyril Chemparathy: > This patch series contains a few minor extensions to test-pmd. These > changes have been added primarily for convenience while testing out various > scenarios with DPDK. > > Cyril Chemparathy (6): > test-pmd: add support for single port loopback topology > test-pmd: add support for auto-start when interactive > test-pmd: allow command line selection of forwarding mode > test-pmd: allow txpkts to be setup via command line > test-pmd: add mac swap forwarding mode > test-pmd: add flowgen forwarding engine Thanks for these new features. This is not the first time a new engine is added by copy/pasting the most part of an existing engine. For instance, the "mac-retry" engine was added by Intel as a copy/paste of the original "mac" one. This is acceptable but not the perfect way to implement engines. To address this issue, a new engine function could be introduced to setup some parameters to be used by "packet_fwd" function. This way, similar engines could be removed. Acked-by: Thomas Monjalon Applied for version 1.7.0. -- Thomas
[dpdk-dev] [PATCH v3] app/testpmd: list forwarding engines
> > Having a function to list forwarding engines helps to show them > > in cli help and in parameters usage witout duplicating code. > > > > Signed-off-by: Thomas Monjalon > > Acked by: Ivan Boule Applied for version 1.7.0. -- Thomas
[dpdk-dev] [PATCH] app/testpmd: add engine that replies to ARP and ICMP echo requests
> From: Ivan Boule > > Add a new specific packet processing engine in the "testpmd" application > that only replies to ARP requests and to ICMP echo requests. > For this purpose, a new "icmpecho" forwarding mode is provided that can be > dynamically selected with the following testpmd command: > > set fwd icmpecho > > before starting the receipt of packets on the selected ports. > > Then, the "icmpecho" engine performs the following actions on all received > packets: > > - replies to a received ARP request by sending back on the RX port a ARP > reply with a "sender hardware address" field containing the MAC address > of the RX port, > > - replies to a ICMP echo request by sending back on the RX port a ICMP echo > reply, swapping the IP source and the IP destination address in the IP > header, > > - otherwise, simply drops the received packet. > > When replying to a received packet that was encapsulated into a VLAN tunnel, > the reply is sent back with the same VLAN identifier. > By default, the testpmd configures VLAN header stripping RX option on each > port. > This option is not managed by the icmpecho engine which won't detect > packets that were encapsulated into a VLAN. > To address this issue, the VLAN header stripping option must be previously > switched off with the following testpmd command: > > vlan set strip off > > When the "verbose" mode has been set with the testpmd command > "set verbose 1", the "icmpecho" engine displays informations about each > received packet. > > The "icmpecho" forwarding engine can also be used to simply check port > connectivity at the hardware level (check that cables are well-plugged) > and at the software level (receipt of VLAN packets, for instance). > > Signed-off-by: Ivan Boule Acked-by: Thomas Monjalon Applied for version 1.7.0. -- Thomas
[dpdk-dev] [PATCH] app/testpmd: add --disable-link-check option
2014-04-30 15:30, David Marchand: > When starting/stopping ports, a link status check on all available ports is > done. This can be annoying when cables are not plugged at the time. > Default behavior is untouched. > > Signed-off-by: David Marchand Acked-by: Thomas Monjalon Applied for version 1.7.0. -- Thomas
[dpdk-dev] [PATCH] app/testpmd: show mac address at initialization
> Display port number and MAC address at start up. > It is useful when configuring a packet generator. > > Signed-off-by: Zijie Pan Acked-by: Thomas Monjalon Applied for version 1.7.0. -- Thomas
[dpdk-dev] [PATCH] mk: add missing scripts directory in install directory
2014-05-09 15:31, David Marchand: > Trying to install headers for an external library using DPDK exported > makefile rte.extshared.mk results in following error : > > $ cd dpdk > $ make install DESTDIR=/home/marchand/myapp/staging/plop > T=x86_64-default-linuxapp-gcc $ cd ~/myapp > $ make RTE_SDK=/home/marchand/myapp/staging/plop > RTE_TARGET=x86_64-default-linuxapp-gcc CC plop.o > LD plop.so > SYMLINK-FILE include/plop.h > /bin/sh: > /home/marchand/myapp/staging/plop/scripts/relpath.sh: No such file or > directory ln: `/home/marchand/myapp/build/include' and `./include' are the > same file make[1]: *** [/home/marchand/myapp/build/include/plop.h] Error 1 > make: *** [all] Error 2 > > This comes from the fact that DPDK only installs its mk/ directory while > some makefiles require the scripts/ directory content as well. > > So install missing files from scripts/. > > Signed-off-by: David Marchand Acked-by: Thomas Monjalon Applied for version 1.7.0. -- Thomas
[dpdk-dev] [PATCH v3 0/6] examples: add a new makefile to build all examples
2014-05-16 10:18, Olivier Matz:
> This patch series adds a makefile to build all examples supported
> by the configuration. It helps to check that all examples compile
> after a dpdk modification.
>
> After applying the patches, it is possible to build all examples for
> given targets, given the installation directory:
>
> # first, install the x86_64-default-linuxapp-gcc in
> # ${RTE_SDK}/x86_64-default-linuxapp-gcc directory
> user at droids:~/dpdk.org$ make install T=x86_64-default-linuxapp-gcc
> # build examples for this new installation in
> # ${RTE_SDK}/examples directory
> user at droids:~/dpdk.org$ make examples T=x86_64-default-linuxapp-gcc
>
> Or directly from examples directory:
>
> user at droids:~/dpdk.org$ cd examples
> user at droids:~/dpdk.org/examples$ make RTE_SDK=${PWD}/.. \
> RTE_TARGET=x86_64-default-linuxapp-gcc
>
>
> Changes included in v3:
> - use x86_64-default-linuxapp-gcc instead of x86_64-ivshmem-linuxapp-gcc
> for default RTE_TARGET of multi_process example (was a bad copy/paste).
> - replace ifndef by ?=
> - fix when O= is a relative directory
> - exit if the installation directory does not exist
>
> Changes included in v2:
> - do not build kni example if CONFIG_RTE_LIBRTE_KNI is not set
> - fix rte.extsubdir.mk when there are several levels of subdirectories
> - allow to build examples directly from dpdk root directory
> - explain in commit logs that it requires an install directory
>
> Olivier Matz (6):
> mk: introduce rte.extsubdir.mk
> examples: use rte.extsubdir.mk to process subdirectories
> examples: add a makefile to build all examples
> examples: fix qos_sched makefile
> examples: fix netmap_compat example
> mk: add "make examples" target in root makefile
Acked-by: Thomas Monjalon
Applied for version 1.7.0.
--
Thomas
[dpdk-dev] [PATCH 5/5] add FILE arguement to debug functions
2014-05-06 12:52, Burakov, Anatoly: > Hi Stephen, > > > The DPDK dump functions are useful for remote debugging of an > > applications. But when application runs as a daemon, stdout > > is typically routed to /dev/null. > > > > Instead change all these functions to take a stdio FILE * handle > > instead. An application can then use open_memstream() to capture > > the output. > > Wouldn't it be better to leave old calls as wrappers with the FILE parameter > defaulting to stdout? That way you wouldn't have to change so much code, > keep backwards compatibility with old code, and get the additional > functionality you need. Refactoring code shouldn't be a problem. We didn't commit for API stability yet. Acked-by: Thomas Monjalon
[dpdk-dev] [PATCH 0/5] Various patches to 1.6.0r2
2014-05-02 16:42, Stephen Hemminger: > These are updated versions of some of the earlier patches I sent. > Plus some more changes that are helpful when interacting with > mempool/zone etc. commits: 356cb73 mempool: add iterator function 58f8a1d memzone: add iterator function e5ac7c2 eal: don't inline string functions 591a9d7 add FILE argument to debug functions c738c6a spelling fixes Applied for version 1.7.0. Thanks Stephen -- Thomas
[dpdk-dev] [PATCH v5 00/14] dpdk: Separate compile time linkage between eal lib and pmd's
On Mon, Apr 21, 2014 at 10:59:25AM -0400, Neil Horman wrote: > Disconnect compile time linkage between eal library / applications and pmd's > > I noticed that, while tinkering with dpdk, building for shared libraries still > resulted in all the test applications linking to all the built pmd's, despite > not actually needing them all. We are able to tell an application at run time > (via the -d/--blacklist/--whitelist/--vdev options) which pmd's we want to > use, > and so have no need to link them at all. The only reason they get pulled in is > because rte_eal_non_pci_init_etherdev and rte_pmd_init_all contain static > lists > to the individual pmd init functions. The result is that, even when building > as > DSO's, we have to load all the pmd libraries, which is space inefficient and > defeating of some of the purpose of shared objects. > > To correct this, I developed this patch series, which introduces a new macro, > PMD_REGISTER_DRIVER, which wraps up Oliviers work using constructors on the > virtual device pmds, then expands on it to include the physical device pmds, > allowing us to break linkages between dpdk applications and pmd's almost > entirely (save for the ring and xenvirt drivers, which have additional api's > outside of the standard dpdk code that we need to further fix). This also > allows us to completely remove the rte_pmd_init_all routine, hiding its > function > internally to the rte_eal_init path. > > I've tested this feature using the igb and pcap pmd's, both statically and > dynamically linked with the test and testpmd sample applications, and it seems > to work well. > > Note, I encountered a few bugs along the way, which I fixed and noted in the > series. > > Regards > Neil > > Change Notes: > > 1) Reposted the entire series. Recent changes permeated accross several > patches, and since a few patches already had multiple versions, I've reposted > the entire series and bumped the version number to 5, whcih skips a few > versions, but ensures this series is seen as the most recent. > > 2) Merged the PMD_REGISTER_DRIVER macro into rte_dev.h, which is a better > location for it. Required removing include of rte_pmd.h across most of the > patches in the series. > > 3) Cleaned up various leftover "virtual" comments in the driver registration > api > that no longer belong there after making it generic > > 4) Fixed the LINK_USING_CC check in rte.lib.mk so it works like other uses > > 5) Fixed CPU_LDFLAGS conversion to use -Wl in case we link with gcc. > > > Ping, so whats the status on the rest of this series? You said you would integrate it with 1.7.0, but you've applied several dozen patches ahead of it (many of which were posted after it), and as a result, it no longer applies. I assume you're planning on fixing all of this up? Neil
[dpdk-dev] [PATCH v5 00/14] dpdk: Separate compile time linkage between eal lib and pmd's
Hi Neil, 2014-05-16 11:28, Neil Horman: > Ping, so whats the status on the rest of this series? You said you would > integrate it with 1.7.0, but you've applied several dozen patches ahead of > it (many of which were posted after it), and as a result, it no longer > applies. I assume you're planning on fixing all of this up? I was pretty sure you'll ping me :) This serie should be the next to be applied, probably on Monday. I take this opportunity to "recruit" more reviewers. Many patches are pending for review and there will be probably even more in next days. So reviewers are welcome! http://dpdk.org/dev#review Thanks -- Thomas
[dpdk-dev] [PATCH 0/6] Extensions to test-pmd
On 5/16/2014 7:22 AM, Thomas Monjalon wrote: > Hi Cyril, > > 2014-04-03 10:30, Cyril Chemparathy: >> This patch series contains a few minor extensions to test-pmd. These >> changes have been added primarily for convenience while testing out various >> scenarios with DPDK. >> >> Cyril Chemparathy (6): >>test-pmd: add support for single port loopback topology >>test-pmd: add support for auto-start when interactive >>test-pmd: allow command line selection of forwarding mode >>test-pmd: allow txpkts to be setup via command line >>test-pmd: add mac swap forwarding mode >>test-pmd: add flowgen forwarding engine > Thanks for these new features. > > This is not the first time a new engine is added by copy/pasting the most part > of an existing engine. For instance, the "mac-retry" engine was added by Intel > as a copy/paste of the original "mac" one. > This is acceptable but not the perfect way to implement engines. > To address this issue, a new engine function could be introduced to setup some > parameters to be used by "packet_fwd" function. This way, similar engines > could be removed. Agreed that it sucks to incessantly replicate code. Maybe some of the packet_fwd code is common enough to bump into run_pkt_fwd_on_lcore()? Most of these forwarding modes have similar looking code to receive/transmit bursts and free the failed remnants of the burst. Could this common code be bumped up into run_pkt_fwd_on_lcore() maybe? > Acked-by: Thomas Monjalon > > Applied for version 1.7.0. Thanks! Much appreciated. -- Cyril.
[dpdk-dev] [PATCH RFC 11/11] ixgbe/mbuf: add TSO support
Hi Oliver, >Yes, recalculating the pseudo-header checksum without the ip_len >is a slow down. This slow down should however be compared to the >operation in progress. When you do TSO, you are generally transmitting >a large TCP packet (several KB), and the cost of the TCP stack is >probably much higher than fixing the checksum. You can't always predict the context in which PMD TX routine will be called. Consider the scenario: one core doing IO over several ports, while few other cores doing upper layer processing of the packets. In that case, pseudo-header checksum (re)calculation inside PMD TX function will slow-down not only that particular packet flow, but the RX/TX over all ports that are managed by the given core. That's why I think that rte_eth_dev_prep_tx(portid, mbuf[], num) rte_eth_dev_tx(portid, mbuf[], num) might have an advantage over rte_eth_dev_tx(portid, mbuf[], num) /* the tx does the cksum job */ As it gives us a freedom to choose: do prep_tx() either on the same execution context with actual tx() or on different one. Though yes, it comes with a price: extra function call with all corresponding drawbacks. Anyway, right now we probably can argue for a while trying to define how generic TX HW offload API should look like. So, from your options list: >1/ Update patch to calculate the pseudo header without the ip_len when >doing TSO. In this case the API is mapped on ixgbe behavior, >probably providing the best performance today. If another PMD comes > in the future, this API may change to something more generic. >2/ Try to define a generic API today, accepting that the first driver >that supports TSO is a bit slower, but reducing the risks of changing > the API for TSO in the future. If #1 means moving pseudo checksum calculation out of PMD code, then my vote would be for it. Konstantin -Original Message- From: Olivier MATZ [mailto:olivier.m...@6wind.com] Sent: Friday, May 16, 2014 1:12 PM To: Ananyev, Konstantin; dev at dpdk.org Subject: Re: [dpdk-dev] [PATCH RFC 11/11] ixgbe/mbuf: add TSO support Hi Konstantin, On 05/15/2014 06:30 PM, Ananyev, Konstantin wrote: > With the current DPDK implementation the upper code would still be different > for TCP checksum (without segmentation) and TCP segmentation: > different flags in mbuf, with TSO you need to setup l4_len and mss fields > inside mbuf, with just checksum - you don't. You are right on this point. > Plus, as I said, it is a bit confusing to calculate PSD csum once in the > stack and then re-calculate in PMD. > Again - unnecessary slowdown. > So why not just have get_ipv4_psd_sum() and get_ipv4_psd_tso_sum() inside > testpmd/csumonly.c and call them accordingly? Yes, recalculating the pseudo-header checksum without the ip_len is a slow down. This slow down should however be compared to the operation in progress. When you do TSO, you are generally transmitting a large TCP packet (several KB), and the cost of the TCP stack is probably much higher than fixing the checksum. But that's not the main argument: my idea was to choose the proper API that will reduce the slow down for most cases. Let's take the case of a future vnic pmd driver supporting an emulation of TSO. In this case, the calculation of the pseudo header is also an unnecessary slowdown. Also, some other hardware I've seen don't need to calculate a different pseudo header checksum when doing TSO. Last argument, the way Linux works is the same that what I've implemented. See in linux ixgbe driver [1] at line 6461, there is a call to csum_tcpudp_magic() which reprocesses the checksum without the ip_len. On the other hand, that's true that today ixgbe is the only hardware supporting TSO in DPDK. The pragmatic approach could be to choose the API that gives the best performance with what we have (the ixgbe driver). I'm ok with this approach if we accept to reconsider the API (and maybe modifying it) when another PMD supporting TSO will be implemented. > About potential future problem with NICs that implement TX > checksum/segmentation offloads in a different manner - yeh that's true... > I think at the final point all that logic could be hidden inside some > function at rte_ethdev level, something like: rte_eth_dev_prep_tx(portid, > mbuf[], num). I don't see the real difference between: rte_eth_dev_prep_tx(portid, mbuf[], num) rte_eth_dev_tx(portid, mbuf[], num) and: rte_eth_dev_tx(portid, mbuf[], num) /* the tx does the cksum job */ And the second is faster because there is only one pointer dereference. > So, based on mbuf TX offload flags and device type, it would do necessary > modifications inside the packet. > But that's future discussion, I suppose. To me, it's not an option to fill that the network stack fills the mbuf differently depending on the device type. For instance, when doing ethernet bonding or bridging, the stack may not know which physical device will be used at the end. So the AP
[dpdk-dev] [PATCH 0/3] ring: provide rte_ring_as_ethdev API
This patch set aims to provide a shorter simpler alternative the public API functions for using rings as ethdevs provided by the librte_pmd_ring library. This alternative just provides simple RX and TX burst functions and a conversion API, without any of the complexities present in the pmd_ring version. This replacement should allow the public APIs in the pmd_ring library to be deprecated in the future. Bruce Richardson (3): ethdev: Remove ethdev.h dependency on mbuf + mempool ring: add support for converting a ring to ethdev ring: autotest for using ring as ethdev app/test-pmd/cmdline.c | 1 + app/test/test_pmd_ring.c| 1 + app/test/test_ring.c| 25 lib/librte_ether/rte_ethdev.h | 4 +++- lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c | 1 + lib/librte_ring/Makefile| 1 + lib/librte_ring/rte_ring.c | 42 + lib/librte_ring/rte_ring.h | 11 + 8 files changed, 85 insertions(+), 1 deletion(-) -- 1.9.0
[dpdk-dev] [PATCH 1/3] ethdev: Remove ethdev.h dependency on mbuf + mempool
This allows us to get the ethdev structure definition without a full
set of additional headers from other libs being included.
To ensure compilation, add new includes to C files that needed mbuf
header without explicitly including it.
Signed-off-by: Bruce Richardson
---
app/test-pmd/cmdline.c | 1 +
app/test/test_pmd_ring.c| 1 +
lib/librte_ether/rte_ethdev.h | 4 +++-
lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c | 1 +
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index b3824f9..2b6ffe4 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -74,6 +74,7 @@
#include
#include
#include
+#include
#include
#include
diff --git a/app/test/test_pmd_ring.c b/app/test/test_pmd_ring.c
index 4d9c2ba..3bb98ee 100644
--- a/app/test/test_pmd_ring.c
+++ b/app/test/test_pmd_ring.c
@@ -36,6 +36,7 @@
#include
+#include
#include
#include
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index dea7471..44f064e 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -175,9 +175,11 @@ extern "C" {
#include
#include
#include
-#include
#include "rte_ether.h"
+struct rte_mbuf;
+struct rte_mempool;
+
/**
* A structure used to retrieve statistics for an Ethernet port.
*/
diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c
b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c
index 8259cfe..6f244b6 100644
--- a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c
+++ b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c
@@ -55,6 +55,7 @@
#include
#include
#include
+#include
#include
#include
#include
--
1.9.0
[dpdk-dev] [PATCH 2/3] ring: add support for converting a ring to ethdev
Add in a pair of functions which meet the criteria for rx_burst and
tx_burst, which then allow a ring to be used as though it were an
ethdev, so that code can be written agnostically. Provide a convertion
function that takes a single ring and returns an index of the ethdev
corresponding to it.
Signed-off-by: Bruce Richardson
---
lib/librte_ring/Makefile | 1 +
lib/librte_ring/rte_ring.c | 42 ++
lib/librte_ring/rte_ring.h | 11 +++
3 files changed, 54 insertions(+)
diff --git a/lib/librte_ring/Makefile b/lib/librte_ring/Makefile
index 64c3460..b1d35ac 100644
--- a/lib/librte_ring/Makefile
+++ b/lib/librte_ring/Makefile
@@ -34,6 +34,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
# library name
LIB = librte_ring.a
+CFLAGS += -I$(RTE_SDK)/lib/librte_ether
CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
# all source are stored in SRCS-y
diff --git a/lib/librte_ring/rte_ring.c b/lib/librte_ring/rte_ring.c
index 3a919b0..56a46a7 100644
--- a/lib/librte_ring/rte_ring.c
+++ b/lib/librte_ring/rte_ring.c
@@ -86,6 +86,7 @@
#include
#include
#include
+#include
#include "rte_ring.h"
@@ -136,6 +137,7 @@ rte_ring_init(struct rte_ring *r, const char *name,
unsigned count,
/* init the ring structure */
memset(r, 0, sizeof(*r));
rte_snprintf(r->name, sizeof(r->name), "%s", name);
+ r->self = r;
r->flags = flags;
r->prod.watermark = count;
r->prod.sp_enqueue = !!(flags & RING_F_SP_ENQ);
@@ -319,3 +321,43 @@ rte_ring_lookup(const char *name)
return r;
}
+
+static uint16_t
+ring_eth_rx_burst(void *rxq, struct rte_mbuf **rx_pkts,
+ uint16_t nb_pkts)
+{
+ struct rte_ring *r = rxq;
+ return rte_ring_dequeue_burst(r, (void *)rx_pkts, nb_pkts);
+}
+
+static uint16_t
+ring_eth_tx_burst(void *txq, struct rte_mbuf **tx_pkts,
+ uint16_t nb_pkts)
+{
+ struct rte_ring *r = txq;
+ return rte_ring_enqueue_burst(r, (void *)tx_pkts, nb_pkts);
+}
+
+int
+rte_ring_as_eth_dev(struct rte_ring *r)
+{
+ static struct eth_dev_ops ops = { NULL };
+
+ /* reserve an ethdev entry */
+ struct rte_eth_dev *eth_dev = rte_eth_dev_allocate();
+ if (eth_dev == NULL)
+ goto error;
+
+ eth_dev->dev_ops = &ops;
+ eth_dev->rx_pkt_burst = ring_eth_rx_burst;
+ eth_dev->tx_pkt_burst = ring_eth_tx_burst;
+ eth_dev->data->nb_rx_queues = 1;
+ eth_dev->data->rx_queues = &r->self;
+ eth_dev->data->nb_tx_queues = 1;
+ eth_dev->data->tx_queues = &r->self;
+
+ return eth_dev->data->port_id;
+
+error:
+ return -1;
+}
diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h
index da54e34..be6bc08 100644
--- a/lib/librte_ring/rte_ring.h
+++ b/lib/librte_ring/rte_ring.h
@@ -141,6 +141,7 @@ struct rte_ring {
TAILQ_ENTRY(rte_ring) next; /**< Next in list. */
char name[RTE_RING_NAMESIZE];/**< Name of the ring. */
+ void *self; /**< Self pointer - used by ethdev fn
*/
int flags; /**< Flags supplied at creation. */
/** Ring producer status. */
@@ -296,6 +297,16 @@ struct rte_ring *rte_ring_create(const char *name,
unsigned count,
int socket_id, unsigned flags);
/**
+ * Use a ring as though it were an ethernet port
+ *
+ * @param r
+ * Pointer to the ring structure
+ * @return
+ * The port number of the new ethdev to be used for rx/tx burst functions
+ */
+int rte_ring_as_eth_dev(struct rte_ring *r);
+
+/**
* Change the high water mark.
*
* If *count* is 0, water marking is disabled. Otherwise, it is set to the
--
1.9.0
[dpdk-dev] [PATCH 3/3] ring: autotest for using ring as ethdev
An automated unit test for the new API to allow a ring to be used as an
ethdev. Verifies that expected enqueue/dequeue functionality still
works.
Signed-off-by: Bruce Richardson
---
app/test/test_ring.c | 25 +
1 file changed, 25 insertions(+)
diff --git a/app/test/test_ring.c b/app/test/test_ring.c
index cfd907f..f2aac24 100644
--- a/app/test/test_ring.c
+++ b/app/test/test_ring.c
@@ -58,6 +58,7 @@
#include
#include
#include
+#include
#include "test.h"
@@ -1322,6 +1323,26 @@ fail_test:
return ret;
}
+static int
+test_ring_as_eth_dev(void)
+{
+ int ethnum = rte_ring_as_eth_dev(r);
+ struct rte_mbuf *buf = NULL;
+
+ printf("Testing ring as ethdev - port num: %d\n", ethnum);
+ if (rte_eth_tx_burst(ethnum, 0, &buf, 1) != 1)
+ return -1;
+ if (rte_ring_count(r) != 1)
+ return -1;
+ if (rte_eth_rx_burst(ethnum, 0, &buf, 1) != 1)
+ return -1;
+ if (buf != NULL)
+ return -1;
+ printf("Enqueue/dequeue tests ok\n");
+
+ return 0;
+}
+
int
test_ring(void)
{
@@ -1379,6 +1400,10 @@ test_ring(void)
else
printf ( "Test detected NULL ring lookup \n");
+ /* test using the ring as an ethdev */
+ if (test_ring_as_eth_dev() < 0)
+ return -1;
+
/* test of creating ring with wrong size */
if (test_ring_creation_with_wrong_size() < 0)
return -1;
--
1.9.0
[dpdk-dev] [PATCH 0/3] ring: provide rte_ring_as_ethdev API
On Fri, May 16, 2014 at 07:15:11PM +0100, Bruce Richardson wrote: > This patch set aims to provide a shorter simpler alternative the public API > functions for using rings as ethdevs provided by the librte_pmd_ring library. > This alternative just provides simple RX and TX burst functions and a > conversion API, without any of the complexities present in the pmd_ring > version. This replacement should allow the public APIs in the pmd_ring > library to be deprecated in the future. > > Bruce Richardson (3): > ethdev: Remove ethdev.h dependency on mbuf + mempool > ring: add support for converting a ring to ethdev > ring: autotest for using ring as ethdev > > app/test-pmd/cmdline.c | 1 + > app/test/test_pmd_ring.c| 1 + > app/test/test_ring.c| 25 > lib/librte_ether/rte_ethdev.h | 4 +++- > lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c | 1 + > lib/librte_ring/Makefile| 1 + > lib/librte_ring/rte_ring.c | 42 > + > lib/librte_ring/rte_ring.h | 11 + > 8 files changed, 85 insertions(+), 1 deletion(-) > > -- > 1.9.0 > > NAK, I don't think this makes sense. If you want to encapsulate a ring pair as an ethdev, then write a pmd that does so. That will give you a standardized ethdev that you can create using the existing --vdev librte_eal command line options without having to widen your API surface, or having to write applications that specifically know about the fact that your ethdev is composed of rings under the covers. Neil
[dpdk-dev] DPDK Bare Metal
Hello, [This message was previously sent to "contact us" on 01.org... they directed me to post here instead... ] My company is developing secure networking technology and we are currently building a prototype of our system using the dpdk as the underlying communications platform. So far so good. We are interested in finding out how much we can decrease the attack surface of our application by going full bare metal.. (i.e. sans OS). The mention of a bare metal version of dpdk is one of the contributing factors for our working on our prototype. Can you please provide any information on the dpdk bare metal version? Such as: 1) is it in fact - a zero OS version or is it based on a RTOS such as those from Wind River. 2) Does the bare metal version only support one kind of processor family such as i7, or is it possible to target atom or arm with it as well? 3) what are the licensing terms for it? 4) are royalties required? Thank you for your help in resolving these questions. Sincerely, Daniel Chapiesky
