Re: [dpdk-dev] [PATCH v2 1/5] event/dpaa2: fix mbuf assignment in atomic processing
-Original Message-
> Date: Fri, 21 Sep 2018 17:16:02 +0530
> From: Hemant Agrawal
> To: dev@dpdk.org
> CC: jerin.ja...@caviumnetworks.com, Hemant Agrawal
> , sta...@dpdk.org
> Subject: [PATCH v2 1/5] event/dpaa2: fix mbuf assignment in atomic
> processing
> X-Mailer: git-send-email 2.7.4
>
>
> Fixes: 7b6edb640b73 ("event/dpaa2: have separate structure to hold dqrr
> entries")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Hemant Agrawal
Applied the series to dpdk-next-eventdev/master with minor git comment changes.
Thanks.
Re: [dpdk-dev] [PATCH 1/2] eventdev: fix eth Rx adapter hotplug incompatibility
-Original Message-
> Date: Thu, 6 Sep 2018 14:41:42 +0530
> From: Nikhil Rao
> To: jerin.ja...@caviumnetworks.com
> CC: dev@dpdk.org, Nikhil Rao , sta...@dpdk.org
> Subject: [PATCH 1/2] eventdev: fix eth Rx adapter hotplug incompatibility
> X-Mailer: git-send-email 1.8.3.1
>
>
> Use RTE_MAX_ETHPORTS instead of rte_eth_dev_count_total()
> when allocating eth Rx adapter's per-eth device data structure
> to account for hotplugged devices.
>
> Fixes: 9c38b704d280 ("eventdev: add eth Rx adapter implementation")
> Cc: sta...@dpdk.org
> Signed-off-by: Nikhil Rao
Applied this series to dpdk-next-eventdev/master. Thanks.
Re: [dpdk-dev] [PATCH] test/eventdev: fix incorrect unit test
-Original Message-
> Date: Wed, 5 Sep 2018 19:53:31 +0530
> From: Pavan Nikhilesh
> To: jerin.ja...@caviumnetworks.com
> Cc: dev@dpdk.org, Pavan Nikhilesh
> Subject: [dpdk-dev] [PATCH] test/eventdev: fix incorrect unit test
> X-Mailer: git-send-email 2.18.0
>
> Enqueue, dequeue depths are only valid for event devs that have burst
> mode capability. Check event dev capability before testing depth
> boundary.
>
> Fixes: f8f9d233ea0e ("test/eventdev: add unit tests")
Cc: sta...@dpdk.org
Acked-by: Jerin Jacob
>
> Signed-off-by: Pavan Nikhilesh
> ---
> test/test/test_eventdev.c | 21 -
> 1 file changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/test/test/test_eventdev.c b/test/test/test_eventdev.c
> index 04bdc6b6c..00d73275c 100644
> --- a/test/test/test_eventdev.c
> +++ b/test/test/test_eventdev.c
> @@ -190,15 +190,18 @@ test_eventdev_configure(void)
>"Config negative test failed");
> TEST_ASSERT_EQUAL(-EINVAL,
> test_ethdev_config_run(&dev_conf, &info, max_event_queue_flows),
> - "Config negative test failed");
> - TEST_ASSERT_EQUAL(-EINVAL,
> - test_ethdev_config_run(&dev_conf, &info,
> - max_event_port_dequeue_depth),
> - "Config negative test failed");
> - TEST_ASSERT_EQUAL(-EINVAL,
> - test_ethdev_config_run(&dev_conf, &info,
> - max_event_port_enqueue_depth),
> - "Config negative test failed");
> + "Config negative test failed");
> +
> + if (info.event_dev_cap & RTE_EVENT_DEV_CAP_BURST_MODE) {
> + TEST_ASSERT_EQUAL(-EINVAL,
> + test_ethdev_config_run(&dev_conf, &info,
> + max_event_port_dequeue_depth),
> + "Config negative test failed");
> + TEST_ASSERT_EQUAL(-EINVAL,
> + test_ethdev_config_run(&dev_conf, &info,
> + max_event_port_enqueue_depth),
> + "Config negative test failed");
> + }
>
> /* Positive case */
> devconf_set_default_sane_values(&dev_conf, &info);
> --
> 2.18.0
>
Re: [dpdk-dev] [PATCH v3 1/4] app/test-eventdev: fix minor typos
-Original Message-
> Date: Thu, 20 Sep 2018 03:52:32 +0530
> From: Pavan Nikhilesh
> To: jerin.ja...@caviumnetworks.com, nikhil@intel.com,
> anoob.jos...@caviumnetworks.com
> Cc: dev@dpdk.org, Pavan Nikhilesh
> Subject: [dpdk-dev] [PATCH v3 1/4] app/test-eventdev: fix minor typos
> X-Mailer: git-send-email 2.18.0
>
> Fix minor typos.
>
> Fixes: 314bcf58ca8f ("app/eventdev: add pipeline queue worker functions")
Cc: sta...@dpdk.org
>
> Signed-off-by: Pavan Nikhilesh
Acked-by: Jerin Jacob
> ---
>
> v3 Changes:
> - Force all the ports to use the non-internal cap mode when we detect
> that one of the port doesn't have internal port capability.
>
> app/test-eventdev/test_pipeline_atq.c| 16
> app/test-eventdev/test_pipeline_common.h | 8
> app/test-eventdev/test_pipeline_queue.c | 16
> 3 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/app/test-eventdev/test_pipeline_atq.c
> b/app/test-eventdev/test_pipeline_atq.c
> index 26dc79f90..f0b2f9015 100644
> --- a/app/test-eventdev/test_pipeline_atq.c
> +++ b/app/test-eventdev/test_pipeline_atq.c
> @@ -18,7 +18,7 @@ pipeline_atq_nb_event_queues(struct evt_options *opt)
> static int
> pipeline_atq_worker_single_stage_tx(void *arg)
> {
> - PIPELINE_WROKER_SINGLE_STAGE_INIT;
> + PIPELINE_WORKER_SINGLE_STAGE_INIT;
>
> while (t->done == false) {
> uint16_t event = rte_event_dequeue_burst(dev, port, &ev, 1, 0);
> @@ -43,7 +43,7 @@ pipeline_atq_worker_single_stage_tx(void *arg)
> static int
> pipeline_atq_worker_single_stage_fwd(void *arg)
> {
> - PIPELINE_WROKER_SINGLE_STAGE_INIT;
> + PIPELINE_WORKER_SINGLE_STAGE_INIT;
> const uint8_t tx_queue = t->tx_service.queue_id;
>
> while (t->done == false) {
> @@ -66,7 +66,7 @@ pipeline_atq_worker_single_stage_fwd(void *arg)
> static int
> pipeline_atq_worker_single_stage_burst_tx(void *arg)
> {
> - PIPELINE_WROKER_SINGLE_STAGE_BURST_INIT;
> + PIPELINE_WORKER_SINGLE_STAGE_BURST_INIT;
>
> while (t->done == false) {
> uint16_t nb_rx = rte_event_dequeue_burst(dev, port, ev,
> @@ -98,7 +98,7 @@ pipeline_atq_worker_single_stage_burst_tx(void *arg)
> static int
> pipeline_atq_worker_single_stage_burst_fwd(void *arg)
> {
> - PIPELINE_WROKER_SINGLE_STAGE_BURST_INIT;
> + PIPELINE_WORKER_SINGLE_STAGE_BURST_INIT;
> const uint8_t tx_queue = t->tx_service.queue_id;
>
> while (t->done == false) {
> @@ -126,7 +126,7 @@ pipeline_atq_worker_single_stage_burst_fwd(void *arg)
> static int
> pipeline_atq_worker_multi_stage_tx(void *arg)
> {
> - PIPELINE_WROKER_MULTI_STAGE_INIT;
> + PIPELINE_WORKER_MULTI_STAGE_INIT;
> const uint8_t nb_stages = t->opt->nb_stages;
>
>
> @@ -161,7 +161,7 @@ pipeline_atq_worker_multi_stage_tx(void *arg)
> static int
> pipeline_atq_worker_multi_stage_fwd(void *arg)
> {
> - PIPELINE_WROKER_MULTI_STAGE_INIT;
> + PIPELINE_WORKER_MULTI_STAGE_INIT;
> const uint8_t nb_stages = t->opt->nb_stages;
> const uint8_t tx_queue = t->tx_service.queue_id;
>
> @@ -192,7 +192,7 @@ pipeline_atq_worker_multi_stage_fwd(void *arg)
> static int
> pipeline_atq_worker_multi_stage_burst_tx(void *arg)
> {
> - PIPELINE_WROKER_MULTI_STAGE_BURST_INIT;
> + PIPELINE_WORKER_MULTI_STAGE_BURST_INIT;
> const uint8_t nb_stages = t->opt->nb_stages;
>
> while (t->done == false) {
> @@ -234,7 +234,7 @@ pipeline_atq_worker_multi_stage_burst_tx(void *arg)
> static int
> pipeline_atq_worker_multi_stage_burst_fwd(void *arg)
> {
> - PIPELINE_WROKER_MULTI_STAGE_BURST_INIT;
> + PIPELINE_WORKER_MULTI_STAGE_BURST_INIT;
> const uint8_t nb_stages = t->opt->nb_stages;
> const uint8_t tx_queue = t->tx_service.queue_id;
>
> diff --git a/app/test-eventdev/test_pipeline_common.h
> b/app/test-eventdev/test_pipeline_common.h
> index 5fb91607d..9cd6b905b 100644
> --- a/app/test-eventdev/test_pipeline_common.h
> +++ b/app/test-eventdev/test_pipeline_common.h
> @@ -65,14 +65,14 @@ struct test_pipeline {
>
> #define BURST_SIZE 16
>
> -#define PIPELINE_WROKER_SINGLE_STAGE_INIT \
> +#define PIPELINE_WORKER_SINGLE_STAGE_INIT \
> struct worker_data *w = arg; \
> struct test_pipeline *t = w->t; \
> const uint8_t dev = w->dev_id;\
> const uint8_t port = w->port_id; \
> struct rte_event ev
>
> -#define PIPELINE_WROKER_SINGLE_STAGE_BURST_INIT \
> +#define PIPELINE_WORKER_SINGLE_STAGE_BURST_INIT \
> int i; \
> struct worker_data *w = arg; \
> struct test_pipeline *t = w->t; \
> @@ -80,7 +80,7 @@ struct test_pipeline {
> const uint8_t port = w->port_id;\
> struct rte_event ev[BURST_SIZE + 1]
>
> -#define PIPELINE_WROKER_MULTI_STAGE_INIT \
> +#define PIPELINE_WORKER_MULTI_STAGE_INIT \
> struct worker_data *w =
Re: [dpdk-dev] [PATCH v3 2/4] app/test-eventdev: remove redundant newlines
-Original Message-
> Date: Thu, 20 Sep 2018 03:52:33 +0530
> From: Pavan Nikhilesh
> To: jerin.ja...@caviumnetworks.com, nikhil@intel.com,
> anoob.jos...@caviumnetworks.com
> Cc: dev@dpdk.org, Pavan Nikhilesh
> Subject: [dpdk-dev] [PATCH v3 2/4] app/test-eventdev: remove redundant
> newlines
> X-Mailer: git-send-email 2.18.0
>
> Signed-off-by: Pavan Nikhilesh
Please fix check-git-log.sh errors.
### app/test-eventdev: remove redundant newlines
WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate
one
With above change:
Acked-by: Jerin Jacob
> ---
> app/test-eventdev/test_pipeline_common.c | 21 ++---
> 1 file changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/app/test-eventdev/test_pipeline_common.c
> b/app/test-eventdev/test_pipeline_common.c
> index 12a58fbbf..cdf9010b4 100644
> --- a/app/test-eventdev/test_pipeline_common.c
> +++ b/app/test-eventdev/test_pipeline_common.c
> @@ -65,12 +65,12 @@ pipeline_test_result(struct evt_test *test, struct
> evt_options *opt)
> uint64_t total = 0;
> struct test_pipeline *t = evt_test_priv(test);
>
> - printf("Packet distribution across worker cores :\n");
> + evt_info("Packet distribution across worker cores :");
> for (i = 0; i < t->nb_workers; i++)
> total += t->worker[i].processed_pkts;
> for (i = 0; i < t->nb_workers; i++)
> - printf("Worker %d packets: "CLGRN"%"PRIx64" "CLNRM"percentage:"
> - CLGRN" %3.2f\n"CLNRM, i,
> + evt_info("Worker %d packets: "CLGRN"%"PRIx64""CLNRM"
> percentage:"
> + CLGRN" %3.2f"CLNRM, i,
> t->worker[i].processed_pkts,
> (((double)t->worker[i].processed_pkts)/total)
> * 100);
> @@ -233,7 +233,7 @@ pipeline_ethdev_setup(struct evt_test *test, struct
> evt_options *opt)
>
> RTE_SET_USED(opt);
> if (!rte_eth_dev_count_avail()) {
> - evt_err("No ethernet ports found.\n");
> + evt_err("No ethernet ports found.");
> return -ENODEV;
> }
>
> @@ -252,7 +252,7 @@ pipeline_ethdev_setup(struct evt_test *test, struct
> evt_options *opt)
> if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
> port_conf.rx_adv_conf.rss_conf.rss_hf) {
> evt_info("Port %u modified RSS hash function based on
> hardware support,"
> - "requested:%#"PRIx64" configured:%#"PRIx64"\n",
> + "requested:%#"PRIx64" configured:%#"PRIx64"",
> i,
> port_conf.rx_adv_conf.rss_conf.rss_hf,
> local_port_conf.rx_adv_conf.rss_conf.rss_hf);
> @@ -261,19 +261,19 @@ pipeline_ethdev_setup(struct evt_test *test, struct
> evt_options *opt)
> if (rte_eth_dev_configure(i, nb_queues, nb_queues,
> &local_port_conf)
> < 0) {
> - evt_err("Failed to configure eth port [%d]\n", i);
> + evt_err("Failed to configure eth port [%d]", i);
> return -EINVAL;
> }
>
> if (rte_eth_rx_queue_setup(i, 0, NB_RX_DESC,
> rte_socket_id(), &rx_conf, t->pool) < 0) {
> - evt_err("Failed to setup eth port [%d] rx_queue: %d.\n",
> + evt_err("Failed to setup eth port [%d] rx_queue: %d.",
> i, 0);
> return -EINVAL;
> }
> if (rte_eth_tx_queue_setup(i, 0, NB_TX_DESC,
> rte_socket_id(), NULL) < 0) {
> - evt_err("Failed to setup eth port [%d] tx_queue: %d.\n",
> + evt_err("Failed to setup eth port [%d] tx_queue: %d.",
> i, 0);
> return -EINVAL;
> }
> @@ -379,7 +379,7 @@ pipeline_event_rx_adapter_setup(struct evt_options *opt,
> uint8_t stride,
> ret = evt_service_setup(service_id);
> if (ret) {
> evt_err("Failed to setup service core"
> - " for Rx adapter\n");
> + " for Rx adapter");
> return ret;
> }
> }
> @@ -396,8 +396,7 @@ pipeline_event_rx_adapter_setup(struct evt_options *opt,
> uint8_t stride,
> evt_err("Rx adapter[%d] start failed", prod);
> return ret;
> }
> - printf("%s: Port[%d] using Rx adapter[%d] started\n", __func__,
> - prod, prod);
> + evt_info("Port
Re: [dpdk-dev] [PATCH v3 4/4] doc: update eventdev application guide
-Original Message- > Date: Thu, 20 Sep 2018 03:52:35 +0530 > From: Pavan Nikhilesh > To: jerin.ja...@caviumnetworks.com, nikhil@intel.com, > anoob.jos...@caviumnetworks.com > Cc: dev@dpdk.org, Pavan Nikhilesh , > john.mcnam...@intel.com > Subject: [dpdk-dev] [PATCH v3 4/4] doc: update eventdev application guide > X-Mailer: git-send-email 2.18.0 > > Update eventdev application guide to reflect Tx adapter related changes. > > Signed-off-by: Pavan Nikhilesh > --- > cc: > > .../eventdev_pipeline_atq_test_generic.svg| 848 +++--- > ...ntdev_pipeline_atq_test_internal_port.svg} | 26 +- > .../eventdev_pipeline_queue_test_generic.svg | 570 +++- > ...dev_pipeline_queue_test_internal_port.svg} | 22 +- Updated diagrams looks good. Since this file gets modified, Can you add the missing pipeline tests in --test documentation. With above change: Acked-by: Jerin Jacob
Re: [dpdk-dev] [PATCH v2 2/3] event/sw: implement unlinks in progress function
-Original Message-
> Date: Thu, 20 Sep 2018 12:22:50 +0100
> From: Harry van Haaren
> To: dev@dpdk.org
> CC: jerin.ja...@caviumnetworks.com, matias@nokia.com, Harry van Haaren
>
> Subject: [PATCH v2 2/3] event/sw: implement unlinks in progress function
> X-Mailer: git-send-email 2.17.1
>
>
> This commit adds a counter to each port, which counts the
> number of unlinks that have been performed. When the scheduler
> thread starts its scheduling routine, it "acks" all unlinks that
> have been requested, and the application is gauranteed that no
> more events will be scheduled to the port from the unlinked queue.
>
> Signed-off-by: Harry van Haaren
>
> ---
>
>
> +static int
> +sw_port_unlinks_in_progress(struct rte_eventdev *dev, void *port)
> +{
> + struct sw_port *p = port;
> + return p->unlinks_in_progress;
Compilation error:
/export/dpdk-next-eventdev/drivers/event/sw/sw_evdev.c: In function
‘sw_port_unlinks_in_progress’:
/export/dpdk-next-eventdev/drivers/event/sw/sw_evdev.c:124:50: error:
unused parameter ‘dev’ [-Werror=unused-parameter]
sw_port_unlinks_in_progress(struct rte_eventdev *dev, void *port)
> +}
> +
Re: [dpdk-dev] [PATCH] event/sw: fix cq idx check for unlink usecases
-Original Message-
> Date: Fri, 21 Sep 2018 12:17:38 +
> From: "Elo, Matias (Nokia - FI/Espoo)"
> To: Harry van Haaren
> CC: "dev@dpdk.org" , "sta...@dpdk.org"
> Subject: Re: [dpdk-dev] [PATCH] event/sw: fix cq idx check for unlink
> usecases
> x-mailer: Apple Mail (2.3445.9.1)
>
>
> > On 21 Sep 2018, at 13:25, Harry van Haaren
> > wrote:
> >
> > This commit fixes the cq index checks when unlinking
> > ports/queues while the scheduler core is running.
> > Previously, the == comparison could be "skipped" if
> > in particular corner cases. With the check being changed
> > to >= this is resolved as the cq idx gets reset to zero.
> >
> > Bugzilla ID: 60
> > Fixes: 617995dfc5b2 ("event/sw: add scheduling logic")
> >
> > Suggested-by: Matias Elo
> > Signed-off-by: Harry van Haaren
> >
> > ---
> >
> > Cc: sta...@dpdk.org
> >
> > @Matias,
> >
> > When testing this patch with your provided test case as per attachment
> > to bug #60 in Bugzilla, I don't see any events arriving to port 0.
> > Hence, I believe this to be the correct behaviour, if you can confirm
> > that'd be awesome!
> >
>
> I can confirm that this patch fixes the problem also on my system. Thanks!
>
> I can’t remember if I ever saw this problem with ordered queues. At least now
> they seem to be also working correctly.
>
> Regards,
> Matias
Cc: sta...@dpdk.org
Applied to dpdk-next-eventdev/master. Thanks.
>
Re: [dpdk-dev] [PATCH v3 3/4] app/test-eventdev: add Tx adapter support
-Original Message-
> Date: Thu, 20 Sep 2018 03:52:34 +0530
> From: Pavan Nikhilesh
> To: jerin.ja...@caviumnetworks.com, nikhil@intel.com,
> anoob.jos...@caviumnetworks.com
> Cc: dev@dpdk.org, Pavan Nikhilesh
> Subject: [dpdk-dev] [PATCH v3 3/4] app/test-eventdev: add Tx adapter support
> X-Mailer: git-send-email 2.18.0
>
> Convert existing Tx service based pipeline to Tx adapter based APIs and
> simplify worker functions.
>
> Signed-off-by: Pavan Nikhilesh
> ---
> app/test-eventdev/test_pipeline_atq.c| 269 ---
> app/test-eventdev/test_pipeline_common.c | 202 +
> app/test-eventdev/test_pipeline_common.h | 62 +++---
> app/test-eventdev/test_pipeline_queue.c | 241 ++--
> 4 files changed, 363 insertions(+), 411 deletions(-)
>
> diff --git a/app/test-eventdev/test_pipeline_atq.c
> b/app/test-eventdev/test_pipeline_atq.c
> index f0b2f9015..01af298f3 100644
> --- a/app/test-eventdev/test_pipeline_atq.c
> +++ b/app/test-eventdev/test_pipeline_atq.c
> @@ -15,7 +15,7 @@ pipeline_atq_nb_event_queues(struct evt_options *opt)
> return rte_eth_dev_count_avail();
> }
> @@ -317,34 +291,36 @@ pipeline_atq_eventdev_setup(struct evt_test *test,
> struct evt_options *opt)
> int nb_ports;
> int nb_queues;
> uint8_t queue;
> - struct rte_event_dev_info info;
> - struct test_pipeline *t = evt_test_priv(test);
> - uint8_t tx_evqueue_id = 0;
> + uint8_t tx_evqueue_id[RTE_MAX_ETHPORTS] = {0};
Some old compiler throws error with this scheme. Please change to memset.
>
> int
> -pipeline_event_tx_service_setup(struct evt_test *test, struct evt_options
> *opt,
> - uint8_t tx_queue_id, uint8_t tx_port_id,
> - const struct rte_event_port_conf p_conf)
> +pipeline_event_tx_adapter_setup(struct evt_options *opt,
> + struct rte_event_port_conf port_conf)
> {
> - int ret;
> - struct rte_service_spec serv;
> - struct test_pipeline *t = evt_test_priv(test);
> - struct tx_service_data *tx = &t->tx_service;
> + int ret = 0;
> + uint16_t consm = 0;
Please check the above needs to be initialized to zero?
>
>
> @@ -326,25 +316,21 @@ pipeline_queue_eventdev_setup(struct evt_test *test,
> struct evt_options *opt)
> int nb_queues;
> int nb_stages = opt->nb_stages;
> uint8_t queue;
> - struct rte_event_dev_info info;
> - struct test_pipeline *t = evt_test_priv(test);
> - uint8_t tx_evqueue_id = 0;
> + uint8_t tx_evport_id = 0;
> + uint8_t tx_evqueue_id[RTE_MAX_ETHPORTS] = {0};
Same as above.
With above changes:
Acked-by: Jerin Jacob
[dpdk-dev] [PATCH v2] kni: dynamically allocate memory for each KNI
Long time ago preallocation of memory for KNI was introduced in commit
0c6bc8e. It was done because of lack of ability to free previously
allocated memzones, which led to memzone exhaustion. Currently memzones
can be freed and this patch uses this ability for dynamic KNI memory
allocation.
Signed-off-by: Igor Ryzhov
---
v2:
* allocate KNI using rte_zmalloc
* swap reserve/release functions
* use "kni" as a variable name
* use macros for memzone names
lib/librte_kni/rte_kni.c | 502 +--
lib/librte_kni/rte_kni.h | 6 +-
test/test/test_kni.c | 6 -
3 files changed, 218 insertions(+), 296 deletions(-)
diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index 8a8f6c1cc..6af6e7efe 100644
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -18,6 +18,9 @@
#include
#include
#include
+#include
+#include
+#include
#include
#include "rte_kni_fifo.h"
@@ -30,7 +33,23 @@
#define KNI_REQUEST_MBUF_NUM_MAX 32
-#define KNI_MEM_CHECK(cond) do { if (cond) goto kni_fail; } while (0)
+#define KNI_MEM_CHECK(cond, fail) do { if (cond) goto fail; } while (0)
+
+#define KNI_MZ_NAME_FMT"kni_info_%s"
+#define KNI_TX_Q_MZ_NAME_FMT "kni_tx_%s"
+#define KNI_RX_Q_MZ_NAME_FMT "kni_rx_%s"
+#define KNI_ALLOC_Q_MZ_NAME_FMT"kni_alloc_%s"
+#define KNI_FREE_Q_MZ_NAME_FMT "kni_free_%s"
+#define KNI_REQ_Q_MZ_NAME_FMT "kni_req_%s"
+#define KNI_RESP_Q_MZ_NAME_FMT "kni_resp_%s"
+#define KNI_SYNC_ADDR_MZ_NAME_FMT "kni_sync_%s"
+
+TAILQ_HEAD(rte_kni_list, rte_tailq_entry);
+
+static struct rte_tailq_elem rte_kni_tailq = {
+ .name = "RTE_KNI",
+};
+EAL_REGISTER_TAILQ(rte_kni_tailq)
/**
* KNI context
@@ -42,18 +61,26 @@ struct rte_kni {
struct rte_mempool *pktmbuf_pool; /**< pkt mbuf mempool */
unsigned mbuf_size; /**< mbuf size */
+ const struct rte_memzone *m_tx_q; /**< TX queue memzone */
+ const struct rte_memzone *m_rx_q; /**< RX queue memzone */
+ const struct rte_memzone *m_alloc_q;/**< Alloc queue memzone */
+ const struct rte_memzone *m_free_q; /**< Free queue memzone */
+
struct rte_kni_fifo *tx_q; /**< TX queue */
struct rte_kni_fifo *rx_q; /**< RX queue */
struct rte_kni_fifo *alloc_q; /**< Allocated mbufs queue */
struct rte_kni_fifo *free_q;/**< To be freed mbufs queue */
+ const struct rte_memzone *m_req_q; /**< Request queue memzone */
+ const struct rte_memzone *m_resp_q; /**< Response queue memzone */
+ const struct rte_memzone *m_sync_addr;/**< Sync addr memzone */
+
/* For request & response */
struct rte_kni_fifo *req_q; /**< Request queue */
struct rte_kni_fifo *resp_q;/**< Response queue */
void * sync_addr; /**< Req/Resp Mem address */
struct rte_kni_ops ops; /**< operations for request */
- uint8_t in_use : 1; /**< kni in use */
};
enum kni_ops_status {
@@ -61,232 +88,91 @@ enum kni_ops_status {
KNI_REQ_REGISTERED,
};
-/**
- * KNI memzone pool slot
- */
-struct rte_kni_memzone_slot {
- uint32_t id;
- uint8_t in_use : 1;/**< slot in use */
-
- /* Memzones */
- const struct rte_memzone *m_ctx; /**< KNI ctx */
- const struct rte_memzone *m_tx_q; /**< TX queue */
- const struct rte_memzone *m_rx_q; /**< RX queue */
- const struct rte_memzone *m_alloc_q; /**< Allocated mbufs queue */
- const struct rte_memzone *m_free_q;/**< To be freed mbufs queue */
- const struct rte_memzone *m_req_q; /**< Request queue */
- const struct rte_memzone *m_resp_q;/**< Response queue */
- const struct rte_memzone *m_sync_addr;
-
- /* Free linked list */
- struct rte_kni_memzone_slot *next; /**< Next slot link.list */
-};
-
-/**
- * KNI memzone pool
- */
-struct rte_kni_memzone_pool {
- uint8_t initialized : 1;/**< Global KNI pool init flag */
-
- uint32_t max_ifaces;/**< Max. num of KNI ifaces */
- struct rte_kni_memzone_slot *slots;/**< Pool slots */
- rte_spinlock_t mutex; /**< alloc/release mutex */
-
- /* Free memzone slots linked-list */
- struct rte_kni_memzone_slot *free; /**< First empty slot */
- struct rte_kni_memzone_slot *free_tail;/**< Last empty slot */
-};
-
-
static void kni_free_mbufs(struct rte_kni *kni);
static void kni_allocate_mbufs(struct rte_kni *kni);
static volatile int kni_fd = -1;
-static struct rte_kni_memzone_pool kni_memzone_pool = {
- .initialized = 0,
-};
-static const struct rte_memzone *
-kni_memzone_reserve(const char *name, size_t len, int socket_id,
- unsigned
Re: [dpdk-dev] [PATCH] devtools: move forbidden tokens awk script to a separate file
On Fri, Sep 21, 2018 at 2:37 PM, Andrzej Ostruszka wrote:
> Acked-by: Andrzej Ostruszka
>
> However you might consider keeping this comment in the awk script.
>
> On 20.09.2018 23:11, Arnon Warshavsky wrote:
> [...]
> > @@ -44,85 +44,12 @@ print_usage () {
> > }
> >
> > check_forbidden_additions() {
> > -# This awk script receives a list of expressions to monitor
> > -# and a list of folders to search these expressions in
> > -# - No search is done inside comments
> > -# - Both additions and removals of the expressions are checked
> > -# A positive balance of additions fails the check
>
> Best regards
> Andrzej
>
Thanks Andrzej , you are right. It was indeed supposed to move into the
awk script.
Will fix that
Re: [dpdk-dev] [PATCH v4 00/20] Support externally allocated memory in DPDK
Hi Anatoly, 21/09/2018 18:13, Anatoly Burakov: > This is a proposal to enable using externally allocated memory > in DPDK. About this change and previous ones, I think we may miss some documentation about the usage and the internal design of the DPDK memory allocation. You already updated some doc recently: http://git.dpdk.org/dpdk/commit/?id=b31739328 This is what we have currently: http://doc.dpdk.org/guides/prog_guide/env_abstraction_layer.html#memory-segments-and-memory-zones-memzone http://doc.dpdk.org/guides/prog_guide/env_abstraction_layer.html#malloc http://doc.dpdk.org/guides/prog_guide/mempool_lib.html This is probably a good time to check this doc again. Do you think it deserves more explanations, or maybe some figures?
Re: [dpdk-dev] [PATCH v2 10/12] net/mvpp2: align documentation with MUSDK 18.09
19/09/2018 19:15, Ferruh Yigit: > On 9/4/2018 2:49 PM, Tomasz Duszynski wrote: > > From: Natalie Samsonov > > --- a/doc/guides/nics/mvpp2.rst > > +++ b/doc/guides/nics/mvpp2.rst > > - git clone > > https://github.com/MarvellEmbeddedProcessors/linux-marvell.git -b > > linux-4.4.52-armada-17.10 > > + git clone > > https://github.com/MarvellEmbeddedProcessors/linux-marvell.git -b > > linux-4.4.120-armada-18.09 > > There is a strict dependency to MUSDK 18.09, dpdk18.11 won't compile with > older > versions. It is hard to trace this dependency, what do you think having a > matrix > in DPDK documentation showing which DPDK version supports which MUSDK? It does not compile even with MUSDK 18.09. With MUSDK 18.09, the error is: drivers/crypto/mvsam/rte_mrvl_pmd.c:867:26: error: 'SAM_HW_RING_NUM' undeclared The explanation is in MUSDK: commit 9bf8b3ca4ddfa00619c0023dfb08ae1601054fce Author: Dmitri Epshtein Date: Mon Nov 20 10:38:31 2017 +0200 sam: remove SAM_HW_RING_NUM from APIs Use function: u32 sam_get_num_cios(u32 inst); As a consequence, next-net cannot be pulled!
Re: [dpdk-dev] [PATCH v2 11/12] net/mvpp2: document MTR and TM usage
04/09/2018 15:49, Tomasz Duszynski: > From: Natalie Samsonov > > Document MTR (metering) and TM (traffic management) usage plus > do some small updates here and there. > > Signed-off-by: Natalie Samsonov > --- > doc/guides/nics/img/mvpp2_tm.png | Bin 0 -> 5355 bytes > doc/guides/nics/mvpp2.rst| 386 > +-- > 2 files changed, 335 insertions(+), 51 deletions(-) > create mode 100644 doc/guides/nics/img/mvpp2_tm.png > > diff --git a/doc/guides/nics/img/mvpp2_tm.png > b/doc/guides/nics/img/mvpp2_tm.png > new file mode 100644 Sorry, it is forbidden to add new binary file. As an Open Source project, everything must be open including the source of the figures. Please could you provide a SVG version?
[dpdk-dev] [PATCH v4 0/2] introduce vdpa sample
Hi, This patchset introduces vdpa sample to demonstrate the vDPA use case. v4 changes: * add client mode support * improve the format to list the vDPA device info and improve the vdpa.rst accordingly * remove some useless comments * add introduction in 18.11 release note. v3 changes: * list cmd would show queue number and supported features of vdpa devices. * address Xiao's review comments v2 changes: * fix a compilation error reported by Rosen * improve create cmd in interactive mode and add two new cmds: list, * quit * add application documentation Xiaolong Ye (2): vhost: introduce API to get vDPA device number examples/vdpa: introduce a new sample for vDPA MAINTAINERS| 2 + doc/guides/sample_app_ug/index.rst | 1 + doc/guides/sample_app_ug/vdpa.rst | 115 +++ examples/Makefile | 2 +- examples/vdpa/Makefile | 32 ++ examples/vdpa/main.c | 458 + examples/vdpa/meson.build | 16 + lib/librte_vhost/rte_vdpa.h| 3 + lib/librte_vhost/rte_vhost_version.map | 1 + lib/librte_vhost/vdpa.c| 6 + 10 files changed, 635 insertions(+), 1 deletion(-) create mode 100644 doc/guides/sample_app_ug/vdpa.rst create mode 100644 examples/vdpa/Makefile create mode 100644 examples/vdpa/main.c create mode 100644 examples/vdpa/meson.build -- 2.17.1
[dpdk-dev] [PATCH v4 1/2] vhost: introduce API to get vDPA device number
It's used to get number of available registered vDPA devices.
Signed-off-by: Xiaolong Ye
---
lib/librte_vhost/rte_vdpa.h| 3 +++
lib/librte_vhost/rte_vhost_version.map | 1 +
lib/librte_vhost/vdpa.c| 6 ++
3 files changed, 10 insertions(+)
diff --git a/lib/librte_vhost/rte_vdpa.h b/lib/librte_vhost/rte_vdpa.h
index 90465ca26..b8223e337 100644
--- a/lib/librte_vhost/rte_vdpa.h
+++ b/lib/librte_vhost/rte_vdpa.h
@@ -84,4 +84,7 @@ rte_vdpa_find_device_id(struct rte_vdpa_dev_addr *addr);
struct rte_vdpa_device * __rte_experimental
rte_vdpa_get_device(int did);
+/* Get current available vdpa device number */
+int __rte_experimental
+rte_vdpa_get_device_num(void);
#endif /* _RTE_VDPA_H_ */
diff --git a/lib/librte_vhost/rte_vhost_version.map
b/lib/librte_vhost/rte_vhost_version.map
index da220dd02..ae39b6e21 100644
--- a/lib/librte_vhost/rte_vhost_version.map
+++ b/lib/librte_vhost/rte_vhost_version.map
@@ -67,6 +67,7 @@ EXPERIMENTAL {
rte_vdpa_unregister_device;
rte_vdpa_find_device_id;
rte_vdpa_get_device;
+ rte_vdpa_get_device_num;
rte_vhost_driver_attach_vdpa_device;
rte_vhost_driver_detach_vdpa_device;
rte_vhost_driver_get_vdpa_device_id;
diff --git a/lib/librte_vhost/vdpa.c b/lib/librte_vhost/vdpa.c
index c82fd4370..c2c5dff1d 100644
--- a/lib/librte_vhost/vdpa.c
+++ b/lib/librte_vhost/vdpa.c
@@ -113,3 +113,9 @@ rte_vdpa_get_device(int did)
return vdpa_devices[did];
}
+
+int
+rte_vdpa_get_device_num(void)
+{
+ return vdpa_device_num;
+}
--
2.17.1
[dpdk-dev] [PATCH v4 2/2] examples/vdpa: introduce a new sample for vDPA
The vdpa sample application creates vhost-user sockets by using the vDPA backend. vDPA stands for vhost Data Path Acceleration which utilizes virtio ring compatible devices to serve virtio driver directly to enable datapath acceleration. As vDPA driver can help to set up vhost datapath, this application doesn't need to launch dedicated worker threads for vhost enqueue/dequeue operations. Signed-off-by: Xiao Wang Signed-off-by: Xiaolong Ye --- MAINTAINERS| 2 + doc/guides/rel_notes/release_18_11.rst | 8 + doc/guides/sample_app_ug/index.rst | 1 + doc/guides/sample_app_ug/vdpa.rst | 118 +++ examples/Makefile | 2 +- examples/vdpa/Makefile | 32 ++ examples/vdpa/main.c | 466 + examples/vdpa/meson.build | 16 + 8 files changed, 644 insertions(+), 1 deletion(-) create mode 100644 doc/guides/sample_app_ug/vdpa.rst create mode 100644 examples/vdpa/Makefile create mode 100644 examples/vdpa/main.c create mode 100644 examples/vdpa/meson.build diff --git a/MAINTAINERS b/MAINTAINERS index 5967c1dd3..5656f18e8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -683,6 +683,8 @@ F: doc/guides/sample_app_ug/vhost.rst F: examples/vhost_scsi/ F: doc/guides/sample_app_ug/vhost_scsi.rst F: examples/vhost_crypto/ +F: examples/vdpa/ +F: doc/guides/sample_app_ug/vdpa.rst Vhost PMD M: Maxime Coquelin diff --git a/doc/guides/rel_notes/release_18_11.rst b/doc/guides/rel_notes/release_18_11.rst index bc9b74ec4..dd53a9ecf 100644 --- a/doc/guides/rel_notes/release_18_11.rst +++ b/doc/guides/rel_notes/release_18_11.rst @@ -67,6 +67,14 @@ New Features SR-IOV option in Hyper-V and Azure. This is an alternative to the previous vdev_netvsc, tap, and failsafe drivers combination. +* **Add a new sample for vDPA** + + The vdpa sample application creates vhost-user sockets by using the + vDPA backend. vDPA stands for vhost Data Path Acceleration which utilizes + virtio ring compatible devices to serve virtio driver directly to enable + datapath acceleration. As vDPA driver can help to set up vhost datapath, + this application doesn't need to launch dedicated worker threads for vhost + enqueue/dequeue operations. API Changes --- diff --git a/doc/guides/sample_app_ug/index.rst b/doc/guides/sample_app_ug/index.rst index 5bedf4f6f..74b12af85 100644 --- a/doc/guides/sample_app_ug/index.rst +++ b/doc/guides/sample_app_ug/index.rst @@ -45,6 +45,7 @@ Sample Applications User Guides vhost vhost_scsi vhost_crypto +vdpa netmap_compatibility ip_pipeline test_pipeline diff --git a/doc/guides/sample_app_ug/vdpa.rst b/doc/guides/sample_app_ug/vdpa.rst new file mode 100644 index 0..d05728a37 --- /dev/null +++ b/doc/guides/sample_app_ug/vdpa.rst @@ -0,0 +1,118 @@ +.. SPDX-License-Identifier: BSD-3-Clause +Copyright(c) 2018 Intel Corporation. + +Vdpa Sample Application +=== + +The vdpa sample application creates vhost-user sockets by using the +vDPA backend. vDPA stands for vhost Data Path Acceleration which utilizes +virtio ring compatible devices to serve virtio driver directly to enable +datapath acceleration. As vDPA driver can help to set up vhost datapath, +this application doesn't need to launch dedicated worker threads for vhost +enqueue/dequeue operations. + +Testing steps +- + +This section shows the steps of how to start VMs with vDPA vhost-user +backend and verify network connection & live migration. + +Build +~ + +To compile the sample application see :doc:`compiling`. + +The application is located in the ``vdpa`` sub-directory. + +Start the vdpa example +~~ + +.. code-block:: console + +./vdpa [EAL options] -- [--client] [--interactive|-i] or [--iface SOCKET_PATH] + +where + +* --client means running vdpa app in client mode, in the client mode, QEMU needs + to run as the server mode and take charge of socket file creation. +* --iface specifies the path prefix of the UNIX domain socket file, e.g. + /tmp/vhost-user-, then the socket files will be named as /tmp/vhost-user- + (n starts from 0). +* --interactive means run the vdpa sample in interactive mode, currently 4 + internal cmds are supported: + + 1. help: show help message + 2. list: list all available vdpa devices + 3. create: create a new vdpa port with socket file and vdpa device address + 4. quit: unregister vhost driver and exit the application + +Take IFCVF driver for example: + +.. code-block:: console + +./vdpa --log-level=9 -c 0x6 -n 4 --socket-mem 1024,1024 \ +-w :06:00.3,vdpa=1 -w :06:00.4,vdpa=1 \ +-- --interactive + +.. note:: +We need to bind vfio-pci to VFs before running vdpa sample. + +* modprobe vfio-pci +* ./usertools/dpdk-devbind.py -b vfio-pci 06:00.3 06:00.4 + +Then we can create 2 vdpa ports in interactive cmd
Re: [dpdk-dev] [PATCH v4 2/2] examples/vdpa: introduce a new sample for vDPA
Hi Xiaolong, Thanks for the update, 2 small comments below. > -Original Message- > From: Ye, Xiaolong > Sent: Monday, September 24, 2018 4:43 PM > To: dev@dpdk.org; Maxime Coquelin ; Bie, > Tiwei ; Wang, Zhihong > Cc: Wang, Xiao W ; Rami Rosen > ; Wang, Haiyue ; Ye, > Xiaolong > Subject: [PATCH v4 2/2] examples/vdpa: introduce a new sample for vDPA > > The vdpa sample application creates vhost-user sockets by using the > vDPA backend. vDPA stands for vhost Data Path Acceleration which utilizes > virtio ring compatible devices to serve virtio driver directly to enable > datapath acceleration. As vDPA driver can help to set up vhost datapath, > this application doesn't need to launch dedicated worker threads for vhost > enqueue/dequeue operations. > > Signed-off-by: Xiao Wang > Signed-off-by: Xiaolong Ye > --- > MAINTAINERS| 2 + > doc/guides/rel_notes/release_18_11.rst | 8 + > doc/guides/sample_app_ug/index.rst | 1 + > doc/guides/sample_app_ug/vdpa.rst | 118 +++ > examples/Makefile | 2 +- > examples/vdpa/Makefile | 32 ++ > examples/vdpa/main.c | 466 + > examples/vdpa/meson.build | 16 + > 8 files changed, 644 insertions(+), 1 deletion(-) > create mode 100644 doc/guides/sample_app_ug/vdpa.rst > create mode 100644 examples/vdpa/Makefile > create mode 100644 examples/vdpa/main.c > create mode 100644 examples/vdpa/meson.build > > diff --git a/MAINTAINERS b/MAINTAINERS > index 5967c1dd3..5656f18e8 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -683,6 +683,8 @@ F: doc/guides/sample_app_ug/vhost.rst > F: examples/vhost_scsi/ > F: doc/guides/sample_app_ug/vhost_scsi.rst > F: examples/vhost_crypto/ > +F: examples/vdpa/ > +F: doc/guides/sample_app_ug/vdpa.rst > > Vhost PMD > M: Maxime Coquelin > diff --git a/doc/guides/rel_notes/release_18_11.rst > b/doc/guides/rel_notes/release_18_11.rst > index bc9b74ec4..dd53a9ecf 100644 > --- a/doc/guides/rel_notes/release_18_11.rst > +++ b/doc/guides/rel_notes/release_18_11.rst > @@ -67,6 +67,14 @@ New Features >SR-IOV option in Hyper-V and Azure. This is an alternative to the previous >vdev_netvsc, tap, and failsafe drivers combination. > > +* **Add a new sample for vDPA** > + > + The vdpa sample application creates vhost-user sockets by using the > + vDPA backend. vDPA stands for vhost Data Path Acceleration which utilizes > + virtio ring compatible devices to serve virtio driver directly to enable > + datapath acceleration. As vDPA driver can help to set up vhost datapath, > + this application doesn't need to launch dedicated worker threads for vhost > + enqueue/dequeue operations. > > API Changes > --- > diff --git a/doc/guides/sample_app_ug/index.rst > b/doc/guides/sample_app_ug/index.rst > index 5bedf4f6f..74b12af85 100644 > --- a/doc/guides/sample_app_ug/index.rst > +++ b/doc/guides/sample_app_ug/index.rst > @@ -45,6 +45,7 @@ Sample Applications User Guides > vhost > vhost_scsi > vhost_crypto > +vdpa > netmap_compatibility > ip_pipeline > test_pipeline > diff --git a/doc/guides/sample_app_ug/vdpa.rst > b/doc/guides/sample_app_ug/vdpa.rst > new file mode 100644 > index 0..d05728a37 > --- /dev/null > +++ b/doc/guides/sample_app_ug/vdpa.rst > @@ -0,0 +1,118 @@ > +.. SPDX-License-Identifier: BSD-3-Clause > +Copyright(c) 2018 Intel Corporation. > + > +Vdpa Sample Application > +=== > + > +The vdpa sample application creates vhost-user sockets by using the > +vDPA backend. vDPA stands for vhost Data Path Acceleration which utilizes > +virtio ring compatible devices to serve virtio driver directly to enable > +datapath acceleration. As vDPA driver can help to set up vhost datapath, > +this application doesn't need to launch dedicated worker threads for vhost > +enqueue/dequeue operations. > + > +Testing steps > +- > + > +This section shows the steps of how to start VMs with vDPA vhost-user > +backend and verify network connection & live migration. > + > +Build > +~ > + > +To compile the sample application see :doc:`compiling`. > + > +The application is located in the ``vdpa`` sub-directory. > + > +Start the vdpa example > +~~ > + > +.. code-block:: console > + > +./vdpa [EAL options] -- [--client] [--interactive|-i] or [--iface > SOCKET_PATH] > + > +where > + > +* --client means running vdpa app in client mode, in the client mode, QEMU > needs > + to run as the server mode and take charge of socket file creation. > +* --iface specifies the path prefix of the UNIX domain socket file, e.g. > + /tmp/vhost-user-, then the socket files will be named as > /tmp/vhost-user- > + (n starts from 0). > +* --interactive means run the vdpa sample in interactive mode, currently 4 > + internal cmds are supported: > + > + 1. help: show help message > + 2. list: list all av
Re: [dpdk-dev] [PATCH 07/21] net/atlantic: hardware register access routines
Hi Igor, On 9/7/2018 8:51 PM, Igor Russkikh wrote: Signed-off-by: Igor Russkikh --- drivers/net/atlantic/atl_hw_regs.c | 58 + drivers/net/atlantic/atl_hw_regs.h | 59 ++ 2 files changed, 117 insertions(+) create mode 100644 drivers/net/atlantic/atl_hw_regs.c create mode 100644 drivers/net/atlantic/atl_hw_regs.h diff --git a/drivers/net/atlantic/atl_hw_regs.c b/drivers/net/atlantic/atl_hw_regs.c new file mode 100644 index 0..7301d08e7 --- /dev/null +++ b/drivers/net/atlantic/atl_hw_regs.c @@ -0,0 +1,58 @@ +/* + * aQuantia Corporation Network Driver + * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + */ DPDK is a open source BSD-3 licensed framework. GPL license files are not allowed in DPDK unless: 1. They are part of kernel module (e.g. KNI) 2. They are dual licensed and they support BSD-3 license as well. So, please submit single or dual BSD-3 licensed source code.
