[dpdk-dev] [PATCH v1 00/30] Enhancements and fixes in NXP dpaax drivers and fsl-mc bus
This patch set adds following enhancements: 1. IEEE1588 support in net/dpaa2 2. Interrupt support in net/dpaa 3. Support multi vfio group in fsl-mc bus 4. Taildrop support on frame count basis 5. Soft parser driver in net/dpaa2 6. Enhanced debug information Hemant Agrawal (14): bus/dpaa: fix DPAA SEC blacklist case net/dpaa: improve the Rx offload debug message net/dpaa: reduce debug messages net/dpaa2: improve the Rx offload debug message common/dpaax: reduce debug mesages mempool/dpaa: reduce debug messages net/dpaa2: realign Rx offload support types net/dpaa2: enable Rx offload for timestamp net/dpaa2: support L2 payload based RSS distribution net/dpaa2: add taildrop support on frame count basis net/dpaa2: add cgr counters in xtra stats net/dpaa2: add support for config max Rx length in HW net/dpaa2: support dpdmux classification on eth type bus/fslmc: support multi vfio group Nipun Gupta (6): bus/dpaa: remove un-necessary thread affinity bus/dpaa: decouple fq portal alloc and init net/dpaa: support Rx interrupt handler net/dpaa: support for Rx interrupt enable and disable net/dpaa: add SG support in Tx for non DPAA buffer net/dpaa2: add optional non-prefetch Rx mode Priyanka Jain (4): net/dpaa2: add Tx confirmation mode support net/dpaa2: add timestamp support net/dpaa2: add dprtc sub-module net/dpaa2: add ptp driver Sachin Saxena (1): net/dpaa2: use LFQIDs in Tx instead of qdid Shreyansh Jain (3): bus/fslmc: update PA-VA dpaax library only in PA mode bus/fslmc: check for Dma map in primary process only net/dpaa2: support separate MC portal per process Sunil Kumar Kori (2): net/dpaa2: add support for soft parser in MC net/dpaa2: add soft parser driver config/defconfig_arm64-dpaa2-linuxapp-gcc| 3 + doc/guides/cryptodevs/dpaa_sec.rst | 6 +- doc/guides/nics/dpaa2.rst| 4 + drivers/bus/dpaa/base/qbman/qman.c | 80 ++- drivers/bus/dpaa/base/qbman/qman_driver.c| 104 ++-- drivers/bus/dpaa/base/qbman/qman_priv.h | 15 +- drivers/bus/dpaa/dpaa_bus.c | 32 +- drivers/bus/dpaa/include/fsl_qman.h | 21 +- drivers/bus/dpaa/include/fsl_usd.h | 7 +- drivers/bus/dpaa/rte_bus_dpaa_version.map| 10 + drivers/bus/dpaa/rte_dpaa_bus.h | 1 + drivers/bus/fslmc/fslmc_bus.c| 32 +- drivers/bus/fslmc/fslmc_vfio.c | 162 -- drivers/bus/fslmc/fslmc_vfio.h | 3 + drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 7 +- drivers/bus/fslmc/rte_fslmc.h| 1 + drivers/common/dpaax/dpaax_iova_table.c | 15 +- drivers/crypto/dpaa_sec/dpaa_sec.c | 3 +- drivers/mempool/dpaa/dpaa_mempool.c | 4 +- drivers/net/dpaa/dpaa_ethdev.c | 110 +++- drivers/net/dpaa/dpaa_rxtx.c | 192 +++ drivers/net/dpaa2/Makefile | 3 + drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h | 24 +- drivers/net/dpaa2/dpaa2_ethdev.c | 456 drivers/net/dpaa2/dpaa2_ethdev.h | 49 +- drivers/net/dpaa2/dpaa2_mux.c| 84 ++- drivers/net/dpaa2/dpaa2_ptp.c| 181 +++ drivers/net/dpaa2/dpaa2_rxtx.c | 284 +- drivers/net/dpaa2/dpaa2_sparser.c| 269 ++ drivers/net/dpaa2/dpaa2_sparser.h| 206 drivers/net/dpaa2/mc/dpni.c | 117 + drivers/net/dpaa2/mc/dprtc.c | 523 +++ drivers/net/dpaa2/mc/fsl_dpni.h | 133 + drivers/net/dpaa2/mc/fsl_dpni_cmd.h | 43 +- drivers/net/dpaa2/mc/fsl_dprtc.h | 109 drivers/net/dpaa2/mc/fsl_dprtc_cmd.h | 91 drivers/net/dpaa2/meson.build| 6 + 37 files changed, 2971 insertions(+), 419 deletions(-) create mode 100644 drivers/net/dpaa2/dpaa2_ptp.c create mode 100644 drivers/net/dpaa2/dpaa2_sparser.c create mode 100644 drivers/net/dpaa2/dpaa2_sparser.h create mode 100644 drivers/net/dpaa2/mc/dprtc.c create mode 100644 drivers/net/dpaa2/mc/fsl_dprtc.h create mode 100644 drivers/net/dpaa2/mc/fsl_dprtc_cmd.h -- 2.17.1
[dpdk-dev] [PATCH v1 02/30] net/dpaa: improve the Rx offload debug message
From: Hemant Agrawal
This patch also align few RX offload support to right category.
Signed-off-by: Hemant Agrawal
Reviewed-by: Sachin Saxena
---
drivers/net/dpaa/dpaa_ethdev.c | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 7154fb9b4..7f5a8ac3b 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -59,7 +59,9 @@ static uint64_t dev_rx_offloads_nodis =
DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM;
/* Supported Tx offloads */
-static uint64_t dev_tx_offloads_sup;
+static uint64_t dev_tx_offloads_sup =
+ DEV_TX_OFFLOAD_MT_LOCKFREE |
+ DEV_TX_OFFLOAD_MBUF_FAST_FREE;
/* Tx offloads which cannot be disabled */
static uint64_t dev_tx_offloads_nodis =
@@ -68,9 +70,7 @@ static uint64_t dev_tx_offloads_nodis =
DEV_TX_OFFLOAD_TCP_CKSUM |
DEV_TX_OFFLOAD_SCTP_CKSUM |
DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
- DEV_TX_OFFLOAD_MULTI_SEGS |
- DEV_TX_OFFLOAD_MT_LOCKFREE |
- DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+ DEV_TX_OFFLOAD_MULTI_SEGS;
/* Keep track of whether QMAN and BMAN have been globally initialized */
static int is_global_init;
@@ -196,20 +196,20 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
PMD_INIT_FUNC_TRACE();
- /* Rx offloads validation */
+ /* Rx offloads which are enabled by default */
if (dev_rx_offloads_nodis & ~rx_offloads) {
- DPAA_PMD_WARN(
- "Rx offloads non configurable - requested 0x%" PRIx64
- " ignored 0x%" PRIx64,
- rx_offloads, dev_rx_offloads_nodis);
+ DPAA_PMD_INFO(
+ "Some of rx offloads enabled by default - requested 0x%" PRIx64
+ " fixed are 0x%" PRIx64,
+ rx_offloads, dev_rx_offloads_nodis);
}
- /* Tx offloads validation */
+ /* Tx offloads which are enabled by default */
if (dev_tx_offloads_nodis & ~tx_offloads) {
- DPAA_PMD_WARN(
- "Tx offloads non configurable - requested 0x%" PRIx64
- " ignored 0x%" PRIx64,
- tx_offloads, dev_tx_offloads_nodis);
+ DPAA_PMD_INFO(
+ "Some of tx offloads enabled by default - requested 0x%" PRIx64
+ " fixed are 0x%" PRIx64,
+ tx_offloads, dev_tx_offloads_nodis);
}
if (rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) {
--
2.17.1
[dpdk-dev] [PATCH v1 01/30] bus/dpaa: fix DPAA SEC blacklist case
From: Hemant Agrawal
The black list of dpaa_sec devices fails.
EAL: failed to parse device "dpaa:dpaa_sec-1"
This patch address following issues:
- bus usages dpaa-sec while the driver usage dpaa_sec
- bus usages numbers from 0 to MAX_SEC - while driver
probe usages sec number form max-fman_device +1
Fixes: 6e0752205bb2 ("bus/dpaa: support device blacklisting")
Cc: sta...@dpdk.org
Signed-off-by: Hemant Agrawal
Reviewed-by: Sachin Saxena
---
doc/guides/cryptodevs/dpaa_sec.rst | 6 +++---
drivers/bus/dpaa/dpaa_bus.c| 6 +++---
drivers/crypto/dpaa_sec/dpaa_sec.c | 3 +--
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/doc/guides/cryptodevs/dpaa_sec.rst
b/doc/guides/cryptodevs/dpaa_sec.rst
index 0a2600634..3a3e30aaf 100644
--- a/doc/guides/cryptodevs/dpaa_sec.rst
+++ b/doc/guides/cryptodevs/dpaa_sec.rst
@@ -85,11 +85,11 @@ For blacklisting a DPAA device, following commands can be
used.
.. code-block:: console
- -b "dpaa_bus:dpaa-secX" -- ...
-e.g. "dpaa_bus:dpaa-sec0"
+ -b "dpaa:dpaa_sec-X" -- ...
+e.g. "dpaa:dpaa_sec-1"
or to disable all 4 SEC devices
--b "dpaa_sec:dpaa-sec0" -b "dpaa_sec:dpaa-sec1" -b "dpaa_sec:dpaa-sec2"
-b "dpaa_sec:dpaa-sec3"
+-b "dpaa:dpaa_sec-1" -b "dpaa:dpaa_sec-2" -b "dpaa:dpaa_sec-3" -b
"dpaa:dpaa_sec-4"
Limitations
---
diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index 07cc5c667..f7d1a5b63 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -218,7 +218,7 @@ dpaa_create_device_list(void)
* allocated for dev->name/
*/
memset(dev->name, 0, RTE_ETH_NAME_MAX_LEN);
- sprintf(dev->name, "dpaa-sec%d", i);
+ sprintf(dev->name, "dpaa_sec-%d", i+1);
DPAA_BUS_LOG(INFO, "%s cryptodev added", dev->name);
dev->device.name = dev->name;
dev->device.devargs = dpaa_devargs_lookup(dev);
@@ -397,7 +397,7 @@ rte_dpaa_bus_parse(const char *name, void *out_name)
* without separator. Both need to be handled.
* It is also possible that "name=fm1-mac3" is passed along.
*/
- DPAA_BUS_DEBUG("Parse device name (%s)\n", name);
+ DPAA_BUS_DEBUG("Parse device name (%s)", name);
/* Check for dpaa_bus:fm1-mac3 style */
dup_name = strdup(name);
@@ -428,7 +428,7 @@ rte_dpaa_bus_parse(const char *name, void *out_name)
for (i = 0; i < RTE_LIBRTE_DPAA_MAX_CRYPTODEV; i++) {
char sec_name[16];
- snprintf(sec_name, 16, "dpaa-sec%d", i);
+ snprintf(sec_name, 16, "dpaa_sec-%d", i+1);
if (strcmp(sec_name, sep) == 0) {
if (out_name)
strcpy(out_name, sep);
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c
b/drivers/crypto/dpaa_sec/dpaa_sec.c
index 122c80a07..1754862be 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -2678,8 +2678,7 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv
__rte_unused,
int retval;
- snprintf(cryptodev_name, sizeof(cryptodev_name), "dpaa_sec-%d",
- dpaa_dev->id.dev_id);
+ snprintf(cryptodev_name, sizeof(cryptodev_name), "%s", dpaa_dev->name);
cryptodev = rte_cryptodev_pmd_allocate(cryptodev_name, rte_socket_id());
if (cryptodev == NULL)
--
2.17.1
[dpdk-dev] [PATCH v1 03/30] bus/dpaa: remove un-necessary thread affinity
From: Nipun Gupta
Thread affinity is already taken care by DPDK. Remove them from bus.
Signed-off-by: Nipun Gupta
---
drivers/bus/dpaa/base/qbman/qman_driver.c | 56 ++-
drivers/bus/dpaa/dpaa_bus.c | 13 --
2 files changed, 3 insertions(+), 66 deletions(-)
diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c
b/drivers/bus/dpaa/base/qbman/qman_driver.c
index ba153396d..5c773669a 100644
--- a/drivers/bus/dpaa/base/qbman/qman_driver.c
+++ b/drivers/bus/dpaa/base/qbman/qman_driver.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)
*
* Copyright 2008-2016 Freescale Semiconductor Inc.
- * Copyright 2017 NXP
+ * Copyright 2017,2019 NXP
*
*/
@@ -32,31 +32,9 @@ static __thread struct dpaa_ioctl_portal_map map = {
static int fsl_qman_portal_init(uint32_t index, int is_shared)
{
- cpu_set_t cpuset;
struct qman_portal *portal;
- int loop, ret;
struct dpaa_ioctl_irq_map irq_map;
-
- /* Verify the thread's cpu-affinity */
- ret = pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t),
-&cpuset);
- if (ret) {
- error(0, ret, "pthread_getaffinity_np()");
- return ret;
- }
- qpcfg.cpu = -1;
- for (loop = 0; loop < CPU_SETSIZE; loop++)
- if (CPU_ISSET(loop, &cpuset)) {
- if (qpcfg.cpu != -1) {
- pr_err("Thread is not affine to 1 cpu\n");
- return -EINVAL;
- }
- qpcfg.cpu = loop;
- }
- if (qpcfg.cpu == -1) {
- pr_err("Bug in getaffinity handling!\n");
- return -EINVAL;
- }
+ int ret;
/* Allocate and map a qman portal */
map.index = index;
@@ -145,14 +123,11 @@ void qman_thread_irq(void)
struct qman_portal *fsl_qman_portal_create(void)
{
- cpu_set_t cpuset;
struct qman_portal *res;
-
struct qm_portal_config *q_pcfg;
- int loop, ret;
struct dpaa_ioctl_irq_map irq_map;
struct dpaa_ioctl_portal_map q_map = {0};
- int q_fd;
+ int q_fd, ret;
q_pcfg = kzalloc((sizeof(struct qm_portal_config)), 0);
if (!q_pcfg) {
@@ -160,31 +135,6 @@ struct qman_portal *fsl_qman_portal_create(void)
return NULL;
}
- /* Verify the thread's cpu-affinity */
- ret = pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t),
-&cpuset);
- if (ret) {
- error(0, ret, "pthread_getaffinity_np()");
- kfree(q_pcfg);
- return NULL;
- }
-
- q_pcfg->cpu = -1;
- for (loop = 0; loop < CPU_SETSIZE; loop++)
- if (CPU_ISSET(loop, &cpuset)) {
- if (q_pcfg->cpu != -1) {
- pr_err("Thread is not affine to 1 cpu\n");
- kfree(q_pcfg);
- return NULL;
- }
- q_pcfg->cpu = loop;
- }
- if (q_pcfg->cpu == -1) {
- pr_err("Bug in getaffinity handling!\n");
- kfree(q_pcfg);
- return NULL;
- }
-
/* Allocate and map a qman portal */
q_map.type = dpaa_portal_qman;
q_map.index = QBMAN_ANY_PORTAL_IDX;
diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index f7d1a5b63..b0e68c4a4 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -250,11 +250,9 @@ dpaa_clean_device_list(void)
int rte_dpaa_portal_init(void *arg)
{
- pthread_t id;
unsigned int cpu, lcore = rte_lcore_id();
int ret;
struct dpaa_portal *dpaa_io_portal;
- rte_cpuset_t cpuset;
BUS_INIT_FUNC_TRACE();
@@ -266,17 +264,6 @@ int rte_dpaa_portal_init(void *arg)
cpu = rte_lcore_to_cpu_id(lcore);
- /* Set CPU affinity for this thread.*/
- id = pthread_self();
- cpuset = rte_lcore_cpuset(lcore);
- ret = pthread_setaffinity_np(id, sizeof(cpu_set_t),
-&cpuset);
- if (ret) {
- DPAA_BUS_LOG(ERR, "pthread_setaffinity_np failed on core :%u"
-" (lcore=%u) with ret: %d", cpu, lcore, ret);
- return ret;
- }
-
/* Initialise bman thread portals */
ret = bman_thread_init();
if (ret) {
--
2.17.1
[dpdk-dev] [PATCH v1 04/30] bus/dpaa: decouple fq portal alloc and init
From: Nipun Gupta
The decoupling of FQ portal allocation is required as a
pre-requisite to support Rx interrupts as we need to have
event FD's at portal allocation i.e. before the
initialization of the Frame Queues.
This change will help us get the event fd once the portals
have been allocated for static FQ's.
Signed-off-by: Nipun Gupta
---
drivers/bus/dpaa/base/qbman/qman.c| 35 -
drivers/bus/dpaa/base/qbman/qman_driver.c | 46 ---
drivers/bus/dpaa/base/qbman/qman_priv.h | 13 +--
drivers/bus/dpaa/dpaa_bus.c | 13 +++
drivers/bus/dpaa/include/fsl_qman.h | 3 +-
drivers/bus/dpaa/include/fsl_usd.h| 6 ++-
drivers/bus/dpaa/rte_bus_dpaa_version.map | 7
drivers/net/dpaa/dpaa_ethdev.c| 10 +
drivers/net/dpaa/dpaa_rxtx.c | 3 +-
9 files changed, 90 insertions(+), 46 deletions(-)
diff --git a/drivers/bus/dpaa/base/qbman/qman.c
b/drivers/bus/dpaa/base/qbman/qman.c
index c6f7d7bb3..79017f7f2 100644
--- a/drivers/bus/dpaa/base/qbman/qman.c
+++ b/drivers/bus/dpaa/base/qbman/qman.c
@@ -498,11 +498,10 @@ static inline void qm_mr_pvb_update(struct qm_portal
*portal)
dcbit_ro(res);
}
-static inline
-struct qman_portal *qman_create_portal(
- struct qman_portal *portal,
- const struct qm_portal_config *c,
- const struct qman_cgrs *cgrs)
+struct qman_portal *
+qman_init_portal(struct qman_portal *portal,
+ const struct qm_portal_config *c,
+ const struct qman_cgrs *cgrs)
{
struct qm_portal *p;
char buf[16];
@@ -511,6 +510,9 @@ struct qman_portal *qman_create_portal(
p = &portal->p;
+ if (!c)
+ c = portal->config;
+
if (dpaa_svr_family == SVR_LS1043A_FAMILY)
portal->use_eqcr_ci_stashing = 3;
else
@@ -632,21 +634,23 @@ struct qman_portal *qman_create_portal(
static struct qman_portal global_portals[MAX_GLOBAL_PORTALS];
static rte_atomic16_t global_portals_used[MAX_GLOBAL_PORTALS];
-static struct qman_portal *
-qman_alloc_global_portal(void)
+struct qman_portal *
+qman_alloc_global_portal(struct qm_portal_config *q_pcfg)
{
unsigned int i;
for (i = 0; i < MAX_GLOBAL_PORTALS; i++) {
- if (rte_atomic16_test_and_set(&global_portals_used[i]))
+ if (rte_atomic16_test_and_set(&global_portals_used[i])) {
+ global_portals[i].config = q_pcfg;
return &global_portals[i];
+ }
}
pr_err("No portal available (%x)\n", MAX_GLOBAL_PORTALS);
return NULL;
}
-static int
+int
qman_free_global_portal(struct qman_portal *portal)
{
unsigned int i;
@@ -661,22 +665,15 @@ qman_free_global_portal(struct qman_portal *portal)
}
struct qman_portal *qman_create_affine_portal(const struct qm_portal_config *c,
- const struct qman_cgrs *cgrs,
- int alloc)
+ const struct qman_cgrs *cgrs)
{
struct qman_portal *res;
- struct qman_portal *portal;
-
- if (alloc)
- portal = qman_alloc_global_portal();
- else
- portal = get_affine_portal();
+ struct qman_portal *portal = get_affine_portal();
/* A criteria for calling this function (from qman_driver.c) is that
* we're already affine to the cpu and won't schedule onto another cpu.
*/
-
- res = qman_create_portal(portal, c, cgrs);
+ res = qman_init_portal(portal, c, cgrs);
if (res) {
spin_lock(&affine_mask_lock);
CPU_SET(c->cpu, &affine_mask);
diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c
b/drivers/bus/dpaa/base/qbman/qman_driver.c
index 5c773669a..06ed814e1 100644
--- a/drivers/bus/dpaa/base/qbman/qman_driver.c
+++ b/drivers/bus/dpaa/base/qbman/qman_driver.c
@@ -62,7 +62,7 @@ static int fsl_qman_portal_init(uint32_t index, int is_shared)
qpcfg.node = NULL;
qpcfg.irq = qmfd;
- portal = qman_create_affine_portal(&qpcfg, NULL, 0);
+ portal = qman_create_affine_portal(&qpcfg, NULL);
if (!portal) {
pr_err("Qman portal initialisation failed (%d)\n",
qpcfg.cpu);
@@ -121,13 +121,13 @@ void qman_thread_irq(void)
out_be32(qpcfg.addr_virt[DPAA_PORTAL_CI] + 0x36C0, 0);
}
-struct qman_portal *fsl_qman_portal_create(void)
+struct qman_portal *fsl_qman_fq_portal_create(void)
{
- struct qman_portal *res;
+ struct qman_portal *portal = NULL;
struct qm_portal_config *q_pcfg;
struct dpaa_ioctl_irq_map irq_map;
struct dpaa_ioctl_portal_map q_map = {0};
- int q_fd, ret;
+ int q_fd = 0, ret;
q_pcfg = kzalloc((sizeof(struct qm_portal_config)), 0
[dpdk-dev] [PATCH v1 05/30] net/dpaa: support Rx interrupt handler
From: Nipun Gupta
This patch adds interrupt handler support for
the ethernet devices which are configured with
a dedicated portal for packet Rx
(i.e. for FQ's in push mode).
Signed-off-by: Nipun Gupta
---
drivers/bus/dpaa/base/qbman/qman_driver.c | 3 ++-
drivers/bus/dpaa/include/fsl_qman.h | 18 +-
drivers/bus/dpaa/include/fsl_usd.h| 2 +-
drivers/bus/dpaa/rte_dpaa_bus.h | 1 +
drivers/net/dpaa/dpaa_ethdev.c| 29 +--
5 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c
b/drivers/bus/dpaa/base/qbman/qman_driver.c
index 06ed814e1..acd003143 100644
--- a/drivers/bus/dpaa/base/qbman/qman_driver.c
+++ b/drivers/bus/dpaa/base/qbman/qman_driver.c
@@ -121,7 +121,7 @@ void qman_thread_irq(void)
out_be32(qpcfg.addr_virt[DPAA_PORTAL_CI] + 0x36C0, 0);
}
-struct qman_portal *fsl_qman_fq_portal_create(void)
+struct qman_portal *fsl_qman_fq_portal_create(int *fd)
{
struct qman_portal *portal = NULL;
struct qm_portal_config *q_pcfg;
@@ -171,6 +171,7 @@ struct qman_portal *fsl_qman_fq_portal_create(void)
irq_map.portal_cinh = q_map.addr.cinh;
process_portal_irq_map(q_fd, &irq_map);
+ *fd = q_fd;
return portal;
err:
if (portal)
diff --git a/drivers/bus/dpaa/include/fsl_qman.h
b/drivers/bus/dpaa/include/fsl_qman.h
index 5f13a5544..064b65aed 100644
--- a/drivers/bus/dpaa/include/fsl_qman.h
+++ b/drivers/bus/dpaa/include/fsl_qman.h
@@ -1215,6 +1215,9 @@ struct qman_fq {
struct qman_fq_cb cb;
u32 fqid_le;
+ u32 fqid;
+
+ int q_fd;
u16 ch_id;
u8 cgr_groupid;
u8 is_static:4;
@@ -1231,7 +1234,6 @@ struct qman_fq {
volatile unsigned long flags;
enum qman_fq_state state;
- u32 fqid;
spinlock_t fqlock;
struct rb_node node;
@@ -1333,6 +1335,13 @@ u32 qman_portal_dequeue(struct rte_event ev[], unsigned
int poll_limit,
*/
int qman_irqsource_add(u32 bits);
+/**
+ * qman_fq_portal_irqsource_add - samilar to qman_irqsource_add, but it
+ * takes portal (fq specific) as input rather than using the thread affined
+ * portal.
+ */
+int qman_fq_portal_irqsource_add(struct qman_portal *p, u32 bits);
+
/**
* qman_irqsource_remove - remove processing sources from being
interrupt-driven
* @bits: bitmask of QM_PIRQ_**I processing sources
@@ -1343,6 +1352,13 @@ int qman_irqsource_add(u32 bits);
*/
int qman_irqsource_remove(u32 bits);
+/**
+ * qman_fq_portal_irqsource_remove - similar to qman_irqsource_remove, but it
+ * takes portal (fq specific) as input rather than using the thread affined
+ * portal.
+ */
+int qman_fq_portal_irqsource_remove(struct qman_portal *p, u32 bits);
+
/**
* qman_affine_channel - return the channel ID of an portal
* @cpu: the cpu whose affine portal is the subject of the query
diff --git a/drivers/bus/dpaa/include/fsl_usd.h
b/drivers/bus/dpaa/include/fsl_usd.h
index ea7be38af..a407e2b22 100644
--- a/drivers/bus/dpaa/include/fsl_usd.h
+++ b/drivers/bus/dpaa/include/fsl_usd.h
@@ -75,7 +75,7 @@ int qman_global_init(void);
int bman_global_init(void);
/* Direct portal create and destroy */
-struct qman_portal *fsl_qman_fq_portal_create(void);
+struct qman_portal *fsl_qman_fq_portal_create(int *fd);
int fsl_qman_fq_portal_destroy(struct qman_portal *qp);
int fsl_qman_fq_portal_init(struct qman_portal *qp);
diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h
index 554a56f2e..9601aebdd 100644
--- a/drivers/bus/dpaa/rte_dpaa_bus.h
+++ b/drivers/bus/dpaa/rte_dpaa_bus.h
@@ -75,6 +75,7 @@ struct rte_dpaa_device {
};
struct rte_dpaa_driver *driver;
struct dpaa_device_id id;
+ struct rte_intr_handle intr_handle;
enum rte_dpaa_type device_type; /**< Ethernet or crypto type device */
char name[RTE_ETH_NAME_MAX_LEN];
};
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 4e2c9471e..1934f85ae 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -628,8 +628,10 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
fman_if_get_sg_enable(dpaa_intf->fif),
dev->data->dev_conf.rxmode.max_rx_pkt_len);
/* checking if push mode only, no error check for now */
- if (dpaa_push_mode_max_queue > dpaa_push_queue_idx) {
+ if (!rxq->is_static &&
+ dpaa_push_mode_max_queue > dpaa_push_queue_idx) {
struct qman_portal *qp;
+ int q_fd;
dpaa_push_queue_idx++;
opts.we_mask = QM_INITFQ_WE_FQCTRL | QM_INITFQ_WE_CONTEXTA;
@@ -676,12 +678,35 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
rxq->is_static = true;
/* Allocate qman specific portals */
- qp = fsl_qman_fq_portal_create();
+
[dpdk-dev] [PATCH v1 06/30] net/dpaa: support for Rx interrupt enable and disable
From: Nipun Gupta
This patch adds support for dpaa eth driver
interrupt enable and disable callback functions.
Signed-off-by: Nipun Gupta
---
drivers/bus/dpaa/base/qbman/qman.c| 45 +++
drivers/bus/dpaa/base/qbman/qman_driver.c | 5 +++
drivers/bus/dpaa/base/qbman/qman_priv.h | 2 +
drivers/bus/dpaa/include/fsl_usd.h| 1 +
drivers/bus/dpaa/rte_bus_dpaa_version.map | 3 ++
drivers/net/dpaa/dpaa_ethdev.c| 39 +++-
6 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/drivers/bus/dpaa/base/qbman/qman.c
b/drivers/bus/dpaa/base/qbman/qman.c
index 79017f7f2..96208bc40 100644
--- a/drivers/bus/dpaa/base/qbman/qman.c
+++ b/drivers/bus/dpaa/base/qbman/qman.c
@@ -664,6 +664,12 @@ qman_free_global_portal(struct qman_portal *portal)
return -1;
}
+void
+qman_portal_uninhibit_isr(struct qman_portal *portal)
+{
+ qm_isr_uninhibit(&portal->p);
+}
+
struct qman_portal *qman_create_affine_portal(const struct qm_portal_config *c,
const struct qman_cgrs *cgrs)
{
@@ -1053,6 +1059,20 @@ int qman_irqsource_add(u32 bits)
dpaa_set_bits(bits, &p->irq_sources);
qm_isr_enable_write(&p->p, p->irq_sources);
+ return 0;
+}
+
+int qman_fq_portal_irqsource_add(struct qman_portal *p, u32 bits)
+{
+ bits = bits & QM_PIRQ_VISIBLE;
+
+ /* Clear any previously remaining interrupt conditions in
+* QCSP_ISR. This prevents raising a false interrupt when
+* interrupt conditions are enabled in QCSP_IER.
+*/
+ qm_isr_status_clear(&p->p, bits);
+ dpaa_set_bits(bits, &p->irq_sources);
+ qm_isr_enable_write(&p->p, p->irq_sources);
return 0;
}
@@ -1083,6 +1103,31 @@ int qman_irqsource_remove(u32 bits)
return 0;
}
+int qman_fq_portal_irqsource_remove(struct qman_portal *p, u32 bits)
+{
+ u32 ier;
+
+ /* Our interrupt handler only processes+clears status register bits that
+* are in p->irq_sources. As we're trimming that mask, if one of them
+* were to assert in the status register just before we remove it from
+* the enable register, there would be an interrupt-storm when we
+* release the IRQ lock. So we wait for the enable register update to
+* take effect in h/w (by reading it back) and then clear all other bits
+* in the status register. Ie. we clear them from ISR once it's certain
+* IER won't allow them to reassert.
+*/
+
+ bits &= QM_PIRQ_VISIBLE;
+ dpaa_clear_bits(bits, &p->irq_sources);
+ qm_isr_enable_write(&p->p, p->irq_sources);
+ ier = qm_isr_enable_read(&p->p);
+ /* Using "~ier" (rather than "bits" or "~p->irq_sources") creates a
+* data-dependency, ie. to protect against re-ordering.
+*/
+ qm_isr_status_clear(&p->p, ~ier);
+ return 0;
+}
+
u16 qman_affine_channel(int cpu)
{
if (cpu < 0) {
diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c
b/drivers/bus/dpaa/base/qbman/qman_driver.c
index acd003143..69244ef70 100644
--- a/drivers/bus/dpaa/base/qbman/qman_driver.c
+++ b/drivers/bus/dpaa/base/qbman/qman_driver.c
@@ -121,6 +121,11 @@ void qman_thread_irq(void)
out_be32(qpcfg.addr_virt[DPAA_PORTAL_CI] + 0x36C0, 0);
}
+void qman_fq_portal_thread_irq(struct qman_portal *qp)
+{
+ qman_portal_uninhibit_isr(qp);
+}
+
struct qman_portal *fsl_qman_fq_portal_create(int *fd)
{
struct qman_portal *portal = NULL;
diff --git a/drivers/bus/dpaa/base/qbman/qman_priv.h
b/drivers/bus/dpaa/base/qbman/qman_priv.h
index 97d5521a8..8254729e6 100644
--- a/drivers/bus/dpaa/base/qbman/qman_priv.h
+++ b/drivers/bus/dpaa/base/qbman/qman_priv.h
@@ -157,6 +157,8 @@ qman_init_portal(struct qman_portal *portal,
struct qman_portal *qman_alloc_global_portal(struct qm_portal_config *q_pcfg);
int qman_free_global_portal(struct qman_portal *portal);
+void qman_portal_uninhibit_isr(struct qman_portal *portal);
+
struct qm_portal_config *qm_get_unused_portal(void);
struct qm_portal_config *qm_get_unused_portal_idx(uint32_t idx);
diff --git a/drivers/bus/dpaa/include/fsl_usd.h
b/drivers/bus/dpaa/include/fsl_usd.h
index a407e2b22..3c26d6ccb 100644
--- a/drivers/bus/dpaa/include/fsl_usd.h
+++ b/drivers/bus/dpaa/include/fsl_usd.h
@@ -67,6 +67,7 @@ int bman_thread_fd(void);
*/
void qman_thread_irq(void);
void bman_thread_irq(void);
+void qman_fq_portal_thread_irq(struct qman_portal *qp);
void qman_clear_irq(void);
diff --git a/drivers/bus/dpaa/rte_bus_dpaa_version.map
b/drivers/bus/dpaa/rte_bus_dpaa_version.map
index f779469f9..962b952d3 100644
--- a/drivers/bus/dpaa/rte_bus_dpaa_version.map
+++ b/drivers/bus/dpaa/rte_bus_dpaa_version.map
@@ -127,6 +127,9 @@ DPDK_19.05 {
DPDK_19.11 {
global:
fsl_qman_fq_portal_create;
+ qman_fq_portal_irqsource_add;
+ qman_fq_portal_irqsource_remove;
+ qman_fq_portal_thread_irq;
[dpdk-dev] [PATCH v1 10/30] common/dpaax: reduce debug mesages
From: Hemant Agrawal
Signed-off-by: Hemant Agrawal
Reviewed-by: Sachin Saxena
---
drivers/common/dpaax/dpaax_iova_table.c | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/common/dpaax/dpaax_iova_table.c
b/drivers/common/dpaax/dpaax_iova_table.c
index ae0af0919..43c9c72e6 100644
--- a/drivers/common/dpaax/dpaax_iova_table.c
+++ b/drivers/common/dpaax/dpaax_iova_table.c
@@ -140,7 +140,8 @@ read_memory_node(unsigned int *count)
DPAAX_DEBUG("Device-tree memory node data:");
do {
- DPAAX_DEBUG("\n%08" PRIx64 " %08zu", nodes[j].addr,
nodes[j].len);
+ DPAAX_DEBUG("%08" PRIx64 " %08zu",
+ nodes[j].addr, nodes[j].len);
} while (--j);
cleanup:
@@ -241,7 +242,7 @@ dpaax_iova_table_populate(void)
/* Release memory associated with nodes array - not required now */
free(nodes);
- DPAAX_DEBUG("Adding mem-event handler\n");
+ DPAAX_DEBUG("Adding mem-event handler");
ret = dpaax_handle_memevents();
if (ret) {
DPAAX_ERR("Unable to add mem-event handler");
@@ -306,10 +307,11 @@ dpaax_iova_table_update(phys_addr_t paddr, void *vaddr,
size_t length)
* case.
*/
entry[i].pages[e_offset] = align_vaddr;
+#ifdef RTE_COMMON_DPAAX_DEBUG
DPAAX_DEBUG("Added: vaddr=%zu for Phy:%"PRIu64" at %zu"
" remaining len %zu", align_vaddr,
align_paddr, e_offset, req_length);
-
+#endif
/* Incoming request can be larger than the
* DPAAX_MEM_SPLIT size - in which case, multiple
* entries in entry->pages[] are filled up.
@@ -336,10 +338,11 @@ dpaax_iova_table_update(phys_addr_t paddr, void *vaddr,
size_t length)
vaddr, paddr);
return -1;
}
-
+#ifdef RTE_COMMON_DPAAX_DEBUG
DPAAX_DEBUG("Add: Found slot at (%"PRIu64")[(%zu)] for vaddr:(%p),"
" phy(%"PRIu64"), len(%zu)", entry[i].start, e_offset,
vaddr, paddr, length);
+#endif
return 0;
}
@@ -404,13 +407,13 @@ dpaax_memevent_cb(enum rte_mem_event type, const void
*addr, size_t len,
phys_addr = rte_mem_virt2phy(ms->addr);
virt_addr = ms->addr;
map_len = ms->len;
-
+#ifdef RTE_COMMON_DPAAX_DEBUG
DPAAX_DEBUG("Request for %s, va=%p, virt_addr=%p,"
"iova=%"PRIu64", map_len=%zu",
type == RTE_MEM_EVENT_ALLOC ?
"alloc" : "dealloc",
va, virt_addr, phys_addr, map_len);
-
+#endif
if (type == RTE_MEM_EVENT_ALLOC)
ret = dpaax_iova_table_update(phys_addr, virt_addr,
map_len);
--
2.17.1
[dpdk-dev] [PATCH v1 11/30] mempool/dpaa: reduce debug messages
From: Hemant Agrawal
Signed-off-by: Hemant Agrawal
Reviewed-by: Sachin Saxena
---
drivers/mempool/dpaa/dpaa_mempool.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/mempool/dpaa/dpaa_mempool.c
b/drivers/mempool/dpaa/dpaa_mempool.c
index c371d3a6b..a25697f05 100644
--- a/drivers/mempool/dpaa/dpaa_mempool.c
+++ b/drivers/mempool/dpaa/dpaa_mempool.c
@@ -298,8 +298,6 @@ dpaa_populate(struct rte_mempool *mp, unsigned int max_objs,
struct dpaa_bp_info *bp_info;
unsigned int total_elt_sz;
- MEMPOOL_INIT_FUNC_TRACE();
-
if (!mp || !mp->pool_data) {
DPAA_MEMPOOL_ERR("Invalid mempool provided\n");
return 0;
@@ -311,7 +309,7 @@ dpaa_populate(struct rte_mempool *mp, unsigned int max_objs,
bp_info = DPAA_MEMPOOL_TO_POOL_INFO(mp);
total_elt_sz = mp->header_size + mp->elt_size + mp->trailer_size;
- DPAA_MEMPOOL_DEBUG("Req size %" PRIx64 " vs Available %u\n",
+ DPAA_MEMPOOL_DPDEBUG("Req size %" PRIx64 " vs Available %u\n",
(uint64_t)len, total_elt_sz * mp->size);
/* Detect pool area has sufficient space for elements in this memzone */
--
2.17.1
[dpdk-dev] [PATCH v1 08/30] net/dpaa: reduce debug messages
From: Hemant Agrawal
Signed-off-by: Hemant Agrawal
Reviewed-by: Sachin Saxena
---
drivers/net/dpaa/dpaa_ethdev.c | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 42ab3d05f..dc2e584b1 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -335,7 +335,7 @@ static void dpaa_eth_dev_info(struct rte_eth_dev *dev,
{
struct dpaa_if *dpaa_intf = dev->data->dev_private;
- PMD_INIT_FUNC_TRACE();
+ DPAA_PMD_DEBUG(": %s", dpaa_intf->name);
dev_info->max_rx_queues = dpaa_intf->nb_rx_queues;
dev_info->max_tx_queues = dpaa_intf->nb_tx_queues;
@@ -1172,8 +1172,6 @@ static int dpaa_rx_queue_init(struct qman_fq *fq, struct
qman_cgr *cgr_rx,
}
};
- PMD_INIT_FUNC_TRACE();
-
if (fqid) {
ret = qman_reserve_fqid(fqid);
if (ret) {
@@ -1225,8 +1223,6 @@ static int dpaa_tx_queue_init(struct qman_fq *fq,
struct qm_mcc_initfq opts = {0};
int ret;
- PMD_INIT_FUNC_TRACE();
-
ret = qman_create_fq(0, QMAN_FQ_FLAG_DYNAMIC_FQID |
QMAN_FQ_FLAG_TO_DCPORTAL, fq);
if (ret) {
--
2.17.1
[dpdk-dev] [PATCH v1 09/30] net/dpaa2: improve the Rx offload debug message
From: Hemant Agrawal
Signed-off-by: Hemant Agrawal
---
drivers/net/dpaa2/dpaa2_ethdev.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index dd6a78f9f..bbebb66fe 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -395,20 +395,20 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
PMD_INIT_FUNC_TRACE();
- /* Rx offloads validation */
+ /* Rx offloads which are enabled by default */
if (dev_rx_offloads_nodis & ~rx_offloads) {
- DPAA2_PMD_WARN(
- "Rx offloads non configurable - requested 0x%" PRIx64
- " ignored 0x%" PRIx64,
- rx_offloads, dev_rx_offloads_nodis);
+ DPAA2_PMD_INFO(
+ "Some of rx offloads enabled by default - requested 0x%" PRIx64
+ " fixed are 0x%" PRIx64,
+ rx_offloads, dev_rx_offloads_nodis);
}
- /* Tx offloads validation */
+ /* Tx offloads which are enabled by default */
if (dev_tx_offloads_nodis & ~tx_offloads) {
- DPAA2_PMD_WARN(
- "Tx offloads non configurable - requested 0x%" PRIx64
- " ignored 0x%" PRIx64,
- tx_offloads, dev_tx_offloads_nodis);
+ DPAA2_PMD_INFO(
+ "Some of tx offloads enabled by default - requested 0x%" PRIx64
+ " fixed are 0x%" PRIx64,
+ tx_offloads, dev_tx_offloads_nodis);
}
if (rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) {
--
2.17.1
[dpdk-dev] [PATCH v1 12/30] net/dpaa2: realign Rx offload support types
From: Hemant Agrawal Signed-off-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_ethdev.c | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index bbebb66fe..130fb5297 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -32,11 +32,11 @@ /* Supported Rx offloads */ static uint64_t dev_rx_offloads_sup = - DEV_RX_OFFLOAD_VLAN_STRIP | - DEV_RX_OFFLOAD_IPV4_CKSUM | - DEV_RX_OFFLOAD_UDP_CKSUM | - DEV_RX_OFFLOAD_TCP_CKSUM | + DEV_RX_OFFLOAD_CHECKSUM | + DEV_RX_OFFLOAD_SCTP_CKSUM | DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM | + DEV_RX_OFFLOAD_OUTER_UDP_CKSUM | + DEV_RX_OFFLOAD_VLAN_STRIP | DEV_RX_OFFLOAD_VLAN_FILTER | DEV_RX_OFFLOAD_JUMBO_FRAME; @@ -51,13 +51,13 @@ static uint64_t dev_tx_offloads_sup = DEV_TX_OFFLOAD_UDP_CKSUM | DEV_TX_OFFLOAD_TCP_CKSUM | DEV_TX_OFFLOAD_SCTP_CKSUM | - DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM; + DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM | + DEV_TX_OFFLOAD_MT_LOCKFREE | + DEV_TX_OFFLOAD_MBUF_FAST_FREE; /* Tx offloads which cannot be disabled */ static uint64_t dev_tx_offloads_nodis = - DEV_TX_OFFLOAD_MULTI_SEGS | - DEV_TX_OFFLOAD_MT_LOCKFREE | - DEV_TX_OFFLOAD_MBUF_FAST_FREE; + DEV_TX_OFFLOAD_MULTI_SEGS; /* enable timestamp in mbuf */ enum pmd_dpaa2_ts dpaa2_enable_ts; @@ -439,7 +439,8 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev) rx_l3_csum_offload = true; if ((rx_offloads & DEV_RX_OFFLOAD_UDP_CKSUM) || - (rx_offloads & DEV_RX_OFFLOAD_TCP_CKSUM)) + (rx_offloads & DEV_RX_OFFLOAD_TCP_CKSUM) || + (rx_offloads & DEV_RX_OFFLOAD_SCTP_CKSUM)) rx_l4_csum_offload = true; ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token, -- 2.17.1
[dpdk-dev] [PATCH v1 07/30] net/dpaa: add SG support in Tx for non DPAA buffer
From: Nipun Gupta
This patch adds support for Scatter Gather
in the transmit side, for the cases where the
buffer are received which are not from DPAA
buffer pool.
Signed-off-by: Nipun Gupta
---
drivers/net/dpaa/dpaa_rxtx.c | 189 +++
1 file changed, 101 insertions(+), 88 deletions(-)
diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c
index 220c3477d..2de1a1a7e 100644
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -642,53 +642,6 @@ uint16_t dpaa_eth_queue_rx(void *q,
return num_rx;
}
-static void *dpaa_get_pktbuf(struct dpaa_bp_info *bp_info)
-{
- int ret;
- size_t buf = 0;
- struct bm_buffer bufs;
-
- ret = bman_acquire(bp_info->bp, &bufs, 1, 0);
- if (ret <= 0) {
- DPAA_PMD_WARN("Failed to allocate buffers %d", ret);
- return (void *)buf;
- }
-
- DPAA_DP_LOG(DEBUG, "got buffer 0x%" PRIx64 " from pool %d",
- (uint64_t)bufs.addr, bufs.bpid);
-
- buf = (size_t)DPAA_MEMPOOL_PTOV(bp_info, bufs.addr)
- - bp_info->meta_data_size;
- if (!buf)
- goto out;
-
-out:
- return (void *)buf;
-}
-
-static struct rte_mbuf *dpaa_get_dmable_mbuf(struct rte_mbuf *mbuf,
-struct dpaa_if *dpaa_intf)
-{
- struct rte_mbuf *dpaa_mbuf;
-
- /* allocate pktbuffer on bpid for dpaa port */
- dpaa_mbuf = dpaa_get_pktbuf(dpaa_intf->bp_info);
- if (!dpaa_mbuf)
- return NULL;
-
- memcpy((uint8_t *)(dpaa_mbuf->buf_addr) + RTE_PKTMBUF_HEADROOM, (void *)
- ((uint8_t *)(mbuf->buf_addr) + mbuf->data_off), mbuf->pkt_len);
-
- /* Copy only the required fields */
- dpaa_mbuf->data_off = RTE_PKTMBUF_HEADROOM;
- dpaa_mbuf->pkt_len = mbuf->pkt_len;
- dpaa_mbuf->ol_flags = mbuf->ol_flags;
- dpaa_mbuf->packet_type = mbuf->packet_type;
- dpaa_mbuf->tx_offload = mbuf->tx_offload;
- rte_pktmbuf_free(mbuf);
- return dpaa_mbuf;
-}
-
int
dpaa_eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,
struct qm_fd *fd,
@@ -862,26 +815,84 @@ tx_on_dpaa_pool(struct rte_mbuf *mbuf,
}
/* Handle all mbufs on an external pool (non-dpaa) */
-static inline uint16_t
-tx_on_external_pool(struct qman_fq *txq, struct rte_mbuf *mbuf,
- struct qm_fd *fd_arr)
+static inline struct rte_mbuf *
+reallocate_mbuf(struct qman_fq *txq, struct rte_mbuf *mbuf)
{
struct dpaa_if *dpaa_intf = txq->dpaa_intf;
- struct rte_mbuf *dmable_mbuf;
+ struct dpaa_bp_info *bp_info = dpaa_intf->bp_info;
+ struct rte_mbuf *new_mbufs[DPAA_SGT_MAX_ENTRIES + 1] = {0};
+ struct rte_mbuf *temp_mbuf;
+ int num_new_segs, mbuf_greater, ret, extra_seg = 0, i = 0;
+ uint64_t mbufs_size, bytes_to_copy, offset1 = 0, offset2 = 0;
+ char *data;
+
+ DPAA_DP_LOG(DEBUG, "Reallocating transmit buffer");
+
+ mbufs_size = bp_info->size -
+ bp_info->meta_data_size - RTE_PKTMBUF_HEADROOM;
+ extra_seg = !!(mbuf->pkt_len % mbufs_size);
+ num_new_segs = (mbuf->pkt_len / mbufs_size) + extra_seg;
+
+ ret = rte_pktmbuf_alloc_bulk(bp_info->mp, new_mbufs, num_new_segs);
+ if (ret != 0) {
+ DPAA_DP_LOG(DEBUG, "Allocation for new buffers failed");
+ return NULL;
+ }
- DPAA_DP_LOG(DEBUG, "Non-BMAN offloaded buffer."
- "Allocating an offloaded buffer");
- dmable_mbuf = dpaa_get_dmable_mbuf(mbuf, dpaa_intf);
- if (!dmable_mbuf) {
- DPAA_DP_LOG(DEBUG, "no dpaa buffers.");
- return 1;
+ temp_mbuf = mbuf;
+
+ while (temp_mbuf) {
+ /* If mbuf data is less than new mbuf remaining memory */
+ if ((temp_mbuf->data_len - offset1) < (mbufs_size - offset2)) {
+ bytes_to_copy = temp_mbuf->data_len - offset1;
+ mbuf_greater = -1;
+ /* If mbuf data is greater than new mbuf remaining memory */
+ } else if ((temp_mbuf->data_len - offset1) >
+ (mbufs_size - offset2)) {
+ bytes_to_copy = mbufs_size - offset2;
+ mbuf_greater = 1;
+ /* if mbuf data is equal to new mbuf remaining memory */
+ } else {
+ bytes_to_copy = temp_mbuf->data_len - offset1;
+ mbuf_greater = 0;
+ }
+
+ /* Copy the data */
+ data = rte_pktmbuf_append(new_mbufs[0], bytes_to_copy);
+
+ rte_memcpy((uint8_t *)data, rte_pktmbuf_mtod_offset(mbuf,
+ void *, offset1), bytes_to_copy);
+
+ /* Set new offsets and the temp buffers */
+ if (mbuf_greater == -1) {
+ offset1 = 0;
+ offset2
[dpdk-dev] [PATCH v1 15/30] net/dpaa2: add optional non-prefetch Rx mode
From: Nipun Gupta
When we need particular number of packets from the rx routine,
which would change in every call, we cannot prefetch the packets
and provide previous results to the user.
User can select the mode by using devargs for non pretech mode.
Signed-off-by: Nipun Gupta
---
doc/guides/nics/dpaa2.rst| 4 ++
drivers/net/dpaa2/dpaa2_ethdev.c | 11 +++-
drivers/net/dpaa2/dpaa2_ethdev.h | 2 +
drivers/net/dpaa2/dpaa2_rxtx.c | 105 +++
4 files changed, 121 insertions(+), 1 deletion(-)
diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst
index a698e5ab6..99e4c8d72 100644
--- a/doc/guides/nics/dpaa2.rst
+++ b/doc/guides/nics/dpaa2.rst
@@ -504,6 +504,10 @@ for details.
driver level. Any packet received will be reflected back by the
driver on same port. e.g. ``fslmc:dpni.1,drv_loopback=1``
+* Use dev arg option ``drv_no_prefetch=1`` to disable prefetching
+ of the packet pull command which is issued in the previous cycle.
+ e.g. ``fslmc:dpni.1,drv_no_prefetch=1``
+
Enabling logs
-
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 4689cf9a4..f25cdfb3d 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -29,6 +29,7 @@
#include
#define DRIVER_LOOPBACK_MODE "drv_loopback"
+#define DRIVER_NO_PREFETCH_MODE "drv_no_prefetch"
/* Supported Rx offloads */
static uint64_t dev_rx_offloads_sup =
@@ -750,6 +751,7 @@ dpaa2_supported_ptypes_get(struct rte_eth_dev *dev)
};
if (dev->rx_pkt_burst == dpaa2_dev_prefetch_rx ||
+ dev->rx_pkt_burst == dpaa2_dev_rx ||
dev->rx_pkt_burst == dpaa2_dev_loopback_rx)
return ptypes;
return NULL;
@@ -2118,6 +2120,9 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
eth_dev->dev_ops = &dpaa2_ethdev_ops;
if (dpaa2_get_devargs(dev->devargs, DRIVER_LOOPBACK_MODE))
eth_dev->rx_pkt_burst = dpaa2_dev_loopback_rx;
+ else if (dpaa2_get_devargs(dev->devargs,
+ DRIVER_NO_PREFETCH_MODE))
+ eth_dev->rx_pkt_burst = dpaa2_dev_rx;
else
eth_dev->rx_pkt_burst = dpaa2_dev_prefetch_rx;
eth_dev->tx_pkt_burst = dpaa2_dev_tx;
@@ -2236,6 +2241,9 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
if (dpaa2_get_devargs(dev->devargs, DRIVER_LOOPBACK_MODE)) {
eth_dev->rx_pkt_burst = dpaa2_dev_loopback_rx;
DPAA2_PMD_INFO("Loopback mode");
+ } else if (dpaa2_get_devargs(dev->devargs, DRIVER_NO_PREFETCH_MODE)) {
+ eth_dev->rx_pkt_burst = dpaa2_dev_rx;
+ DPAA2_PMD_INFO("No Prefetch mode");
} else {
eth_dev->rx_pkt_burst = dpaa2_dev_prefetch_rx;
}
@@ -2395,7 +2403,8 @@ static struct rte_dpaa2_driver rte_dpaa2_pmd = {
RTE_PMD_REGISTER_DPAA2(net_dpaa2, rte_dpaa2_pmd);
RTE_PMD_REGISTER_PARAM_STRING(net_dpaa2,
- DRIVER_LOOPBACK_MODE "=");
+ DRIVER_LOOPBACK_MODE "= "
+ DRIVER_NO_PREFETCH_MODE "=");
RTE_INIT(dpaa2_pmd_init_log)
{
dpaa2_logtype_pmd = rte_log_register("pmd.net.dpaa2");
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h
index 69ab577f5..a991ccc1d 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.h
+++ b/drivers/net/dpaa2/dpaa2_ethdev.h
@@ -149,6 +149,8 @@ int dpaa2_eth_eventq_attach(const struct rte_eth_dev *dev,
int dpaa2_eth_eventq_detach(const struct rte_eth_dev *dev,
int eth_rx_queue_id);
+uint16_t dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts);
+
uint16_t dpaa2_dev_loopback_rx(void *queue, struct rte_mbuf **bufs,
uint16_t nb_pkts);
diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index 6ca5071e0..19838180f 100644
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -727,6 +727,111 @@ dpaa2_dev_process_ordered_event(struct qbman_swp *swp,
qbman_swp_dqrr_consume(swp, dq);
}
+uint16_t
+dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
+{
+ /* Function receive frames for a given device and VQ */
+ struct dpaa2_queue *dpaa2_q = (struct dpaa2_queue *)queue;
+ struct qbman_result *dq_storage;
+ uint32_t fqid = dpaa2_q->fqid;
+ int ret, num_rx = 0, next_pull = nb_pkts, num_pulled;
+ uint8_t pending, status;
+ struct qbman_swp *swp;
+ const struct qbman_fd *fd, *next_fd;
+ struct qbman_pull_desc pulldesc;
+ struct rte_eth_dev_data *eth_data = dpaa2_q->eth_data;
+
+ if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
+ ret = dpaa2_affine_qbman_swp();
+ if (ret) {
+ DPAA2_PMD_ERR("Failure in affining portal\n");
+ return 0;
+ }
+
[dpdk-dev] [PATCH v1 16/30] net/dpaa2: add taildrop support on frame count basis
From: Hemant Agrawal
The existing taildrop was based on queue data size.
This patch replaces it with frame count bases using
CGR methods of DPAA2 device.
The number of CGRs are limited. So,
- use per queue CGR based tail drop for as many as CGR
available.
- Remaining queues shall use the legacy byte based tail drop
Number of CGRs can be controlled by dpl file during dpni_create.
Signed-off-by: Hemant Agrawal
---
drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 5 +-
drivers/net/dpaa2/dpaa2_ethdev.c| 112 +---
drivers/net/dpaa2/dpaa2_ethdev.h| 6 +-
3 files changed, 106 insertions(+), 17 deletions(-)
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
index 4bb6b26c7..7f7e2fd78 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
@@ -145,10 +145,10 @@ struct dpaa2_queue {
struct rte_eth_dev_data *eth_data;
struct rte_cryptodev_data *crypto_data;
};
- int32_t eventfd;/*!< Event Fd of this queue */
uint32_t fqid; /*!< Unique ID of this queue */
- uint8_t tc_index; /*!< traffic class identifier */
uint16_t flow_id; /*!< To be used by DPAA2 frmework */
+ uint8_t tc_index; /*!< traffic class identifier */
+ uint8_t cgid; /*! < Congestion Group id for this queue */
uint64_t rx_pkts;
uint64_t tx_pkts;
uint64_t err_pkts;
@@ -157,6 +157,7 @@ struct dpaa2_queue {
struct qbman_result *cscn;
};
struct rte_event ev;
+ int32_t eventfd;/*!< Event Fd of this queue */
dpaa2_queue_cb_dqrr_t *cb;
dpaa2_queue_cb_eqresp_free_t *cb_eqresp_free;
struct dpaa2_bp_info *bp_array;
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index f25cdfb3d..b30f37ecb 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -514,7 +514,7 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
static int
dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
-uint16_t nb_rx_desc __rte_unused,
+uint16_t nb_rx_desc,
unsigned int socket_id __rte_unused,
const struct rte_eth_rxconf *rx_conf __rte_unused,
struct rte_mempool *mb_pool)
@@ -526,7 +526,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint8_t options = 0;
uint8_t flow_id;
uint32_t bpid;
- int ret;
+ int i, ret;
PMD_INIT_FUNC_TRACE();
@@ -545,12 +545,28 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
dpaa2_q->bp_array = rte_dpaa2_bpid_info;
/*Get the flow id from given VQ id*/
- flow_id = rx_queue_id % priv->nb_rx_queues;
+ flow_id = dpaa2_q->flow_id;
memset(&cfg, 0, sizeof(struct dpni_queue));
options = options | DPNI_QUEUE_OPT_USER_CTX;
cfg.user_context = (size_t)(dpaa2_q);
+ /* check if a private cgr available. */
+ for (i = 0; i < priv->max_cgs; i++) {
+ if (!priv->cgid_in_use[i]) {
+ priv->cgid_in_use[i] = 1;
+ break;
+ }
+ }
+
+ if (i < priv->max_cgs) {
+ options |= DPNI_QUEUE_OPT_SET_CGID;
+ cfg.cgid = i;
+ dpaa2_q->cgid = cfg.cgid;
+ } else {
+ dpaa2_q->cgid = 0xff;
+ }
+
/*if ls2088 or rev2 device, enable the stashing */
if ((dpaa2_svr_family & 0x) != SVR_LS2080A) {
@@ -579,15 +595,56 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
struct dpni_taildrop taildrop;
taildrop.enable = 1;
- /*enabling per rx queue congestion control */
- taildrop.threshold = CONG_THRESHOLD_RX_Q;
- taildrop.units = DPNI_CONGESTION_UNIT_BYTES;
- taildrop.oal = CONG_RX_OAL;
- DPAA2_PMD_DEBUG("Enabling Early Drop on queue = %d",
- rx_queue_id);
- ret = dpni_set_taildrop(dpni, CMD_PRI_LOW, priv->token,
+
+ /* Private CGR will use tail drop length as nb_rx_desc.
+* for rest cases we can use standard byte based tail drop.
+* There is no HW restriction, but number of CGRs are limited,
+* hence this restriction is placed.
+*/
+ if (dpaa2_q->cgid != 0xff) {
+ /*enabling per rx queue congestion control */
+ taildrop.threshold = nb_rx_desc;
+ taildrop.units = DPNI_CONGESTION_UNIT_FRAMES;
+ taildrop.oal = 0;
+ DPAA2_PMD_DEBUG("Enabling CG Tail Drop on queue = %d",
+ r
[dpdk-dev] [PATCH v1 19/30] net/dpaa2: use LFQIDs in Tx instead of qdid
Signed-off-by: Sachin Saxena
---
drivers/net/dpaa2/dpaa2_ethdev.c | 10 ++
drivers/net/dpaa2/dpaa2_rxtx.c | 12 +---
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 925637409..8814de271 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -677,6 +677,7 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
struct dpni_queue tx_conf_cfg;
struct dpni_queue tx_flow_cfg;
uint8_t options = 0, flow_id;
+ struct dpni_queue_id qid;
uint32_t tc_id;
int ret;
@@ -718,6 +719,15 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
}
dpaa2_q->tc_index = tc_id;
+ ret = dpni_get_queue(dpni, CMD_PRI_LOW, priv->token,
+DPNI_QUEUE_TX, dpaa2_q->tc_index,
+dpaa2_q->flow_id, &tx_flow_cfg, &qid);
+ if (ret) {
+ DPAA2_PMD_ERR("Error in getting LFQID err=%d", ret);
+ return -1;
+ }
+ dpaa2_q->fqid = qid.fqid;
+
if (!(priv->flags & DPAA2_TX_CGR_OFF)) {
struct dpni_congestion_notification_cfg cong_notif_cfg = {};
diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index 19838180f..2209b78a4 100644
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -869,8 +869,8 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t
nb_pkts)
/*Prepare enqueue descriptor*/
qbman_eq_desc_clear(&eqdesc);
qbman_eq_desc_set_no_orp(&eqdesc, DPAA2_EQ_RESP_ERR_FQ);
- qbman_eq_desc_set_qd(&eqdesc, priv->qdid,
-dpaa2_q->flow_id, dpaa2_q->tc_index);
+ qbman_eq_desc_set_fq(&eqdesc, dpaa2_q->fqid);
+
/*Clear the unused FD fields before sending*/
while (nb_pkts) {
/*Check if the queue is congested*/
@@ -1021,8 +1021,7 @@ dpaa2_set_enqueue_descriptor(struct dpaa2_queue *dpaa2_q,
uint16_t orpid, seqnum;
uint8_t dq_idx;
- qbman_eq_desc_set_qd(eqdesc, priv->qdid, dpaa2_q->flow_id,
-dpaa2_q->tc_index);
+ qbman_eq_desc_set_fq(eqdesc, dpaa2_q->fqid);
if (m->seqn & DPAA2_ENQUEUE_FLAG_ORP) {
orpid = (m->seqn & DPAA2_EQCR_OPRID_MASK) >>
@@ -1128,9 +1127,8 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs,
uint16_t nb_pkts)
} else {
qbman_eq_desc_set_no_orp(&eqdesc[loop],
DPAA2_EQ_RESP_ERR_FQ);
- qbman_eq_desc_set_qd(&eqdesc[loop], priv->qdid,
-dpaa2_q->flow_id,
-dpaa2_q->tc_index);
+ qbman_eq_desc_set_fq(&eqdesc[loop],
+dpaa2_q->fqid);
}
if (likely(RTE_MBUF_DIRECT(*bufs))) {
--
2.17.1
[dpdk-dev] [PATCH v1 14/30] net/dpaa2: support L2 payload based RSS distribution
From: Hemant Agrawal Signed-off-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_ethdev.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 33b1506aa..69ab577f5 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -54,6 +54,7 @@ #define DPAA2_RX_TAILDROP_OFF 0x04 #define DPAA2_RSS_OFFLOAD_ALL ( \ + ETH_RSS_L2_PAYLOAD | \ ETH_RSS_IP | \ ETH_RSS_UDP | \ ETH_RSS_TCP | \ -- 2.17.1
[dpdk-dev] [PATCH v1 17/30] net/dpaa2: add cgr counters in xtra stats
From: Hemant Agrawal
Add congestion frame drop and byte drop count in xtra stats.
Signed-off-by: Hemant Agrawal
---
drivers/net/dpaa2/dpaa2_ethdev.c | 24 ++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index b30f37ecb..259180e4f 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -84,6 +84,8 @@ static const struct rte_dpaa2_xstats_name_off
dpaa2_xstats_strings[] = {
{"ingress_nobuffer_discards", 2, 2},
{"egress_discarded_frames", 2, 3},
{"egress_confirmed_frames", 2, 4},
+ {"cgr_reject_frames", 4, 0},
+ {"cgr_reject_bytes", 4, 1},
};
static const enum rte_filter_op dpaa2_supported_filter_ops[] = {
@@ -1370,7 +1372,7 @@ dpaa2_dev_xstats_get(struct rte_eth_dev *dev, struct
rte_eth_xstat *xstats,
struct dpaa2_dev_priv *priv = dev->data->dev_private;
struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
int32_t retcode;
- union dpni_statistics value[3] = {};
+ union dpni_statistics value[5] = {};
unsigned int i = 0, num = RTE_DIM(dpaa2_xstats_strings);
if (n < num)
@@ -1397,6 +1399,18 @@ dpaa2_dev_xstats_get(struct rte_eth_dev *dev, struct
rte_eth_xstat *xstats,
if (retcode)
goto err;
+ for (i = 0; i < priv->max_cgs; i++) {
+ if (!priv->cgid_in_use[i]) {
+ /* Get Counters from page_4*/
+ retcode = dpni_get_statistics(dpni, CMD_PRI_LOW,
+ priv->token,
+ 4, 0, &value[4]);
+ if (retcode)
+ goto err;
+ break;
+ }
+ }
+
for (i = 0; i < num; i++) {
xstats[i].id = i;
xstats[i].value = value[dpaa2_xstats_strings[i].page_id].
@@ -1438,7 +1452,7 @@ dpaa2_xstats_get_by_id(struct rte_eth_dev *dev, const
uint64_t *ids,
struct dpaa2_dev_priv *priv = dev->data->dev_private;
struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
int32_t retcode;
- union dpni_statistics value[3] = {};
+ union dpni_statistics value[5] = {};
if (n < stat_cnt)
return stat_cnt;
@@ -1464,6 +1478,12 @@ dpaa2_xstats_get_by_id(struct rte_eth_dev *dev, const
uint64_t *ids,
if (retcode)
return 0;
+ /* Get Counters from page_4*/
+ retcode = dpni_get_statistics(dpni, CMD_PRI_LOW, priv->token,
+ 4, 0, &value[4]);
+ if (retcode)
+ return 0;
+
for (i = 0; i < stat_cnt; i++) {
values[i] = value[dpaa2_xstats_strings[i].page_id].
raw.counter[dpaa2_xstats_strings[i].stats_id];
--
2.17.1
[dpdk-dev] [PATCH v1 18/30] net/dpaa2: add support for config max Rx length in HW
From: Hemant Agrawal
The MC expects the length to be configured without CRC
Signed-off-by: Hemant Agrawal
---
drivers/net/dpaa2/dpaa2_ethdev.c | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 259180e4f..925637409 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -418,12 +418,17 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
if (rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) {
if (eth_conf->rxmode.max_rx_pkt_len <= DPAA2_MAX_RX_PKT_LEN) {
ret = dpni_set_max_frame_length(dpni, CMD_PRI_LOW,
- priv->token, eth_conf->rxmode.max_rx_pkt_len);
+ priv->token, eth_conf->rxmode.max_rx_pkt_len
+ - RTE_ETHER_CRC_LEN);
if (ret) {
DPAA2_PMD_ERR(
"Unable to set mtu. check config");
return ret;
}
+ dev->data->mtu =
+ dev->data->dev_conf.rxmode.max_rx_pkt_len -
+ RTE_ETHER_HDR_LEN - RTE_ETHER_CRC_LEN -
+ VLAN_TAG_SIZE;
} else {
return -1;
}
@@ -1200,7 +1205,7 @@ dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
* Maximum Ethernet header length
*/
ret = dpni_set_max_frame_length(dpni, CMD_PRI_LOW, priv->token,
- frame_size);
+ frame_size - RTE_ETHER_CRC_LEN);
if (ret) {
DPAA2_PMD_ERR("Setting the max frame length failed");
return -1;
@@ -2375,6 +2380,14 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
}
}
+ ret = dpni_set_max_frame_length(dpni_dev, CMD_PRI_LOW, priv->token,
+ RTE_ETHER_MAX_LEN - RTE_ETHER_CRC_LEN
+ + VLAN_TAG_SIZE);
+ if (ret) {
+ DPAA2_PMD_ERR("Unable to set mtu. check config");
+ goto init_err;
+ }
+
RTE_LOG(INFO, PMD, "%s: netdev created\n", eth_dev->data->name);
return 0;
init_err:
--
2.17.1
[dpdk-dev] [PATCH v1 13/30] net/dpaa2: enable Rx offload for timestamp
From: Hemant Agrawal Signed-off-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_ethdev.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 130fb5297..4689cf9a4 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -38,7 +38,8 @@ static uint64_t dev_rx_offloads_sup = DEV_RX_OFFLOAD_OUTER_UDP_CKSUM | DEV_RX_OFFLOAD_VLAN_STRIP | DEV_RX_OFFLOAD_VLAN_FILTER | - DEV_RX_OFFLOAD_JUMBO_FRAME; + DEV_RX_OFFLOAD_JUMBO_FRAME | + DEV_RX_OFFLOAD_TIMESTAMP; /* Rx offloads which cannot be disabled */ static uint64_t dev_rx_offloads_nodis = @@ -457,6 +458,9 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev) return ret; } + if (rx_offloads & DEV_RX_OFFLOAD_TIMESTAMP) + dpaa2_enable_ts = true; + if (tx_offloads & DEV_TX_OFFLOAD_IPV4_CKSUM) tx_l3_csum_offload = true; -- 2.17.1
[dpdk-dev] [PATCH v1 24/30] net/dpaa2: add ptp driver
From: Priyanka Jain
This patch adds the support for PTP driver for
DPAA2 devices.
To enable set
CONFIG_RTE_LIBRTE_IEEE1588=y in
config/defconfig_arm64-dpaa2-linuxapp-gc
Signed-off-by: Priyanka Jain
---
config/defconfig_arm64-dpaa2-linuxapp-gcc| 2 +-
drivers/bus/fslmc/fslmc_bus.c| 2 +
drivers/bus/fslmc/fslmc_vfio.c | 2 +
drivers/bus/fslmc/rte_fslmc.h| 1 +
drivers/net/dpaa2/Makefile | 1 +
drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h | 2 +-
drivers/net/dpaa2/dpaa2_ethdev.c | 9 +
drivers/net/dpaa2/dpaa2_ethdev.h | 27 ++-
drivers/net/dpaa2/dpaa2_ptp.c| 181 +++
drivers/net/dpaa2/meson.build| 1 +
10 files changed, 225 insertions(+), 3 deletions(-)
create mode 100644 drivers/net/dpaa2/dpaa2_ptp.c
diff --git a/config/defconfig_arm64-dpaa2-linuxapp-gcc
b/config/defconfig_arm64-dpaa2-linuxapp-gcc
index b2543266a..5c7eddd5e 100644
--- a/config/defconfig_arm64-dpaa2-linuxapp-gcc
+++ b/config/defconfig_arm64-dpaa2-linuxapp-gcc
@@ -16,7 +16,7 @@ CONFIG_RTE_CACHE_LINE_SIZE=64
CONFIG_RTE_PKTMBUF_HEADROOM=128
# Enable IEEE1588, Keep it disable by default
-CONFIG_RTE_LIBRTE_IEEE1588=n
+CONFIG_RTE_LIBRTE_IEEE1588=y
# Doesn't support NUMA
CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index a2f482516..9b2dd51c4 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -191,6 +191,8 @@ scan_one_fslmc_device(char *dev_name)
dev->dev_type = DPAA2_QDMA;
else if (!strncmp("dpdmux", t_ptr, 6))
dev->dev_type = DPAA2_MUX;
+ else if (!strncmp("dprtc", t_ptr, 5))
+ dev->dev_type = DPAA2_DPRTC;
else
dev->dev_type = DPAA2_UNKNOWN;
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index 9658fd84d..60c51d80e 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -612,6 +612,7 @@ fslmc_process_iodevices(struct rte_dpaa2_device *dev)
case DPAA2_IO:
case DPAA2_CI:
case DPAA2_BPOOL:
+ case DPAA2_DPRTC:
case DPAA2_MUX:
TAILQ_FOREACH(object, &dpaa2_obj_list, next) {
if (dev->dev_type == object->dev_type)
@@ -768,6 +769,7 @@ fslmc_vfio_process_group(void)
case DPAA2_CON:
case DPAA2_CI:
case DPAA2_BPOOL:
+ case DPAA2_DPRTC:
case DPAA2_MUX:
/* IN case of secondary processes, all control objects
* like dpbp, dpcon, dpci are not initialized/required
diff --git a/drivers/bus/fslmc/rte_fslmc.h b/drivers/bus/fslmc/rte_fslmc.h
index 5cfb24505..31dfd1377 100644
--- a/drivers/bus/fslmc/rte_fslmc.h
+++ b/drivers/bus/fslmc/rte_fslmc.h
@@ -67,6 +67,7 @@ enum rte_dpaa2_dev_type {
DPAA2_MPORTAL, /**< DPMCP type device */
DPAA2_QDMA, /**< DPDMAI type device */
DPAA2_MUX, /**< DPDMUX type device */
+ DPAA2_DPRTC,/**< DPRTC type device */
/* Unknown device placeholder */
DPAA2_UNKNOWN,
DPAA2_DEVTYPE_MAX,
diff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile
index 9b52fa1e5..0cc539dc5 100644
--- a/drivers/net/dpaa2/Makefile
+++ b/drivers/net/dpaa2/Makefile
@@ -38,6 +38,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpni.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpkg.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpdmux.c
SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += mc/dprtc.c
+SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += dpaa2_ptp.c
LDLIBS += -lrte_bus_fslmc
LDLIBS += -lrte_mempool_dpaa2
diff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h
b/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h
index 0d6324183..699e4c089 100644
--- a/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h
+++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h
@@ -279,7 +279,7 @@ struct dpaa2_faead {
#define DPAA2_ETH_FAS_DISC 0x8000
/* MACSEC frame */
#define DPAA2_ETH_FAS_MS 0x4000
-#define DPAA2_ETH_FAS_PTP 0x0800
+#define DPAA2_ETH_FAS_PTP BIT_POS(59)
/* Ethernet multicast frame */
#define DPAA2_ETH_FAS_MC 0x0400
/* Ethernet broadcast frame */
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index afad96b15..3381b1894 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -2177,6 +2177,15 @@ static struct eth_dev_ops dpaa2_ethdev_ops = {
.rss_hash_update = dpaa2_dev_rss_hash_update,
.rss_hash_conf_get= dpaa2_dev_rss_hash_conf_get,
.filter_ctrl = dpaa2_dev_flow_ctrl,
+#if defined(RTE_LIBRTE_IEEE1588)
+ .timesync_enable = dpaa2_timesync_enable,
+ .timesync_disable = dpaa2_timesync_disable,
+ .timesync
[dpdk-dev] [PATCH v1 20/30] net/dpaa2: support dpdmux classification on eth type
From: Hemant Agrawal
Signed-off-by: Hemant Agrawal
---
drivers/net/dpaa2/dpaa2_mux.c | 84 +++
1 file changed, 55 insertions(+), 29 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_mux.c b/drivers/net/dpaa2/dpaa2_mux.c
index e487c6b54..1910cc418 100644
--- a/drivers/net/dpaa2/dpaa2_mux.c
+++ b/drivers/net/dpaa2/dpaa2_mux.c
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2018 NXP
+ * Copyright 2018-2019 NXP
*/
#include
@@ -60,19 +60,13 @@ rte_pmd_dpaa2_mux_flow_create(uint32_t dpdmux_id,
{
struct dpaa2_dpdmux_dev *dpdmux_dev;
struct dpkg_profile_cfg kg_cfg;
- const struct rte_flow_item_ipv4 *spec;
const struct rte_flow_action_vf *vf_conf;
struct dpdmux_cls_action dpdmux_action;
struct rte_flow *flow = NULL;
void *key_iova, *mask_iova, *key_cfg_iova = NULL;
+ uint8_t key_size = 0;
int ret;
- if (pattern[0]->type != RTE_FLOW_ITEM_TYPE_IPV4) {
- DPAA2_PMD_ERR("Not supported pattern type: %d",
- pattern[0]->type);
- return NULL;
- }
-
/* Find the DPDMUX from dpdmux_id in our list */
dpdmux_dev = get_dpdmux_from_id(dpdmux_id);
if (!dpdmux_dev) {
@@ -86,16 +80,63 @@ rte_pmd_dpaa2_mux_flow_create(uint32_t dpdmux_id,
DPAA2_PMD_ERR("Unable to allocate flow-dist parameters");
return NULL;
}
+ flow = rte_zmalloc(NULL, sizeof(struct rte_flow) +
+ (2 * DIST_PARAM_IOVA_SIZE), RTE_CACHE_LINE_SIZE);
+ if (!flow) {
+ DPAA2_PMD_ERR(
+ "Memory allocation failure for rule configration\n");
+ goto creation_error;
+ }
+ key_iova = (void *)((size_t)flow + sizeof(struct rte_flow));
+ mask_iova = (void *)((size_t)key_iova + DIST_PARAM_IOVA_SIZE);
/* Currently taking only IP protocol as an extract type.
* This can be exended to other fields using pattern->type.
*/
memset(&kg_cfg, 0, sizeof(struct dpkg_profile_cfg));
- kg_cfg.extracts[0].extract.from_hdr.prot = NET_PROT_IP;
- kg_cfg.extracts[0].extract.from_hdr.field = NH_FLD_IP_PROTO;
- kg_cfg.extracts[0].type = DPKG_EXTRACT_FROM_HDR;
- kg_cfg.extracts[0].extract.from_hdr.type = DPKG_FULL_FIELD;
- kg_cfg.num_extracts = 1;
+
+ switch (pattern[0]->type) {
+ case RTE_FLOW_ITEM_TYPE_IPV4:
+ {
+ const struct rte_flow_item_ipv4 *spec;
+ kg_cfg.extracts[0].extract.from_hdr.prot = NET_PROT_IP;
+ kg_cfg.extracts[0].extract.from_hdr.field = NH_FLD_IP_PROTO;
+ kg_cfg.extracts[0].type = DPKG_EXTRACT_FROM_HDR;
+ kg_cfg.extracts[0].extract.from_hdr.type = DPKG_FULL_FIELD;
+ kg_cfg.num_extracts = 1;
+
+ spec = (const struct rte_flow_item_ipv4 *)pattern[0]->spec;
+ memcpy(key_iova, (const void *)(&spec->hdr.next_proto_id),
+ sizeof(uint8_t));
+ memcpy(mask_iova, pattern[0]->mask, sizeof(uint8_t));
+ key_size = sizeof(uint8_t);
+ }
+ break;
+
+ case RTE_FLOW_ITEM_TYPE_ETH:
+ {
+ const struct rte_flow_item_eth *spec;
+ uint16_t eth_type;
+ kg_cfg.extracts[0].extract.from_hdr.prot = NET_PROT_ETH;
+ kg_cfg.extracts[0].extract.from_hdr.field = NH_FLD_ETH_TYPE;
+ kg_cfg.extracts[0].type = DPKG_EXTRACT_FROM_HDR;
+ kg_cfg.extracts[0].extract.from_hdr.type = DPKG_FULL_FIELD;
+ kg_cfg.num_extracts = 1;
+
+ spec = (const struct rte_flow_item_eth *)pattern[0]->spec;
+ eth_type = rte_constant_bswap16(spec->type);
+ memcpy((void *)key_iova, (const void *)ð_type,
+ sizeof(rte_be16_t));
+ memcpy(mask_iova, pattern[0]->mask, sizeof(uint16_t));
+ key_size = sizeof(uint16_t);
+ }
+ break;
+
+ default:
+ DPAA2_PMD_ERR("Not supported pattern type: %d",
+ pattern[0]->type);
+ goto creation_error;
+ }
ret = dpkg_prepare_key_cfg(&kg_cfg, key_cfg_iova);
if (ret) {
@@ -114,24 +155,9 @@ rte_pmd_dpaa2_mux_flow_create(uint32_t dpdmux_id,
/* As now our key extract parameters are set, let us configure
* the rule.
*/
- flow = rte_zmalloc(NULL, sizeof(struct rte_flow) +
- (2 * DIST_PARAM_IOVA_SIZE), RTE_CACHE_LINE_SIZE);
- if (!flow) {
- DPAA2_PMD_ERR(
- "Memory allocation failure for rule configration\n");
- goto creation_error;
- }
- key_iova = (void *)((size_t)flow + sizeof(struct rte_flow));
- mask_iova = (void *)((size_t)key_iova + DIST_PARAM_IOVA_
[dpdk-dev] [PATCH v1 23/30] net/dpaa2: add dprtc sub-module
From: Priyanka Jain
This patch add support for dprtc
(Data Path Real Time Clock) sub-module
based on MC 10.16.0 flib.
It provides interface for PTP stack software
to access physical IEEE 1588 Real Time Clock.
Signed-off-by: Priyanka Jain
---
drivers/net/dpaa2/Makefile | 1 +
drivers/net/dpaa2/mc/dprtc.c | 523 +++
drivers/net/dpaa2/mc/fsl_dprtc.h | 109 ++
drivers/net/dpaa2/mc/fsl_dprtc_cmd.h | 91 +
drivers/net/dpaa2/meson.build| 4 +
5 files changed, 728 insertions(+)
create mode 100644 drivers/net/dpaa2/mc/dprtc.c
create mode 100644 drivers/net/dpaa2/mc/fsl_dprtc.h
create mode 100644 drivers/net/dpaa2/mc/fsl_dprtc_cmd.h
diff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile
index c7262ffd5..9b52fa1e5 100644
--- a/drivers/net/dpaa2/Makefile
+++ b/drivers/net/dpaa2/Makefile
@@ -37,6 +37,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_mux.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpni.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpkg.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpdmux.c
+SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += mc/dprtc.c
LDLIBS += -lrte_bus_fslmc
LDLIBS += -lrte_mempool_dpaa2
diff --git a/drivers/net/dpaa2/mc/dprtc.c b/drivers/net/dpaa2/mc/dprtc.c
new file mode 100644
index 0..42ac89150
--- /dev/null
+++ b/drivers/net/dpaa2/mc/dprtc.c
@@ -0,0 +1,523 @@
+/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)
+ * Copyright 2019 NXP
+ */
+#include
+#include
+#include
+#include
+
+/** @addtogroup dprtc
+ * @{
+ */
+
+/**
+ * dprtc_open() - Open a control session for the specified object.
+ * @mc_io: Pointer to MC portal's I/O object
+ * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_'
+ * @dprtc_id: DPRTC unique ID
+ * @token: Returned token; use in subsequent API calls
+ *
+ * This function can be used to open a control session for an
+ * already created object; an object may have been declared in
+ * the DPL or by calling the dprtc_create function.
+ * This function returns a unique authentication token,
+ * associated with the specific object ID and the specific MC
+ * portal; this token must be used in all subsequent commands for
+ * this specific object
+ *
+ * Return: '0' on Success; Error code otherwise.
+ */
+int dprtc_open(struct fsl_mc_io *mc_io,
+ uint32_t cmd_flags,
+ int dprtc_id,
+ uint16_t *token)
+{
+ struct dprtc_cmd_open *cmd_params;
+ struct mc_command cmd = { 0 };
+ int err;
+
+ /* prepare command */
+ cmd.header = mc_encode_cmd_header(DPRTC_CMDID_OPEN,
+ cmd_flags,
+ 0);
+ cmd_params = (struct dprtc_cmd_open *)cmd.params;
+ cmd_params->dprtc_id = cpu_to_le32(dprtc_id);
+
+ /* send command to mc*/
+ err = mc_send_command(mc_io, &cmd);
+ if (err)
+ return err;
+
+ /* retrieve response parameters */
+ *token = mc_cmd_hdr_read_token(&cmd);
+
+ return err;
+}
+
+/**
+ * dprtc_close() - Close the control session of the object
+ * @mc_io: Pointer to MC portal's I/O object
+ * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_'
+ * @token: Token of DPRTC object
+ *
+ * After this function is called, no further operations are
+ * allowed on the object without opening a new control session.
+ *
+ * Return: '0' on Success; Error code otherwise.
+ */
+int dprtc_close(struct fsl_mc_io *mc_io,
+ uint32_t cmd_flags,
+ uint16_t token)
+{
+ struct mc_command cmd = { 0 };
+
+ /* prepare command */
+ cmd.header = mc_encode_cmd_header(DPRTC_CMDID_CLOSE, cmd_flags,
+ token);
+
+ /* send command to mc*/
+ return mc_send_command(mc_io, &cmd);
+}
+
+/**
+ * dprtc_create() - Create the DPRTC object.
+ * @mc_io: Pointer to MC portal's I/O object
+ * @dprc_token:Parent container token; '0' for default container
+ * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_'
+ * @cfg: Configuration structure
+ * @obj_id:Returned object id
+ *
+ * Create the DPRTC object, allocate required resources and
+ * perform required initialization.
+ *
+ * The function accepts an authentication token of a parent
+ * container that this object should be assigned to. The token
+ * can be '0' so the object will be assigned to the default container.
+ * The newly created object can be opened with the returned
+ * object id and using the container's associated tokens and MC portals.
+ *
+ * Return: '0' on Success; Error code otherwise.
+ */
+int dprtc_create(struct fsl_mc_io *mc_io,
+uint16_t dprc_token,
+uint32_t cmd_flags,
+const struct dprtc_cfg *cfg,
+uint32_t *obj_id)
+{
+ struct mc_command cmd = { 0 };
+ int err;
+
+ (void)(cfg); /* unused */
+
+ /* pr
[dpdk-dev] [PATCH v1 22/30] net/dpaa2: add timestamp support
From: Priyanka Jain
IEEE1588 driver needs timestamp of packets.
For DPAA2, the timestamp of TX packets is
stored in annotation area of corresponding
TX confirmation packet.
This patch enables timestamp fields in
annotation area and TX confirmation mode if
CONFIG_RTE_LIBRTE_IEEE1588 is set in
config/defconfig_arm64-dpaa2-linuxapp-gc
Signed-off-by: Priyanka Jain
---
config/defconfig_arm64-dpaa2-linuxapp-gcc | 3 ++
drivers/net/dpaa2/dpaa2_ethdev.c | 5 ++
drivers/net/dpaa2/dpaa2_rxtx.c| 61 +++
3 files changed, 69 insertions(+)
diff --git a/config/defconfig_arm64-dpaa2-linuxapp-gcc
b/config/defconfig_arm64-dpaa2-linuxapp-gcc
index 8b545f5f7..b2543266a 100644
--- a/config/defconfig_arm64-dpaa2-linuxapp-gcc
+++ b/config/defconfig_arm64-dpaa2-linuxapp-gcc
@@ -15,6 +15,9 @@ CONFIG_RTE_CACHE_LINE_SIZE=64
CONFIG_RTE_PKTMBUF_HEADROOM=128
+# Enable IEEE1588, Keep it disable by default
+CONFIG_RTE_LIBRTE_IEEE1588=n
+
# Doesn't support NUMA
CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n
CONFIG_RTE_LIBRTE_VHOST_NUMA=n
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 5c4d22e7c..afad96b15 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -2377,6 +2377,11 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
priv->max_mac_filters = attr.mac_filter_entries;
priv->max_vlan_filters = attr.vlan_filter_entries;
priv->flags = 0;
+#if defined(RTE_LIBRTE_IEEE1588)
+ priv->tx_conf_en = 1;
+#else
+ priv->tx_conf_en = 0;
+#endif
/* Allocate memory for hardware structure for queues */
ret = dpaa2_alloc_rx_tx_queues(eth_dev);
diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index 1c14b7354..7cea109d5 100644
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -29,6 +29,8 @@ static inline uint32_t __attribute__((hot))
dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf,
struct dpaa2_annot_hdr *annotation);
+static void enable_tx_tstamp(struct qbman_fd *fd) __attribute__((unused));
+
#define DPAA2_MBUF_TO_CONTIG_FD(_mbuf, _fd, _bpid) do { \
DPAA2_SET_FD_ADDR(_fd, DPAA2_MBUF_VADDR_TO_IOVA(_mbuf)); \
DPAA2_SET_FD_LEN(_fd, _mbuf->data_len); \
@@ -131,6 +133,11 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf,
"(4)=0x%" PRIx64 "\t",
annotation->word3, annotation->word4);
+#if defined(RTE_LIBRTE_IEEE1588)
+ if (BIT_ISSET_AT_POS(annotation->word1, DPAA2_ETH_FAS_PTP))
+ mbuf->ol_flags |= PKT_RX_IEEE1588_PTP;
+#endif
+
if (BIT_ISSET_AT_POS(annotation->word3, L2_VLAN_1_PRESENT)) {
vlan_tci = rte_pktmbuf_mtod_offset(mbuf, uint16_t *,
(VLAN_TCI_OFFSET_1(annotation->word5) >> 16));
@@ -511,6 +518,9 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs,
uint16_t nb_pkts)
struct qbman_pull_desc pulldesc;
struct queue_storage_info_t *q_storage = dpaa2_q->q_storage;
struct rte_eth_dev_data *eth_data = dpaa2_q->eth_data;
+#if defined(RTE_LIBRTE_IEEE1588)
+ struct dpaa2_dev_priv *priv = eth_data->dev_private;
+#endif
if (unlikely(!DPAA2_PER_LCORE_ETHRX_DPIO)) {
ret = dpaa2_affine_qbman_ethrx_swp();
@@ -615,6 +625,9 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs,
uint16_t nb_pkts)
else
bufs[num_rx] = eth_fd_to_mbuf(fd);
bufs[num_rx]->port = eth_data->port_id;
+#if defined(RTE_LIBRTE_IEEE1588)
+ priv->rx_timestamp = bufs[num_rx]->timestamp;
+#endif
if (eth_data->dev_conf.rxmode.offloads &
DEV_RX_OFFLOAD_VLAN_STRIP)
@@ -846,6 +859,11 @@ uint16_t dpaa2_dev_tx_conf(void *queue)
struct qbman_release_desc releasedesc;
uint32_t bpid;
uint64_t buf;
+#if defined(RTE_LIBRTE_IEEE1588)
+ struct rte_eth_dev_data *eth_data = dpaa2_q->eth_data;
+ struct dpaa2_dev_priv *priv = eth_data->dev_private;
+ struct dpaa2_annot_hdr *annotation;
+#endif
if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
ret = dpaa2_affine_qbman_swp();
@@ -926,6 +944,12 @@ uint16_t dpaa2_dev_tx_conf(void *queue)
dq_storage++;
num_tx_conf++;
num_pulled++;
+#if defined(RTE_LIBRTE_IEEE1588)
+ annotation = (struct dpaa2_annot_hdr *)((size_t)
+ DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)) +
+ DPAA2_FD_PTA_SIZE);
+ priv->tx_timestamp = annotation->word2;
+#endif
} while (pending);
/* Last VDQ provided all packets and more packets are requested */
@@ -936,6 +960,28 @@ uint16_t dpaa2_dev_tx_conf(void *queue)
return num_tx_conf;
}
+/* Configure the egress frame annotation fo
[dpdk-dev] [PATCH v1 21/30] net/dpaa2: add Tx confirmation mode support
From: Priyanka Jain
TX confirmation mode provides dedicated confirmation
queues for transmitted packets. These queues are used
by software to get the status and release
transmitted packets buffers.
By default TX confirmation mode is kept disabled.
Signed-off-by: Priyanka Jain
---
drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 2 +
drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h | 22
drivers/net/dpaa2/dpaa2_ethdev.c | 101 --
drivers/net/dpaa2/dpaa2_ethdev.h | 4 +-
drivers/net/dpaa2/dpaa2_rxtx.c | 106 ++-
5 files changed, 227 insertions(+), 8 deletions(-)
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
index 7f7e2fd78..5087f68c6 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
@@ -161,6 +161,8 @@ struct dpaa2_queue {
dpaa2_queue_cb_dqrr_t *cb;
dpaa2_queue_cb_eqresp_free_t *cb_eqresp_free;
struct dpaa2_bp_info *bp_array;
+ /*to store tx_conf_queue corresponding to tx_queue*/
+ struct dpaa2_queue *tx_conf_queue;
};
struct swp_active_dqs {
diff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h
b/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h
index adb730b71..0d6324183 100644
--- a/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h
+++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h
@@ -253,6 +253,28 @@ struct dpaa2_annot_hdr {
#define PARSE_ERROR_CODE(var) ((uint64_t)(var) & 0xFF00)
#define SOFT_PARSING_CONTEXT(var) ((uint64_t)(var) & 0x00FF)
+/*FAEAD offset in anmotation area*/
+#define DPAA2_FD_HW_ANNOT_FAEAD_OFFSET 0x58
+
+struct dpaa2_faead {
+ uint32_t fqid;
+ uint32_t ctrl;
+};
+
+/*FAEAD bits */
+/*A2 OMB contains valid data*/
+#define DPAA2_ANNOT_FAEAD_A2V 0x2000
+/*egress confirmation FQID in FAEAD contains valid data*/
+#define DPAA2_ANNOT_FAEAD_A4V 0x0800
+/*UPD is valid*/
+#define DPAA2_ANNOT_FAEAD_UPDV 0x1000
+/*EBDD is valid*/
+#define DPAA2_ANNOT_FAEAD_EBDDV0x2000
+/*EBDD (External Buffer Deallocation Disable) */
+#define DPAA2_ANNOT_FAEAD_EBDD 0x0020
+/*UPD (Update prepended data)*/
+#define DPAA2_ANNOT_FAEAD_UPD 0x0010
+
/* Debug frame, otherwise supposed to be discarded */
#define DPAA2_ETH_FAS_DISC 0x8000
/* MACSEC frame */
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 8814de271..5c4d22e7c 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -290,7 +290,10 @@ dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev)
PMD_INIT_FUNC_TRACE();
num_rxqueue_per_tc = (priv->nb_rx_queues / priv->num_rx_tc);
- tot_queues = priv->nb_rx_queues + priv->nb_tx_queues;
+ if (priv->tx_conf_en)
+ tot_queues = priv->nb_rx_queues + 2 * priv->nb_tx_queues;
+ else
+ tot_queues = priv->nb_rx_queues + priv->nb_tx_queues;
mc_q = rte_malloc(NULL, sizeof(struct dpaa2_queue) * tot_queues,
RTE_CACHE_LINE_SIZE);
if (!mc_q) {
@@ -325,6 +328,28 @@ dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev)
goto fail_tx;
}
+ if (priv->tx_conf_en) {
+ /*Setup tx confirmation queues*/
+ for (i = 0; i < priv->nb_tx_queues; i++) {
+ mc_q->eth_data = dev->data;
+ mc_q->tc_index = i;
+ mc_q->flow_id = 0;
+ priv->tx_conf_vq[i] = mc_q++;
+ dpaa2_q = (struct dpaa2_queue *)priv->tx_conf_vq[i];
+ dpaa2_q->q_storage =
+ rte_malloc("dq_storage",
+ sizeof(struct queue_storage_info_t),
+ RTE_CACHE_LINE_SIZE);
+ if (!dpaa2_q->q_storage)
+ goto fail_tx_conf;
+
+ memset(dpaa2_q->q_storage, 0,
+ sizeof(struct queue_storage_info_t));
+ if (dpaa2_alloc_dq_storage(dpaa2_q->q_storage))
+ goto fail_tx_conf;
+ }
+ }
+
vq_id = 0;
for (dist_idx = 0; dist_idx < priv->nb_rx_queues; dist_idx++) {
mcq = (struct dpaa2_queue *)priv->rx_vq[vq_id];
@@ -334,6 +359,14 @@ dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev)
}
return 0;
+fail_tx_conf:
+ i -= 1;
+ while (i >= 0) {
+ dpaa2_q = (struct dpaa2_queue *)priv->tx_conf_vq[i];
+ rte_free(dpaa2_q->q_storage);
+ priv->tx_conf_vq[i--] = NULL;
+ }
+ i = priv->nb_tx_queues;
fail_tx:
i -= 1;
while (i >= 0) {
@@ -377,6 +410,14 @@ dpaa2_free_rx_tx_queues(struct rte_eth_dev *dev)
[dpdk-dev] [PATCH v1 29/30] net/dpaa2: add support for soft parser in MC
From: Sunil Kumar Kori
Signed-off-by: Sunil Kumar Kori
Reviewed-by: Sachin Saxena
---
drivers/net/dpaa2/mc/dpni.c | 117
drivers/net/dpaa2/mc/fsl_dpni.h | 133
drivers/net/dpaa2/mc/fsl_dpni_cmd.h | 43 -
3 files changed, 292 insertions(+), 1 deletion(-)
diff --git a/drivers/net/dpaa2/mc/dpni.c b/drivers/net/dpaa2/mc/dpni.c
index 362cd476f..b37f9976f 100644
--- a/drivers/net/dpaa2/mc/dpni.c
+++ b/drivers/net/dpaa2/mc/dpni.c
@@ -2484,3 +2484,120 @@ int dpni_get_custom_tpid(struct fsl_mc_io *mc_io,
uint32_t cmd_flags,
return err;
}
+
+int dpni_load_sw_sequence(struct fsl_mc_io *mc_io,
+ uint32_t cmd_flags,
+ uint16_t token,
+ struct dpni_load_ss_cfg *cfg)
+{
+ struct dpni_load_sw_sequence *cmd_params;
+ struct mc_command cmd = { 0 };
+
+ /* prepare command */
+ cmd.header = mc_encode_cmd_header(DPNI_CMDID_LOAD_SW_SEQUENCE,
+ cmd_flags,
+ token);
+ cmd_params = (struct dpni_load_sw_sequence *)cmd.params;
+ cmd_params->dest = cfg->dest;
+ cmd_params->ss_offset = cpu_to_le16(cfg->ss_offset);
+ cmd_params->ss_size = cpu_to_le16(cfg->ss_size);
+ cmd_params->ss_iova = cpu_to_le64(cfg->ss_iova);
+
+ /* send command to mc*/
+ return mc_send_command(mc_io, &cmd);
+}
+
+int dpni_enable_sw_sequence(struct fsl_mc_io *mc_io,
+ uint32_t cmd_flags,
+ uint16_t token,
+ struct dpni_enable_ss_cfg *cfg)
+{
+ struct dpni_enable_sw_sequence *cmd_params;
+ struct mc_command cmd = { 0 };
+
+ /* prepare command */
+ cmd.header = mc_encode_cmd_header(DPNI_CMDID_ENABLE_SW_SEQUENCE,
+ cmd_flags,
+ token);
+ cmd_params = (struct dpni_enable_sw_sequence *)cmd.params;
+ cmd_params->dest = cfg->dest;
+ cmd_params->set_start = cfg->set_start;
+ cmd_params->hxs = cpu_to_le16(cfg->hxs);
+ cmd_params->ss_offset = cpu_to_le16(cfg->ss_offset);
+ cmd_params->param_offset = cfg->param_offset;
+ cmd_params->param_size = cfg->param_size;
+ cmd_params->param_iova = cpu_to_le64(cfg->param_iova);
+
+ /* send command to mc*/
+ return mc_send_command(mc_io, &cmd);
+}
+
+/**
+ * dpni_get_sw_sequence_layout() - Get the soft sequence layout
+ * @mc_io: Pointer to MC portal's I/O object
+ * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_'
+ * @token: Token of DPNI object
+ * @src: Source of the layout (WRIOP Rx or Tx)
+ * @ss_layout_iova: I/O virtual address of 264 bytes DMA-able memory
+ *
+ * warning: After calling this function, call dpni_extract_sw_sequence_layout()
+ * to get the layout.
+ *
+ * Return: '0' on Success; error code otherwise.
+ */
+int dpni_get_sw_sequence_layout(struct fsl_mc_io *mc_io,
+ uint32_t cmd_flags,
+ uint16_t token,
+ enum dpni_soft_sequence_dest src,
+ uint64_t ss_layout_iova)
+{
+ struct dpni_get_sw_sequence_layout *cmd_params;
+ struct mc_command cmd = { 0 };
+
+ /* prepare command */
+ cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_SW_SEQUENCE_LAYOUT,
+ cmd_flags,
+ token);
+
+ cmd_params = (struct dpni_get_sw_sequence_layout *)cmd.params;
+ cmd_params->src = src;
+ cmd_params->layout_iova = cpu_to_le64(ss_layout_iova);
+
+ /* send command to mc*/
+ return mc_send_command(mc_io, &cmd);
+}
+
+/**
+ * dpni_extract_sw_sequence_layout() - extract the software sequence layout
+ * @layout:software sequence layout
+ * @sw_sequence_layout_buf:Zeroed 264 bytes of memory before mapping it
+ * to DMA
+ *
+ * This function has to be called after dpni_get_sw_sequence_layout
+ *
+ */
+void dpni_extract_sw_sequence_layout(struct dpni_sw_sequence_layout *layout,
+const uint8_t *sw_sequence_layout_buf)
+{
+ const struct dpni_sw_sequence_layout_entry *ext_params;
+ int i;
+ uint16_t ss_size, ss_offset;
+
+ ext_params = (const struct dpni_sw_sequence_layout_entry *)
+ sw_sequence_layout_buf;
+
+ for (i = 0; i < DPNI_SW_SEQUENCE_LAYOUT_SIZE; i++) {
+ ss_offset = le16_to_cpu(ext_params[i].ss_offset);
+ ss_size = le16_to_cpu(ext_params[i].ss_size);
+
+ if (ss_offset == 0 && ss_size == 0) {
+ layout->num_ss = i;
+ return;
+ }
+
+ layout->ss[i].ss_offset = ss_offset;
+ layout->ss[i].ss_size = ss_size;
+ layout->ss[i].param_offset = ext_params[i].param_offset;
+
[dpdk-dev] [PATCH v1 28/30] net/dpaa2: support separate MC portal per process
From: Shreyansh Jain
Earlier, there was a single MCP handle which was available across
complete DPAA2 driver as well as part of the dev_private which was
shared by the secondary process.
For secondary, that is not valid and it would require to open its
own handle for the MC. This is eventually used as part of the DPNI
configuration.
By using the process_private member of the rte_eth_dev, it is
possible to keep separate handles per process. Without worry of
overwriting when secondary process accesses the dev_private.
Signed-off-by: Shreyansh Jain
Reviewed-by: Sachin Saxena
---
drivers/net/dpaa2/dpaa2_ethdev.c | 108 ---
drivers/net/dpaa2/dpaa2_ethdev.h | 3 +
2 files changed, 59 insertions(+), 52 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 3381b1894..fe84f3ac6 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -117,7 +117,7 @@ dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t
vlan_id, int on)
{
int ret;
struct dpaa2_dev_priv *priv = dev->data->dev_private;
- struct fsl_mc_io *dpni = priv->hw;
+ struct fsl_mc_io *dpni = dev->process_private;
PMD_INIT_FUNC_TRACE();
@@ -144,7 +144,7 @@ static int
dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask)
{
struct dpaa2_dev_priv *priv = dev->data->dev_private;
- struct fsl_mc_io *dpni = priv->hw;
+ struct fsl_mc_io *dpni = dev->process_private;
int ret;
PMD_INIT_FUNC_TRACE();
@@ -182,7 +182,7 @@ dpaa2_vlan_tpid_set(struct rte_eth_dev *dev,
uint16_t tpid)
{
struct dpaa2_dev_priv *priv = dev->data->dev_private;
- struct fsl_mc_io *dpni = priv->hw;
+ struct fsl_mc_io *dpni = dev->process_private;
int ret = -ENOTSUP;
PMD_INIT_FUNC_TRACE();
@@ -220,8 +220,7 @@ dpaa2_fw_version_get(struct rte_eth_dev *dev,
size_t fw_size)
{
int ret;
- struct dpaa2_dev_priv *priv = dev->data->dev_private;
- struct fsl_mc_io *dpni = priv->hw;
+ struct fsl_mc_io *dpni = dev->process_private;
struct mc_soc_version mc_plat_info = {0};
struct mc_version mc_ver_info = {0};
@@ -428,7 +427,7 @@ static int
dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
{
struct dpaa2_dev_priv *priv = dev->data->dev_private;
- struct fsl_mc_io *dpni = priv->hw;
+ struct fsl_mc_io *dpni = dev->process_private;
struct rte_eth_conf *eth_conf = &dev->data->dev_conf;
uint64_t rx_offloads = eth_conf->rxmode.offloads;
uint64_t tx_offloads = eth_conf->txmode.offloads;
@@ -568,7 +567,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
struct rte_mempool *mb_pool)
{
struct dpaa2_dev_priv *priv = dev->data->dev_private;
- struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+ struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
struct dpaa2_queue *dpaa2_q;
struct dpni_queue cfg;
uint8_t options = 0;
@@ -716,7 +715,7 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
priv->tx_vq[tx_queue_id];
struct dpaa2_queue *dpaa2_tx_conf_q = (struct dpaa2_queue *)
priv->tx_conf_vq[tx_queue_id];
- struct fsl_mc_io *dpni = priv->hw;
+ struct fsl_mc_io *dpni = dev->process_private;
struct dpni_queue tx_conf_cfg;
struct dpni_queue tx_flow_cfg;
uint8_t options = 0, flow_id;
@@ -842,7 +841,8 @@ dpaa2_dev_rx_queue_release(void *q __rte_unused)
{
struct dpaa2_queue *dpaa2_q = (struct dpaa2_queue *)q;
struct dpaa2_dev_priv *priv = dpaa2_q->eth_data->dev_private;
- struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+ struct fsl_mc_io *dpni =
+ (struct fsl_mc_io *)priv->eth_dev->process_private;
uint8_t options = 0;
int ret;
struct dpni_queue cfg = {};
@@ -939,7 +939,7 @@ dpaa2_interrupt_handler(void *param)
{
struct rte_eth_dev *dev = param;
struct dpaa2_dev_priv *priv = dev->data->dev_private;
- struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+ struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
int ret;
int irq_index = DPNI_IRQ_INDEX;
unsigned int status = 0, clear = 0;
@@ -978,7 +978,7 @@ dpaa2_eth_setup_irqs(struct rte_eth_dev *dev, int enable)
{
int err = 0;
struct dpaa2_dev_priv *priv = dev->data->dev_private;
- struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+ struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
int irq_index = DPNI_IRQ_INDEX;
unsigned int mask = DPNI_IRQ_EVENT_LINK_CHANGED;
@@ -1008,7 +1008,7 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
struct rte_dpaa2_device *dpaa2_dev;
struct rte_eth_dev_data *data = dev->data;
struct dpaa2_dev_priv *
[dpdk-dev] [PATCH v1 27/30] bus/fslmc: support multi vfio group
From: Hemant Agrawal
DPAA2 support VFIO device passthrough in VM.
However in this case, each device is associated with different vfio group.
This code required different container id for each group.
On using the same container fd the second time,
ioctl calls are returning error.
Signed-off-by: Hemant Agrawal
---
drivers/bus/fslmc/fslmc_bus.c | 7 +-
drivers/bus/fslmc/fslmc_vfio.c | 160 ++---
drivers/bus/fslmc/fslmc_vfio.h | 3 +
3 files changed, 133 insertions(+), 37 deletions(-)
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index 9226d5b62..eff15f25d 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
*
- * Copyright 2016,2018 NXP
+ * Copyright 2016,2018-2019 NXP
*
*/
@@ -325,8 +325,7 @@ rte_fslmc_scan(void)
goto scan_fail;
/* Scan devices on the group */
- snprintf(fslmc_dirpath, sizeof(fslmc_dirpath), "%s/%d/devices",
- VFIO_IOMMU_GROUP_PATH, groupid);
+ sprintf(fslmc_dirpath, "%s/%s", SYSFS_FSL_MC_DEVICES, fslmc_container);
dir = opendir(fslmc_dirpath);
if (!dir) {
DPAA2_BUS_ERR("Unable to open VFIO group directory");
@@ -334,7 +333,7 @@ rte_fslmc_scan(void)
}
while ((entry = readdir(dir)) != NULL) {
- if (entry->d_name[0] == '.' || entry->d_type != DT_LNK)
+ if (entry->d_name[0] == '.' || entry->d_type != DT_DIR)
continue;
ret = scan_one_fslmc_device(entry->d_name);
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index 60c51d80e..970969d2b 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -40,16 +40,13 @@
#include "portal/dpaa2_hw_pvt.h"
#include "portal/dpaa2_hw_dpio.h"
-/** Pathname of FSL-MC devices directory. */
-#define SYSFS_FSL_MC_DEVICES "/sys/bus/fsl-mc/devices"
-
#define FSLMC_CONTAINER_MAX_LEN 8 /**< Of the format dprc.XX */
/* Number of VFIO containers & groups with in */
static struct fslmc_vfio_group vfio_group;
static struct fslmc_vfio_container vfio_container;
static int container_device_fd;
-static char *fslmc_container;
+char *fslmc_container;
static int fslmc_iommu_type;
static uint32_t *msi_intr_vaddr;
void *(*rte_mcp_ptr_list);
@@ -435,28 +432,136 @@ int rte_fslmc_vfio_dmamap(void)
return 0;
}
-static int64_t vfio_map_mcp_obj(struct fslmc_vfio_group *group, char *mcp_obj)
+static int
+fslmc_vfio_setup_device(const char *sysfs_base, const char *dev_addr,
+ int *vfio_dev_fd, struct vfio_device_info *device_info)
+{
+ struct vfio_group_status group_status = {
+ .argsz = sizeof(group_status)
+ };
+ int vfio_group_fd, vfio_container_fd, iommu_group_no, ret;
+
+ /* get group number */
+ ret = rte_vfio_get_group_num(sysfs_base, dev_addr, &iommu_group_no);
+ if (ret < 0)
+ return -1;
+
+ /* get the actual group fd */
+ vfio_group_fd = rte_vfio_get_group_fd(iommu_group_no);
+ if (vfio_group_fd < 0)
+ return -1;
+
+ /* if group_fd == 0, that means the device isn't managed by VFIO */
+ if (vfio_group_fd == 0) {
+ RTE_LOG(WARNING, EAL, " %s not managed by VFIO driver,
skipping\n",
+ dev_addr);
+ return 1;
+ }
+
+ /* Opens main vfio file descriptor which represents the "container" */
+ vfio_container_fd = rte_vfio_get_container_fd();
+ if (vfio_container_fd < 0) {
+ DPAA2_BUS_ERR("Failed to open VFIO container");
+ return -errno;
+ }
+
+ /* check if the group is viable */
+ ret = ioctl(vfio_group_fd, VFIO_GROUP_GET_STATUS, &group_status);
+ if (ret) {
+ DPAA2_BUS_ERR(" %s cannot get group status, "
+ "error %i (%s)\n", dev_addr,
+ errno, strerror(errno));
+ close(vfio_group_fd);
+ rte_vfio_clear_group(vfio_group_fd);
+ return -1;
+ } else if (!(group_status.flags & VFIO_GROUP_FLAGS_VIABLE)) {
+ DPAA2_BUS_ERR(" %s VFIO group is not viable!\n", dev_addr);
+ close(vfio_group_fd);
+ rte_vfio_clear_group(vfio_group_fd);
+ return -1;
+ }
+ /* At this point, we know that this group is viable (meaning,
+* all devices are either bound to VFIO or not bound to anything)
+*/
+
+ /* check if group does not have a container yet */
+ if (!(group_status.flags & VFIO_GROUP_FLAGS_CONTAINER_SET)) {
+
+ /* add group to a container */
+ ret = ioctl(vfio_group_fd, VFIO_GROUP_SET_CONTAINER,
+ &vfio_container_fd);
+ if (ret) {
+
[dpdk-dev] [PATCH v1 25/30] bus/fslmc: update PA-VA dpaax library only in PA mode
From: Shreyansh Jain
The address translation support for PA->VA is required only in
case of PA mode operation of DPDK. This was causing warning to
be reported on running any DPAA2 application in VA mode:
Add: Incorrect entry for PA->VA Table(xx)
Add: Lowest address:
This was caused by call to update the DPAAX table when VA mode
was enabled, in which case the VA==IOVA address.
Signed-off-by: Shreyansh Jain
Reviewed-by: Sachin Saxena
---
drivers/bus/fslmc/fslmc_bus.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index 9b2dd51c4..aa90d686f 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -421,8 +421,11 @@ rte_fslmc_probe(void)
*
* Error is ignored as relevant logs are handled within dpaax and
* handling for unavailable dpaax table too is transparent to caller.
+*
+* And, the IOVA table is only applicable in case of PA mode.
*/
- dpaax_iova_table_populate();
+ if (rte_eal_iova_mode() == RTE_IOVA_PA)
+ dpaax_iova_table_populate();
TAILQ_FOREACH(dev, &rte_fslmc_bus.device_list, next) {
TAILQ_FOREACH(drv, &rte_fslmc_bus.driver_list, next) {
@@ -519,7 +522,8 @@ rte_fslmc_driver_unregister(struct rte_dpaa2_driver *driver)
/* Cleanup the PA->VA Translation table; From whereever this function
* is called from.
*/
- dpaax_iova_table_depopulate();
+ if (rte_eal_iova_mode() == RTE_IOVA_PA)
+ dpaax_iova_table_depopulate();
TAILQ_REMOVE(&fslmc_bus->driver_list, driver, next);
/* Update Bus references */
--
2.17.1
[dpdk-dev] [PATCH v1 26/30] bus/fslmc: check for Dma map in primary process only
From: Shreyansh Jain
DMA mapping is a property of primary process - SMMU population done
once by primary doesn't need to be populated again in secondary
Signed-off-by: Shreyansh Jain
Reviewed-by: Sachin Saxena
---
drivers/bus/fslmc/fslmc_bus.c | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index aa90d686f..9226d5b62 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -395,12 +395,15 @@ rte_fslmc_probe(void)
/* Map existing segments as well as, in case of hotpluggable memory,
* install callback handler.
*/
- ret = rte_fslmc_vfio_dmamap();
- if (ret) {
- DPAA2_BUS_ERR("Unable to DMA map existing VAs: (%d)", ret);
- /* Not continuing ahead */
- DPAA2_BUS_ERR("FSLMC VFIO Mapping failed");
- return 0;
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+ ret = rte_fslmc_vfio_dmamap();
+ if (ret) {
+ DPAA2_BUS_ERR("Unable to DMA map existing VAs: (%d)",
+ ret);
+ /* Not continuing ahead */
+ DPAA2_BUS_ERR("FSLMC VFIO Mapping failed");
+ return 0;
+ }
}
ret = fslmc_vfio_process_group();
--
2.17.1
[dpdk-dev] [PATCH v1 30/30] net/dpaa2: add soft parser driver
From: Sunil Kumar Kori
Signed-off-by: Sunil Kumar Kori
---
drivers/net/dpaa2/Makefile| 1 +
drivers/net/dpaa2/dpaa2_ethdev.c | 24 +++
drivers/net/dpaa2/dpaa2_ethdev.h | 4 +
drivers/net/dpaa2/dpaa2_sparser.c | 269 ++
drivers/net/dpaa2/dpaa2_sparser.h | 206 +++
drivers/net/dpaa2/meson.build | 1 +
6 files changed, 505 insertions(+)
create mode 100644 drivers/net/dpaa2/dpaa2_sparser.c
create mode 100644 drivers/net/dpaa2/dpaa2_sparser.h
diff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile
index 0cc539dc5..7924871c8 100644
--- a/drivers/net/dpaa2/Makefile
+++ b/drivers/net/dpaa2/Makefile
@@ -34,6 +34,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_rxtx.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_ethdev.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_flow.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_mux.c
+SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_sparser.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpni.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpkg.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpdmux.c
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index fe84f3ac6..34852ad08 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -26,6 +26,7 @@
#include
#include
#include "dpaa2_ethdev.h"
+#include "dpaa2_sparser.h"
#include
#define DRIVER_LOOPBACK_MODE "drv_loopback"
@@ -2498,6 +2499,29 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
goto init_err;
}
+ /*TODO To enable soft parser support DPAA2 driver needs to integrate
+* with external entity to receive byte code for software sequence
+* and same will be offload to the H/W using MC interface.
+* Currently it is assumed that DPAA2 driver has byte code by some
+* mean and same if offloaded to H/W.
+*/
+ if (getenv("DPAA2_ENABLE_SOFT_PARSER")) {
+ WRIOP_SS_INITIALIZER(priv);
+ ret = dpaa2_eth_load_wriop_soft_parser(priv, DPNI_SS_INGRESS);
+ if (ret < 0) {
+ DPAA2_PMD_ERR(" Error(%d) in loading softparser\n",
+ ret);
+ return ret;
+ }
+
+ ret = dpaa2_eth_enable_wriop_soft_parser(priv,
+DPNI_SS_INGRESS);
+ if (ret < 0) {
+ DPAA2_PMD_ERR(" Error(%d) in enabling softparser\n",
+ ret);
+ return ret;
+ }
+ }
RTE_LOG(INFO, PMD, "%s: netdev created\n", eth_dev->data->name);
return 0;
init_err:
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h
index bcb8360be..823f9e97c 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.h
+++ b/drivers/net/dpaa2/dpaa2_ethdev.h
@@ -22,6 +22,7 @@
#define MAX_TCSDPNI_MAX_TC
#define MAX_RX_QUEUES 128
#define MAX_TX_QUEUES 16
+#define MAX_DPNI 8
/*default tc to be used for ,congestion, distribution etc configuration. */
#define DPAA2_DEF_TC 0
@@ -131,6 +132,9 @@ struct dpaa2_dev_priv {
uint64_t fs_extract_param[MAX_TCS];
} extract;
+ uint16_t ss_offset;
+ uint64_t ss_iova;
+ uint64_t ss_param_iova;
#if defined(RTE_LIBRTE_IEEE1588)
/*stores timestamp of last received packet on dev*/
uint64_t rx_timestamp;
diff --git a/drivers/net/dpaa2/dpaa2_sparser.c
b/drivers/net/dpaa2/dpaa2_sparser.c
new file mode 100644
index 0..7e8fedd81
--- /dev/null
+++ b/drivers/net/dpaa2/dpaa2_sparser.c
@@ -0,0 +1,269 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2018-2019 NXP
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "dpaa2_ethdev.h"
+#include "dpaa2_sparser.h"
+#include "base/dpaa2_hw_dpni_annot.h"
+#define __STDC_FORMAT_MACROS
+#include
+#include
+
+uint8_t wriop_bytecode[] = {
+ 0x00, 0x04, 0x29, 0x42, 0x03, 0xe0, 0x12, 0x00, 0x29, 0x02,
+ 0x18, 0x00, 0x87, 0x3c, 0x00, 0x02, 0x18, 0x00, 0x00, 0x00
+};
+
+struct frame_attr frame_attr_arr[] = {
+ /* Frame Attribute Flags 1 */
+ /* 000 */ {"Routing header present in IPv6 header 2 ", 0, 0x8000},
+ /* 001 */ {"GTP Primed was detected ", 0, 0x4000},
+ /* 002 */ {"VLAN with VID = 0 was detected ", 0, 0x2000},
+ /* 003 */ {"A PTP frame was detected", 0, 0x1000},
+ /* 004 */ {"VXLAN was parsed", 0, 0x0800},
+ /* 005 */ {"A VXLAN HXS parsing error was detected ", 0, 0x0400},
+ /* 006 */ {"Ethernet control protocol was detected ", 0, 0x0200},
+ /* 007 */ {"IKE was detected at UDP port 4500
Re: [dpdk-dev] [PATCH v1 00/13] introduces ppfe network PMD
Hi Ferruh, > Subject: [PATCH v1 00/13] introduces ppfe network PMD > > This series introduces ppfe (programmable packet > forwarding engine) network poll mode driver for > NXP SoC ls1012a. > > First patch of this series move OF library code from > dpaa bus to a common folder as PPFE also uses the > same library for getting information from the device > tree. > This patch is included in this series so that > compilation by CI don't break. > > Gagandeep Singh (12): > net/ppfe: introduce ppfe net poll mode driver > doc: add guide for ppfe net PMD > net/ppfe: support dynamic logging > net/ppfe: add HW specific macros and operations > net/ppfe: add MAC and host interface initialisation > net/ppfe: add device start stop operations > net/ppfe: add queue setup and release operations > net/ppfe: add burst enqueue and dequeue operations > net/ppfe: add supported packet types and basic statistics > net/ppfe: add MTU and MAC address set operations > net/ppfe: add allmulticast and promiscuous > net/ppfe: add link status update > > Hemant Agrawal (1): > common/dpaax: moving OF lib code from dpaa bus > We are seeing DPDK compilation break on CENTOS in CI test reports. One of the error is " error: unknown pragma ignored [-Werror,-Wunknown-pragmas]" with clang version 3.4.2 which is pretty old and it seems this version of clang is not supporting the function level optimization. Do you know why we are using such an old version of clang? Can you please suggest how can I fix this issue? Thanks, Gagan
[dpdk-dev] [PATCH v2] net/ixgbe: fix Rx/Tx queue interrupt for X552/557 devices
X552/557 devices do not enable the queue interrupt mapping,
this patch fix the issue.
Fixes: d2e72774e58c ("ixgbe/base: support X550")
Signed-off-by: Jiang JunyuX
---
drivers/net/ixgbe/ixgbe_ethdev.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 03fc1f717..e36e1c58e 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -5896,7 +5896,8 @@ ixgbe_set_ivar_map(struct ixgbe_hw *hw, int8_t direction,
IXGBE_WRITE_REG(hw, IXGBE_IVAR(idx), tmp);
} else if ((hw->mac.type == ixgbe_mac_82599EB) ||
(hw->mac.type == ixgbe_mac_X540) ||
- (hw->mac.type == ixgbe_mac_X550)) {
+ (hw->mac.type == ixgbe_mac_X550) ||
+ (hw->mac.type == ixgbe_mac_X550EM_x)) {
if (direction == -1) {
/* other causes */
idx = ((queue & 1) * 8);
@@ -6026,6 +6027,7 @@ ixgbe_configure_msix(struct rte_eth_dev *dev)
case ixgbe_mac_82599EB:
case ixgbe_mac_X540:
case ixgbe_mac_X550:
+ case ixgbe_mac_X550EM_x:
ixgbe_set_ivar_map(hw, -1, 1, IXGBE_MISC_VEC_ID);
break;
default:
--
2.17.1
Re: [dpdk-dev] [PATCH v2] net/ixgbe: fix Rx/Tx queue interrupt for X552/557 devices
Hi,
On 08/27, Jiang JunyuX wrote:
>X552/557 devices do not enable the queue interrupt mapping,
>this patch fix the issue.
Could you elaborate more about the issue that this patch trying to solve?
>
>Fixes: d2e72774e58c ("ixgbe/base: support X550")
Please also cc sta...@dpdk.org for a fix patch.
Thanks,
Xiaolong
>
>Signed-off-by: Jiang JunyuX
>---
> drivers/net/ixgbe/ixgbe_ethdev.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c
>b/drivers/net/ixgbe/ixgbe_ethdev.c
>index 03fc1f717..e36e1c58e 100644
>--- a/drivers/net/ixgbe/ixgbe_ethdev.c
>+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
>@@ -5896,7 +5896,8 @@ ixgbe_set_ivar_map(struct ixgbe_hw *hw, int8_t direction,
> IXGBE_WRITE_REG(hw, IXGBE_IVAR(idx), tmp);
> } else if ((hw->mac.type == ixgbe_mac_82599EB) ||
> (hw->mac.type == ixgbe_mac_X540) ||
>- (hw->mac.type == ixgbe_mac_X550)) {
>+ (hw->mac.type == ixgbe_mac_X550) ||
>+ (hw->mac.type == ixgbe_mac_X550EM_x)) {
> if (direction == -1) {
> /* other causes */
> idx = ((queue & 1) * 8);
>@@ -6026,6 +6027,7 @@ ixgbe_configure_msix(struct rte_eth_dev *dev)
> case ixgbe_mac_82599EB:
> case ixgbe_mac_X540:
> case ixgbe_mac_X550:
>+ case ixgbe_mac_X550EM_x:
> ixgbe_set_ivar_map(hw, -1, 1, IXGBE_MISC_VEC_ID);
> break;
> default:
>--
>2.17.1
>
Re: [dpdk-dev] [PATCH v5] eal: use memzone to share tsc hz with secondary processes
On Mon, Aug 26, 2019 at 06:44:46AM -0700, Jim Harris wrote: > Ideally, get_tsc_freq_arch() is able to provide the > TSC rate using arch-specific means. When that is not > possible, DPDK reverts to calculating the TSC rate with > a 100ms nanosleep or 1s sleep. The latter occurs more > frequently in VMs which often do not have access to the > data they need from arch-specific means (CPUID leaf 0x15 > or MSR 0xCE on x86). > > In secondary processes, the extra 100ms is especially > noticeable and consumes the bulk of rte_eal_init() > execution time. To resolve this extra delay, have > the primary process put the TSC rate into a shared > memory region that the secondary process can lookup. > > Reduces rte_eal_init() execution time in a secondary > process from 165ms to 66ms on my test system. > > Signed-off-by: Jim Harris > --- I think using shared memory is a lot simpler to manage, so LGTM. Acked-by: Bruce Richardson
Re: [dpdk-dev] [PATCH v2 0/2] add abi version testing to app/test
On Mon, Aug 26, 2019 at 05:45:55PM +0100, Ray Kinsella wrote: > > > On 23/08/2019 16:49, Aaron Conole wrote: > > Ray Kinsella writes: > > > >> This patchset adds ABI version testing to the app/test unit test framework, > >> addressing two issues previously raised during ML conversations on ABI > >> stability; > >> > >> 1. How do we unit test still supported previous ABI versions? > >> 2. How to we unit test inline functions from still supported previous ABI > >> versions? > >> > >> Starting with rte_lpm, I did the following:- > >> > >> * I reproduced mostly unmodified unit tests for the v2.0 ABI, taken from > >> DPDK > >> 2.2 and 17.02. > >> * I reproduced the rte_lpm interface header from v2.0, including the inline > >> functions and remapping symbols to their appropriate versions. > >> * I added support for multiple abi versions to the app/test unit test > >> framework > >> to allow users to switch between abi versions (set_abi_version), without > >> further polluting the already long list of unit tests available in > >> app/test. > >> > >> The intention here is that in future as developers need to deprecate APIs, > >> the > >> associated unit tests may move into the ABI version testing mechanism of > >> the > >> app/test instead of being replaced by the latest set of unit tests as > >> would be > >> the case today. > >> > >> v2: > >> > >> * Added LPM IPv6 test cases for the v2.0 ABI. > >> * Fixed a number of checkpatch errors, stop short of substantially > >> reworking > >> the test code from the v2.0 ABI. > >> * Removed duplicating test cases published in the original v1 patch. > > > > Thanks for this work. I think it's useful. > > > > I see an error under aarch64 builds because there are some x86_64 > > specific types being used in the testing. > > So the problem is that LPM didn't fully support ARM until DPDK v16.04. > The ABI versioning code in the LPM library is there to support the 2.0 ABI. > > The intention of this unit test is to test backward's compatibility with > an inline LPM function from DPDK v2.2.0, which was essentially x86 only > at that time. > > Unless we want to get into the business of backporting ARM support to > DPDK 2.2.0 (from where this test cases came from) - we should probably > restrict these ABI versioning test cases to CONFIG_RTE_ARCH_X86_64 only. > > The other option is forget about testing this the LPM ABI versioning > support, which then asks the question should be perhaps excise that code > altogether. > I think function versioning is great and should be widely used. Unfortunately, though, in our case since we break the ABI so consistently, this old code is pretty useless. Therefore, I think we should remove all old versionned code from e.g. pre-18.11, since no app is realistically going to work from that far back anyway. /Bruce
[dpdk-dev] [RFC PATCH 2/2] virtio: one way barrier for packed vring desc used flags
In case VIRTIO_F_ORDER_PLATFORM(36) is not negotiated, then the
frontend and backend are assumed to be implemented in software,
that is they can run on identical CPUs in an SMP configuration.
Thus a weak form of memory barriers like rte_smp_r/wmb, other
than rte_cio_r/wmb, is sufficient for this case(vq->hw->weak_barriers
== 1) and yields better performance.
For the above case, this patch helps yielding even better performance
by replacing the two-way barriers with C11 one-way barriers.
Signed-off-by: Joyce Kong
---
drivers/net/virtio/virtio_rxtx.c | 12 +---
drivers/net/virtio/virtio_user/virtio_user_dev.c | 4 ++--
drivers/net/virtio/virtqueue.h | 7 ++-
lib/librte_vhost/virtio_net.c| 5 ++---
4 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 2a2153c..1d818c8 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -122,9 +122,11 @@ virtqueue_dequeue_burst_rx_packed(struct virtqueue *vq,
for (i = 0; i < num; i++) {
used_idx = vq->vq_used_cons_idx;
+ /* desc_is_used has a load-acquire or rte_cio_rmb inside
+* and wait for used desc in virtqueue.
+*/
if (!desc_is_used(&desc[used_idx], vq))
return i;
- virtio_rmb(vq->hw->weak_barriers);
len[i] = desc[used_idx].len;
id = desc[used_idx].id;
cookie = (struct rte_mbuf *)vq->vq_descx[id].cookie;
@@ -233,8 +235,10 @@ virtio_xmit_cleanup_inorder_packed(struct virtqueue *vq,
int num)
struct vq_desc_extra *dxp;
used_idx = vq->vq_used_cons_idx;
+ /* desc_is_used has a load-acquire or rte_cio_rmb inside
+* and wait for used desc in virtqueue.
+*/
while (num > 0 && desc_is_used(&desc[used_idx], vq)) {
- virtio_rmb(vq->hw->weak_barriers);
id = desc[used_idx].id;
do {
curr_id = used_idx;
@@ -265,8 +269,10 @@ virtio_xmit_cleanup_normal_packed(struct virtqueue *vq,
int num)
struct vq_desc_extra *dxp;
used_idx = vq->vq_used_cons_idx;
+ /* desc_is_used has a load-acquire or rte_cio_rmb inside
+* and wait for used desc in virtqueue.
+*/
while (num-- && desc_is_used(&desc[used_idx], vq)) {
- virtio_rmb(vq->hw->weak_barriers);
id = desc[used_idx].id;
dxp = &vq->vq_descx[id];
vq->vq_used_cons_idx += dxp->ndescs;
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c
b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 7911c39..1c575d0 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -698,8 +698,8 @@ virtio_user_handle_cq_packed(struct virtio_user_dev *dev,
uint16_t queue_idx)
if (vq->used_wrap_counter)
flags |= VRING_PACKED_DESC_F_AVAIL_USED;
- rte_smp_wmb();
- vring->desc[vq->used_idx].flags = flags;
+ __atomic_store_n(&vring->desc[vq->used_idx].flags, flags,
+__ATOMIC_RELEASE);
vq->used_idx += n_descs;
if (vq->used_idx >= dev->queue_size) {
diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index c6dd4a3..ee6fcbb 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -286,7 +286,12 @@ desc_is_used(struct vring_packed_desc *desc, struct
virtqueue *vq)
{
uint16_t used, avail, flags;
- flags = desc->flags;
+ if (vq->hw->weak_barriers)
+ flags = __atomic_load_n(&desc->flags, __ATOMIC_ACQUIRE);
+ else {
+ flags = desc->flags;
+ rte_cio_rmb();
+ }
used = !!(flags & VRING_PACKED_DESC_F_USED);
avail = !!(flags & VRING_PACKED_DESC_F_AVAIL);
diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
index e7463ff..241d467 100644
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -110,8 +110,6 @@ flush_shadow_used_ring_packed(struct virtio_net *dev,
used_idx -= vq->size;
}
- rte_smp_wmb();
-
for (i = 0; i < vq->shadow_used_idx; i++) {
uint16_t flags;
@@ -147,7 +145,8 @@ flush_shadow_used_ring_packed(struct virtio_net *dev,
}
}
- vq->desc_packed[head_idx].flags = head_flags;
+ __atomic_store_n(&vq->desc_packed[head_idx].flags, head_flags,
+__ATOMIC_RELEASE);
vhost_log_cache_used_vring(dev, vq,
head_idx *
--
2.7.4
[dpdk-dev] [RFC PATCH 0/2] virtio: one way barrier for packed vring flags
This patch set replaces the two-way barriers with C11 one-way barriers for packed vring flags, when the frontend and backend are implemented in software. By doing vhost-user + virtio-user case benchmarking, 9% performance gain in the RFC2544 test was measured on Thunderx2 platform.[1] [1]https://doc.dpdk.org/dts/test_plans/pvp_multi_paths_performance_test_plan.html PVP test with virtio 1.1 mergeable path Joyce Kong (2): virtio: one way barrier for packed vring desc avail flags virtio: one way barrier for packed vring desc used flags drivers/net/virtio/virtio_rxtx.c | 38 ++-- drivers/net/virtio/virtio_user/virtio_user_dev.c | 10 +-- drivers/net/virtio/virtqueue.h | 7 - lib/librte_vhost/vhost.h | 2 +- lib/librte_vhost/virtio_net.c| 16 +- 5 files changed, 50 insertions(+), 23 deletions(-) -- 2.7.4
[dpdk-dev] [RFC PATCH 1/2] virtio: one way barrier for packed vring desc avail flags
In case VIRTIO_F_ORDER_PLATFORM(36) is not negotiated, then the frontend
and backend are assumed to be implemented in software, that is they can
run on identical CPUs in an SMP configuration. Thus a weak form of memory
barriers like rte_smp_r/wmb, other than rte_cio_r/wmb, is sufficient for
this case(vq->hw->weak_barriers == 1) and yields better performance.
For the above case, this patch helps yielding even better performance
by replacing the two-way barriers with C11 one-way barriers.
Meanwhile, a read barrier is required to ensure ordering between
descriptor's flags and content reads[1]. With C11, load-acquire can
enforce the ordering instead of rmb barrier.
[1]https://patchwork.dpdk.org/patch/49109/
Signed-off-by: Joyce Kong
---
drivers/net/virtio/virtio_rxtx.c | 26 ++--
drivers/net/virtio/virtio_user/virtio_user_dev.c | 6 +-
lib/librte_vhost/vhost.h | 2 +-
lib/librte_vhost/virtio_net.c| 11 +-
4 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 27ead19..2a2153c 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -456,8 +456,14 @@ virtqueue_enqueue_recv_refill_packed(struct virtqueue *vq,
vq->vq_desc_head_idx = dxp->next;
if (vq->vq_desc_head_idx == VQ_RING_DESC_CHAIN_END)
vq->vq_desc_tail_idx = vq->vq_desc_head_idx;
- virtio_wmb(hw->weak_barriers);
- start_dp[idx].flags = flags;
+
+ if (hw->weak_barriers)
+ __atomic_store_n(&start_dp[idx].flags, flags,
+__ATOMIC_RELEASE);
+ else {
+ rte_cio_wmb();
+ start_dp[idx].flags = flags;
+ }
if (++vq->vq_avail_idx >= vq->vq_nentries) {
vq->vq_avail_idx -= vq->vq_nentries;
vq->vq_packed.cached_flags ^=
@@ -671,8 +677,12 @@ virtqueue_enqueue_xmit_packed_fast(struct virtnet_tx *txvq,
vq->vq_desc_tail_idx = VQ_RING_DESC_CHAIN_END;
}
- virtio_wmb(vq->hw->weak_barriers);
- dp->flags = flags;
+ if (vq->hw->weak_barriers)
+ __atomic_store_n(&dp->flags, flags, __ATOMIC_RELEASE);
+ else {
+ rte_cio_wmb();
+ dp->flags = flags;
+ }
}
static inline void
@@ -763,8 +773,12 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq,
struct rte_mbuf *cookie,
vq->vq_desc_tail_idx = VQ_RING_DESC_CHAIN_END;
}
- virtio_wmb(vq->hw->weak_barriers);
- head_dp->flags = head_flags;
+ if (vq->hw->weak_barriers)
+ __atomic_store_n(&head_dp->flags, head_flags, __ATOMIC_RELEASE);
+ else {
+ rte_cio_wmb();
+ head_dp->flags = head_flags;
+ }
}
static inline void
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c
b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index fab87eb..7911c39 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -624,7 +624,7 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev,
struct vring *vring,
static inline int
desc_is_avail(struct vring_packed_desc *desc, bool wrap_counter)
{
- uint16_t flags = desc->flags;
+ uint16_t flags = __atomic_load_n(&desc->flags, __ATOMIC_ACQUIRE);
return wrap_counter == !!(flags & VRING_PACKED_DESC_F_AVAIL) &&
wrap_counter != !!(flags & VRING_PACKED_DESC_F_USED);
@@ -684,6 +684,10 @@ virtio_user_handle_cq_packed(struct virtio_user_dev *dev,
uint16_t queue_idx)
struct vring_packed *vring = &dev->packed_vrings[queue_idx];
uint16_t n_descs, flags;
+ /* Perform a load-acquire barrier in desc_is_avail to
+* enforce the ordering between desc flags and desc
+* content.
+*/
while (desc_is_avail(&vring->desc[vq->used_idx],
vq->used_wrap_counter)) {
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 884befa..d294ed1 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -344,7 +344,7 @@ vq_is_packed(struct virtio_net *dev)
static inline bool
desc_is_avail(struct vring_packed_desc *desc, bool wrap_counter)
{
- uint16_t flags = *((volatile uint16_t *) &desc->flags);
+ uint16_t flags = __atomic_load_n(&desc->flags, __ATOMIC_ACQUIRE);
return wrap_counter == !!(flags & VRING_DESC_F_AVAIL) &&
wrap_counter != !!(flags & VRING_DESC_F_USED);
diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
index 5b85b83..e7463ff 100644
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -503,14 +503,13 @@ fil
Re: [dpdk-dev] [PATCH 1/6] net/e1000: use dynamic log type for tx/rx debug
On 7/16/2019 4:40 PM, Stephen Hemminger wrote:
> The generic RTE_LOGTYPE_PMD is a historical relic and should
> not be used. Every driver should register the logtypes
> for itself.
>
> Signed-off-by: Stephen Hemminger
<...>
> +#ifdef RTE_LIBRTE_E1000_DEBUG_RX
> + e1000_logtype_rx = rte_log_register("pmd.net.e1000.rx");
> + if (e1000_logtype_rx >= 0)
> + rte_log_set_level(e1000_logtype_rx, RTE_LOG_NOTICE);
What do you think setting default level for data path log level to
'RTE_LOG_DEBUG' since they are already controlled by a config option, and to
keep the behavior consistent with previous usage, because almost all macros are
called with DEBUG level. Same for all drivers in this patchset.
Re: [dpdk-dev] [PATCH 3/6] net/ixgbe: use dynamic log type for tx/rx debug
On 7/16/2019 4:40 PM, Stephen Hemminger wrote:
> The generic RTE_LOGTYPE_PMD is a historical relic and should
> not be used. Every driver must dynamic log types.
>
> Signed-off-by: Stephen Hemminger
<...>
> @@ -161,16 +161,14 @@ ixgbe_add_tx_flow_control_drop_filter(struct
> rte_eth_dev *eth_dev)
> struct ixgbe_ethertype_filter ethertype_filter;
>
> if (!hw->mac.ops.set_ethertype_anti_spoofing) {
> - RTE_LOG(INFO, PMD, "ether type anti-spoofing is not"
> - " supported.\n");
> + PMD_DRV_LOG(INFO, "ether type anti-spoofing is not
> supported.\n");
> return;
> }
>
> i = ixgbe_ethertype_filter_lookup(filter_info,
> IXGBE_ETHERTYPE_FLOW_CTRL);
> if (i >= 0) {
> - RTE_LOG(ERR, PMD, "A ether type filter"
> - " entity for flow control already exists!\n");
> + PMD_DRV_LOG(ERR, "A ether type filter entity for flow control
> already exists!\n");
> return;
> }
>
This patch both adds dynamic log for Rx/Tx and converts log macro 'RTE_LOG' to
'PMD_DRV_LOG', can we separate these into two different patches?
Re: [dpdk-dev] [PATCH] net/cxgbe: implement dynamic log type
On 7/16/2019 7:53 PM, Stephen Hemminger wrote: > The generic RTE_LOGTYPE_PMD is a historical relic and should > be deprecated. Every driver must register its own logtype. > > Signed-off-by: Stephen Hemminger Applied to dpdk-next-net/master, thanks.
Re: [dpdk-dev] [PATCH v2 0/2] add abi version testing to app/test
On 27/08/2019 09:17, Bruce Richardson wrote: > On Mon, Aug 26, 2019 at 05:45:55PM +0100, Ray Kinsella wrote: >> >> >> On 23/08/2019 16:49, Aaron Conole wrote: >>> Ray Kinsella writes: >>> This patchset adds ABI version testing to the app/test unit test framework, addressing two issues previously raised during ML conversations on ABI stability; 1. How do we unit test still supported previous ABI versions? 2. How to we unit test inline functions from still supported previous ABI versions? Starting with rte_lpm, I did the following:- * I reproduced mostly unmodified unit tests for the v2.0 ABI, taken from DPDK 2.2 and 17.02. * I reproduced the rte_lpm interface header from v2.0, including the inline functions and remapping symbols to their appropriate versions. * I added support for multiple abi versions to the app/test unit test framework to allow users to switch between abi versions (set_abi_version), without further polluting the already long list of unit tests available in app/test. The intention here is that in future as developers need to deprecate APIs, the associated unit tests may move into the ABI version testing mechanism of the app/test instead of being replaced by the latest set of unit tests as would be the case today. v2: * Added LPM IPv6 test cases for the v2.0 ABI. * Fixed a number of checkpatch errors, stop short of substantially reworking the test code from the v2.0 ABI. * Removed duplicating test cases published in the original v1 patch. >>> >>> Thanks for this work. I think it's useful. >>> >>> I see an error under aarch64 builds because there are some x86_64 >>> specific types being used in the testing. >> >> So the problem is that LPM didn't fully support ARM until DPDK v16.04. >> The ABI versioning code in the LPM library is there to support the 2.0 ABI. >> >> The intention of this unit test is to test backward's compatibility with >> an inline LPM function from DPDK v2.2.0, which was essentially x86 only >> at that time. >> >> Unless we want to get into the business of backporting ARM support to >> DPDK 2.2.0 (from where this test cases came from) - we should probably >> restrict these ABI versioning test cases to CONFIG_RTE_ARCH_X86_64 only. >> >> The other option is forget about testing this the LPM ABI versioning >> support, which then asks the question should be perhaps excise that code >> altogether. >> > > I think function versioning is great and should be widely used. > Unfortunately, though, in our case since we break the ABI so consistently, > this old code is pretty useless. Therefore, I think we should remove all > old versionned code from e.g. pre-18.11, since no app is realistically > going to work from that far back anyway. > > /Bruce > I had come to a similar conclusion, that we likely need to deprecate much or all of the existing ABI Compatibility code, it needs a wider review. BIND_VERSION_SYMBOL and friends, are still needed to unit test ABI Versioning, the general idea is sound. And I liked LPM as an example, because it is well understood and contained, but I will look for something more recent we could use instead.
[dpdk-dev] [PATCH 0/1] net/enic: enic driver doesn't work with 2nd process
dirk (1): net/enic: enic driver doesn't work with 2nd process. the problem is that the private data structure enic uses pointers to rte_eth_dev and rte_pci_device which are overwritten when a 2nd process starts using this device. given patch removes these two pointers from the private data and uses the correct pointers. For us the given patch works fine on a cisco rack. (we used three processes working concurrently) drivers/net/enic/enic.h | 36 --- drivers/net/enic/enic_clsf.c | 5 +- drivers/net/enic/enic_ethdev.c| 79 ++- drivers/net/enic/enic_main.c | 177 +++--- drivers/net/enic/enic_res.c | 7 +- drivers/net/enic/enic_res.h | 6 +- drivers/net/enic/enic_rxtx_vec_avx2.c | 5 +- 7 files changed, 156 insertions(+), 159 deletions(-) -- 2.15.1
[dpdk-dev] [PATCH 1/1] net/enic: enic driver doesn't work with 2nd process
Signed-off-by: dirk
---
drivers/net/enic/enic.h | 36 ---
drivers/net/enic/enic_clsf.c | 5 +-
drivers/net/enic/enic_ethdev.c| 79 ++-
drivers/net/enic/enic_main.c | 177 +++---
drivers/net/enic/enic_res.c | 7 +-
drivers/net/enic/enic_res.h | 6 +-
drivers/net/enic/enic_rxtx_vec_avx2.c | 5 +-
7 files changed, 156 insertions(+), 159 deletions(-)
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 5a92508f0..87d799594 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -97,7 +97,6 @@ struct rte_flow {
/* Per-instance private data structure */
struct enic {
struct enic *next;
- struct rte_pci_device *pdev;
struct vnic_enet_config config;
struct vnic_dev_bar bar0;
struct vnic_dev *vdev;
@@ -109,7 +108,6 @@ struct enic {
uint64_t mbuf_initializer;
unsigned int port_id;
bool overlay_offload;
- struct rte_eth_dev *rte_dev;
struct enic_fdir fdir;
char bdf_name[ENICPMD_BDF_LENGTH];
int dev_fd;
@@ -275,7 +273,7 @@ enic_ring_incr(uint32_t n_descriptors, uint32_t idx)
void enic_fdir_stats_get(struct enic *enic,
struct rte_eth_fdir_stats *stats);
-int enic_fdir_add_fltr(struct enic *enic,
+int enic_fdir_add_fltr(struct rte_eth_dev *eth_dev,
struct rte_eth_fdir_filter *params);
int enic_fdir_del_fltr(struct enic *enic,
struct rte_eth_fdir_filter *params);
@@ -284,30 +282,30 @@ int enic_alloc_intr_resources(struct enic *enic);
int enic_setup_finish(struct enic *enic);
int enic_alloc_wq(struct enic *enic, uint16_t queue_idx,
unsigned int socket_id, uint16_t nb_desc);
-void enic_start_wq(struct enic *enic, uint16_t queue_idx);
-int enic_stop_wq(struct enic *enic, uint16_t queue_idx);
-void enic_start_rq(struct enic *enic, uint16_t queue_idx);
-int enic_stop_rq(struct enic *enic, uint16_t queue_idx);
+void enic_start_wq(struct rte_eth_dev *eth_dev, uint16_t queue_idx);
+int enic_stop_wq(struct rte_eth_dev *eth_dev, uint16_t queue_idx);
+void enic_start_rq(struct rte_eth_dev *eth_dev, uint16_t queue_idx);
+int enic_stop_rq(struct rte_eth_dev *eth_dev, uint16_t queue_idx);
void enic_free_rq(void *rxq);
-int enic_alloc_rq(struct enic *enic, uint16_t queue_idx,
+int enic_alloc_rq(struct rte_eth_dev *eth_dev, uint16_t queue_idx,
unsigned int socket_id, struct rte_mempool *mp,
uint16_t nb_desc, uint16_t free_thresh);
-int enic_set_vnic_res(struct enic *enic);
-int enic_init_rss_nic_cfg(struct enic *enic);
-int enic_set_rss_conf(struct enic *enic,
+int enic_set_vnic_res(struct rte_eth_dev *eth_dev);
+int enic_init_rss_nic_cfg(struct rte_eth_dev *eth_dev);
+int enic_set_rss_conf(struct rte_eth_dev *eth_dev,
struct rte_eth_rss_conf *rss_conf);
int enic_set_rss_reta(struct enic *enic, union vnic_rss_cpu *rss_cpu);
int enic_set_vlan_strip(struct enic *enic);
-int enic_enable(struct enic *enic);
-int enic_disable(struct enic *enic);
+int enic_enable(struct rte_eth_dev *eth_dev);
+int enic_disable(struct rte_eth_dev *eth_dev);
void enic_remove(struct enic *enic);
int enic_get_link_status(struct enic *enic);
int enic_dev_stats_get(struct enic *enic,
struct rte_eth_stats *r_stats);
void enic_dev_stats_clear(struct enic *enic);
void enic_add_packet_filter(struct enic *enic);
-int enic_set_mac_address(struct enic *enic, uint8_t *mac_addr);
-int enic_del_mac_address(struct enic *enic, int mac_index);
+int enic_set_mac_address(struct rte_eth_dev *eth_dev, uint8_t *mac_addr);
+int enic_del_mac_address(struct rte_eth_dev *eth_dev, int mac_index);
unsigned int enic_cleanup_wq(struct enic *enic, struct vnic_wq *wq);
void enic_send_pkt(struct enic *enic, struct vnic_wq *wq,
struct rte_mbuf *tx_pkt, unsigned short len,
@@ -315,7 +313,7 @@ void enic_send_pkt(struct enic *enic, struct vnic_wq *wq,
uint16_t ol_flags, uint16_t vlan_tag);
void enic_post_wq_index(struct vnic_wq *wq);
-int enic_probe(struct enic *enic);
+int enic_probe(struct rte_eth_dev *eth_dev);
int enic_clsf_init(struct enic *enic);
void enic_clsf_destroy(struct enic *enic);
uint16_t enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
@@ -331,9 +329,9 @@ uint16_t enic_simple_xmit_pkts(void *tx_queue, struct
rte_mbuf **tx_pkts,
uint16_t nb_pkts);
uint16_t enic_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts);
-int enic_set_mtu(struct enic *enic, uint16_t new_mtu);
-int enic_link_update(struct enic *enic);
-bool enic_use_vector_rx_handler(struct enic *enic);
+int enic_set_mtu(struct rte_eth_dev *eth_dev, uint16_t new_mtu);
+int enic_link_update(struct rte_eth_dev *eth_dev);
+bool enic_use_vector_rx_handler(struct rte_eth_dev *eth_dev)
Re: [dpdk-dev] [PATCH] net/ark: implement dynamic log type
On 7/16/2019 7:55 PM, Stephen Hemminger wrote: > The generic RTE_LOGTYPE_PMD is a historical relic and should > will be deprecated in near future. Every driver must register its own logtype. > > Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit Applied to dpdk-next-net/master, thanks.
Re: [dpdk-dev] [dpdk-stable] [PATCH] app/testpmd: remove duplicated support for Rx offloading
On 8/5/2019 1:25 PM, Flavia Musatescu wrote:
> The testpmd application provides two sets of commands for RX offload
> flags configuration. The purpose of this patch is to eliminate this
> duplication by removing the old set of commands:
> “port config all crc-strip|scatter|rx-cksum|rx-timestamp|hw-vlan|
> hw-vlan-filter|hw-vlan-strip|hw-vlan-extend on|off”
>
> The other commands set that can be used instead in order to enable
> or disable the same RX offloading flags on all RX queues of a port is:
> "port config rx_offload crc_strip|scatter|ipv4_cksum|
> udp_cksum|tcp_cksum|timestamp|vlan_strip|vlan_filter|vlan_extend on|off"
>
> This patch also fixes the "drop-en" command, which enables packets
> dropping on all RX queues of all ports when no receive buffers available
> “port config all drop-en on|off”
>
> Fixes: 384161e00627 ("app/testpmd: adjust on the fly VLAN configuration")
> Cc: shah...@mellanox.com
> Cc: sta...@dpdk.org
>
> Signed-off-by: Flavia Musatescu
> ---
> app/test-pmd/cmdline.c | 120
>
> doc/guides/rel_notes/release_19_08.rst | 9 +++
Hi Flavia,
Can you please send a new version with the 19.11 release notes update?
> doc/guides/testpmd_app_ug/testpmd_funcs.rst | 81 +--
> 3 files changed, 25 insertions(+), 185 deletions(-)
<...>
[dpdk-dev] [PATCH 1/1] net/enic: enic driver doesn't work with 2nd process
net/enic: enic driver doesn't work with 2nd process. the problem is that the
private data structure enic uses pointers to rte_eth_dev and rte_pci_device
which are overwritten when a 2nd process starts using this device.
given patch removes these two pointers from the private data and uses the
correct pointers. For us the given patch works fine on a cisco rack.
(we used three processes working concurrently)
Signed-off-by: dirk
---
drivers/net/enic/enic.h | 36 ---
drivers/net/enic/enic_clsf.c | 5 +-
drivers/net/enic/enic_ethdev.c| 79 ++-
drivers/net/enic/enic_main.c | 177 +++---
drivers/net/enic/enic_res.c | 7 +-
drivers/net/enic/enic_res.h | 6 +-
drivers/net/enic/enic_rxtx_vec_avx2.c | 5 +-
7 files changed, 156 insertions(+), 159 deletions(-)
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 5a92508f0..87d799594 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -97,7 +97,6 @@ struct rte_flow {
/* Per-instance private data structure */
struct enic {
struct enic *next;
- struct rte_pci_device *pdev;
struct vnic_enet_config config;
struct vnic_dev_bar bar0;
struct vnic_dev *vdev;
@@ -109,7 +108,6 @@ struct enic {
uint64_t mbuf_initializer;
unsigned int port_id;
bool overlay_offload;
- struct rte_eth_dev *rte_dev;
struct enic_fdir fdir;
char bdf_name[ENICPMD_BDF_LENGTH];
int dev_fd;
@@ -275,7 +273,7 @@ enic_ring_incr(uint32_t n_descriptors, uint32_t idx)
void enic_fdir_stats_get(struct enic *enic,
struct rte_eth_fdir_stats *stats);
-int enic_fdir_add_fltr(struct enic *enic,
+int enic_fdir_add_fltr(struct rte_eth_dev *eth_dev,
struct rte_eth_fdir_filter *params);
int enic_fdir_del_fltr(struct enic *enic,
struct rte_eth_fdir_filter *params);
@@ -284,30 +282,30 @@ int enic_alloc_intr_resources(struct enic *enic);
int enic_setup_finish(struct enic *enic);
int enic_alloc_wq(struct enic *enic, uint16_t queue_idx,
unsigned int socket_id, uint16_t nb_desc);
-void enic_start_wq(struct enic *enic, uint16_t queue_idx);
-int enic_stop_wq(struct enic *enic, uint16_t queue_idx);
-void enic_start_rq(struct enic *enic, uint16_t queue_idx);
-int enic_stop_rq(struct enic *enic, uint16_t queue_idx);
+void enic_start_wq(struct rte_eth_dev *eth_dev, uint16_t queue_idx);
+int enic_stop_wq(struct rte_eth_dev *eth_dev, uint16_t queue_idx);
+void enic_start_rq(struct rte_eth_dev *eth_dev, uint16_t queue_idx);
+int enic_stop_rq(struct rte_eth_dev *eth_dev, uint16_t queue_idx);
void enic_free_rq(void *rxq);
-int enic_alloc_rq(struct enic *enic, uint16_t queue_idx,
+int enic_alloc_rq(struct rte_eth_dev *eth_dev, uint16_t queue_idx,
unsigned int socket_id, struct rte_mempool *mp,
uint16_t nb_desc, uint16_t free_thresh);
-int enic_set_vnic_res(struct enic *enic);
-int enic_init_rss_nic_cfg(struct enic *enic);
-int enic_set_rss_conf(struct enic *enic,
+int enic_set_vnic_res(struct rte_eth_dev *eth_dev);
+int enic_init_rss_nic_cfg(struct rte_eth_dev *eth_dev);
+int enic_set_rss_conf(struct rte_eth_dev *eth_dev,
struct rte_eth_rss_conf *rss_conf);
int enic_set_rss_reta(struct enic *enic, union vnic_rss_cpu *rss_cpu);
int enic_set_vlan_strip(struct enic *enic);
-int enic_enable(struct enic *enic);
-int enic_disable(struct enic *enic);
+int enic_enable(struct rte_eth_dev *eth_dev);
+int enic_disable(struct rte_eth_dev *eth_dev);
void enic_remove(struct enic *enic);
int enic_get_link_status(struct enic *enic);
int enic_dev_stats_get(struct enic *enic,
struct rte_eth_stats *r_stats);
void enic_dev_stats_clear(struct enic *enic);
void enic_add_packet_filter(struct enic *enic);
-int enic_set_mac_address(struct enic *enic, uint8_t *mac_addr);
-int enic_del_mac_address(struct enic *enic, int mac_index);
+int enic_set_mac_address(struct rte_eth_dev *eth_dev, uint8_t *mac_addr);
+int enic_del_mac_address(struct rte_eth_dev *eth_dev, int mac_index);
unsigned int enic_cleanup_wq(struct enic *enic, struct vnic_wq *wq);
void enic_send_pkt(struct enic *enic, struct vnic_wq *wq,
struct rte_mbuf *tx_pkt, unsigned short len,
@@ -315,7 +313,7 @@ void enic_send_pkt(struct enic *enic, struct vnic_wq *wq,
uint16_t ol_flags, uint16_t vlan_tag);
void enic_post_wq_index(struct vnic_wq *wq);
-int enic_probe(struct enic *enic);
+int enic_probe(struct rte_eth_dev *eth_dev);
int enic_clsf_init(struct enic *enic);
void enic_clsf_destroy(struct enic *enic);
uint16_t enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
@@ -331,9 +329,9 @@ uint16_t enic_simple_xmit_pkts(void *tx_queue, struct
rte_mbuf **tx_pkts,
uint16_t nb_pkts);
uint16_t enic_prep_pkts(void
[dpdk-dev] [PATCH 0/1] net/enic: enic driver doesn't work with 2nd process
dirk (1): net/enic: enic driver doesn't work with 2nd process. the problem is that the private data structure enic uses pointers to rte_eth_dev and rte_pci_device which are overwritten when a 2nd process starts using this device. given patch removes these two pointers from the private data and uses the correct pointers. For us the given patch works fine on a cisco rack. (we used three processes working concurrently) drivers/net/enic/enic.h | 36 --- drivers/net/enic/enic_clsf.c | 5 +- drivers/net/enic/enic_ethdev.c| 79 ++- drivers/net/enic/enic_main.c | 177 +++--- drivers/net/enic/enic_res.c | 7 +- drivers/net/enic/enic_res.h | 6 +- drivers/net/enic/enic_rxtx_vec_avx2.c | 5 +- 7 files changed, 156 insertions(+), 159 deletions(-) -- 2.15.1
[dpdk-dev] [PATCH] net/mlx5: remove unneeded constant definition
Constant MLX5_GROUP_FACTOR is defined with value 1, and used to
multiply group value in two places.
This patch removes the unneeded constant definition and use.
Cc: sta...@dpdk.org
Signed-off-by: Dekel Peled
---
drivers/net/mlx5/mlx5.h | 1 -
drivers/net/mlx5/mlx5_flow_dv.c | 5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index d878e33..0308e5e 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -516,7 +516,6 @@ struct mlx5_flow_tbl_resource {
#define MLX5_MAX_TABLES 0x
#define MLX5_MAX_TABLES_FDB 0x
-#define MLX5_GROUP_FACTOR 1
#define MLX5_DBR_PAGE_SIZE 4096 /* Must be >= 512. */
#define MLX5_DBR_SIZE 8
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 7ae4b1c..7b2ba07 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -4476,7 +4476,7 @@ struct field_modify_info modify_tcp[] = {
return rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
"cannot allocate matcher memory");
- tbl = flow_dv_tbl_resource_get(dev, matcher->group * MLX5_GROUP_FACTOR,
+ tbl = flow_dv_tbl_resource_get(dev, matcher->group,
matcher->egress, matcher->transfer,
error);
if (!tbl) {
@@ -4866,8 +4866,7 @@ struct field_modify_info modify_tcp[] = {
break;
case RTE_FLOW_ACTION_TYPE_JUMP:
jump_data = action->conf;
- tbl = flow_dv_tbl_resource_get(dev, jump_data->group *
- MLX5_GROUP_FACTOR,
+ tbl = flow_dv_tbl_resource_get(dev, jump_data->group,
attr->egress,
attr->transfer, error);
if (!tbl)
--
1.8.3.1
Re: [dpdk-dev] [PATCH v2] net/ixgbe: fix Rx/Tx queue interrupt for X552/557 devices
Hi,
> Could you elaborate more about the issue that this patch trying to solve?
this issue is:start l3fwd-power with pf port0 bind to vfio-pci,there was no
response when send packets to l3fwd-power in x552/x557.
> -Original Message-
> From: Ye, Xiaolong
> Sent: Tuesday, August 27, 2019 4:08 PM
> To: Jiang, JunyuX
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v2] net/ixgbe: fix Rx/Tx queue interrupt for
> X552/557 devices
>
> Hi,
>
> On 08/27, Jiang JunyuX wrote:
> >X552/557 devices do not enable the queue interrupt mapping, this patch
> >fix the issue.
>
> Could you elaborate more about the issue that this patch trying to solve?
>
> >
> >Fixes: d2e72774e58c ("ixgbe/base: support X550")
>
> Please also cc sta...@dpdk.org for a fix patch.
>
> Thanks,
> Xiaolong
>
> >
> >Signed-off-by: Jiang JunyuX
> >---
> > drivers/net/ixgbe/ixgbe_ethdev.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> >diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c
> >b/drivers/net/ixgbe/ixgbe_ethdev.c
> >index 03fc1f717..e36e1c58e 100644
> >--- a/drivers/net/ixgbe/ixgbe_ethdev.c
> >+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> >@@ -5896,7 +5896,8 @@ ixgbe_set_ivar_map(struct ixgbe_hw *hw, int8_t
> direction,
> > IXGBE_WRITE_REG(hw, IXGBE_IVAR(idx), tmp);
> > } else if ((hw->mac.type == ixgbe_mac_82599EB) ||
> > (hw->mac.type == ixgbe_mac_X540) ||
> >-(hw->mac.type == ixgbe_mac_X550)) {
> >+(hw->mac.type == ixgbe_mac_X550) ||
> >+(hw->mac.type == ixgbe_mac_X550EM_x)) {
> > if (direction == -1) {
> > /* other causes */
> > idx = ((queue & 1) * 8);
> >@@ -6026,6 +6027,7 @@ ixgbe_configure_msix(struct rte_eth_dev *dev)
> > case ixgbe_mac_82599EB:
> > case ixgbe_mac_X540:
> > case ixgbe_mac_X550:
> >+case ixgbe_mac_X550EM_x:
> > ixgbe_set_ivar_map(hw, -1, 1, IXGBE_MISC_VEC_ID);
> > break;
> > default:
> >--
> >2.17.1
> >
[dpdk-dev] [PATCH 2/2] eal: DPDK init doesn't fail even if device probe fails.
rte_bus_probe() doesn't return error. As a result rte_eal_init()
doesn't catch this error and thus making dpdk initialization
successful despite probe failing for devices.
This patch returns error if probe fails for any of device.
Signed-off-by: Nitin Katiyar
---
lib/librte_eal/common/eal_common_bus.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_bus.c
b/lib/librte_eal/common/eal_common_bus.c
index baa5b53..1721179 100644
--- a/lib/librte_eal/common/eal_common_bus.c
+++ b/lib/librte_eal/common/eal_common_bus.c
@@ -70,16 +70,20 @@
}
ret = bus->probe();
- if (ret)
+ if (ret) {
RTE_LOG(ERR, EAL, "Bus (%s) probe failed.\n",
bus->name);
+ return ret;
+ }
}
if (vbus) {
ret = vbus->probe();
- if (ret)
+ if (ret) {
RTE_LOG(ERR, EAL, "Bus (%s) probe failed.\n",
vbus->name);
+ return ret;
+ }
}
return 0;
--
1.9.1
[dpdk-dev] [PATCH 1/2] bus/pci: Fail rte_pci_probe if probing all whitelisted devices fail.
Even if whitelist of devices is provided, rte_pci_probe() increments
the probed counter for all the devices present in the system. If probe
fails for all the whitelisted devices it still return success because
failed and probed counts don't match.
This patch increments probed count only when devices are actually
probed.
Signed-off-by: Nitin Katiyar
Signed-off-by: Venkatesan Pradeep
---
drivers/bus/pci/pci_common.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 6b46b4f..25d1002 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -300,15 +300,17 @@ static struct rte_devargs *pci_devargs_lookup(struct
rte_pci_device *dev)
probe_all = 1;
FOREACH_DEVICE_ON_PCIBUS(dev) {
- probed++;
-
devargs = dev->device.devargs;
/* probe all or only whitelisted devices */
- if (probe_all)
+ if (probe_all) {
ret = pci_probe_all_drivers(dev);
+ probed++;
+ }
else if (devargs != NULL &&
- devargs->policy == RTE_DEV_WHITELISTED)
+ devargs->policy == RTE_DEV_WHITELISTED) {
ret = pci_probe_all_drivers(dev);
+ probed++;
+ }
if (ret < 0) {
if (ret != -EEXIST) {
RTE_LOG(ERR, EAL, "Requested device "
--
1.9.1
Re: [dpdk-dev] [PATCH v2] net/pcap: propagate timestamp from pcap_pkthdr to mbuf
On 8/2/2019 9:57 AM, Sylvain Rodon wrote: > From: Sylvain Rodon > > Timestamp is always set in PCAP header, whether it reads a file or > listen on an interface. This information can be important for some > applications and it cannot be obtained otherwise (especially when > reading a PCAP file, where the timestamp is not the current time). > Timestamp here is the number of microseconds since epoch. > > Signed-off-by: Sylvain Rodon Acked-by: Ferruh Yigit Applied to dpdk-next-net/master, thanks.
[dpdk-dev] [PATCH v3 0/4] add unit tests for eal vfio library
1/4: fix vfio unmap that fails unexpectedly 2/4: fix vfio unmap that succeeds unexpectedly 3/4: add API to check iommu type is set 4/4: add unit tests for eal vfio Patch 4/4 depends on 1/4,2/4,3/4 Signed-off-by: Chaitanya Babu Talluri --- v3: Added API to check iommu type. v2: Updated commit messages. --- Chaitanya Babu Talluri (4): lib/eal: fix vfio unmap that fails unexpectedly lib/eal: fix vfio unmap that succeeds unexpectedly lib/eal: add API to check iommu type is set app/test: add unit tests for eal vfio app/test/Makefile| 1 + app/test/meson.build | 2 + app/test/test_eal_vfio.c | 736 +++ lib/librte_eal/common/include/rte_vfio.h | 10 + lib/librte_eal/linux/eal/eal_vfio.c | 75 ++- 5 files changed, 817 insertions(+), 7 deletions(-) create mode 100644 app/test/test_eal_vfio.c -- 2.17.2
[dpdk-dev] [PATCH v3 2/4] lib/eal: fix vfio unmap that succeeds unexpectedly
Unmapping page with a VA that is found in the list
of current mappings will succeed even if the IOVA
for the chunk that is being unmapped,is mismatched.
Fix it by checking if IOVA address matches the
expected IOVA address exactly.
Fixes: 73a6390859 ("vfio: allow to map other memory regions")
Cc: sta...@dpdk.org
Signed-off-by: Chaitanya Babu Talluri
---
lib/librte_eal/linux/eal/eal_vfio.c | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/lib/librte_eal/linux/eal/eal_vfio.c
b/lib/librte_eal/linux/eal/eal_vfio.c
index 104912077..04c284cb2 100644
--- a/lib/librte_eal/linux/eal/eal_vfio.c
+++ b/lib/librte_eal/linux/eal/eal_vfio.c
@@ -184,13 +184,13 @@ find_user_mem_map(struct user_mem_maps *user_mem_maps,
uint64_t addr,
uint64_t iova, uint64_t len)
{
uint64_t va_end = addr + len;
- uint64_t iova_end = iova + len;
int i;
for (i = 0; i < user_mem_maps->n_maps; i++) {
struct user_mem_map *map = &user_mem_maps->maps[i];
uint64_t map_va_end = map->addr + map->len;
- uint64_t map_iova_end = map->iova + map->len;
+ uint64_t diff_addr_len = addr - map->addr;
+ uint64_t expected_iova = map->iova + diff_addr_len;
/* check start VA */
if (addr < map->addr || addr >= map_va_end)
@@ -199,11 +199,10 @@ find_user_mem_map(struct user_mem_maps *user_mem_maps,
uint64_t addr,
if (va_end <= map->addr || va_end > map_va_end)
continue;
- /* check start IOVA */
- if (iova < map->iova || iova >= map_iova_end)
- continue;
- /* check if IOVA end is within boundaries */
- if (iova_end <= map->iova || iova_end > map_iova_end)
+ /* check whether user input iova is in sync with
+* user_mem_map entry's iova
+*/
+ if (expected_iova != iova)
continue;
/* we've found our map */
--
2.17.2
[dpdk-dev] [PATCH v3 3/4] lib/eal: add API to check iommu type is set
Add rte_vfio_iommu_type_is_set() to check IOMMU
type for default container.
Signed-off-by: Chaitanya Babu Talluri
---
lib/librte_eal/common/include/rte_vfio.h | 10 ++
lib/librte_eal/linux/eal/eal_vfio.c | 16
2 files changed, 26 insertions(+)
diff --git a/lib/librte_eal/common/include/rte_vfio.h
b/lib/librte_eal/common/include/rte_vfio.h
index b360485fa..a62006e5a 100644
--- a/lib/librte_eal/common/include/rte_vfio.h
+++ b/lib/librte_eal/common/include/rte_vfio.h
@@ -397,6 +397,16 @@ int
rte_vfio_container_dma_unmap(int container_fd, uint64_t vaddr,
uint64_t iova, uint64_t len);
+/**
+ * Check VFIO IOMMU Type is set for default container.
+ *
+ * @return
+ *0 if successful
+ * <0 if failed
+ */
+int
+rte_vfio_iommu_type_is_set(void);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/librte_eal/linux/eal/eal_vfio.c
b/lib/librte_eal/linux/eal/eal_vfio.c
index 04c284cb2..a5bb1cff4 100644
--- a/lib/librte_eal/linux/eal/eal_vfio.c
+++ b/lib/librte_eal/linux/eal/eal_vfio.c
@@ -2071,6 +2071,17 @@ rte_vfio_container_dma_unmap(int container_fd, uint64_t
vaddr, uint64_t iova,
return container_dma_unmap(vfio_cfg, vaddr, iova, len);
}
+int
+rte_vfio_iommu_type_is_set(void)
+{
+ if (vfio_get_iommu_type() < 0) {
+ RTE_LOG(ERR, EAL, "VFIO IOMMU Type is not set\n");
+ return -1;
+ }
+
+ return 0;
+}
+
#else
int
@@ -2191,4 +2202,9 @@ rte_vfio_container_dma_unmap(__rte_unused int
container_fd,
return -1;
}
+int
+rte_vfio_iommu_type_is_set(void)
+{
+ return -1;
+}
#endif /* VFIO_PRESENT */
--
2.17.2
[dpdk-dev] [PATCH v3 4/4] app/test: add unit tests for eal vfio
Unit test cases are added for eal vfio library.
eal_vfio_autotest added to meson build file.
Signed-off-by: Chaitanya Babu Talluri
---
app/test/Makefile| 1 +
app/test/meson.build | 2 +
app/test/test_eal_vfio.c | 736 +++
3 files changed, 739 insertions(+)
create mode 100644 app/test/test_eal_vfio.c
diff --git a/app/test/Makefile b/app/test/Makefile
index 26ba6fe2b..9b9c78b4e 100644
--- a/app/test/Makefile
+++ b/app/test/Makefile
@@ -137,6 +137,7 @@ SRCS-y += test_cpuflags.c
SRCS-y += test_mp_secondary.c
SRCS-y += test_eal_flags.c
SRCS-y += test_eal_fs.c
+SRCS-y += test_eal_vfio.c
SRCS-y += test_alarm.c
SRCS-y += test_interrupts.c
SRCS-y += test_version.c
diff --git a/app/test/meson.build b/app/test/meson.build
index ec40943bd..bd96ebb2b 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -36,6 +36,7 @@ test_sources = files('commands.c',
'test_distributor_perf.c',
'test_eal_flags.c',
'test_eal_fs.c',
+ 'test_eal_vfio.c',
'test_efd.c',
'test_efd_perf.c',
'test_errno.c',
@@ -175,6 +176,7 @@ fast_test_names = [
'eal_flags_file_prefix_autotest',
'eal_flags_misc_autotest',
'eal_fs_autotest',
+'eal_vfio_autotest',
'errno_autotest',
'event_ring_autotest',
'func_reentrancy_autotest',
diff --git a/app/test/test_eal_vfio.c b/app/test/test_eal_vfio.c
new file mode 100644
index 0..ca3efb034
--- /dev/null
+++ b/app/test/test_eal_vfio.c
@@ -0,0 +1,736 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2019 Intel Corporation
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "test.h"
+
+#if !defined(RTE_EXEC_ENV_LINUX) || !defined(RTE_EAL_VFIO)
+static int
+test_eal_vfio(void)
+{
+ printf("VFIO not supported, skipping test\n");
+ return TEST_SKIPPED;
+}
+
+#else
+
+#define PAGESIZE sysconf(_SC_PAGESIZE)
+#define INVALID_CONTAINER_FD -5
+#define THREE_PAGES 3
+#define UNALIGNED_ADDR 0x1500
+
+uint64_t virtaddr_64;
+const char *name = "heap";
+size_t map_length;
+int container_fds[RTE_MAX_VFIO_CONTAINERS];
+
+static int
+check_get_mem(void *addr, rte_iova_t *iova)
+{
+ const struct rte_memseg_list *msl;
+ const struct rte_memseg *ms;
+ rte_iova_t expected_iova;
+
+ msl = rte_mem_virt2memseg_list(addr);
+ if (!msl->external) {
+ printf("%s():%i: Memseg list is not marked as "
+ "external\n", __func__, __LINE__);
+ return -1;
+ }
+ ms = rte_mem_virt2memseg(addr, msl);
+ if (ms == NULL) {
+ printf("%s():%i: Failed to retrieve memseg for "
+ "external mem\n", __func__, __LINE__);
+ return -1;
+ }
+ if (ms->addr != addr) {
+ printf("%s():%i: VA mismatch\n", __func__, __LINE__);
+ return -1;
+ }
+ expected_iova = (iova == NULL) ? RTE_BAD_IOVA : iova[0];
+ if (ms->iova != expected_iova) {
+ printf("%s():%i: IOVA mismatch\n", __func__, __LINE__);
+ return -1;
+ }
+ return 0;
+}
+static int
+check_vfio_exist_and_initialize(void)
+{
+ int i = 0;
+
+ if (rte_vfio_is_enabled("vfio_pci") == 0) {
+ printf("VFIO is not enabled\n");
+ return TEST_SKIPPED;
+ }
+ if (rte_vfio_iommu_type_is_set() < 0) {
+ printf("VFIO IOMMU Type is not set\n");
+ return TEST_SKIPPED;
+ }
+
+ /* initialize_container_fds */;
+ for (i = 0; i < RTE_MAX_VFIO_CONTAINERS; i++)
+ container_fds[i] = -1;
+
+ return TEST_SUCCESS;
+}
+
+/* To test vfio container create */
+static int
+test_vfio_container_create(void)
+{
+ int ret = 0, i = 0;
+
+ /* check max containers limit */
+ for (i = 1; i < RTE_MAX_VFIO_CONTAINERS; i++) {
+ container_fds[i] = rte_vfio_container_create();
+ TEST_ASSERT(container_fds[i] > 0, "Test to check "
+ "rte_vfio_container_create with max "
+ "containers limit: Failed\n");
+ }
+
+ /* check rte_vfio_container_create when exceeds max containers limit */
+ ret = rte_vfio_container_create();
+ TEST_ASSERT(ret == -1, "Test to check "
+ "rte_vfio_container_create container "
+ "when exceeds limit: Failed\n");
+
+ return TEST_SUCCESS;
+}
+
+/* To test vfio container destroy */
+static int
+test_vfio_container_destroy(void)
+{
+ int i = 0, ret = 0;
+
+ /* check to destroy max container limit */
+ for (i = 1; i < RTE_MAX_VFIO_CONTAINERS; i++) {
+ ret = rte_vfio_container_destroy(container_fds[i]);
+ TEST_ASSERT(ret == 0, "Test to check "
+ "rt
[dpdk-dev] [PATCH v3 1/4] lib/eal: fix vfio unmap that fails unexpectedly
Unmap fails when there are duplicate entries in user_mem_maps.
The fix is to validate if the input VA, IOVA exists or
overlaps in user_mem_maps before creating map.
Fixes: 73a63908 ("vfio: allow to map other memory regions")
Cc: sta...@dpdk.org
Signed-off-by: Chaitanya Babu Talluri
---
lib/librte_eal/linux/eal/eal_vfio.c | 46 +
1 file changed, 46 insertions(+)
diff --git a/lib/librte_eal/linux/eal/eal_vfio.c
b/lib/librte_eal/linux/eal/eal_vfio.c
index 501c74f23..104912077 100644
--- a/lib/librte_eal/linux/eal/eal_vfio.c
+++ b/lib/librte_eal/linux/eal/eal_vfio.c
@@ -212,6 +212,41 @@ find_user_mem_map(struct user_mem_maps *user_mem_maps,
uint64_t addr,
return NULL;
}
+static int
+find_user_mem_map_overlap(struct user_mem_maps *user_mem_maps, uint64_t addr,
+ uint64_t iova, uint64_t len)
+{
+ uint64_t va_end = addr + len;
+ uint64_t iova_end = iova + len;
+ int i;
+
+ for (i = 0; i < user_mem_maps->n_maps; i++) {
+ struct user_mem_map *map = &user_mem_maps->maps[i];
+ uint64_t map_va_end = map->addr + map->len;
+ uint64_t map_iova_end = map->iova + map->len;
+
+ bool no_lo_va_overlap = addr < map->addr && va_end <= map->addr;
+ bool no_hi_va_overlap = addr >= map_va_end &&
+ va_end > map_va_end;
+ bool no_lo_iova_overlap = iova < map->iova &&
+ iova_end <= map->iova;
+ bool no_hi_iova_overlap = iova >= map_iova_end &&
+ iova_end > map_iova_end;
+
+ /* check input VA and iova is not within the
+* existing map's range
+*/
+ if ((no_lo_va_overlap || no_hi_va_overlap) &&
+ (no_lo_iova_overlap || no_hi_iova_overlap))
+ continue;
+ else
+ /* map overlaps */
+ return 1;
+ }
+ /* map doesn't overlap */
+ return 0;
+}
+
/* this will sort all user maps, and merge/compact any adjacent maps */
static void
compact_user_maps(struct user_mem_maps *user_mem_maps)
@@ -1732,6 +1767,17 @@ container_dma_map(struct vfio_config *vfio_cfg, uint64_t
vaddr, uint64_t iova,
ret = -1;
goto out;
}
+
+ /* check whether vaddr and iova exists in user_mem_maps */
+ ret = find_user_mem_map_overlap(user_mem_maps, vaddr, iova, len);
+ if (ret) {
+ RTE_LOG(ERR, EAL, "Mapping overlaps with a previously "
+ "existing mapping\n");
+ rte_errno = EEXIST;
+ ret = -1;
+ goto out;
+ }
+
/* map the entry */
if (vfio_dma_mem_map(vfio_cfg, vaddr, iova, len, 1)) {
/* technically, this will fail if there are currently no devices
--
2.17.2
Re: [dpdk-dev] [PATCH v5] eal: use memzone to share tsc hz with secondary processes
On 26-Aug-19 2:44 PM, Jim Harris wrote: Ideally, get_tsc_freq_arch() is able to provide the TSC rate using arch-specific means. When that is not possible, DPDK reverts to calculating the TSC rate with a 100ms nanosleep or 1s sleep. The latter occurs more frequently in VMs which often do not have access to the data they need from arch-specific means (CPUID leaf 0x15 or MSR 0xCE on x86). In secondary processes, the extra 100ms is especially noticeable and consumes the bulk of rte_eal_init() execution time. To resolve this extra delay, have the primary process put the TSC rate into a shared memory region that the secondary process can lookup. Reduces rte_eal_init() execution time in a secondary process from 165ms to 66ms on my test system. Signed-off-by: Jim Harris --- I think this is a bad idea. If you're allocating something, you're supposed to free it in rte_eal_cleanup(). If you don't, that memory leaks (i.e. there are leftover hugepages after process exit). Since both primary and secondary are referencing it (even if only at init), there is no safe way to free this memzone. -- Thanks, Anatoly
Re: [dpdk-dev] [PATCH v2] net/nfb: remove resources when port is closed
On 8/12/2019 12:19 PM, Rastislav Cernay wrote: > From: Rastislav Cernay > > The rte_eth_dev_close() function now handles freeing resources for > devices (e.g., mac_addrs). To conform with the new close() behaviour we > are asserting the RTE_ETH_DEV_CLOSE_REMOVE flag so that > rte_eth_dev_close() releases all device level dynamic memory. > > Signed-off-by: Rastislav Cernay > Acked-by: Jan Remes > Reviewed-by: Xiaolong Ye > --- > v2: remove unnecessary cast > drivers/net/szedata2/rte_eth_szedata2.c | 14 ++ > 1 file changed, 10 insertions(+), 4 deletions(-) Hi Rastislav, The first version of this patch is for 'nfb' driver [1], ack/review is based on that path. But this patch, v2, is for 'szedata2' driver. It looks like something went wrong. But both driver needs this update, can you please send a proper new version for 'nfb' (v3) and a new 'szedata2' patch? Thanks, ferruh [1] https://mails.dpdk.org/archives/dev/2019-August/140864.html
Re: [dpdk-dev] [PATCH] net/mlx5: remove unneeded constant definition
From: Dekel Peled > Constant MLX5_GROUP_FACTOR is defined with value 1, and used to > multiply group value in two places. > > This patch removes the unneeded constant definition and use. > > Cc: sta...@dpdk.org > > Signed-off-by: Dekel Peled Acked-by: Matan Azrad
Re: [dpdk-dev] [PATCH] ethdev: fix doc reference to FDIR disabled mode
On 8/18/2019 10:37 AM, Andrew Rybchenko wrote:
> There is no RTE_FDIR_DISABLE. The right name is RTE_FDIR_MODE_NONE.
>
> Fixes: af75078fece3 ("first public release")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Andrew Rybchenko
Applied to dpdk-next-net/master, thanks.
Re: [dpdk-dev] [PATCH v5] eal: use memzone to share tsc hz with secondary processes
On Tue, Aug 27, 2019 at 01:04:18PM +0100, Burakov, Anatoly wrote: > On 26-Aug-19 2:44 PM, Jim Harris wrote: > > Ideally, get_tsc_freq_arch() is able to provide the > > TSC rate using arch-specific means. When that is not > > possible, DPDK reverts to calculating the TSC rate with > > a 100ms nanosleep or 1s sleep. The latter occurs more > > frequently in VMs which often do not have access to the > > data they need from arch-specific means (CPUID leaf 0x15 > > or MSR 0xCE on x86). > > > > In secondary processes, the extra 100ms is especially > > noticeable and consumes the bulk of rte_eal_init() > > execution time. To resolve this extra delay, have > > the primary process put the TSC rate into a shared > > memory region that the secondary process can lookup. > > > > Reduces rte_eal_init() execution time in a secondary > > process from 165ms to 66ms on my test system. > > > > Signed-off-by: Jim Harris > > --- > > I think this is a bad idea. If you're allocating something, you're supposed > to free it in rte_eal_cleanup(). If you don't, that memory leaks (i.e. there > are leftover hugepages after process exit). Since both primary and secondary > are referencing it (even if only at init), there is no safe way to free this > memzone. > What is the issue with not freeing it? How do we handle this for other global data to be shared?
Re: [dpdk-dev] [RFC] net/ena: use dynamic log type for debug logging
wt., 16 lip 2019 o 22:43 Stephen Hemminger
napisał(a):
>
> The generic RTE_LOGTYPE_PMD is a historical relic and should
> not be used. Every driver must use dynamic logtypes.
>
> Compile tested only!
>
> Signed-off-by: Stephen Hemminger
Tested-by: Michal Krawczyk
> ---
> drivers/net/ena/base/ena_plat_dpdk.h | 20 ++--
> drivers/net/ena/ena_ethdev.c | 167 ---
> drivers/net/ena/ena_logs.h | 18 ++-
> 3 files changed, 125 insertions(+), 80 deletions(-)
>
> diff --git a/drivers/net/ena/base/ena_plat_dpdk.h
> b/drivers/net/ena/base/ena_plat_dpdk.h
> index 902d91efbe38..0909bfc4835d 100644
> --- a/drivers/net/ena/base/ena_plat_dpdk.h
> +++ b/drivers/net/ena/base/ena_plat_dpdk.h
> @@ -98,11 +98,13 @@ typedef uint64_t dma_addr_t;
> #define ENA_GET_SYSTEM_USECS() \
> (rte_get_timer_cycles() * US_PER_S / rte_get_timer_hz())
>
> +extern int ena_logtype_com;
> #if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
> #define ENA_ASSERT(cond, format, arg...) \
> do {\
> if (unlikely(!(cond))) {\
> - RTE_LOG(ERR, PMD, format, ##arg); \
> + rte_log(RTE_LOGTYPE_ERR, ena_logtype_com, \
> + format, ##arg); \
> rte_panic("line %d\tassert \"" #cond "\"" \
> "failed\n", __LINE__); \
> } \
> @@ -127,14 +129,14 @@ typedef uint64_t dma_addr_t;
> (~0ULL >> (BITS_PER_LONG_LONG - 1 - (h
>
> #ifdef RTE_LIBRTE_ENA_COM_DEBUG
> -#define ena_trc_dbg(format, arg...)\
> - RTE_LOG(DEBUG, PMD, "[ENA_COM: %s] " format, __func__, ##arg)
> -#define ena_trc_info(format, arg...) \
> - RTE_LOG(INFO, PMD, "[ENA_COM: %s] " format, __func__, ##arg)
> -#define ena_trc_warn(format, arg...) \
> - RTE_LOG(ERR, PMD, "[ENA_COM: %s] " format, __func__, ##arg)
> -#define ena_trc_err(format, arg...)\
> - RTE_LOG(ERR, PMD, "[ENA_COM: %s] " format, __func__, ##arg)
> +#define ena_trc_log(level, fmt, arg...) \
> + rte_log(RTE_LOG_ ## level, ena_logtype_com, \
> + "[ENA_COM: %s]" fmt, __func__, ##arg)
> +
> +#define ena_trc_dbg(format, arg...)ena_trc_log(DEBUG, format, ##arg)
> +#define ena_trc_info(format, arg...) ena_trc_log(INFO, format, ##arg)
> +#define ena_trc_warn(format, arg...) ena_trc_log(WARNING, format, ##arg)
> +#define ena_trc_err(format, arg...)ena_trc_log(ERR, format, ##arg)
> #else
> #define ena_trc_dbg(format, arg...) do { } while (0)
> #define ena_trc_info(format, arg...) do { } while (0)
> diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
> index f5833408044c..4a67298e9d1f 100644
> --- a/drivers/net/ena/ena_ethdev.c
> +++ b/drivers/net/ena/ena_ethdev.c
> @@ -178,6 +178,19 @@ static const struct ena_stats ena_stats_rx_strings[] = {
> int ena_logtype_init;
> int ena_logtype_driver;
>
> +#ifdef RTE_LIBRTE_ENA_DEBUG_RX
> +int ena_logtype_rx;
> +#endif
> +#ifdef RTE_LIBRTE_ENA_DEBUG_TX
> +int ena_logtype_tx;
> +#endif
> +#ifdef RTE_LIBRTE_ENA_DEBUG_TX_FREE
> +int ena_logtype_tx_free;
> +#endif
> +#ifdef RTE_LIBRTE_ENA_COM_DEBUG
> +int ena_logtype_com;
> +#endif
> +
> static const struct rte_pci_id pci_id_ena_map[] = {
> { RTE_PCI_DEVICE(PCI_VENDOR_ID_AMAZON, PCI_DEVICE_ID_ENA_VF) },
> { RTE_PCI_DEVICE(PCI_VENDOR_ID_AMAZON, PCI_DEVICE_ID_ENA_LLQ_VF) },
> @@ -358,7 +371,7 @@ static inline int validate_rx_req_id(struct ena_ring
> *rx_ring, uint16_t req_id)
> if (likely(req_id < rx_ring->ring_size))
> return 0;
>
> - RTE_LOG(ERR, PMD, "Invalid rx req_id: %hu\n", req_id);
> + PMD_DRV_LOG(ERR, "Invalid rx req_id: %hu\n", req_id);
>
> rx_ring->adapter->reset_reason = ENA_REGS_RESET_INV_RX_REQ_ID;
> rx_ring->adapter->trigger_reset = true;
> @@ -378,9 +391,9 @@ static int validate_tx_req_id(struct ena_ring *tx_ring,
> u16 req_id)
> }
>
> if (tx_info)
> - RTE_LOG(ERR, PMD, "tx_info doesn't have valid mbuf\n");
> + PMD_DRV_LOG(ERR, "tx_info doesn't have valid mbuf\n");
> else
> - RTE_LOG(ERR, PMD, "Invalid req_id: %hu\n", req_id);
> + PMD_DRV_LOG(ERR, "Invalid req_id: %hu\n", req_id);
>
> /* Trigger device reset */
> ++tx_ring->tx_stats.bad_req_id;
> @@ -397,7 +410,7 @@ static void ena_config_host_info(struct ena_com_dev
> *ena_dev)
> /* Allocate only the host info */
> rc = ena_com_allocate_host_info(ena_dev);
> if (rc) {
> -
Re: [dpdk-dev] [PATCH] ethdev: fix endian annotation for spi item
On 8/23/2019 11:17 AM, Andrew Rybchenko wrote:
> On 8/20/19 4:45 PM, David Marchand wrote:
>> spi should be set with network endian values.
>> While 0x == htonl(0x), this missing annotation is caught
>> by sparse when compiling ovs (dpdk-latest branch).
>>
>> Fixes: d4b684f7197a ("net: add ESP header to generic flow steering")
>> Cc: sta...@dpdk.org
>>
>> Signed-off-by: David Marchand
>
> Reviewed-by: Andrew Rybchenko
>
Applied to dpdk-next-net/master, thanks.
Re: [dpdk-dev] [dpdk-stable] [PATCH] net/af_packet: fix for stale sockets
On 8/23/2019 4:28 PM, John W. Linville wrote: > On Thu, Aug 22, 2019 at 11:55:36AM +0530, Abhishek Sachan wrote: >> af_packet driver is leaving stale socket after device is removed. >> Ring buffers are memory mapped when device is added using rte_dev_probe. >> There is no corresponding munmap call when device is removed/closed. >> This commit fixes the issue by calling munmap >> from rte_pmd_af_packet_remove(). >> >> Bugzilla ID: 339 >> Cc: sta...@dpdk.org >> >> Signed-off-by: Abhishek Sachan >> Reviewed-by: John W. Linville > > Confirmed... > > Reviewed-by: John W. Linville Applied to dpdk-next-net/master, thanks.
Re: [dpdk-dev] [PATCH v2 2/7] ethdev: add mbuf RSS update as an offload
On 8/23/19 4:19 AM, Stephen Hemminger wrote: On Thu, 22 Aug 2019 02:17:50 +0530 wrote: From: Pavan Nikhilesh Add new Rx offload flag `DEV_RX_OFFLOAD_RSS_HASH` which can be used to enable/disable PMDs write to `rte_mbuf::hash::rss`. PMDs notify the validity of `rte_mbuf::hash:rss` to the applcation by enabling `PKT_RX_RSS_HASH ` flag in `rte_mbuf::ol_flags`. Signed-off-by: Pavan Nikhilesh Reviewed-by: Andrew Rybchenko Is this really a good idea? Every bit of hardware that works on Windows with RSS is required to supply the hash (for software steering). So if adding an additional capability, just adds another bit of complexity, code coverage, and one more thing that won't be tested by everyone. If hardware has it why not set it? Adding a branch is more expensive than an unused assignment. If a PMD sees no gain in disabling the offload and addition branches, nothing obligates PMD to do. Just keep as is - no problem. However, it opens the door to skip delivery of the RSS hash from NIC HW to host CPU if the hash is not required. Why should it be delivered to CPU and eat PCIe bandwidth if the information is not required?
Re: [dpdk-dev] [PATCH 01/13] net/bnxt: hsi version update
On 8/22/2019 6:53 AM, Ajit Khaparde wrote: > From: Kalesh AP > > Signed-off-by: Kalesh AP > Reviewed-by: Somnath Kotur > Reviewed-by: Ajit Khaparde > --- > drivers/net/bnxt/hsi_struct_def_dpdk.h | 137 + > 1 file changed, 137 insertions(+) Hi Kalesh, As far as I can see WRM API version is not changed, only two new structs has been added which are used later for "FW reset" on 12/13. Can you please give a little more detail on the commit log?
Re: [dpdk-dev] [PATCH 2/2] eal: DPDK init doesn't fail even if device probe fails.
Nitin Katiyar writes:
> rte_bus_probe() doesn't return error. As a result rte_eal_init()
> doesn't catch this error and thus making dpdk initialization
> successful despite probe failing for devices.
>
> This patch returns error if probe fails for any of device.
>
> Signed-off-by: Nitin Katiyar
> ---
> lib/librte_eal/common/eal_common_bus.c | 8 ++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_eal/common/eal_common_bus.c
> b/lib/librte_eal/common/eal_common_bus.c
> index baa5b53..1721179 100644
> --- a/lib/librte_eal/common/eal_common_bus.c
> +++ b/lib/librte_eal/common/eal_common_bus.c
> @@ -70,16 +70,20 @@
> }
>
> ret = bus->probe();
> - if (ret)
> + if (ret) {
> RTE_LOG(ERR, EAL, "Bus (%s) probe failed.\n",
> bus->name);
> + return ret;
> + }
If we return an error here, won't this fail to probe vbus? In fact,
this will disrupt all subsequent bus probes, yes?
Why should a single bus problem be a 'cannot init' level failure?
> }
>
> if (vbus) {
> ret = vbus->probe();
> - if (ret)
> + if (ret) {
> RTE_LOG(ERR, EAL, "Bus (%s) probe failed.\n",
> vbus->name);
> + return ret;
> + }
> }
>
> return 0;
Re: [dpdk-dev] [PATCH v5] eal: use memzone to share tsc hz with secondary processes
On Tue, Aug 27, 2019 at 01:04:18PM +0100, Burakov, Anatoly wrote: > On 26-Aug-19 2:44 PM, Jim Harris wrote: > > Ideally, get_tsc_freq_arch() is able to provide the > > TSC rate using arch-specific means. When that is not > > possible, DPDK reverts to calculating the TSC rate with > > a 100ms nanosleep or 1s sleep. The latter occurs more > > frequently in VMs which often do not have access to the > > data they need from arch-specific means (CPUID leaf 0x15 > > or MSR 0xCE on x86). > > > > In secondary processes, the extra 100ms is especially > > noticeable and consumes the bulk of rte_eal_init() > > execution time. To resolve this extra delay, have > > the primary process put the TSC rate into a shared > > memory region that the secondary process can lookup. > > > > Reduces rte_eal_init() execution time in a secondary > > process from 165ms to 66ms on my test system. > > > > Signed-off-by: Jim Harris > > --- > > I think this is a bad idea. If you're allocating something, you're supposed > to free it in rte_eal_cleanup(). If you don't, that memory leaks (i.e. there > are leftover hugepages after process exit). Since both primary and secondary > are referencing it (even if only at init), there is no safe way to free this > memzone. > Actually, after looking at the code again, the secondary processes only reference the memzone once on init, and fallback to the current path if the memzone does not exist. Therefore, it should be safe to remove the memzone on termination of the primary process.
Re: [dpdk-dev] [PATCH v2 0/2] add abi version testing to app/test
On 27/08/2019 09:28, Ray Kinsella wrote:
>
>
> On 27/08/2019 09:17, Bruce Richardson wrote:
>> On Mon, Aug 26, 2019 at 05:45:55PM +0100, Ray Kinsella wrote:
>>>
>>>
>>> On 23/08/2019 16:49, Aaron Conole wrote:
Ray Kinsella writes:
> This patchset adds ABI version testing to the app/test unit test
> framework,
> addressing two issues previously raised during ML conversations on ABI
> stability;
>
> 1. How do we unit test still supported previous ABI versions?
> 2. How to we unit test inline functions from still supported previous ABI
> versions?
>
> Starting with rte_lpm, I did the following:-
>
> * I reproduced mostly unmodified unit tests for the v2.0 ABI, taken from
> DPDK
> 2.2 and 17.02.
> * I reproduced the rte_lpm interface header from v2.0, including the
> inline
> functions and remapping symbols to their appropriate versions.
> * I added support for multiple abi versions to the app/test unit test
> framework
> to allow users to switch between abi versions (set_abi_version), without
> further polluting the already long list of unit tests available in
> app/test.
>
> The intention here is that in future as developers need to deprecate
> APIs, the
> associated unit tests may move into the ABI version testing mechanism of
> the
> app/test instead of being replaced by the latest set of unit tests as
> would be
> the case today.
>
> v2:
>
> * Added LPM IPv6 test cases for the v2.0 ABI.
> * Fixed a number of checkpatch errors, stop short of substantially
> reworking
> the test code from the v2.0 ABI.
> * Removed duplicating test cases published in the original v1 patch.
Thanks for this work. I think it's useful.
I see an error under aarch64 builds because there are some x86_64
specific types being used in the testing.
>>>
>>> So the problem is that LPM didn't fully support ARM until DPDK v16.04.
>>> The ABI versioning code in the LPM library is there to support the 2.0 ABI.
>>>
>>> The intention of this unit test is to test backward's compatibility with
>>> an inline LPM function from DPDK v2.2.0, which was essentially x86 only
>>> at that time.
>>>
>>> Unless we want to get into the business of backporting ARM support to
>>> DPDK 2.2.0 (from where this test cases came from) - we should probably
>>> restrict these ABI versioning test cases to CONFIG_RTE_ARCH_X86_64 only.
>>>
>>> The other option is forget about testing this the LPM ABI versioning
>>> support, which then asks the question should be perhaps excise that code
>>> altogether.
>>>
>>
>> I think function versioning is great and should be widely used.
>> Unfortunately, though, in our case since we break the ABI so consistently,
>> this old code is pretty useless. Therefore, I think we should remove all
>> old versionned code from e.g. pre-18.11, since no app is realistically
>> going to work from that far back anyway.
>>
>> /Bruce
>>
>
> I had come to a similar conclusion, that we likely need to deprecate
> much or all of the existing ABI Compatibility code, it needs a wider
> review.
>
> BIND_VERSION_SYMBOL and friends, are still needed to unit test ABI
> Versioning, the general idea is sound. And I liked LPM as an example,
> because it is well understood and contained, but I will look for
> something more recent we could use instead.
>
Only recent example I can find of ABI versioning is the Timer Library,
changed in April 2019. After that are the distributor and the lpm
library both changes in 2017, does this seem right?
Ray K
root@xxx:/build/dpdk# find lib -name *.map | xargs -I{} -- git log -1
--format="%ai {}" {} | sort -k 1,2 | tail -n 10
2019-04-03 18:20:13 -0500 lib/librte_stack/rte_stack_version.map
2019-04-15 16:41:28 -0500 lib/librte_timer/rte_timer_version.map
2019-04-30 22:54:16 -0500 lib/librte_rcu/rte_rcu_version.map
2019-06-25 04:46:02 +0530 lib/librte_eventdev/rte_eventdev_version.map
2019-07-05 10:16:17 -0700 lib/librte_net/rte_net_version.map
2019-07-11 09:26:05 + lib/librte_metrics/rte_metrics_version.map
2019-07-17 03:23:55 +0800 lib/librte_ring/rte_ring_version.map
2019-07-26 15:10:19 +0100 lib/librte_security/rte_security_version.map
2019-07-27 09:21:33 +0200 lib/librte_eal/rte_eal_version.map
2019-07-31 14:27:16 +0200 lib/librte_ethdev/rte_ethdev_version.map
root@xxx:/build/dpdk# find lib -name *.map | xargs -I{} -- git log -1
--format="%ai {}" {} | sort -k 1,2 | tail -n 50 | awk '{print $4}' |
xargs sort | uniq -c | sort -k 1
...
2 rte_distributor_clear_returns;
2 rte_distributor_create;
2 rte_distributor_flush;
2 rte_distributor_get_pkt;
2 rte_distributor_poll_pkt;
2 rte_distributor_process;
2 rte_distributor_request_pkt;
2 rte_distributor_returned_pkts;
2 rte_distributor_
[dpdk-dev] [PATCH 02/51] app/testpmd: check status of getting ethdev info
From: Ivan Ilchenko
Add eth_dev_info_get_print_err() which is a wrapper for
rte_eth_dev_info_get() printing error if rte_eth_dev_info_get()
fails and returning its status code.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
app/test-pmd/cmdline.c | 119
app/test-pmd/cmdline_flow.c | 5 +-
app/test-pmd/config.c | 78 -
app/test-pmd/parameters.c | 8 ++-
app/test-pmd/testpmd.c | 30 ---
app/test-pmd/testpmd.h | 3 ++
app/test-pmd/util.c | 28 ++-
7 files changed, 228 insertions(+), 43 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 56783aa..d4ab143 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -2273,6 +2273,7 @@ struct cmd_config_rss {
int all_updated = 1;
int diag;
uint16_t i;
+ int ret;
if (!strcmp(res->value, "all"))
rss_conf.rss_hf = ETH_RSS_IP | ETH_RSS_TCP |
@@ -2312,7 +2313,10 @@ struct cmd_config_rss {
RTE_ETH_FOREACH_DEV(i) {
struct rte_eth_rss_conf local_rss_conf;
- rte_eth_dev_info_get(i, &dev_info);
+ ret = eth_dev_info_get_print_err(i, &dev_info);
+ if (ret != 0)
+ return;
+
if (use_default)
rss_conf.rss_hf = dev_info.flow_type_rss_offloads;
@@ -2410,9 +2414,13 @@ struct cmd_config_rss_hash_key {
struct rte_eth_dev_info dev_info;
uint8_t hash_key_size;
uint32_t key_len;
+ int ret;
memset(&dev_info, 0, sizeof(dev_info));
- rte_eth_dev_info_get(res->port_id, &dev_info);
+ ret = eth_dev_info_get_print_err(res->port_id, &dev_info);
+ if (ret != 0)
+ return;
+
if (dev_info.hash_key_size > 0 &&
dev_info.hash_key_size <= sizeof(hash_key))
hash_key_size = dev_info.hash_key_size;
@@ -2945,7 +2953,10 @@ struct cmd_config_rss_reta {
struct cmd_config_rss_reta *res = parsed_result;
memset(&dev_info, 0, sizeof(dev_info));
- rte_eth_dev_info_get(res->port_id, &dev_info);
+ ret = eth_dev_info_get_print_err(res->port_id, &dev_info);
+ if (ret != 0)
+ return;
+
if (dev_info.reta_size == 0) {
printf("Redirection table size is 0 which is "
"invalid for RSS\n");
@@ -3063,9 +3074,13 @@ struct cmd_showport_reta {
struct rte_eth_rss_reta_entry64 reta_conf[8];
struct rte_eth_dev_info dev_info;
uint16_t max_reta_size;
+ int ret;
memset(&dev_info, 0, sizeof(dev_info));
- rte_eth_dev_info_get(res->port_id, &dev_info);
+ ret = eth_dev_info_get_print_err(res->port_id, &dev_info);
+ if (ret != 0)
+ return;
+
max_reta_size = RTE_MIN(dev_info.reta_size, ETH_RSS_RETA_SIZE_512);
if (res->size == 0 || res->size > max_reta_size) {
printf("Invalid redirection table size: %u (1-%u)\n",
@@ -3292,6 +3307,7 @@ struct cmd_config_burst {
struct cmd_config_burst *res = parsed_result;
struct rte_eth_dev_info dev_info;
uint16_t rec_nb_pkts;
+ int ret;
if (!all_ports_stopped()) {
printf("Please stop all ports first\n");
@@ -3305,7 +3321,10 @@ struct cmd_config_burst {
* size for all ports, so assume all ports are the same
* NIC model and use the values from Port 0.
*/
- rte_eth_dev_info_get(0, &dev_info);
+ ret = eth_dev_info_get_print_err(0, &dev_info);
+ if (ret != 0)
+ return;
+
rec_nb_pkts = dev_info.default_rxportconf.burst_size;
if (rec_nb_pkts == 0) {
@@ -4375,6 +4394,7 @@ struct cmd_csum_result {
{
struct rte_eth_dev_info dev_info;
uint64_t tx_offloads;
+ int ret;
tx_offloads = ports[port_id].dev_conf.txmode.offloads;
printf("Parse tunnel is %s\n",
@@ -4393,7 +4413,10 @@ struct cmd_csum_result {
(tx_offloads & DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) ? "hw" : "sw");
/* display warnings if configuration is not supported by the NIC */
- rte_eth_dev_info_get(port_id, &dev_info);
+ ret = eth_dev_info_get_print_err(port_id, &dev_info);
+ if (ret != 0)
+ return;
+
if ((tx_offloads & DEV_TX_OFFLOAD_IPV4_CKSUM) &&
(dev_info.tx_offload_capa & DEV_TX_OFFLOAD_IPV4_CKSUM) == 0) {
printf("Warning: hardware IP checksum enabled but not "
@@ -4447,6 +4470,7 @@ struct cmd_csum_result {
int hw = 0;
uint64_t csum_offloads = 0;
struct rte_eth_dev_info dev_info;
+ int ret;
if (port_id_is_invalid(
[dpdk-dev] [PATCH 07/51] ring: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
app/test/test_pmd_ring.c according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
app/test/test_pmd_ring.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/app/test/test_pmd_ring.c b/app/test/test_pmd_ring.c
index 6414bbd..eb49735 100644
--- a/app/test/test_pmd_ring.c
+++ b/app/test/test_pmd_ring.c
@@ -490,10 +490,16 @@
test_command_line_ring_port(void)
{
int port, cmdl_port0 = -1;
+ int ret;
/* find a port created with the --vdev=net_ring0 command line option */
RTE_ETH_FOREACH_DEV(port) {
struct rte_eth_dev_info dev_info;
- rte_eth_dev_info_get(port, &dev_info);
+
+ ret = rte_eth_dev_info_get(port, &dev_info);
+ TEST_ASSERT((ret != 0),
+ "Error during getting device (port %d) info:
%s\n",
+ port, strerror(-ret));
+
if (!strcmp(dev_info.driver_name, "Rings PMD")) {
printf("found a command line ring port=%d\n", port);
cmdl_port0 = port;
--
1.8.3.1
[dpdk-dev] [PATCH 05/51] latency: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
latency component according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
lib/librte_latencystats/rte_latencystats.c | 23 +--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/lib/librte_latencystats/rte_latencystats.c
b/lib/librte_latencystats/rte_latencystats.c
index 06c6283..98e0189 100644
--- a/lib/librte_latencystats/rte_latencystats.c
+++ b/lib/librte_latencystats/rte_latencystats.c
@@ -208,6 +208,7 @@ struct latency_stats_nameoff {
const char *ptr_strings[NUM_LATENCY_STATS] = {0};
const struct rte_memzone *mz = NULL;
const unsigned int flags = 0;
+ int ret;
if (rte_memzone_lookup(MZ_RTE_LATENCY_STATS))
return -EEXIST;
@@ -239,7 +240,16 @@ struct latency_stats_nameoff {
/** Register Rx/Tx callbacks */
RTE_ETH_FOREACH_DEV(pid) {
struct rte_eth_dev_info dev_info;
- rte_eth_dev_info_get(pid, &dev_info);
+
+ ret = rte_eth_dev_info_get(pid, &dev_info);
+ if (ret != 0) {
+ RTE_LOG(INFO, LATENCY_STATS,
+ "Error during getting device (port %u) info:
%s\n",
+ pid, strerror(-ret));
+
+ continue;
+ }
+
for (qid = 0; qid < dev_info.nb_rx_queues; qid++) {
cbs = &rx_cbs[pid][qid];
cbs->cb = rte_eth_add_first_rx_callback(pid, qid,
@@ -274,7 +284,16 @@ struct latency_stats_nameoff {
/** De register Rx/Tx callbacks */
RTE_ETH_FOREACH_DEV(pid) {
struct rte_eth_dev_info dev_info;
- rte_eth_dev_info_get(pid, &dev_info);
+
+ ret = rte_eth_dev_info_get(pid, &dev_info);
+ if (ret != 0) {
+ RTE_LOG(INFO, LATENCY_STATS,
+ "Error during getting device (port %u) info:
%s\n",
+ pid, strerror(-ret));
+
+ continue;
+ }
+
for (qid = 0; qid < dev_info.nb_rx_queues; qid++) {
cbs = &rx_cbs[pid][qid];
ret = rte_eth_remove_rx_callback(pid, qid, cbs->cb);
--
1.8.3.1
[dpdk-dev] [PATCH 08/51] app/procinfo: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to int, so
this patch modify rte_eth_dev_info_get() usage across app/procinfo
according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
app/proc-info/main.c | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index a89b51b..34eb7a7 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -683,7 +683,12 @@ static void collectd_resolve_cnt_type(char *cnt_type,
size_t cnt_type_len,
if (ret == 0)
printf("\t -- mtu (%d)\n", mtu);
- rte_eth_dev_info_get(i, &dev_info);
+ ret = rte_eth_dev_info_get(i, &dev_info);
+ if (ret != 0) {
+ printf("Error during getting device (port %u) info:
%s\n",
+ i, strerror(-ret));
+ return;
+ }
printf(" - queue\n");
for (j = 0; j < dev_info.nb_rx_queues; j++) {
@@ -836,7 +841,13 @@ static void collectd_resolve_cnt_type(char *cnt_type,
size_t cnt_type_len,
memset(&cap, 0, sizeof(cap));
memset(&error, 0, sizeof(error));
- rte_eth_dev_info_get(i, &dev_info);
+ ret = rte_eth_dev_info_get(i, &dev_info);
+ if (ret != 0) {
+ printf("Error during getting device (port %u) info:
%s\n",
+ i, strerror(-ret));
+ return;
+ }
+
printf(" - Generic for port (%u)\n"
"\t -- driver name %s\n"
"\t -- max vf (%u)\n"
--
1.8.3.1
[dpdk-dev] [PATCH 00/51] ethdev: change rte_eth_dev_info_get() return value to int
It is the first patch series to get rid of void returning functions in ethdev in accordance with deprecation notice [1]. The patch to change dev_infos_get callback prototype to allow driver return error will follow. [1] https://patches.dpdk.org/patch/56969/ Ivan Ilchenko (51): ethdev: change rte_eth_dev_info_get() return value to int app/testpmd: check status of getting ethdev info app/eventdev: check status of getting ethdev info kni: check status of getting ethdev info latency: check status of getting ethdev info pdump: check status of getting ethdev info ring: check status of getting ethdev info app/procinfo: check status of getting ethdev info app/test: check status of getting ethdev info in bonding app/test: check ethdev info get result in event Rx adapter net/bnxt: check status of getting ethdev info net/bonding: check status of getting ethdev info net/netvsc: check status of getting ethdev info net/softnic: check status of getting ethdev info examples/rxtx_callbacks: check status of getting ethdev info examples/l3fwd: check status of getting ethdev info examples/qos_meter: check status of getting ethdev info examples/ip_frag: check status of getting ethdev info examples/performance-thread: check dev info get result examples/vmdq: check status of getting ethdev info examples/distributor: check status of getting ethdev info examples/l3fwd-acl: check status of getting ethdev info examples/vm_power: check status of getting ethdev info examples/qos_sched: check status of getting ethdev info examples/flow_filtering: check status of getting ethdev info examples/l3fwd-power: check status of getting ethdev info examples/l2fwd: check status of getting ethdev info examples/skeleton: check status of getting ethdev info examples/vmdq_dcb: check status of getting ethdev info examples/ipv4_multicast: check status of getting ethdev info examples/l2fwd-jobstats: check status of getting ethdev info examples/bond: check status of getting ethdev info examples/eventdev: check status of getting ethdev info examples/ip_reassembly: check status of getting ethdev info examples/vhost: check status of getting ethdev info examples/ptpclient: check status of getting ethdev info examples/link_status_interrupt: check dev info get result examples/tep_termination: check dev info get result examples/server_node_efd: check dev info get result examples/flow_classify: check status of getting ethdev info examples/packet_ordering: check dev info get result examples/l2fwd-crypto: check status of getting ethdev info examples/multi_process: check status of getting ethdev info examples/ipsec-secgw: check status of getting ethdev info examples/netmap_compat: check status of getting ethdev info examples/l2fwd-keepalive: check dev info get result examples/ip_pipeline: check status of getting ethdev info examples/load_balancer: check status of getting ethdev info examples/kni: check status of getting ethdev info examples/ethtool: check status of getting ethdev info examples/exception_path: check status of getting ethdev info app/proc-info/main.c| 15 ++- app/test-eventdev/test_perf_common.c| 8 +- app/test-eventdev/test_pipeline_common.c| 9 +- app/test-pmd/cmdline.c | 119 +++ app/test-pmd/cmdline_flow.c | 5 +- app/test-pmd/config.c | 78 --- app/test-pmd/parameters.c | 8 +- app/test-pmd/testpmd.c | 30 -- app/test-pmd/testpmd.h | 3 + app/test-pmd/util.c | 28 +- app/test/test_event_eth_rx_adapter.c| 4 +- app/test/test_kni.c | 27 +- app/test/test_link_bonding_rssconf.c| 33 ++- app/test/test_pmd_ring.c| 8 +- doc/guides/rel_notes/deprecation.rst| 1 - doc/guides/rel_notes/release_19_11.rst | 5 +- drivers/net/bnxt/rte_pmd_bnxt.c | 122 +--- drivers/net/bonding/rte_eth_bond_api.c | 10 +- drivers/net/bonding/rte_eth_bond_pmd.c | 36 ++- drivers/net/netvsc/hn_vf.c | 10 +- drivers/net/softnic/rte_eth_softnic_link.c | 5 +- examples/bond/main.c| 14 ++- examples/distributor/main.c | 8 +- examples/ethtool/ethtool-app/main.c | 8 +- examples/ethtool/lib/rte_ethtool.c | 21 +++- examples/eventdev_pipeline/main.c | 8 +- examples/exception_path/main.c | 7 +- examples/flow_classify/flow_classify.c | 8 +- examples/flow_filtering/main.c | 7 +- examples/ip_fragmentation/main.c| 14 ++- examples/ip_pipeline/kni.c
[dpdk-dev] [PATCH 03/51] app/eventdev: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to int, so
this patch modify rte_eth_dev_info_get() usage across app/test-eventdev
according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
app/test-eventdev/test_perf_common.c | 8 +++-
app/test-eventdev/test_pipeline_common.c | 9 -
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/app/test-eventdev/test_perf_common.c
b/app/test-eventdev/test_perf_common.c
index aa925a7..e75582b 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -660,6 +660,7 @@
perf_ethdev_setup(struct evt_test *test, struct evt_options *opt)
{
uint16_t i;
+ int ret;
struct test_perf *t = evt_test_priv(test);
struct rte_eth_conf port_conf = {
.rxmode = {
@@ -688,7 +689,12 @@
struct rte_eth_dev_info dev_info;
struct rte_eth_conf local_port_conf = port_conf;
- rte_eth_dev_info_get(i, &dev_info);
+ ret = rte_eth_dev_info_get(i, &dev_info);
+ if (ret != 0) {
+ evt_err("Error during getting device (port %u) info:
%s\n",
+ i, strerror(-ret));
+ return ret;
+ }
local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
dev_info.flow_type_rss_offloads;
diff --git a/app/test-eventdev/test_pipeline_common.c
b/app/test-eventdev/test_pipeline_common.c
index 16c49b8..ef8ae28 100644
--- a/app/test-eventdev/test_pipeline_common.c
+++ b/app/test-eventdev/test_pipeline_common.c
@@ -159,6 +159,7 @@
pipeline_ethdev_setup(struct evt_test *test, struct evt_options *opt)
{
uint16_t i;
+ int ret;
uint8_t nb_queues = 1;
struct test_pipeline *t = evt_test_priv(test);
struct rte_eth_rxconf rx_conf;
@@ -191,7 +192,13 @@
if (!(caps & RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT))
t->internal_port = 0;
- rte_eth_dev_info_get(i, &dev_info);
+ ret = rte_eth_dev_info_get(i, &dev_info);
+ if (ret != 0) {
+ evt_err("Error during getting device (port %u) info:
%s\n",
+ i, strerror(-ret));
+ return ret;
+ }
+
rx_conf = dev_info.default_rxconf;
rx_conf.offloads = port_conf.rxmode.offloads;
--
1.8.3.1
[dpdk-dev] [PATCH 04/51] kni: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to int,
so this patch modify rte_eth_dev_info_get() usage across
app/test/test_kni.c according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
app/test/test_kni.c | 27 ---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/app/test/test_kni.c b/app/test/test_kni.c
index 7a65de1..2c33374 100644
--- a/app/test/test_kni.c
+++ b/app/test/test_kni.c
@@ -436,7 +436,13 @@ struct test_kni_stats {
memset(&info, 0, sizeof(info));
memset(&ops, 0, sizeof(ops));
- rte_eth_dev_info_get(port_id, &info);
+ ret = rte_eth_dev_info_get(port_id, &info);
+ if (ret != 0) {
+ printf("Error during getting device (port %u) info: %s\n",
+ port_id, strerror(-ret));
+ return -1;
+ }
+
if (info.device)
bus = rte_bus_find_by_device(info.device);
if (bus && !strcmp(bus->name, "pci")) {
@@ -622,7 +628,14 @@ struct test_kni_stats {
memset(&info, 0, sizeof(info));
memset(&conf, 0, sizeof(conf));
memset(&ops, 0, sizeof(ops));
- rte_eth_dev_info_get(port_id, &info);
+
+ ret = rte_eth_dev_info_get(port_id, &info);
+ if (ret != 0) {
+ printf("Error during getting device (port %u) info: %s\n",
+ port_id, strerror(-ret));
+ return -1;
+ }
+
if (info.device)
bus = rte_bus_find_by_device(info.device);
else
@@ -658,7 +671,15 @@ struct test_kni_stats {
memset(&conf, 0, sizeof(conf));
memset(&info, 0, sizeof(info));
memset(&ops, 0, sizeof(ops));
- rte_eth_dev_info_get(port_id, &info);
+
+ ret = rte_eth_dev_info_get(port_id, &info);
+ if (ret != 0) {
+ printf("Error during getting device (port %u) info: %s\n",
+ port_id, strerror(-ret));
+ ret = -1;
+ goto fail;
+ }
+
if (info.device)
bus = rte_bus_find_by_device(info.device);
else
--
1.8.3.1
[dpdk-dev] [PATCH 06/51] pdump: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to int,
so this patch modify rte_eth_dev_info_get() usage across
pdump component according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
lib/librte_pdump/rte_pdump.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lib/librte_pdump/rte_pdump.c b/lib/librte_pdump/rte_pdump.c
index cd24dd0..ac94fea 100644
--- a/lib/librte_pdump/rte_pdump.c
+++ b/lib/librte_pdump/rte_pdump.c
@@ -333,7 +333,14 @@ struct pdump_response {
if (queue == RTE_PDUMP_ALL_QUEUES) {
struct rte_eth_dev_info dev_info;
- rte_eth_dev_info_get(port, &dev_info);
+ ret = rte_eth_dev_info_get(port, &dev_info);
+ if (ret != 0) {
+ RTE_LOG(ERR, PDUMP,
+ "Error during getting device (port %u) info:
%s\n",
+ port, strerror(-ret));
+ return ret;
+ }
+
nb_rx_q = dev_info.nb_rx_queues;
nb_tx_q = dev_info.nb_tx_queues;
if (nb_rx_q == 0 && flags & RTE_PDUMP_FLAG_RX) {
--
1.8.3.1
[dpdk-dev] [PATCH 15/51] examples/rxtx_callbacks: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
examples/rxtx_callbacks according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
examples/rxtx_callbacks/main.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/examples/rxtx_callbacks/main.c b/examples/rxtx_callbacks/main.c
index dbcd9f4..9fd4b8e 100644
--- a/examples/rxtx_callbacks/main.c
+++ b/examples/rxtx_callbacks/main.c
@@ -112,7 +112,14 @@
if (!rte_eth_dev_is_valid_port(port))
return -1;
- rte_eth_dev_info_get(port, &dev_info);
+ retval = rte_eth_dev_info_get(port, &dev_info);
+ if (retval != 0) {
+ printf("Error during getting device (port %u) info: %s\n",
+ port, strerror(-retval));
+
+ return retval;
+ }
+
if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
port_conf.txmode.offloads |=
DEV_TX_OFFLOAD_MBUF_FAST_FREE;
--
1.8.3.1
[dpdk-dev] [PATCH 17/51] examples/qos_meter: check status of getting ethdev info
From: Ivan Ilchenko rte_eth_dev_info_get() return value was changed from void to int, so this patch modify rte_eth_dev_info_get() usage across examples/qos_meter according to its new return type. Signed-off-by: Ivan Ilchenko Signed-off-by: Andrew Rybchenko --- examples/qos_meter/main.c | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/examples/qos_meter/main.c b/examples/qos_meter/main.c index da7afe8..13c85e9 100644 --- a/examples/qos_meter/main.c +++ b/examples/qos_meter/main.c @@ -329,7 +329,13 @@ static __attribute__((noreturn)) int /* NIC init */ conf = port_conf; - rte_eth_dev_info_get(port_rx, &dev_info); + + ret = rte_eth_dev_info_get(port_rx, &dev_info); + if (ret != 0) + rte_exit(EXIT_FAILURE, + "Error during getting device (port %u) info: %s\n", + port_rx, strerror(-ret)); + if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE) conf.txmode.offloads |= DEV_TX_OFFLOAD_MBUF_FAST_FREE; @@ -369,7 +375,13 @@ static __attribute__((noreturn)) int rte_exit(EXIT_FAILURE, "Port %d TX queue setup error (%d)\n", port_rx, ret); conf = port_conf; - rte_eth_dev_info_get(port_tx, &dev_info); + + ret = rte_eth_dev_info_get(port_tx, &dev_info); + if (ret != 0) + rte_exit(EXIT_FAILURE, + "Error during getting device (port %u) info: %s\n", + port_tx, strerror(-ret)); + if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE) conf.txmode.offloads |= DEV_TX_OFFLOAD_MBUF_FAST_FREE; -- 1.8.3.1
[dpdk-dev] [PATCH 09/51] app/test: check status of getting ethdev info in bonding
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to int,
so this patch modify rte_eth_dev_info_get() usage across
app/test/test_link_bonding_rssconf.c according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
app/test/test_link_bonding_rssconf.c | 33 -
1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/app/test/test_link_bonding_rssconf.c
b/app/test/test_link_bonding_rssconf.c
index 65de3b9..1a9571e 100644
--- a/app/test/test_link_bonding_rssconf.c
+++ b/app/test/test_link_bonding_rssconf.c
@@ -329,7 +329,11 @@ struct link_bonding_rssconf_unittest_params {
uint64_t rss_hf = 0;
uint64_t default_rss_hf = 0;
- rte_eth_dev_info_get(test_params.bond_port_id,
&test_params.bond_dev_info);
+ retval = rte_eth_dev_info_get(test_params.bond_port_id,
+ &test_params.bond_dev_info);
+ TEST_ASSERT((retval == 0),
+ "Error during getting device (port %u) info: %s\n",
+ test_params.bond_port_id, strerror(-retval));
/*
* Test hash function propagation
@@ -443,10 +447,16 @@ struct link_bonding_rssconf_unittest_params {
/**
* Configure bonding port in RSS mq mode
*/
+ int ret;
+
TEST_ASSERT_SUCCESS(configure_ethdev(test_params.bond_port_id,
&rss_pmd_conf, 0), "Failed to configure bonding
device\n");
- rte_eth_dev_info_get(test_params.bond_port_id,
&test_params.bond_dev_info);
+ ret = rte_eth_dev_info_get(test_params.bond_port_id,
+ &test_params.bond_dev_info);
+ TEST_ASSERT((ret == 0),
+ "Error during getting device (port %u) info: %s\n",
+ test_params.bond_port_id, strerror(-ret));
TEST_ASSERT_SUCCESS(bond_slaves(), "Bonding slaves failed");
@@ -468,10 +478,16 @@ struct link_bonding_rssconf_unittest_params {
static int
test_rss_lazy(void)
{
+ int ret;
+
TEST_ASSERT_SUCCESS(configure_ethdev(test_params.bond_port_id,
&default_pmd_conf, 0), "Failed to configure bonding
device\n");
- rte_eth_dev_info_get(test_params.bond_port_id,
&test_params.bond_dev_info);
+ ret = rte_eth_dev_info_get(test_params.bond_port_id,
+ &test_params.bond_dev_info);
+ TEST_ASSERT((ret == 0),
+ "Error during getting device (port %u) info: %s\n",
+ test_params.bond_port_id, strerror(-ret));
TEST_ASSERT_SUCCESS(bond_slaves(), "Bonding slaves failed");
@@ -532,6 +548,10 @@ struct link_bonding_rssconf_unittest_params {
rte_eth_dev_default_mac_addr_set(port->port_id, &mac_addr);
rte_eth_dev_info_get(port->port_id, &port->dev_info);
+ retval = rte_eth_dev_info_get(port->port_id, &port->dev_info);
+ TEST_ASSERT((retval == 0),
+ "Error during getting device (port %u) info:
%s\n",
+ test_params.bond_port_id, strerror(-retval));
}
if (test_params.bond_port_id == INVALID_PORT_ID) {
@@ -545,8 +565,11 @@ struct link_bonding_rssconf_unittest_params {
TEST_ASSERT_SUCCESS(configure_ethdev(test_params.bond_port_id,
&default_pmd_conf, 0), "Failed to configure
bonding device\n");
- rte_eth_dev_info_get(test_params.bond_port_id,
- &test_params.bond_dev_info);
+ retval = rte_eth_dev_info_get(test_params.bond_port_id,
+ &test_params.bond_dev_info);
+ TEST_ASSERT((retval == 0),
+ "Error during getting device (port %u) info:
%s\n",
+ test_params.bond_port_id, strerror(-retval));
}
return TEST_SUCCESS;
--
1.8.3.1
[dpdk-dev] [PATCH 10/51] app/test: check ethdev info get result in event Rx adapter
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
app/test/test_event_eth_rx_adapter.c according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
app/test/test_event_eth_rx_adapter.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/test/test_event_eth_rx_adapter.c
b/app/test/test_event_eth_rx_adapter.c
index 953b827..950bc67 100644
--- a/app/test/test_event_eth_rx_adapter.c
+++ b/app/test/test_event_eth_rx_adapter.c
@@ -45,7 +45,9 @@ struct event_eth_rx_adapter_test_params {
retval = rte_eth_dev_configure(port, 0, 0, port_conf);
- rte_eth_dev_info_get(port, &dev_info);
+ retval = rte_eth_dev_info_get(port, &dev_info);
+ if (retval != 0)
+ return retval;
default_params.rx_rings = RTE_MIN(dev_info.max_rx_queues,
MAX_NUM_RX_QUEUE);
--
1.8.3.1
[dpdk-dev] [PATCH 11/51] net/bnxt: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to int, so
this patch modify rte_eth_dev_info_get() usage across
net/bnxt according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
drivers/net/bnxt/rte_pmd_bnxt.c | 122 +++-
1 file changed, 109 insertions(+), 13 deletions(-)
diff --git a/drivers/net/bnxt/rte_pmd_bnxt.c b/drivers/net/bnxt/rte_pmd_bnxt.c
index fbd2dd4..4374034 100644
--- a/drivers/net/bnxt/rte_pmd_bnxt.c
+++ b/drivers/net/bnxt/rte_pmd_bnxt.c
@@ -145,7 +145,15 @@ int rte_pmd_bnxt_set_vf_mac_addr(uint16_t port, uint16_t
vf,
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
+
bp = dev->data->dev_private;
if (vf >= dev_info.max_vfs || mac_addr == NULL)
@@ -179,7 +187,14 @@ int rte_pmd_bnxt_set_vf_rate_limit(uint16_t port, uint16_t
vf,
if (!is_bnxt_supported(eth_dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
bp = eth_dev->data->dev_private;
if (!bp->pf.active_vfs)
@@ -230,7 +245,14 @@ int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint16_t port,
uint16_t vf, uint8_t on)
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
bp = dev->data->dev_private;
if (!BNXT_PF(bp)) {
@@ -282,7 +304,14 @@ int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint16_t port,
uint16_t vf, uint8_t on)
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
bp = dev->data->dev_private;
if (!BNXT_PF(bp)) {
@@ -332,7 +361,14 @@ int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint16_t port,
uint16_t vf, uint8_t on)
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
bp = dev->data->dev_private;
if (vf >= dev_info.max_vfs)
@@ -369,7 +405,14 @@ int rte_pmd_bnxt_set_vf_rxmode(uint16_t port, uint16_t vf,
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
bp = dev->data->dev_private;
if (!bp->pf.vf_info)
@@ -545,12 +588,20 @@ int rte_pmd_bnxt_get_vf_stats(uint16_t port,
struct rte_eth_dev *dev;
struct rte_eth_dev_info dev_info;
struct bnxt *bp;
+ int rc;
dev = &rte_eth_devices[port];
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
bp = dev->data->dev_private;
if (vf_id >= dev_info.max_vfs)
@@ -572,12 +623,20 @@ int rte_pmd_bnxt_reset_vf_stats(uint16_t port,
struct rte_eth_dev *dev;
struct rte_eth_dev_info dev_info;
struct bnxt *bp;
+ int rc;
dev = &rte_eth_devices[port];
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
+ rc = rte_eth_dev_info_get(port, &dev_info);
+
[dpdk-dev] [PATCH 13/51] net/netvsc: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to int,
so this patch modify rte_eth_dev_info_get() usage across
net/netvsc according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
drivers/net/netvsc/hn_vf.c | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/net/netvsc/hn_vf.c b/drivers/net/netvsc/hn_vf.c
index 03f855b..b6b1e5d 100644
--- a/drivers/net/netvsc/hn_vf.c
+++ b/drivers/net/netvsc/hn_vf.c
@@ -176,8 +176,16 @@ static void hn_vf_info_merge(struct rte_eth_dev *vf_dev,
struct rte_eth_dev_info *info)
{
struct rte_eth_dev_info vf_info;
+ int ret;
+
+ ret = rte_eth_dev_info_get(vf_dev->data->port_id, &vf_info);
+ if (ret != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ vf_dev->data->port_id, strerror(-ret));
- rte_eth_dev_info_get(vf_dev->data->port_id, &vf_info);
+ return;
+ }
info->speed_capa = vf_info.speed_capa;
info->default_rxportconf = vf_info.default_rxportconf;
--
1.8.3.1
[dpdk-dev] [PATCH 16/51] examples/l3fwd: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
examples/l3fwd according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
examples/l3fwd/main.c | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 3800bad..3294ac2 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -874,7 +874,12 @@ enum {
printf("Creating queues: nb_rxq=%d nb_txq=%u... ",
nb_rx_queue, (unsigned)n_tx_queue );
- rte_eth_dev_info_get(portid, &dev_info);
+ ret = rte_eth_dev_info_get(portid, &dev_info);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Error during getting device (port %u) info:
%s\n",
+ portid, strerror(-ret));
+
if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
local_port_conf.txmode.offloads |=
DEV_TX_OFFLOAD_MBUF_FAST_FREE;
@@ -985,7 +990,12 @@ enum {
printf("rxq=%d,%d,%d ", portid, queueid, socketid);
fflush(stdout);
- rte_eth_dev_info_get(portid, &dev_info);
+ ret = rte_eth_dev_info_get(portid, &dev_info);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Error during getting device (port %u)
info: %s\n",
+ portid, strerror(-ret));
+
rxq_conf = dev_info.default_rxconf;
rxq_conf.offloads = port_conf.rxmode.offloads;
if (!per_port_pool)
--
1.8.3.1
[dpdk-dev] [PATCH 12/51] net/bonding: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
net/bonding according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
drivers/net/bonding/rte_eth_bond_api.c | 10 +-
drivers/net/bonding/rte_eth_bond_pmd.c | 36 ++
2 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/drivers/net/bonding/rte_eth_bond_api.c
b/drivers/net/bonding/rte_eth_bond_api.c
index 0fc4c5e..e2e27e9 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -452,6 +452,7 @@
struct bond_dev_private *internals;
struct rte_eth_link link_props;
struct rte_eth_dev_info dev_info;
+ int ret;
bonded_eth_dev = &rte_eth_devices[bonded_port_id];
internals = bonded_eth_dev->data->dev_private;
@@ -465,7 +466,14 @@
return -1;
}
- rte_eth_dev_info_get(slave_port_id, &dev_info);
+ ret = rte_eth_dev_info_get(slave_port_id, &dev_info);
+ if (ret != 0) {
+ RTE_BOND_LOG(ERR,
+ "%s: Error during getting device (port %u) info: %s\n",
+ __func__, slave_port_id, strerror(-ret));
+
+ return ret;
+ }
if (dev_info.max_rx_pktlen < internals->max_rx_pktlen) {
RTE_BOND_LOG(ERR, "Slave (port %u) max_rx_pktlen too small",
slave_port_id);
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
b/drivers/net/bonding/rte_eth_bond_pmd.c
index 97ab3f2..a1b5014 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -186,7 +186,15 @@
return -1;
}
- rte_eth_dev_info_get(slave_port, &slave_info);
+ ret = rte_eth_dev_info_get(slave_port, &slave_info);
+ if (ret != 0) {
+ RTE_BOND_LOG(ERR,
+ "%s: Error during getting device (port %u) info: %s\n",
+ __func__, slave_port, strerror(-ret));
+
+ return ret;
+ }
+
if (slave_info.max_rx_queues < bond_dev->data->nb_rx_queues ||
slave_info.max_tx_queues <
bond_dev->data->nb_tx_queues) {
RTE_BOND_LOG(ERR,
@@ -204,10 +212,19 @@
struct bond_dev_private *internals = bond_dev->data->dev_private;
struct rte_eth_dev_info bond_info;
uint16_t idx;
+ int ret;
/* Verify if all slaves in bonding supports flow director and */
if (internals->slave_count > 0) {
- rte_eth_dev_info_get(bond_dev->data->port_id, &bond_info);
+ ret = rte_eth_dev_info_get(bond_dev->data->port_id, &bond_info);
+ if (ret != 0) {
+ RTE_BOND_LOG(ERR,
+ "%s: Error during getting device (port %u)
info: %s\n",
+ __func__, bond_dev->data->port_id,
+ strerror(-ret));
+
+ return ret;
+ }
internals->mode4.dedicated_queues.rx_qid =
bond_info.nb_rx_queues;
internals->mode4.dedicated_queues.tx_qid =
bond_info.nb_tx_queues;
@@ -2102,6 +2119,8 @@ struct bwg_slave {
bond_ethdev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
{
struct bond_dev_private *internals = dev->data->dev_private;
+ struct bond_slave_details slave;
+ int ret;
uint16_t max_nb_rx_queues = UINT16_MAX;
uint16_t max_nb_tx_queues = UINT16_MAX;
@@ -2123,8 +2142,17 @@ struct bwg_slave {
uint16_t idx;
for (idx = 0; idx < internals->slave_count; idx++) {
- rte_eth_dev_info_get(internals->slaves[idx].port_id,
- &slave_info);
+ slave = internals->slaves[idx];
+ ret = rte_eth_dev_info_get(slave.port_id, &slave_info);
+ if (ret != 0) {
+ RTE_BOND_LOG(ERR,
+ "%s: Error during getting device (port
%u) info: %s\n",
+ __func__,
+ slave.port_id,
+ strerror(-ret));
+
+ return;
+ }
if (slave_info.max_rx_queues < max_nb_rx_queues)
max_nb_rx_queues = slave_info.max_rx_queues;
--
1.8.3.1
[dpdk-dev] [PATCH 18/51] examples/ip_frag: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
examples/ip_frag according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
examples/ip_fragmentation/main.c | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index 324d607..6b83244 100644
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -903,7 +903,12 @@ struct rte_lpm6_config lpm6_config = {
qconf = &lcore_queue_conf[rx_lcore_id];
/* limit the frame size to the maximum supported by NIC */
- rte_eth_dev_info_get(portid, &dev_info);
+ ret = rte_eth_dev_info_get(portid, &dev_info);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Error during getting device (port %u) info:
%s\n",
+ portid, strerror(-ret));
+
local_port_conf.rxmode.max_rx_pkt_len = RTE_MIN(
dev_info.max_rx_pktlen,
local_port_conf.rxmode.max_rx_pkt_len);
@@ -984,7 +989,12 @@ struct rte_lpm6_config lpm6_config = {
printf("\n");
/* init one TX queue per couple (lcore,port) */
- rte_eth_dev_info_get(portid, &dev_info);
+ ret = rte_eth_dev_info_get(portid, &dev_info);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Error during getting device (port %u) info:
%s\n",
+ portid, strerror(-ret));
+
queueid = 0;
for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
if (rte_lcore_is_enabled(lcore_id) == 0)
--
1.8.3.1
[dpdk-dev] [PATCH 14/51] net/softnic: check status of getting ethdev info
From: Ivan Ilchenko rte_eth_dev_info_get() return value was changed from void to int, so this patch modify rte_eth_dev_info_get() usage across net/softnic according to its new return type. Signed-off-by: Ivan Ilchenko Signed-off-by: Andrew Rybchenko --- drivers/net/softnic/rte_eth_softnic_link.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/softnic/rte_eth_softnic_link.c b/drivers/net/softnic/rte_eth_softnic_link.c index d669913..21a6406 100644 --- a/drivers/net/softnic/rte_eth_softnic_link.c +++ b/drivers/net/softnic/rte_eth_softnic_link.c @@ -57,6 +57,7 @@ struct softnic_link * struct rte_eth_dev_info port_info; struct softnic_link *link; uint16_t port_id; + int ret; /* Check input params */ if (name == NULL || @@ -78,7 +79,9 @@ struct softnic_link * return NULL; } - rte_eth_dev_info_get(port_id, &port_info); + ret = rte_eth_dev_info_get(port_id, &port_info); + if (ret != 0) + return NULL; /* Node allocation */ link = calloc(1, sizeof(struct softnic_link)); -- 1.8.3.1
[dpdk-dev] [PATCH 01/51] ethdev: change rte_eth_dev_info_get() return value to int
From: Ivan Ilchenko
Change rte_eth_dev_info_get() return value from void to int and return
negative errno values in case of error conditions.
Modify rte_eth_dev_info_get() usage across the ethdev according
to new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
doc/guides/rel_notes/deprecation.rst | 1 -
doc/guides/rel_notes/release_19_11.rst | 5 ++-
lib/librte_ethdev/rte_ethdev.c | 71 --
lib/librte_ethdev/rte_ethdev.h | 6 ++-
4 files changed, 60 insertions(+), 23 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 0ee8533..cbb4c34 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -88,7 +88,6 @@ Deprecation Notices
negative errno values to indicate various error conditions (e.g.
invalid port ID, unsupported operation, failed operation):
- - ``rte_eth_dev_info_get``
- ``rte_eth_promiscuous_enable`` and ``rte_eth_promiscuous_disable``
- ``rte_eth_allmulticast_enable`` and ``rte_eth_allmulticast_disable``
- ``rte_eth_link_get`` and ``rte_eth_link_get_nowait``
diff --git a/doc/guides/rel_notes/release_19_11.rst
b/doc/guides/rel_notes/release_19_11.rst
index 8490d89..5424b6a 100644
--- a/doc/guides/rel_notes/release_19_11.rst
+++ b/doc/guides/rel_notes/release_19_11.rst
@@ -85,6 +85,9 @@ API Changes
Also, make sure to start the actual text at the margin.
=
+* ethdev: changed ``rte_eth_dev_infos_get`` return value from ``void`` to
+ ``int`` to provide a way to report various error conditions.
+
ABI Changes
---
@@ -136,7 +139,7 @@ The libraries prepended with a plus sign were incremented
in this version.
librte_distributor.so.1
librte_eal.so.11
librte_efd.so.1
- librte_ethdev.so.12
+ + librte_ethdev.so.13
librte_eventdev.so.7
librte_flow_classify.so.1
librte_gro.so.1
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 17d183e..4b6cbe2 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -1125,7 +1125,6 @@ struct rte_eth_dev *
dev = &rte_eth_devices[port_id];
- RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP);
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_configure, -ENOTSUP);
if (dev->data->dev_started) {
@@ -1144,7 +1143,9 @@ struct rte_eth_dev *
*/
memcpy(&dev->data->dev_conf, dev_conf, sizeof(dev->data->dev_conf));
- rte_eth_dev_info_get(port_id, &dev_info);
+ ret = rte_eth_dev_info_get(port_id, &dev_info);
+ if (ret != 0)
+ return ret;
/* If number of queues specified by application for both Rx and Tx is
* zero, use driver preferred values. This cannot be done individually
@@ -1406,6 +1407,7 @@ struct rte_eth_dev *
struct rte_eth_dev *dev;
struct rte_eth_dev_info dev_info;
int diag;
+ int ret;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
@@ -1420,7 +1422,9 @@ struct rte_eth_dev *
return 0;
}
- rte_eth_dev_info_get(port_id, &dev_info);
+ ret = rte_eth_dev_info_get(port_id, &dev_info);
+ if (ret != 0)
+ return ret;
/* Lets restore MAC now if device does not support live change */
if (*dev_info.dev_flags & RTE_ETH_DEV_NOLIVE_MAC_ADDR)
@@ -1584,7 +1588,6 @@ struct rte_eth_dev *
return -EINVAL;
}
- RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP);
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_setup, -ENOTSUP);
/*
@@ -1592,7 +1595,10 @@ struct rte_eth_dev *
* This value must be provided in the private data of the memory pool.
* First check that the memory pool has a valid private data.
*/
- rte_eth_dev_info_get(port_id, &dev_info);
+ ret = rte_eth_dev_info_get(port_id, &dev_info);
+ if (ret != 0)
+ return ret;
+
if (mp->private_data_size < sizeof(struct rte_pktmbuf_pool_private)) {
RTE_ETHDEV_LOG(ERR, "%s private_data_size %d < %d\n",
mp->name, (int)mp->private_data_size,
@@ -1703,6 +1709,7 @@ struct rte_eth_dev *
struct rte_eth_dev_info dev_info;
struct rte_eth_txconf local_conf;
void **txq;
+ int ret;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
@@ -1712,10 +1719,11 @@ struct rte_eth_dev *
return -EINVAL;
}
- RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP);
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_setup, -ENOTSUP);
- rte_eth_dev_info_get(port_id, &dev_info);
+ ret = rte_eth_dev_info_get(port_id, &dev_info);
+ if (ret != 0)
+ return ret;
/* Use default specified b
[dpdk-dev] [PATCH 21/51] examples/distributor: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
examples/distributor according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
examples/distributor/main.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/examples/distributor/main.c b/examples/distributor/main.c
index 81d7ca6..8942f36 100644
--- a/examples/distributor/main.c
+++ b/examples/distributor/main.c
@@ -120,7 +120,13 @@ struct output_buffer {
if (!rte_eth_dev_is_valid_port(port))
return -1;
- rte_eth_dev_info_get(port, &dev_info);
+ retval = rte_eth_dev_info_get(port, &dev_info);
+ if (retval != 0) {
+ printf("Error during getting device (port %u) info: %s\n",
+ port, strerror(-retval));
+ return retval;
+ }
+
if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
port_conf.txmode.offloads |=
DEV_TX_OFFLOAD_MBUF_FAST_FREE;
--
1.8.3.1
[dpdk-dev] [PATCH 20/51] examples/vmdq: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
examples/vmdq according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
examples/vmdq/main.c | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/examples/vmdq/main.c b/examples/vmdq/main.c
index 7281ffd..91f9a99 100644
--- a/examples/vmdq/main.c
+++ b/examples/vmdq/main.c
@@ -169,7 +169,13 @@
* The max pool number from dev_info will be used to validate the pool
* number specified in cmd line
*/
- rte_eth_dev_info_get(port, &dev_info);
+ retval = rte_eth_dev_info_get(port, &dev_info);
+ if (retval != 0) {
+ printf("Error during getting device (port %u) info: %s\n",
+ port, strerror(-retval));
+ return retval;
+ }
+
max_nb_pools = (uint32_t)dev_info.max_vmdq_pools;
/*
* We allow to process part of VMDQ pools specified by num_pools in
@@ -214,7 +220,13 @@
rxRings = (uint16_t)dev_info.max_rx_queues;
txRings = (uint16_t)dev_info.max_tx_queues;
- rte_eth_dev_info_get(port, &dev_info);
+ retval = rte_eth_dev_info_get(port, &dev_info);
+ if (retval != 0) {
+ printf("Error during getting device (port %u) info: %s\n",
+ port, strerror(-retval));
+ return retval;
+ }
+
if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
port_conf.txmode.offloads |=
DEV_TX_OFFLOAD_MBUF_FAST_FREE;
--
1.8.3.1
[dpdk-dev] [PATCH 22/51] examples/l3fwd-acl: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
examples/l3fwd-acl according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
examples/l3fwd-acl/main.c | 22 +++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c
index 0c44df7..60531ce 100644
--- a/examples/l3fwd-acl/main.c
+++ b/examples/l3fwd-acl/main.c
@@ -1924,7 +1924,13 @@ struct lcore_conf {
n_tx_queue = MAX_TX_QUEUE_PER_PORT;
printf("Creating queues: nb_rxq=%d nb_txq=%u... ",
nb_rx_queue, (unsigned)n_tx_queue);
- rte_eth_dev_info_get(portid, &dev_info);
+
+ ret = rte_eth_dev_info_get(portid, &dev_info);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Error during getting device (port %u) info:
%s\n",
+ portid, strerror(-ret));
+
if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
local_port_conf.txmode.offloads |=
DEV_TX_OFFLOAD_MBUF_FAST_FREE;
@@ -1994,7 +2000,12 @@ struct lcore_conf {
printf("txq=%u,%d,%d ", lcore_id, queueid, socketid);
fflush(stdout);
- rte_eth_dev_info_get(portid, &dev_info);
+ ret = rte_eth_dev_info_get(portid, &dev_info);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Error during getting device (port %u)
info: %s\n",
+ portid, strerror(-ret));
+
txconf = &dev_info.default_txconf;
txconf->offloads = local_port_conf.txmode.offloads;
ret = rte_eth_tx_queue_setup(portid, queueid, nb_txd,
@@ -2036,7 +2047,12 @@ struct lcore_conf {
printf("rxq=%d,%d,%d ", portid, queueid, socketid);
fflush(stdout);
- rte_eth_dev_info_get(portid, &dev_info);
+ ret = rte_eth_dev_info_get(portid, &dev_info);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Error during getting device (port %u)
info: %s\n",
+ portid, strerror(-ret));
+
rxq_conf = dev_info.default_rxconf;
rxq_conf.offloads = port_conf.rxmode.offloads;
ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
--
1.8.3.1
[dpdk-dev] [PATCH 23/51] examples/vm_power: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
examples/vm_power according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
examples/vm_power_manager/main.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c
index 54c7046..0f48ae9 100644
--- a/examples/vm_power_manager/main.c
+++ b/examples/vm_power_manager/main.c
@@ -71,7 +71,13 @@
if (!rte_eth_dev_is_valid_port(port))
return -1;
- rte_eth_dev_info_get(port, &dev_info);
+ retval = rte_eth_dev_info_get(port, &dev_info);
+ if (retval != 0) {
+ printf("Error during getting device (port %u) info: %s\n",
+ port, strerror(-retval));
+ return retval;
+ }
+
if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
port_conf.txmode.offloads |=
DEV_TX_OFFLOAD_MBUF_FAST_FREE;
--
1.8.3.1
[dpdk-dev] [PATCH 25/51] examples/flow_filtering: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
examples/flow_filtering according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
examples/flow_filtering/main.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c
index a0487be..fe064fa 100644
--- a/examples/flow_filtering/main.c
+++ b/examples/flow_filtering/main.c
@@ -136,7 +136,12 @@
struct rte_eth_rxconf rxq_conf;
struct rte_eth_dev_info dev_info;
- rte_eth_dev_info_get(port_id, &dev_info);
+ ret = rte_eth_dev_info_get(port_id, &dev_info);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Error during getting device (port %u) info: %s\n",
+ port_id, strerror(-ret));
+
port_conf.txmode.offloads &= dev_info.tx_offload_capa;
printf(":: initializing port: %d\n", port_id);
ret = rte_eth_dev_configure(port_id,
--
1.8.3.1
[dpdk-dev] [PATCH 24/51] examples/qos_sched: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
examples/qos_sched according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
examples/qos_sched/init.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c
index b05206d..cf9e8f4 100644
--- a/examples/qos_sched/init.c
+++ b/examples/qos_sched/init.c
@@ -98,7 +98,13 @@ struct ring_thresh tx_thresh = {
/* init port */
RTE_LOG(INFO, APP, "Initializing port %"PRIu16"... ", portid);
fflush(stdout);
- rte_eth_dev_info_get(portid, &dev_info);
+
+ ret = rte_eth_dev_info_get(portid, &dev_info);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Error during getting device (port %u) info: %s\n",
+ portid, strerror(-ret));
+
if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
local_port_conf.txmode.offloads |=
DEV_TX_OFFLOAD_MBUF_FAST_FREE;
--
1.8.3.1
[dpdk-dev] [PATCH 26/51] examples/l3fwd-power: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
examples/l3fwd-power according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
examples/l3fwd-power/main.c | 22 +++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index fd8d952..bfcaa46 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -2257,7 +2257,12 @@ static int check_ptype(uint16_t portid)
printf("Initializing port %d ... ", portid );
fflush(stdout);
- rte_eth_dev_info_get(portid, &dev_info);
+ ret = rte_eth_dev_info_get(portid, &dev_info);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Error during getting device (port %u) info:
%s\n",
+ portid, strerror(-ret));
+
dev_rxq_num = dev_info.max_rx_queues;
dev_txq_num = dev_info.max_tx_queues;
@@ -2275,7 +2280,13 @@ static int check_ptype(uint16_t portid)
/* If number of Rx queue is 0, no need to enable Rx interrupt */
if (nb_rx_queue == 0)
local_port_conf.intr_conf.rxq = 0;
- rte_eth_dev_info_get(portid, &dev_info);
+
+ ret = rte_eth_dev_info_get(portid, &dev_info);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Error during getting device (port %u) info:
%s\n",
+ portid, strerror(-ret));
+
if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
local_port_conf.txmode.offloads |=
DEV_TX_OFFLOAD_MBUF_FAST_FREE;
@@ -2398,7 +2409,12 @@ static int check_ptype(uint16_t portid)
printf("rxq=%d,%d,%d ", portid, queueid, socketid);
fflush(stdout);
- rte_eth_dev_info_get(portid, &dev_info);
+ ret = rte_eth_dev_info_get(portid, &dev_info);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Error during getting device (port %u)
info: %s\n",
+ portid, strerror(-ret));
+
rxq_conf = dev_info.default_rxconf;
rxq_conf.offloads = port_conf.rxmode.offloads;
ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
--
1.8.3.1
[dpdk-dev] [PATCH 27/51] examples/l2fwd: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
examples/l2fwd according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
examples/l2fwd/main.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c
index 1e2b142..8d4c539 100644
--- a/examples/l2fwd/main.c
+++ b/examples/l2fwd/main.c
@@ -635,7 +635,13 @@ enum {
/* init port */
printf("Initializing port %u... ", portid);
fflush(stdout);
- rte_eth_dev_info_get(portid, &dev_info);
+
+ ret = rte_eth_dev_info_get(portid, &dev_info);
+ if (ret != 0)
+ rte_exit(EXIT_FAILURE,
+ "Error during getting device (port %u) info:
%s\n",
+ portid, strerror(-ret));
+
if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
local_port_conf.txmode.offloads |=
DEV_TX_OFFLOAD_MBUF_FAST_FREE;
--
1.8.3.1
[dpdk-dev] [PATCH 29/51] examples/vmdq_dcb: check status of getting ethdev info
From: Ivan Ilchenko
rte_eth_dev_info_get() return value was changed from void to
int, so this patch modify rte_eth_dev_info_get() usage across
examples/vmdq_dcb according to its new return type.
Signed-off-by: Ivan Ilchenko
Signed-off-by: Andrew Rybchenko
---
examples/vmdq_dcb/main.c | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/examples/vmdq_dcb/main.c b/examples/vmdq_dcb/main.c
index 3890003..2122e41 100644
--- a/examples/vmdq_dcb/main.c
+++ b/examples/vmdq_dcb/main.c
@@ -202,7 +202,14 @@
* The max pool number from dev_info will be used to validate the pool
* number specified in cmd line
*/
- rte_eth_dev_info_get(port, &dev_info);
+ retval = rte_eth_dev_info_get(port, &dev_info);
+ if (retval != 0) {
+ printf("Error during getting device (port %u) info: %s\n",
+ port, strerror(-retval));
+
+ return retval;
+ }
+
max_nb_pools = (uint32_t)dev_info.max_vmdq_pools;
/*
* We allow to process part of VMDQ pools specified by num_pools in
@@ -253,7 +260,14 @@
if (retval < 0)
return retval;
- rte_eth_dev_info_get(port, &dev_info);
+ retval = rte_eth_dev_info_get(port, &dev_info);
+ if (retval != 0) {
+ printf("Error during getting device (port %u) info: %s\n",
+ port, strerror(-retval));
+
+ return retval;
+ }
+
if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
port_conf.txmode.offloads |=
DEV_TX_OFFLOAD_MBUF_FAST_FREE;
--
1.8.3.1
