[dpdk-dev] [PATCH] lpm: do not return defer queue handle to the user
There is no need to return defer queue handle in rte_lpm_rcu_qsbr_add API,
since enough flexibility has been provided to configure the defer queue.
Signed-off-by: Ruifeng Wang
Reviewed-by: Honnappa Nagarahalli
---
This is a followup patch of LPM RCU reclamation series [1].
[1] http://patches.dpdk.org/cover/73673/
app/test/test_lpm.c | 10 +-
app/test/test_lpm_perf.c | 4 ++--
lib/librte_lpm/rte_lpm.c | 5 +
lib/librte_lpm/rte_lpm.h | 5 +
4 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/app/test/test_lpm.c b/app/test/test_lpm.c
index 8330501f0..258b2f67c 100644
--- a/app/test/test_lpm.c
+++ b/app/test/test_lpm.c
@@ -1308,12 +1308,12 @@ test19(void)
rcu_cfg.v = qsv;
/* Invalid QSBR mode */
rcu_cfg.mode = 2;
- status = rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg, NULL);
+ status = rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg);
TEST_LPM_ASSERT(status != 0);
rcu_cfg.mode = RTE_LPM_QSBR_MODE_DQ;
/* Attach RCU QSBR to LPM table */
- status = rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg, NULL);
+ status = rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg);
TEST_LPM_ASSERT(status == 0);
/* Create and attach another RCU QSBR to LPM table */
@@ -1323,7 +1323,7 @@ test19(void)
rcu_cfg.v = qsv2;
rcu_cfg.mode = RTE_LPM_QSBR_MODE_SYNC;
- status = rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg, NULL);
+ status = rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg);
TEST_LPM_ASSERT(status != 0);
rte_lpm_free(lpm);
@@ -1379,7 +1379,7 @@ test20(void)
rcu_cfg.v = qsv;
rcu_cfg.mode = RTE_LPM_QSBR_MODE_DQ;
/* Attach RCU QSBR to LPM table */
- status = rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg, NULL);
+ status = rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg);
TEST_LPM_ASSERT(status == 0);
ip = RTE_IPV4(192, 0, 2, 100);
@@ -1510,7 +1510,7 @@ test21(void)
rcu_cfg.v = g_v;
rcu_cfg.mode = RTE_LPM_QSBR_MODE_SYNC;
/* Attach RCU QSBR to LPM table */
- status = rte_lpm_rcu_qsbr_add(g_lpm, &rcu_cfg, NULL);
+ status = rte_lpm_rcu_qsbr_add(g_lpm, &rcu_cfg);
TEST_LPM_ASSERT(status == 0);
writer_done = 0;
diff --git a/app/test/test_lpm_perf.c b/app/test/test_lpm_perf.c
index dfe186426..58076795e 100644
--- a/app/test/test_lpm_perf.c
+++ b/app/test/test_lpm_perf.c
@@ -521,7 +521,7 @@ test_lpm_rcu_perf_multi_writer(void)
rcu_cfg.v = rv;
/* Assign the RCU variable to LPM */
- if (rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg, NULL) != 0) {
+ if (rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg) != 0) {
printf("RCU variable assignment failed\n");
goto error;
}
@@ -674,7 +674,7 @@ test_lpm_rcu_perf(void)
rcu_cfg.v = rv;
/* Assign the RCU variable to LPM */
- if (rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg, NULL) != 0) {
+ if (rte_lpm_rcu_qsbr_add(lpm, &rcu_cfg) != 0) {
printf("RCU variable assignment failed\n");
goto error;
}
diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c
index 126fc5a82..2db9e16a2 100644
--- a/lib/librte_lpm/rte_lpm.c
+++ b/lib/librte_lpm/rte_lpm.c
@@ -288,8 +288,7 @@ __lpm_rcu_qsbr_free_resource(void *p, void *data, unsigned
int n)
/* Associate QSBR variable with an LPM object.
*/
int
-rte_lpm_rcu_qsbr_add(struct rte_lpm *lpm, struct rte_lpm_rcu_config *cfg,
- struct rte_rcu_qsbr_dq **dq)
+rte_lpm_rcu_qsbr_add(struct rte_lpm *lpm, struct rte_lpm_rcu_config *cfg)
{
struct rte_rcu_qsbr_dq_parameters params = {0};
char rcu_dq_name[RTE_RCU_QSBR_DQ_NAMESIZE];
@@ -329,8 +328,6 @@ rte_lpm_rcu_qsbr_add(struct rte_lpm *lpm, struct
rte_lpm_rcu_config *cfg,
RTE_LOG(ERR, LPM, "LPM defer queue creation failed\n");
return 1;
}
- if (dq != NULL)
- *dq = internal_lpm->dq;
} else {
rte_errno = EINVAL;
return 1;
diff --git a/lib/librte_lpm/rte_lpm.h b/lib/librte_lpm/rte_lpm.h
index a9568fcdd..03da2d37e 100644
--- a/lib/librte_lpm/rte_lpm.h
+++ b/lib/librte_lpm/rte_lpm.h
@@ -218,8 +218,6 @@ rte_lpm_free(struct rte_lpm *lpm);
* the lpm object to add RCU QSBR
* @param cfg
* RCU QSBR configuration
- * @param dq
- * handler of created RCU QSBR defer queue
* @return
* On success - 0
* On error - 1 with error code set in rte_errno.
@@ -229,8 +227,7 @@ rte_lpm_free(struct rte_lpm *lpm);
* - ENOMEM - memory allocation failure
*/
__rte_experimental
-int rte_lpm_rcu_qsbr_add(struct rte_lpm *lpm, struct rte_lpm_rcu_config *cfg,
- struct rte_rcu_qsbr_dq **dq);
+int rte_lpm_rcu_qsbr_add(struct rte_lpm *lpm, struct rte_lpm_rcu_config *cfg);
/**
* Add a rule to the LPM table.
--
2.17.1
Re: [dpdk-dev] DPDK hugepage memory fragmentation
Hello Anatoly/Bruce, We are using the 18_11 version of DPDK and we are using igb_uio. The way we observe an issue here is that, after we tried multiple iterations of start/stop of container application(which has DPDK), we were not able to allocate the memory for port during the init. We thought that it could be an issue of not getting continuous allocation hence it fails. Is there an API where I can check if the memory is fragmented before we invoke an allocation ? Or do we have any such mechanism to defragment the memory allocation once we exist from the application ? Please advise. Thanks, Kamaraj On Fri, Jul 10, 2020 at 9:14 PM Burakov, Anatoly wrote: > On 10-Jul-20 11:28 AM, Bruce Richardson wrote: > > On Fri, Jul 10, 2020 at 02:52:16PM +0530, Kamaraj P wrote: > >> Hello All, > >> > >> We are running to run DPDK based application in a container mode, > >> When we do multiple start/stop of our container application, the DPDK > >> initialization seems to be failing. > >> This is because the hugepage memory fragementated and is not able to > find > >> the continuous allocation of the memory to initialize the buffer in the > >> dpdk init. > >> > >> As part of the cleanup of the container, we do call rte_eal_cleanup() to > >> cleanup the memory w.r.t our application. However after iterations we > still > >> see the memory allocation failure due to the fragmentation issue. > >> > >> We also tried to set the "--huge-unlink" as an argument before when we > >> called the rte_eal_init() and it did not help. > >> > >> Could you please suggest if there is an option or any existing patches > >> available to clean up the memory to avoid fragmentation issues in the > >> future. > >> > >> Please advise. > >> > > What version of DPDK are you using, and what kernel driver for NIC > > interfacing are you using? > > DPDK versions since 18.05 should be more forgiving of fragmented memory, > > especially if using the vfio-pci kernel driver. > > > > This sounds odd, to be honest. > > Unless you're allocating huge chunks of IOVA-contiguous memory, > fragmentation shouldn't be an issue. How did you determine that this was > in fact due to fragmentation? > > > Regards, > > /Bruce > > > > > -- > Thanks, > Anatoly >
[dpdk-dev] [PATCH v3 2/8] net/dpaa: add VSP support in FMLIB
From: Jun Yang
This patch adds support for VSP (Virtual Storage Profile)
in fmlib routines.
VSP allow a network interface to be divided into physical
and virtual instance(s).
The concept is very similar to SRIOV.
Signed-off-by: Jun Yang
Acked-by: Hemant Agrawal
---
drivers/net/dpaa/Makefile | 1 +
drivers/net/dpaa/fmlib/fm_vsp.c | 143
drivers/net/dpaa/fmlib/fm_vsp_ext.h | 141 +++
drivers/net/dpaa/meson.build| 1 +
4 files changed, 286 insertions(+)
create mode 100644 drivers/net/dpaa/fmlib/fm_vsp.c
create mode 100644 drivers/net/dpaa/fmlib/fm_vsp_ext.h
diff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile
index 0d2f32ba1..8db4e457f 100644
--- a/drivers/net/dpaa/Makefile
+++ b/drivers/net/dpaa/Makefile
@@ -28,6 +28,7 @@ EXPORT_MAP := rte_pmd_dpaa_version.map
# Interfaces with DPDK
SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += fmlib/fm_lib.c
+SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += fmlib/fm_vsp.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_ethdev.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_rxtx.c
diff --git a/drivers/net/dpaa/fmlib/fm_vsp.c b/drivers/net/dpaa/fmlib/fm_vsp.c
new file mode 100644
index 0..b511b5159
--- /dev/null
+++ b/drivers/net/dpaa/fmlib/fm_vsp.c
@@ -0,0 +1,143 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2019-2020 NXP
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include "fm_ext.h"
+#include "fm_pcd_ext.h"
+#include "fm_port_ext.h"
+#include "fm_vsp_ext.h"
+#include
+
+uint32_t FM_PORT_VSPAlloc(t_Handle h_FmPort,
+ t_FmPortVSPAllocParams *p_Params)
+{
+ t_Device *p_Dev = (t_Device *)h_FmPort;
+ ioc_fm_port_vsp_alloc_params_t params;
+
+ _fml_dbg("Calling...\n");
+ memset(¶ms, 0, sizeof(ioc_fm_port_vsp_alloc_params_t));
+ memcpy(¶ms.params, p_Params, sizeof(t_FmPortVSPAllocParams));
+
+ if (ioctl(p_Dev->fd, FM_PORT_IOC_VSP_ALLOC, ¶ms))
+ RETURN_ERROR(MINOR, E_INVALID_OPERATION, NO_MSG);
+
+ _fml_dbg("Called.\n");
+
+ return E_OK;
+}
+
+t_Handle FM_VSP_Config(t_FmVspParams *p_FmVspParams)
+{
+ t_Device *p_Dev = NULL;
+ t_Device *p_VspDev = NULL;
+ ioc_fm_vsp_params_t param;
+
+ p_Dev = p_FmVspParams->h_Fm;
+
+ _fml_dbg("Performing VSP Configuration...\n");
+
+ memset(¶m, 0, sizeof(ioc_fm_vsp_params_t));
+ memcpy(¶m, p_FmVspParams, sizeof(t_FmVspParams));
+ param.vsp_params.h_Fm = UINT_TO_PTR(p_Dev->id);
+ param.id = NULL;
+
+ if (ioctl(p_Dev->fd, FM_IOC_VSP_CONFIG, ¶m)) {
+ DPAA_PMD_ERR("%s ioctl error\n", __func__);
+ return NULL;
+ }
+
+ p_VspDev = (t_Device *)malloc(sizeof(t_Device));
+ if (!p_VspDev) {
+ DPAA_PMD_ERR("FM VSP Params!\n");
+ return NULL;
+ }
+ memset(p_VspDev, 0, sizeof(t_Device));
+ p_VspDev->h_UserPriv = (t_Handle)p_Dev;
+ p_Dev->owners++;
+ p_VspDev->id = PTR_TO_UINT(param.id);
+
+ _fml_dbg("VSP Configuration completed\n");
+
+ return (t_Handle)p_VspDev;
+}
+
+uint32_t FM_VSP_Init(t_Handle h_FmVsp)
+{
+ t_Device *p_Dev = NULL;
+ t_Device *p_VspDev = (t_Device *)h_FmVsp;
+ ioc_fm_obj_t id;
+
+ _fml_dbg("Calling...\n");
+
+ p_Dev = (t_Device *)p_VspDev->h_UserPriv;
+ id.obj = UINT_TO_PTR(p_VspDev->id);
+
+ if (ioctl(p_Dev->fd, FM_IOC_VSP_INIT, &id)) {
+ DPAA_PMD_ERR("%s ioctl error\n", __func__);
+ RETURN_ERROR(MINOR, E_INVALID_OPERATION, NO_MSG);
+ }
+
+ _fml_dbg("Called.\n");
+
+ return E_OK;
+}
+
+uint32_t FM_VSP_Free(t_Handle h_FmVsp)
+{
+ t_Device *p_Dev = NULL;
+ t_Device *p_VspDev = (t_Device *)h_FmVsp;
+ ioc_fm_obj_t id;
+
+ _fml_dbg("Calling...\n");
+
+ p_Dev = (t_Device *)p_VspDev->h_UserPriv;
+ id.obj = UINT_TO_PTR(p_VspDev->id);
+
+ if (ioctl(p_Dev->fd, FM_IOC_VSP_FREE, &id)) {
+ DPAA_PMD_ERR("%s ioctl error\n", __func__);
+ RETURN_ERROR(MINOR, E_INVALID_OPERATION, NO_MSG);
+ }
+
+ p_Dev->owners--;
+ free(p_VspDev);
+
+ _fml_dbg("Called.\n");
+
+ return E_OK;
+}
+
+uint32_t FM_VSP_ConfigBufferPrefixContent(t_Handle h_FmVsp,
+ t_FmBufferPrefixContent *p_FmBufferPrefixContent)
+{
+ t_Device *p_Dev = NULL;
+ t_Device *p_VspDev = (t_Device *)h_FmVsp;
+ ioc_fm_buffer_prefix_content_params_t params;
+
+ _fml_dbg("Calling...\n");
+
+ p_Dev = (t_Device *)p_VspDev->h_UserPriv;
+ params.p_fm_vsp = UINT_TO_PTR(p_VspDev->id);
+ memcpy(¶ms.fm_buffer_prefix_content,
+ p_FmBufferPrefixContent, sizeof(*p_FmBufferPrefixContent));
+
+ if (ioctl(p_Dev->fd, FM_IOC_VSP_CONFIG_BUFFER_PREFIX_CONTENT,
+ ¶ms)) {
+ DPAA_PMD_ERR("%s ioctl error\n", __func__
[dpdk-dev] [PATCH v3 3/8] net/dpaa: add support for fmcless mode
From: Sachin Saxena
This patch uses fmlib to configure the FMAN HW for flow
and distribution configuration, thus avoiding the need
for static FMC tool execution optionally.
Signed-off-by: Sachin Saxena
Signed-off-by: Hemant Agrawal
---
drivers/net/dpaa/Makefile | 1 +
drivers/net/dpaa/dpaa_ethdev.c | 111 +++-
drivers/net/dpaa/dpaa_ethdev.h | 4 +
drivers/net/dpaa/dpaa_flow.c | 904 +
drivers/net/dpaa/dpaa_flow.h | 14 +
drivers/net/dpaa/meson.build | 1 +
6 files changed, 1013 insertions(+), 22 deletions(-)
create mode 100644 drivers/net/dpaa/dpaa_flow.c
create mode 100644 drivers/net/dpaa/dpaa_flow.h
diff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile
index 8db4e457f..d334b82a0 100644
--- a/drivers/net/dpaa/Makefile
+++ b/drivers/net/dpaa/Makefile
@@ -30,6 +30,7 @@ EXPORT_MAP := rte_pmd_dpaa_version.map
SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += fmlib/fm_lib.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += fmlib/fm_vsp.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_ethdev.c
+SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_flow.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_rxtx.c
LDLIBS += -lrte_bus_dpaa
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index c15e2b546..c5b9ac1a5 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -39,6 +39,7 @@
#include
#include
+#include
#include
#include
@@ -76,6 +77,7 @@ static uint64_t dev_tx_offloads_nodis =
/* Keep track of whether QMAN and BMAN have been globally initialized */
static int is_global_init;
+static int fmc_q = 1; /* Indicates the use of static fmc for distribution */
static int default_q; /* use default queue - FMC is not executed*/
/* At present we only allow up to 4 push mode queues as default - as each of
* this queue need dedicated portal and we are short of portals.
@@ -1418,16 +1420,15 @@ static int dpaa_rx_queue_init(struct qman_fq *fq,
struct qman_cgr *cgr_rx,
}
};
- if (fqid) {
+ if (fmc_q || default_q) {
ret = qman_reserve_fqid(fqid);
if (ret) {
- DPAA_PMD_ERR("reserve rx fqid 0x%x failed with ret: %d",
+ DPAA_PMD_ERR("reserve rx fqid 0x%x failed, ret: %d",
fqid, ret);
return -EINVAL;
}
- } else {
- flags |= QMAN_FQ_FLAG_DYNAMIC_FQID;
}
+
DPAA_PMD_DEBUG("creating rx fq %p, fqid 0x%x", fq, fqid);
ret = qman_create_fq(fqid, flags, fq);
if (ret) {
@@ -1602,7 +1603,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
struct fman_if_bpool *bp, *tmp_bp;
uint32_t cgrid[DPAA_MAX_NUM_PCD_QUEUES];
uint32_t cgrid_tx[MAX_DPAA_CORES];
- char eth_buf[RTE_ETHER_ADDR_FMT_SIZE];
+ uint32_t dev_rx_fqids[DPAA_MAX_NUM_PCD_QUEUES];
PMD_INIT_FUNC_TRACE();
@@ -1619,30 +1620,36 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
dpaa_intf->ifid = dev_id;
dpaa_intf->cfg = cfg;
+ memset((char *)dev_rx_fqids, 0,
+ sizeof(uint32_t) * DPAA_MAX_NUM_PCD_QUEUES);
+
/* Initialize Rx FQ's */
if (default_q) {
num_rx_fqs = DPAA_DEFAULT_NUM_PCD_QUEUES;
+ } else if (fmc_q) {
+ num_rx_fqs = 1;
} else {
- if (getenv("DPAA_NUM_RX_QUEUES"))
- num_rx_fqs = atoi(getenv("DPAA_NUM_RX_QUEUES"));
- else
- num_rx_fqs = DPAA_DEFAULT_NUM_PCD_QUEUES;
+ /* FMCLESS mode, load balance to multiple cores.*/
+ num_rx_fqs = rte_lcore_count();
}
-
/* Each device can not have more than DPAA_MAX_NUM_PCD_QUEUES RX
* queues.
*/
- if (num_rx_fqs <= 0 || num_rx_fqs > DPAA_MAX_NUM_PCD_QUEUES) {
+ if (num_rx_fqs < 0 || num_rx_fqs > DPAA_MAX_NUM_PCD_QUEUES) {
DPAA_PMD_ERR("Invalid number of RX queues\n");
return -EINVAL;
}
- dpaa_intf->rx_queues = rte_zmalloc(NULL,
- sizeof(struct qman_fq) * num_rx_fqs, MAX_CACHELINE);
- if (!dpaa_intf->rx_queues) {
- DPAA_PMD_ERR("Failed to alloc mem for RX queues\n");
- return -ENOMEM;
+ if (num_rx_fqs > 0) {
+ dpaa_intf->rx_queues = rte_zmalloc(NULL,
+ sizeof(struct qman_fq) * num_rx_fqs, MAX_CACHELINE);
+ if (!dpaa_intf->rx_queues) {
+ DPAA_PMD_ERR("Failed to alloc mem for RX queues\n");
+ return -ENOMEM;
+ }
+ } else {
+ dpaa_intf->rx_queues = NULL;
}
memset(cgrid, 0, sizeof(cgrid));
@@ -1661,7 +1668,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
}
/* If congestion control is enabled globally*/
- if (td_threshold) {
+ if (num_rx_fqs > 0 && t
[dpdk-dev] [PATCH v3 5/8] bus/dpaa: add Virtual Storage Profile port init
This patch add support to initialize the VSP ports
in the FMAN library.
Signed-off-by: Hemant Agrawal
---
drivers/bus/dpaa/base/fman/fman.c | 57 +++
drivers/bus/dpaa/include/fman.h | 3 ++
2 files changed, 60 insertions(+)
diff --git a/drivers/bus/dpaa/base/fman/fman.c
b/drivers/bus/dpaa/base/fman/fman.c
index 3ae29bf06..39102bc1f 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -145,6 +145,61 @@ fman_get_mac_index(uint64_t regs_addr_host, uint8_t
*mac_idx)
return ret;
}
+static void fman_if_vsp_init(struct __fman_if *__if)
+{
+ const phandle *prop;
+ int cell_index;
+ const struct device_node *dev;
+ size_t lenp;
+ const uint8_t mac_idx[] = {-1, 0, 1, 2, 3, 4, 5, 6, 7, 0, 1};
+
+ if (__if->__if.mac_type == fman_mac_1g) {
+ for_each_compatible_node(dev, NULL,
+ "fsl,fman-port-1g-rx-extended-args") {
+ prop = of_get_property(dev, "cell-index", &lenp);
+ if (prop) {
+ cell_index = of_read_number(
+ &prop[0],
+ lenp / sizeof(phandle));
+ if (cell_index == mac_idx[__if->__if.mac_idx]) {
+ prop = of_get_property(
+ dev,
+ "vsp-window", &lenp);
+ if (prop) {
+ __if->__if.num_profiles =
+ of_read_number(
+ &prop[0], 1);
+ __if->__if.base_profile_id =
+ of_read_number(
+ &prop[1], 1);
+ }
+ }
+ }
+ }
+ } else if (__if->__if.mac_type == fman_mac_10g) {
+ for_each_compatible_node(dev, NULL,
+ "fsl,fman-port-10g-rx-extended-args") {
+ prop = of_get_property(dev, "cell-index", &lenp);
+ if (prop) {
+ cell_index = of_read_number(
+ &prop[0], lenp / sizeof(phandle));
+ if (cell_index == mac_idx[__if->__if.mac_idx]) {
+ prop = of_get_property(
+ dev, "vsp-window", &lenp);
+ if (prop) {
+ __if->__if.num_profiles =
+ of_read_number(
+ &prop[0], 1);
+ __if->__if.base_profile_id =
+ of_read_number(
+ &prop[1], 1);
+ }
+ }
+ }
+ }
+ }
+}
+
static int
fman_if_init(const struct device_node *dpa_node)
{
@@ -519,6 +574,8 @@ fman_if_init(const struct device_node *dpa_node)
if (is_shared)
__if->__if.is_shared_mac = 1;
+ fman_if_vsp_init(__if);
+
/* Parsing of the network interface is complete, add it to the list */
DPAA_BUS_LOG(DEBUG, "Found %s, Tx Channel = %x, FMAN = %x,"
"Port ID = %x",
diff --git a/drivers/bus/dpaa/include/fman.h b/drivers/bus/dpaa/include/fman.h
index cb7f18ca2..dcf408372 100644
--- a/drivers/bus/dpaa/include/fman.h
+++ b/drivers/bus/dpaa/include/fman.h
@@ -321,6 +321,9 @@ struct fman_if {
/* The Qman channel to schedule Tx FQs to */
u16 tx_channel_id;
+ uint8_t base_profile_id;
+ uint8_t num_profiles;
+
uint8_t is_shared_mac;
/* The hard-coded FQIDs for this interface. Note: this doesn't cover
* the PCD nor the "Rx default" FQIDs, which are configured via FMC
--
2.17.1
[dpdk-dev] [PATCH v3 4/8] bus/dpaa: add shared MAC support
From: Radu Bulie
A shared MAC interface is an interface which can be used
by both kernel and userspace based on classification configuration
It is defined in dts with the compatible string "fsl,dpa-ethernet-shared"
which bpool will be seeded by the dpdk partition and configured
as a netdev by the dpaa Linux eth driver.
User space buffers from the bpool will be kmapped by the kernel.
Signed-off-by: Radu Bulie
Signed-off-by: Jun Yang
Signed-off-by: Nipun Gupta
Acked-by: Hemant Agrawal
---
drivers/bus/dpaa/base/fman/fman.c | 27 ++-
drivers/bus/dpaa/include/fman.h | 2 ++
drivers/net/dpaa/dpaa_ethdev.c| 31 +--
drivers/net/dpaa/dpaa_flow.c | 18 ++
4 files changed, 55 insertions(+), 23 deletions(-)
diff --git a/drivers/bus/dpaa/base/fman/fman.c
b/drivers/bus/dpaa/base/fman/fman.c
index 33be9e5d7..3ae29bf06 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -167,13 +167,21 @@ fman_if_init(const struct device_node *dpa_node)
const char *mname, *fname;
const char *dname = dpa_node->full_name;
size_t lenp;
- int _errno;
+ int _errno, is_shared = 0;
const char *char_prop;
uint32_t na;
if (of_device_is_available(dpa_node) == false)
return 0;
+ if (!of_device_is_compatible(dpa_node, "fsl,dpa-ethernet-init") &&
+ !of_device_is_compatible(dpa_node, "fsl,dpa-ethernet-shared")) {
+ return 0;
+ }
+
+ if (of_device_is_compatible(dpa_node, "fsl,dpa-ethernet-shared"))
+ is_shared = 1;
+
rprop = "fsl,qman-frame-queues-rx";
mprop = "fsl,fman-mac";
@@ -387,7 +395,7 @@ fman_if_init(const struct device_node *dpa_node)
goto err;
}
- assert(lenp == (4 * sizeof(phandle)));
+ assert(lenp >= (4 * sizeof(phandle)));
na = of_n_addr_cells(mac_node);
/* Get rid of endianness (issues). Convert to host byte order */
@@ -408,7 +416,7 @@ fman_if_init(const struct device_node *dpa_node)
goto err;
}
- assert(lenp == (4 * sizeof(phandle)));
+ assert(lenp >= (4 * sizeof(phandle)));
/*TODO: Fix for other cases also */
na = of_n_addr_cells(mac_node);
/* Get rid of endianness (issues). Convert to host byte order */
@@ -508,6 +516,9 @@ fman_if_init(const struct device_node *dpa_node)
pools_phandle++;
}
+ if (is_shared)
+ __if->__if.is_shared_mac = 1;
+
/* Parsing of the network interface is complete, add it to the list */
DPAA_BUS_LOG(DEBUG, "Found %s, Tx Channel = %x, FMAN = %x,"
"Port ID = %x",
@@ -524,7 +535,7 @@ fman_if_init(const struct device_node *dpa_node)
int
fman_init(void)
{
- const struct device_node *dpa_node;
+ const struct device_node *dpa_node, *parent_node;
int _errno;
/* If multiple dependencies try to initialise the Fman driver, don't
@@ -539,7 +550,13 @@ fman_init(void)
return fman_ccsr_map_fd;
}
- for_each_compatible_node(dpa_node, NULL, "fsl,dpa-ethernet-init") {
+ parent_node = of_find_compatible_node(NULL, NULL, "fsl,dpaa");
+ if (!parent_node) {
+ DPAA_BUS_LOG(ERR, "Unable to find fsl,dpaa node");
+ return -ENODEV;
+ }
+
+ for_each_child_node(parent_node, dpa_node) {
_errno = fman_if_init(dpa_node);
if (_errno) {
FMAN_ERR(_errno, "if_init(%s)\n", dpa_node->full_name);
diff --git a/drivers/bus/dpaa/include/fman.h b/drivers/bus/dpaa/include/fman.h
index 7a0a7d405..cb7f18ca2 100644
--- a/drivers/bus/dpaa/include/fman.h
+++ b/drivers/bus/dpaa/include/fman.h
@@ -320,6 +320,8 @@ struct fman_if {
struct rte_ether_addr mac_addr;
/* The Qman channel to schedule Tx FQs to */
u16 tx_channel_id;
+
+ uint8_t is_shared_mac;
/* The hard-coded FQIDs for this interface. Note: this doesn't cover
* the PCD nor the "Rx default" FQIDs, which are configured via FMC
* and its XML-based configuration.
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index c5b9ac1a5..c2d480397 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -351,7 +351,8 @@ static void dpaa_eth_dev_stop(struct rte_eth_dev *dev)
PMD_INIT_FUNC_TRACE();
- fman_if_disable_rx(fif);
+ if (!fif->is_shared_mac)
+ fman_if_disable_rx(fif);
dev->tx_pkt_burst = dpaa_eth_tx_drop_all;
}
@@ -1807,19 +1808,21 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
fman_intf->mac_addr.addr_bytes[4],
fman_intf->mac_addr.addr_bytes[5]);
-
- /* Disable RX mode */
- fman_if_discard_rx_errors(fman_intf);
- fman_if_disable_rx(fman_intf);
- /* Di
[dpdk-dev] [PATCH v3 6/8] net/dpaa: add support for Virtual Storage Profile
From: Jun Yang
This patch adds support for Virtual Storage profile (VSP) feature.
With VSP support when memory pool is created, the hw buffer pool id
i.e. bpid is not allocated; thhe bpid is identified by dpaa flow
create API.
The memory pool of RX queue is attached to specific BMan pool
according to the VSP ID when RX queue is setup.
for fmlib based hash queue, vsp base ID is assigned to each queue.
Signed-off-by: Jun Yang
Acked-by: Hemant Agrawal
---
drivers/bus/dpaa/include/fsl_qman.h | 1 +
drivers/net/dpaa/dpaa_ethdev.c | 135 +-
drivers/net/dpaa/dpaa_ethdev.h | 7 ++
drivers/net/dpaa/dpaa_flow.c| 167 +++-
drivers/net/dpaa/dpaa_flow.h| 5 +
5 files changed, 287 insertions(+), 28 deletions(-)
diff --git a/drivers/bus/dpaa/include/fsl_qman.h
b/drivers/bus/dpaa/include/fsl_qman.h
index 8ba37411a..d98b9bee3 100644
--- a/drivers/bus/dpaa/include/fsl_qman.h
+++ b/drivers/bus/dpaa/include/fsl_qman.h
@@ -1229,6 +1229,7 @@ struct qman_fq {
int q_fd;
u16 ch_id;
+ int8_t vsp_id;
u8 cgr_groupid;
u8 is_static:4;
u8 qp_initialized:4;
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index c2d480397..8549fc2ce 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -722,6 +722,56 @@ static int dpaa_eth_multicast_disable(struct rte_eth_dev
*dev)
return 0;
}
+static void dpaa_fman_if_pool_setup(struct rte_eth_dev *dev)
+{
+ struct dpaa_if *dpaa_intf = dev->data->dev_private;
+ struct fman_if_ic_params icp;
+ uint32_t fd_offset;
+ uint32_t bp_size;
+
+ memset(&icp, 0, sizeof(icp));
+ /* set ICEOF for to the default value , which is 0*/
+ icp.iciof = DEFAULT_ICIOF;
+ icp.iceof = DEFAULT_RX_ICEOF;
+ icp.icsz = DEFAULT_ICSZ;
+ fman_if_set_ic_params(dev->process_private, &icp);
+
+ fd_offset = RTE_PKTMBUF_HEADROOM + DPAA_HW_BUF_RESERVE;
+ fman_if_set_fdoff(dev->process_private, fd_offset);
+
+ /* Buffer pool size should be equal to Dataroom Size*/
+ bp_size = rte_pktmbuf_data_room_size(dpaa_intf->bp_info->mp);
+
+ fman_if_set_bp(dev->process_private,
+ dpaa_intf->bp_info->mp->size,
+ dpaa_intf->bp_info->bpid, bp_size);
+}
+
+static inline int dpaa_eth_rx_queue_bp_check(
+ struct rte_eth_dev *dev, int8_t vsp_id, uint32_t bpid)
+{
+ struct dpaa_if *dpaa_intf = dev->data->dev_private;
+ struct fman_if *fif = dev->process_private;
+
+ if (fif->num_profiles) {
+ if (vsp_id < 0)
+ vsp_id = fif->base_profile_id;
+ } else {
+ if (vsp_id < 0)
+ vsp_id = 0;
+ }
+
+ if (dpaa_intf->vsp_bpid[vsp_id] &&
+ bpid != dpaa_intf->vsp_bpid[vsp_id]) {
+ DPAA_PMD_ERR(
+ "Various MPs are assigned to RXQs with same VSP");
+
+ return -1;
+ }
+
+ return 0;
+}
+
static
int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
uint16_t nb_desc,
@@ -757,6 +807,20 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
DPAA_PMD_INFO("Rx queue setup for queue index: %d fq_id (0x%x)",
queue_idx, rxq->fqid);
+ if (!fif->num_profiles) {
+ if (dpaa_intf->bp_info && dpaa_intf->bp_info->bp &&
+ dpaa_intf->bp_info->mp != mp) {
+ DPAA_PMD_WARN(
+ "Multiple pools on same interface not
supported");
+ return -EINVAL;
+ }
+ } else {
+ if (dpaa_eth_rx_queue_bp_check(dev, rxq->vsp_id,
+ DPAA_MEMPOOL_TO_POOL_INFO(mp)->bpid)) {
+ return -EINVAL;
+ }
+ }
+
/* Max packet can fit in single buffer */
if (dev->data->dev_conf.rxmode.max_rx_pkt_len <= buffsz) {
;
@@ -779,36 +843,41 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
buffsz - RTE_PKTMBUF_HEADROOM);
}
- if (!dpaa_intf->bp_info || dpaa_intf->bp_info->mp != mp) {
- struct fman_if_ic_params icp;
- uint32_t fd_offset;
- uint32_t bp_size;
+ dpaa_intf->bp_info = DPAA_MEMPOOL_TO_POOL_INFO(mp);
- if (!mp->pool_data) {
- DPAA_PMD_ERR("Not an offloaded buffer pool!");
- return -1;
+ /* For shared interface, it's done in kernel, skip.*/
+ if (!fif->is_shared_mac)
+ dpaa_fman_if_pool_setup(dev);
+
+ if (fif->num_profiles) {
+ int8_t vsp_id = rxq->vsp_id;
+
+ if (vsp_id >= 0) {
+ ret = dpaa_port_vsp_update(dpaa_intf, fmc_q, v
[dpdk-dev] [PATCH v3 8/8] net/dpaa: add RSS update func with FMCless
From: Sachin Saxena
With fmlib (FMCLESS) mode now RSS can be modified on runtime.
This patch add support for RSS update functions
Signed-off-by: Hemant Agrawal
Signed-off-by: Sachin Saxena
---
drivers/net/dpaa/dpaa_ethdev.c | 37 ++
1 file changed, 37 insertions(+)
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index a416090c0..23cf48df4 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -1305,6 +1305,41 @@ dpaa_dev_set_mac_addr(struct rte_eth_dev *dev,
return ret;
}
+static int
+dpaa_dev_rss_hash_update(struct rte_eth_dev *dev,
+struct rte_eth_rss_conf *rss_conf)
+{
+ struct rte_eth_dev_data *data = dev->data;
+ struct rte_eth_conf *eth_conf = &data->dev_conf;
+
+ PMD_INIT_FUNC_TRACE();
+
+ if (!(default_q || fmc_q)) {
+ if (dpaa_fm_config(dev, rss_conf->rss_hf)) {
+ DPAA_PMD_ERR("FM port configuration: Failed\n");
+ return -1;
+ }
+ eth_conf->rx_adv_conf.rss_conf.rss_hf = rss_conf->rss_hf;
+ } else {
+ DPAA_PMD_ERR("Function not supported\n");
+ return -ENOTSUP;
+ }
+ return 0;
+}
+
+static int
+dpaa_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
+ struct rte_eth_rss_conf *rss_conf)
+{
+ struct rte_eth_dev_data *data = dev->data;
+ struct rte_eth_conf *eth_conf = &data->dev_conf;
+
+ /* dpaa does not support rss_key, so length should be 0*/
+ rss_conf->rss_key_len = 0;
+ rss_conf->rss_hf = eth_conf->rx_adv_conf.rss_conf.rss_hf;
+ return 0;
+}
+
static int dpaa_dev_queue_intr_enable(struct rte_eth_dev *dev,
uint16_t queue_id)
{
@@ -1420,6 +1455,8 @@ static struct eth_dev_ops dpaa_devops = {
.rx_queue_intr_enable = dpaa_dev_queue_intr_enable,
.rx_queue_intr_disable= dpaa_dev_queue_intr_disable,
+ .rss_hash_update = dpaa_dev_rss_hash_update,
+ .rss_hash_conf_get= dpaa_dev_rss_hash_conf_get,
};
static bool
--
2.17.1
[dpdk-dev] [PATCH v3 7/8] net/dpaa: add fmc parser support for VSP
From: Jun Yang
Parse the fmc.bin generated by fmc to setup
RXQs for each port on fmc mode.
The parser gets the fqids and vspids from fmc.bin.
Signed-off-by: Jun Yang
Acked-by: Hemant Agrawal
---
drivers/net/dpaa/Makefile | 1 +
drivers/net/dpaa/dpaa_ethdev.c | 26 +-
drivers/net/dpaa/dpaa_ethdev.h | 10 +-
drivers/net/dpaa/dpaa_fmc.c| 488 +
drivers/net/dpaa/meson.build | 3 +-
5 files changed, 521 insertions(+), 7 deletions(-)
create mode 100644 drivers/net/dpaa/dpaa_fmc.c
diff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile
index d334b82a0..f4a1c0ec5 100644
--- a/drivers/net/dpaa/Makefile
+++ b/drivers/net/dpaa/Makefile
@@ -32,6 +32,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += fmlib/fm_vsp.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_ethdev.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_flow.c
SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_rxtx.c
+SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_fmc.c
LDLIBS += -lrte_bus_dpaa
LDLIBS += -lrte_mempool_dpaa
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 8549fc2ce..a416090c0 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -259,6 +259,16 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
dev->data->scattered_rx = 1;
}
+ if (!(default_q || fmc_q)) {
+ if (dpaa_fm_config(dev,
+ eth_conf->rx_adv_conf.rss_conf.rss_hf)) {
+ dpaa_write_fm_config_to_file();
+ DPAA_PMD_ERR("FM port configuration: Failed\n");
+ return -1;
+ }
+ dpaa_write_fm_config_to_file();
+ }
+
/* if the interrupts were configured on this devices*/
if (intr_handle && intr_handle->fd) {
if (dev->data->dev_conf.intr_conf.lsc != 0)
@@ -334,6 +344,9 @@ static int dpaa_eth_dev_start(struct rte_eth_dev *dev)
PMD_INIT_FUNC_TRACE();
+ if (!(default_q || fmc_q))
+ dpaa_write_fm_config_to_file();
+
/* Change tx callback to the real one */
if (dpaa_intf->cgr_tx)
dev->tx_pkt_burst = dpaa_eth_queue_tx_slow;
@@ -1701,7 +1714,18 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
if (default_q) {
num_rx_fqs = DPAA_DEFAULT_NUM_PCD_QUEUES;
} else if (fmc_q) {
- num_rx_fqs = 1;
+ num_rx_fqs = dpaa_port_fmc_init(fman_intf, dev_rx_fqids,
+ dev_vspids,
+ DPAA_MAX_NUM_PCD_QUEUES);
+ if (num_rx_fqs < 0) {
+ DPAA_PMD_ERR("%s FMC initializes failed!",
+ dpaa_intf->name);
+ goto free_rx;
+ }
+ if (!num_rx_fqs) {
+ DPAA_PMD_WARN("%s is not configured by FMC.",
+ dpaa_intf->name);
+ }
} else {
/* FMCLESS mode, load balance to multiple cores.*/
num_rx_fqs = rte_lcore_count();
diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h
index dd182c4d5..1b8e120e8 100644
--- a/drivers/net/dpaa/dpaa_ethdev.h
+++ b/drivers/net/dpaa/dpaa_ethdev.h
@@ -59,10 +59,10 @@
#endif
/* PCD frame queues */
-#define DPAA_PCD_FQID_START0x400
-#define DPAA_PCD_FQID_MULTIPLIER 0x100
#define DPAA_DEFAULT_NUM_PCD_QUEUES1
-#define DPAA_MAX_NUM_PCD_QUEUES4
+#define DPAA_VSP_PROFILE_MAX_NUM 8
+#define DPAA_MAX_NUM_PCD_QUEUESDPAA_VSP_PROFILE_MAX_NUM
+/*Same as VSP profile number*/
#define DPAA_IF_TX_PRIORITY3
#define DPAA_IF_RX_PRIORITY0
@@ -103,10 +103,10 @@
#define DPAA_FD_CMD_CFQ0x00ff
/**< Confirmation Frame Queue */
-#define DPAA_VSP_PROFILE_MAX_NUM 8
-
#define DPAA_DEFAULT_RXQ_VSP_ID1
+#define FMC_FILE "/tmp/fmc.bin"
+
/* Each network interface is represented by one of these */
struct dpaa_if {
int valid;
diff --git a/drivers/net/dpaa/dpaa_fmc.c b/drivers/net/dpaa/dpaa_fmc.c
new file mode 100644
index 0..b3b9a7e43
--- /dev/null
+++ b/drivers/net/dpaa/dpaa_fmc.c
@@ -0,0 +1,488 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2017-2020 NXP
+ */
+
+/* System headers */
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#define FMC_OUTPUT_FORMAT_VER 0x106
+
+#define FMC_NAME_LEN 64
+#define FMC_FMAN_NUM 2
+#define FMC_PORTS_PER_FMAN 16
+#define FMC_SCHEMES_NUM 32
+#define FMC_SCHEME_PROTOCOLS_NUM 16
+#define FMC_CC_NODES_NUM512
+#define FMC_REPLICATORS_NUM 16
+#define FMC_PLC_NUM 64
+#define MAX_SP_CODE_SIZE 0x7C0
+#define FMC_MANIP_MAX64
+#define FMC_HMANIP_MAX 512
+#def
[dpdk-dev] [PATCH v3 2/2] test: add support for testing bitrate stats free
This patch adds support to test rte_stats_bitrate_free
Signed-off-by: Hemant Agrawal
---
app/test/test_bitratestats.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/test/test_bitratestats.c b/app/test/test_bitratestats.c
index 39d7f734d4..fd4e949642 100644
--- a/app/test/test_bitratestats.c
+++ b/app/test/test_bitratestats.c
@@ -32,12 +32,14 @@ test_stats_bitrate_create(void)
return TEST_SUCCESS;
}
-/* To test free the resources from bitrate_reg test */
+/* To test free the resources from bitrate_create test */
static int
test_stats_bitrate_free(void)
{
int ret = 0;
+ rte_stats_bitrate_free(bitrate_data);
+
ret = rte_metrics_deinit();
TEST_ASSERT(ret >= 0, "Test Failed: rte_metrics_deinit failed");
--
2.17.1
[dpdk-dev] [PATCH v3 1/2] bitratestats: add support for free
This patch adds support for free funnction.
Signed-off-by: Hemant Agrawal
---
lib/librte_bitratestats/rte_bitrate.c| 6 ++
lib/librte_bitratestats/rte_bitrate.h| 10 +-
lib/librte_bitratestats/rte_bitratestats_version.map | 6 ++
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/lib/librte_bitratestats/rte_bitrate.c
b/lib/librte_bitratestats/rte_bitrate.c
index d18152365e..8fd9f47288 100644
--- a/lib/librte_bitratestats/rte_bitrate.c
+++ b/lib/librte_bitratestats/rte_bitrate.c
@@ -35,6 +35,12 @@ rte_stats_bitrate_create(void)
RTE_CACHE_LINE_SIZE);
}
+void
+rte_stats_bitrate_free(struct rte_stats_bitrates *bitrate_data)
+{
+ rte_free(bitrate_data);
+}
+
int
rte_stats_bitrate_reg(struct rte_stats_bitrates *bitrate_data)
{
diff --git a/lib/librte_bitratestats/rte_bitrate.h
b/lib/librte_bitratestats/rte_bitrate.h
index ef10f22ff3..4865929e8f 100644
--- a/lib/librte_bitratestats/rte_bitrate.h
+++ b/lib/librte_bitratestats/rte_bitrate.h
@@ -27,12 +27,20 @@ struct rte_stats_bitrates;
*/
struct rte_stats_bitrates *rte_stats_bitrate_create(void);
+/**
+ * Free bitrate statistics structure
+ *
+ * @param bitrate_data
+ * Pointer allocated by rte_stats_bitrate_create()
+ */
+__rte_experimental
+void rte_stats_bitrate_free(struct rte_stats_bitrates *bitrate_data);
/**
* Register bitrate statistics with the metric library.
*
* @param bitrate_data
- * Pointer allocated by rte_stats_create()
+ * Pointer allocated by rte_stats_bitrate_create()
*
* @return
* Zero on success
diff --git a/lib/librte_bitratestats/rte_bitratestats_version.map
b/lib/librte_bitratestats/rte_bitratestats_version.map
index 88fc2912db..85522a05d5 100644
--- a/lib/librte_bitratestats/rte_bitratestats_version.map
+++ b/lib/librte_bitratestats/rte_bitratestats_version.map
@@ -7,3 +7,9 @@ DPDK_20.0 {
local: *;
};
+
+EXPERIMENTAL {
+ global:
+
+ rte_stats_bitrate_free;
+};
--
2.17.1
Re: [dpdk-dev] [dpdk-stable] [PATCH v2] eal: fix macros to align value
24/06/2020 12:20, Harman Kalra:
> Found an issue while using RTE_ALIGN_MUL_NEAR with an
> expression, like as passed in estimate_tsc_freq().
> RTE_ALIGN_MUL_FLOOR resulted in unexpected value as
> parathesis are required to evaluate an expression.
>
> Fixes: 5120203d753f ("eal: add macros to align value to multiple")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Harman Kalra
Applied, thanks
Re: [dpdk-dev] [PATCH v2] pci: keep API compatibility with mmap values
11/07/2020 05:27, Ma, LihongX:
> Tested-by:ma,lhong
For info, your name is written Lihong Ma
Please remove patch content and avoid top-post when sending a test tag.
> -Original Message-
> From: dev On Behalf Of Thomas Monjalon
> Sent: Saturday, July 11, 2020 4:41 AM
> To: dev@dpdk.org
> Cc: david.march...@redhat.com; Yigit, Ferruh ;
> gr...@u256.net; Zhang, AlvinX ; Xing, Beilei
> ; Guo, Jia ; Burakov, Anatoly
> ; Richardson, Bruce ;
> dmitry.kozl...@gmail.com; navas...@linux.microsoft.com;
> dmit...@microsoft.com; Kadam, Pallavi ;
> tal...@mellanox.com
> Subject: [dpdk-dev] [PATCH v2] pci: keep API compatibility with mmap values
>
> The function pci_map_resource() returns MAP_FAILED in case of error.
> When replacing the call to mmap() by rte_mem_map(), the error code became
> NULL, breaking the API.
> This function is probably not used outside of DPDK, but it is still a problem
> for two reasons:
> - the deprecation process was not followed
> - the Linux function pci_vfio_mmap_bar() is broken for i40e
>
> The error code is reverted to the Unix value MAP_FAILED.
> Windows needs to define this special value (-1 as in Unix).
> After proper deprecation process, the API could be changed again if really
> needed.
>
> Because of the switch from mmap() to rte_mem_map(), another part of the API
> was changed: "int additional_flags"
> are defined as "additional flags for the mapping range"
> without mentioning it was directly used in mmap().
> Currently it is directly used in rte_mem_map(), that's why the values
> rte_map_flags must be mapped (sic) on the mmap ones in case of Unix OS.
>
> These are side effects of a badly defined API using Unix values.
>
> Bugzilla ID: 503
> Fixes: 2fd3567e5425 ("pci: use OS generic memory mapping functions")
> Cc: tal...@mellanox.com
>
> Reported-by: David Marchand
> Signed-off-by: Thomas Monjalon
Re: [dpdk-dev] [PATCH v2] pci: keep API compatibility with mmap values
10/07/2020 23:07, Dmitry Kozlyuk:
> On Fri, 10 Jul 2020 22:40:34 +0200, Thomas Monjalon wrote:
> > The function pci_map_resource() returns MAP_FAILED in case of error.
> > When replacing the call to mmap() by rte_mem_map(),
> > the error code became NULL, breaking the API.
> > This function is probably not used outside of DPDK,
> > but it is still a problem for two reasons:
> > - the deprecation process was not followed
> > - the Linux function pci_vfio_mmap_bar() is broken for i40e
> >
> > The error code is reverted to the Unix value MAP_FAILED.
> > Windows needs to define this special value (-1 as in Unix).
> > After proper deprecation process, the API could be changed again
> > if really needed.
> >
> > Because of the switch from mmap() to rte_mem_map(),
> > another part of the API was changed: "int additional_flags"
> > are defined as "additional flags for the mapping range"
> > without mentioning it was directly used in mmap().
> > Currently it is directly used in rte_mem_map(),
> > that's why the values rte_map_flags must be mapped (sic) on the mmap ones
> > in case of Unix OS.
> >
> > These are side effects of a badly defined API using Unix values.
> >
> > Bugzilla ID: 503
> > Fixes: 2fd3567e5425 ("pci: use OS generic memory mapping functions")
> > Cc: tal...@mellanox.com
> >
> > Reported-by: David Marchand
> > Signed-off-by: Thomas Monjalon
> > ---
> > v2: move MAP_FAILED from sys/mman.h to rte_os.h
> > ---
> > drivers/bus/pci/bsd/pci.c | 2 +-
> > drivers/bus/pci/linux/pci_uio.c | 2 +-
> > drivers/bus/pci/linux/pci_vfio.c| 4 ++--
> > drivers/bus/pci/pci_common_uio.c| 2 +-
> > lib/librte_eal/include/rte_eal_paging.h | 10 ++
> > lib/librte_eal/windows/include/rte_os.h | 6 ++
> > lib/librte_pci/rte_pci.c| 1 +
> > lib/librte_pci/rte_pci.h| 2 +-
> > 8 files changed, 23 insertions(+), 6 deletions(-)
>
> Acked-by: Dmitry Kozlyuk
>
> No Intel NIC to test, but LGTM and compiles OK for Windows.
Tested-by: Lihong Ma
Applied
[dpdk-dev] [PATCH v2] app/procinfo: enhance port mempool and crypto info
This patch enhances the port info for more details about
the port and queues.
This patch also add support to get info about the mempool
ops and security context for crypto devices.
Signed-off-by: Hemant Agrawal
---
app/proc-info/main.c | 84 +---
1 file changed, 72 insertions(+), 12 deletions(-)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index abeca4aab..818c85d61 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -661,6 +661,7 @@ show_port(void)
{
uint16_t i = 0;
int ret = 0, j, k;
+ int rxq_count;
snprintf(bdr_str, MAX_STRING_LEN, " show - Port PMD %"PRIu64,
rte_get_tsc_hz());
@@ -672,12 +673,26 @@ show_port(void)
struct rte_eth_dev_info dev_info;
struct rte_eth_rxq_info queue_info;
struct rte_eth_rss_conf rss_conf;
+ struct rte_ether_addr ethaddr;
+ char name[RTE_ETH_NAME_MAX_LEN];
memset(&rss_conf, 0, sizeof(rss_conf));
- snprintf(bdr_str, MAX_STRING_LEN, " Port (%u)", i);
+ rte_eth_dev_get_name_by_port(i, name);
+
+ snprintf(bdr_str, MAX_STRING_LEN, " Port (%u)(%s)", i, name);
STATS_BDR_STR(5, bdr_str);
printf(" - generic config\n");
+ ret = rte_eth_macaddr_get(i, ðaddr);
+ if (ret != 0) {
+ printf("macaddr get failed (port %u): %s\n",
+ i, rte_strerror(-ret));
+ } else {
+ char buf[RTE_ETHER_ADDR_FMT_SIZE];
+ rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE,
+ ðaddr);
+ printf("\t -- MAC:%s\n", buf);
+ }
printf("\t -- Socket %d\n", rte_eth_dev_socket_id(i));
ret = rte_eth_link_get(i, &link);
@@ -685,18 +700,21 @@ show_port(void)
printf("Link get failed (port %u): %s\n",
i, rte_strerror(-ret));
} else {
- printf("\t -- link speed %d duplex %d,"
- " auto neg %d status %d\n",
- link.link_speed,
- link.link_duplex,
- link.link_autoneg,
- link.link_status);
+ printf("\t -- link speed: %d Mbps %s,"
+ ":auto neg %d :status-%s\n",
+ link.link_speed,
+ (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
+("full-duplex") : ("half-duplex"),
+ link.link_autoneg,
+ (link.link_status) ? ("up") : ("down"));
}
- printf("\t -- promiscuous (%d)\n",
- rte_eth_promiscuous_get(i));
+ printf("\t -- promiscuous: %s\n",
+ rte_eth_promiscuous_get(i) ? "enabled" : "disabled");
ret = rte_eth_dev_get_mtu(i, &mtu);
if (ret == 0)
printf("\t -- mtu (%d)\n", mtu);
+ printf("\t -- multicast mode: %s\n",
+ rte_eth_allmulticast_get(i) ? "enabled" : "disabled");
ret = rte_eth_dev_info_get(i, &dev_info);
if (ret != 0) {
@@ -704,7 +722,17 @@ show_port(void)
i, strerror(-ret));
return;
}
-
+ printf("\t -- Driver name: %s\n", dev_info.driver_name);
+ if (dev_info.device->devargs && dev_info.device->devargs->args)
+ printf("\t -- Devargs: %s\n",
+ dev_info.device->devargs->args);
+ printf("\t -- min size of RX buf: %u\n",
+ dev_info.min_rx_bufsize);
+ printf("\t -- max config length of RX pkt: %u\n",
+ dev_info.max_rx_pktlen);
+
+ printf("\t -- num of RX queues: %u\n", dev_info.nb_rx_queues);
+ printf("\t -- num of TX queues: %u\n", dev_info.nb_tx_queues);
printf(" - queue\n");
for (j = 0; j < dev_info.nb_rx_queues; j++) {
ret = rte_eth_rx_queue_info_get(i, j, &queue_info);
@@ -718,7 +746,15 @@ show_port(void)
queue_info.nb_desc,
queue_info.conf.offloads,
queue_info.mp->socket_id);
+ printf("\t -- mempool name: %s\n",
+ (queue_info.mp == NULL) ?
+
Re: [dpdk-dev] [dpdk-stable] [PATCH] examples: fix return value of function that parses portmask
Why nobody reviewed? Isn't there some maintainers of example apps? 11/06/2020 14:36, Sarosh Arif: > Giving invalid or zero portmask as command line option to > these applications will have an unexpected response. > The reason behind this is that the return value of function > that parses portmask is stored in a variable whose datatype is > unsigned int, hence returning -1 in case of zero or > invalid portmask causes an unexpected behaviour. After looking at few examples, the function returns a signed int. > If we return 0 instead of -1 this issue can be resolved. Yes, the caller of the function seems to expect 0 as error value. > The program already contains the functionality to print > "invalid portmask" and program usage if zero is returned. > > Signed-off-by: Sarosh Arif
Re: [dpdk-dev] [PATCH] pmd_bond: fix mac address update for ACTIVE_BACKUP, TLB and ALB modes
Hi, Sergey Lvov
There was a two-patch series about bonding those are still in reviewing
state，
and the one of them includes the identical modification.
http://patches.dpdk.org/patch/68742/
Would you like to review it and give 'Signed-off-by' on the patch if
there are no object?
Thanks, Xavier
On 2020/6/19 9:19, Wei Hu (Xavier) wrote:
Hi， Chas Williams & Sergey Lvov
There was a two-patch series about bonding those are still in
reviewing state，
and the one of them includes the identical modification. Thanks.
http://patches.dpdk.org/patch/68742/
The series include two patches:
http://patches.dpdk.org/patch/68742/
http://patches.dpdk.org/patch/68743/
Best Regards
Xavier
On 2020/6/19 4:32, Chas Williams wrote:
Yes, this does look like a typo on someone's part.
Please change use net/bonding: instead of pmd_bond:
Please add a Fixes: line
Please add a Cc: sta...@dpdk.org
On 6/17/20 3:02 PM, Sergey Lvov wrote:
> It seems to be a typo
>
> Signed-off-by: Sergey Lvov
> ---
> drivers/net/bonding/rte_eth_bond_pmd.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
b/drivers/net/bonding/rte_eth_bond_pmd.c
> index 612a64599..3ef0df84a 100644
> --- a/drivers/net/bonding/rte_eth_bond_pmd.c
> +++ b/drivers/net/bonding/rte_eth_bond_pmd.c
> @@ -1533,7 +1533,7 @@ mac_address_slaves_update(struct rte_eth_dev
*bonded_eth_dev)
> if (internals->slaves[i].port_id ==
> internals->current_primary_port) {
> if (rte_eth_dev_default_mac_addr_set(
> -internals->primary_port,
> + internals->current_primary_port,
> bonded_eth_dev->data->mac_addrs)) {
> RTE_BOND_LOG(ERR, "Failed to update port Id
%d MAC address",
> internals->current_primary_port);
>
[dpdk-dev] [PATCH] mempool: enhance dump function to print ops name
Enhance the dump function to also print the ops index
and associated mempool ops name
Signed-off-by: Hemant Agrawal
---
lib/librte_mempool/rte_mempool.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c
index 5b23e2ae78..462ea850a1 100644
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -1186,6 +1186,7 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
unsigned lcore_id;
#endif
struct rte_mempool_memhdr *memhdr;
+ struct rte_mempool_ops *ops;
unsigned common_count;
unsigned cache_count;
size_t mem_len = 0;
@@ -1208,6 +1209,10 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
fprintf(f, " private_data_size=%"PRIu32"\n", mp->private_data_size);
+ ops = rte_mempool_get_ops(mp->ops_index);
+ fprintf(f, " ops_index=%d ops_name: <%s>\n",
+ mp->ops_index, ops ? ops->name:"NA");
+
STAILQ_FOREACH(memhdr, &mp->mem_list, next)
mem_len += memhdr->len;
if (mem_len != 0) {
@@ -1250,7 +1255,6 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
#else
fprintf(f, " no statistics available\n");
#endif
-
rte_mempool_audit(mp);
}
--
2.17.1
Re: [dpdk-dev] [PATCH v3 7/7] l3fwd-power: add auto-selection of default mode
19/06/2020 12:53, Anatoly Burakov: > Currently, the application does support running without the power > library being initialized, but it has to be specifically requested. On > platforms without support for frequency scaling using the power library, > we can just enable interrupt-only mode by default. > > Signed-off-by: Anatoly Burakov > Suggested-by: Jerin Jacob > Tested-by: Harman Kalra Please keep the chronological order in tags: Suggested-by should be first.
[dpdk-dev] [PATCH 2/4] net/hns3: support 200G speed rate
The 200G device has a new device id 0xA228, so adds this device id
to pci table for pci driver can probe it. Similar to the network port
with other speed, the hns3 PMD driver gets 200G speed information
from firmware, and passes them to DPDK framework.
Signed-off-by: Wei Hu (Xavier)
---
drivers/net/hns3/hns3_cmd.h | 1 +
drivers/net/hns3/hns3_ethdev.c| 12 +++-
drivers/net/hns3/hns3_ethdev.h| 1 +
drivers/net/hns3/hns3_ethdev_vf.c | 1 +
4 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h
index b203e66..d70f42e 100644
--- a/drivers/net/hns3/hns3_cmd.h
+++ b/drivers/net/hns3/hns3_cmd.h
@@ -622,6 +622,7 @@ struct hns3_config_mac_mode_cmd {
#define HNS3_CFG_SPEED_40G 3
#define HNS3_CFG_SPEED_50G 4
#define HNS3_CFG_SPEED_100G5
+#define HNS3_CFG_SPEED_200G8
#define HNS3_CFG_SPEED_S 0
#define HNS3_CFG_SPEED_M GENMASK(5, 0)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index f218fb8..4712cc2 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2560,6 +2560,7 @@ hns3_dev_link_update(struct rte_eth_dev *eth_dev,
case ETH_SPEED_NUM_40G:
case ETH_SPEED_NUM_50G:
case ETH_SPEED_NUM_100G:
+ case ETH_SPEED_NUM_200G:
new_link.link_speed = mac->link_speed;
break;
default:
@@ -2789,6 +2790,9 @@ hns3_parse_speed(int speed_cmd, uint32_t *speed)
case HNS3_CFG_SPEED_100G:
*speed = ETH_SPEED_NUM_100G;
break;
+ case HNS3_CFG_SPEED_200G:
+ *speed = ETH_SPEED_NUM_200G;
+ break;
default:
return -EINVAL;
}
@@ -2811,7 +2815,8 @@ hns3_get_capability(struct hns3_hw *hw)
if (device_id == HNS3_DEV_ID_25GE_RDMA ||
device_id == HNS3_DEV_ID_50GE_RDMA ||
- device_id == HNS3_DEV_ID_100G_RDMA_MACSEC)
+ device_id == HNS3_DEV_ID_100G_RDMA_MACSEC ||
+ device_id == HNS3_DEV_ID_200G_RDMA)
hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_DCB_B, 1);
/* Get PCI revision id */
@@ -3027,6 +3032,10 @@ hns3_cfg_mac_speed_dup_hw(struct hns3_hw *hw, uint32_t
speed, uint8_t duplex)
hns3_set_field(req->speed_dup, HNS3_CFG_SPEED_M,
HNS3_CFG_SPEED_S, HNS3_CFG_SPEED_100G);
break;
+ case ETH_SPEED_NUM_200G:
+ hns3_set_field(req->speed_dup, HNS3_CFG_SPEED_M,
+ HNS3_CFG_SPEED_S, HNS3_CFG_SPEED_200G);
+ break;
default:
PMD_INIT_LOG(ERR, "invalid speed (%u)", speed);
return -EINVAL;
@@ -5589,6 +5598,7 @@ static const struct rte_pci_id pci_id_hns3_map[] = {
{ RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_25GE_RDMA) },
{ RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_50GE_RDMA) },
{ RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_100G_RDMA_MACSEC) },
+ { RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_200G_RDMA) },
{ .vendor_id = 0, /* sentinel */ },
};
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 31d34b0..0e665e5 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -23,6 +23,7 @@
#define HNS3_DEV_ID_25GE_RDMA 0xA222
#define HNS3_DEV_ID_50GE_RDMA 0xA224
#define HNS3_DEV_ID_100G_RDMA_MACSEC 0xA226
+#define HNS3_DEV_ID_200G_RDMA 0xA228
#define HNS3_DEV_ID_100G_VF0xA22E
#define HNS3_DEV_ID_100G_RDMA_PFC_VF 0xA22F
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c
b/drivers/net/hns3/hns3_ethdev_vf.c
index 54e5dac..b881bbe 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1893,6 +1893,7 @@ hns3vf_dev_link_update(struct rte_eth_dev *eth_dev,
case ETH_SPEED_NUM_40G:
case ETH_SPEED_NUM_50G:
case ETH_SPEED_NUM_100G:
+ case ETH_SPEED_NUM_200G:
new_link.link_speed = mac->link_speed;
break;
default:
--
2.7.4
[dpdk-dev] [PATCH 1/4] net/hns3: support copper media type
The hns3 network engine is built-in multiple SoCs, such as kunpeng 920,
kunpeng 930, etc. The PCI revision id is 0x21 in kunpeng 920, and the PCI
revision id is 0x30 in kunpeng 930.
Copper media type is supported for hns3 PF device in kunpeng 930 and later
SoCs. The configuration operation for PHY is implemented by firmware.
Signed-off-by: Wei Hu (Xavier)
---
drivers/net/hns3/hns3_ethdev.c | 6 +-
drivers/net/hns3/hns3_ethdev.h | 7 +++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 9575a05..f218fb8 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2823,6 +2823,9 @@ hns3_get_capability(struct hns3_hw *hw)
}
hw->revision = revision;
+ if (revision >= PCI_REVISION_ID_HIP09_A)
+ hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_COPPER_B, 1);
+
return 0;
}
@@ -2840,7 +2843,8 @@ hns3_get_board_configuration(struct hns3_hw *hw)
return ret;
}
- if (cfg.media_type == HNS3_MEDIA_TYPE_COPPER) {
+ if (cfg.media_type == HNS3_MEDIA_TYPE_COPPER &&
+ !hns3_dev_copper_supported(hw)) {
PMD_INIT_LOG(ERR, "media type is copper, not supported.");
return -EOPNOTSUPP;
}
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 3c991f4..31d34b0 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -30,6 +30,9 @@
#define HNS3_PCI_REVISION_ID 0x08
#define HNS3_PCI_REVISION_ID_LEN 1
+#define PCI_REVISION_ID_HIP08_B0x21
+#define PCI_REVISION_ID_HIP09_A0x30
+
#define HNS3_PF_FUNC_ID0
#define HNS3_1ST_VF_FUNC_ID1
@@ -530,10 +533,14 @@ struct hns3_adapter {
};
#define HNS3_DEV_SUPPORT_DCB_B 0x0
+#define HNS3_DEV_SUPPORT_COPPER_B 0x1
#define hns3_dev_dcb_supported(hw) \
hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_DCB_B)
+#define hns3_dev_copper_supported(hw) \
+ hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_COPPER_B)
+
#define HNS3_DEV_PRIVATE_TO_HW(adapter) \
(&((struct hns3_adapter *)adapter)->hw)
#define HNS3_DEV_PRIVATE_TO_ADAPTER(adapter) \
--
2.7.4
[dpdk-dev] [PATCH 0/4] updates for hns3 PMD driver
This series are misc updates for hns3 PMD driver. Lijun Ou (1): net/hns3: fix RSS configuration when empty RSS type Min Hu (Connor) (1): net/hns3: support keeping CRC Wei Hu (Xavier) (2): net/hns3: support copper media type net/hns3: support 200G speed rate drivers/net/hns3/hns3_cmd.h | 1 + drivers/net/hns3/hns3_ethdev.c| 28 ++--- drivers/net/hns3/hns3_ethdev.h| 8 ++ drivers/net/hns3/hns3_ethdev_vf.c | 2 +- drivers/net/hns3/hns3_flow.c | 7 +++--- drivers/net/hns3/hns3_rxtx.c | 53 +-- drivers/net/hns3/hns3_rxtx.h | 3 +++ 7 files changed, 92 insertions(+), 10 deletions(-) -- 2.7.4
[dpdk-dev] [PATCH 3/4] net/hns3: support keeping CRC
From: "Min Hu (Connor)"
CRC is the end of frame, which occupies 4 bytes. Keeping CRC is a feature
of MAC, which will not strip CRC field when receiving frames. The featrue
can be enabled using DEV_RX_OFFLOAD_KEEP_CRC offload by upper level
application. And the feature is only supported for hns3 PF PMD driver.
Signed-off-by: Min Hu (Connor)
Signed-off-by: Wei Hu (Xavier)
---
drivers/net/hns3/hns3_ethdev.c| 10 +++-
drivers/net/hns3/hns3_ethdev_vf.c | 1 -
drivers/net/hns3/hns3_rxtx.c | 53 +--
drivers/net/hns3/hns3_rxtx.h | 3 +++
4 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 4712cc2..81e7730 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -4184,7 +4184,15 @@ hns3_cfg_mac_mode(struct hns3_hw *hw, bool enable)
hns3_set_bit(loop_en, HNS3_MAC_LINE_LP_B, 0);
hns3_set_bit(loop_en, HNS3_MAC_FCS_TX_B, val);
hns3_set_bit(loop_en, HNS3_MAC_RX_FCS_B, val);
- hns3_set_bit(loop_en, HNS3_MAC_RX_FCS_STRIP_B, val);
+
+ /*
+* If DEV_RX_OFFLOAD_KEEP_CRC offload is set, MAC will not strip CRC
+* when receiving frames. Otherwise, CRC will be stripped.
+*/
+ if (hw->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_KEEP_CRC)
+ hns3_set_bit(loop_en, HNS3_MAC_RX_FCS_STRIP_B, 0);
+ else
+ hns3_set_bit(loop_en, HNS3_MAC_RX_FCS_STRIP_B, val);
hns3_set_bit(loop_en, HNS3_MAC_TX_OVERSIZE_TRUNCATE_B, val);
hns3_set_bit(loop_en, HNS3_MAC_RX_OVERSIZE_TRUNCATE_B, val);
hns3_set_bit(loop_en, HNS3_MAC_TX_UNDER_MIN_ERR_B, val);
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c
b/drivers/net/hns3/hns3_ethdev_vf.c
index b881bbe..1d2941f 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -913,7 +913,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct
rte_eth_dev_info *info)
DEV_RX_OFFLOAD_SCTP_CKSUM |
DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |
DEV_RX_OFFLOAD_OUTER_UDP_CKSUM |
-DEV_RX_OFFLOAD_KEEP_CRC |
DEV_RX_OFFLOAD_SCATTER |
DEV_RX_OFFLOAD_VLAN_STRIP |
DEV_RX_OFFLOAD_VLAN_FILTER |
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index b0253d5..11763a5 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -1312,6 +1312,12 @@ hns3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t
idx, uint16_t nb_desc,
rxq->ol3_csum_erros = 0;
rxq->ol4_csum_erros = 0;
+ /* CRC len set here is used for amending packet length */
+ if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_KEEP_CRC)
+ rxq->crc_len = RTE_ETHER_CRC_LEN;
+ else
+ rxq->crc_len = 0;
+
rte_spinlock_lock(&hw->lock);
dev->data->rx_queues[idx] = rxq;
rte_spinlock_unlock(&hw->lock);
@@ -1578,6 +1584,23 @@ hns3_rxd_to_vlan_tci(struct hns3_rx_queue *rxq, struct
rte_mbuf *mb,
}
}
+static inline void
+recalulate_data_len(struct rte_mbuf *first_seg, struct rte_mbuf *last_seg,
+ struct rte_mbuf *rxm, struct hns3_rx_queue *rxq,
+ uint16_t data_len)
+{
+ uint8_t crc_len = rxq->crc_len;
+
+ if (data_len <= crc_len) {
+ rte_pktmbuf_free_seg(rxm);
+ first_seg->nb_segs--;
+ last_seg->data_len = (uint16_t)(last_seg->data_len -
+ (crc_len - data_len));
+ last_seg->next = NULL;
+ } else
+ rxm->data_len = (uint16_t)(data_len - crc_len);
+}
+
uint16_t
hns3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
{
@@ -1708,7 +1731,11 @@ hns3_recv_pkts(void *rx_queue, struct rte_mbuf
**rx_pkts, uint16_t nb_pkts)
rxdp->rx.bd_base_info = 0;
rxdp->addr = dma_addr;
- /* Load remained descriptor data and extract necessary fields */
+ /*
+* Load remained descriptor data and extract necessary fields.
+* Data size from buffer description may contains CRC len,
+* packet len should subtract it.
+*/
data_len = (uint16_t)(rte_le_to_cpu_16(rxd.rx.size));
l234_info = rte_le_to_cpu_32(rxd.rx.l234_info);
ol_info = rte_le_to_cpu_32(rxd.rx.ol_info);
@@ -1729,9 +1756,31 @@ hns3_recv_pkts(void *rx_queue, struct rte_mbuf
**rx_pkts, uint16_t nb_pkts)
continue;
}
- /* The last buffer of the received packet */
+ /*
+* The last buffer of the received packet. packet len from
+* buffer descr
[dpdk-dev] [PATCH 4/4] net/hns3: fix RSS configuration when empty RSS type
From: Lijun Ou
According to the definition of RSS types of action attributes from
testpmd, the driver will not disable RSS but instead requests the
unspecified "best-effort" settings when upper application call
rte_flow_create API function to create flow using empty RSS types.
As a result, here use the default RSS types when RSS types is empty.
Fixes: c37ca66f2b27 ("net/hns3: support RSS")
Cc: sta...@dpdk.org
Signed-off-by: Lijun Ou
Signed-off-by: Wei Hu (Xavier)
---
drivers/net/hns3/hns3_flow.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index 1e58ad7..7ec46ae 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -1486,7 +1486,9 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
}
/* Filter the unsupported flow types */
- flow_types = rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT;
+ flow_types = conf->conf.types ?
+rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT :
+hw->rss_info.conf.types;
if (flow_types != rss_flow_conf.types)
hns3_warn(hw, "modified RSS types based on hardware support, "
"requested:%" PRIx64 " configured:%" PRIx64,
@@ -1494,9 +1496,6 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
/* Update the useful flow types */
rss_flow_conf.types = flow_types;
- if ((rss_flow_conf.types & ETH_RSS_PROTO_MASK) == 0)
- return hns3_disable_rss(hw);
-
rss_info = &hw->rss_info;
if (!add) {
if (hns3_action_rss_same(&rss_info->conf, &rss_flow_conf)) {
--
2.7.4
[dpdk-dev] [PATCH v2 4/4] net/hns3: fix RSS configuration when empty RSS type
From: Lijun Ou
According to the definition of RSS types of action attributes from
testpmd, the driver will not disable RSS but instead requests the
unspecified "best-effort" settings when upper application call
rte_flow_create API function to create flow using empty RSS types.
As a result, here use the default RSS types when RSS types is empty.
Fixes: c37ca66f2b27 ("net/hns3: support RSS")
Cc: sta...@dpdk.org
Signed-off-by: Lijun Ou
Signed-off-by: Wei Hu (Xavier)
---
drivers/net/hns3/hns3_flow.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index 1e58ad7..7ec46ae 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -1486,7 +1486,9 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
}
/* Filter the unsupported flow types */
- flow_types = rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT;
+ flow_types = conf->conf.types ?
+rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT :
+hw->rss_info.conf.types;
if (flow_types != rss_flow_conf.types)
hns3_warn(hw, "modified RSS types based on hardware support, "
"requested:%" PRIx64 " configured:%" PRIx64,
@@ -1494,9 +1496,6 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
/* Update the useful flow types */
rss_flow_conf.types = flow_types;
- if ((rss_flow_conf.types & ETH_RSS_PROTO_MASK) == 0)
- return hns3_disable_rss(hw);
-
rss_info = &hw->rss_info;
if (!add) {
if (hns3_action_rss_same(&rss_info->conf, &rss_flow_conf)) {
--
2.7.4
[dpdk-dev] [PATCH v2 0/4] updates for hns3 PMD driver
This series are updates for hns3 PMD driver. Lijun Ou (1): net/hns3: fix RSS configuration when empty RSS type Min Hu (Connor) (1): net/hns3: support keeping CRC Wei Hu (Xavier) (2): net/hns3: support copper media type net/hns3: support 200G speed rate drivers/net/hns3/hns3_cmd.h | 1 + drivers/net/hns3/hns3_ethdev.c| 28 ++--- drivers/net/hns3/hns3_ethdev.h| 8 ++ drivers/net/hns3/hns3_ethdev_vf.c | 2 +- drivers/net/hns3/hns3_flow.c | 7 +++--- drivers/net/hns3/hns3_rxtx.c | 53 +-- drivers/net/hns3/hns3_rxtx.h | 3 +++ 7 files changed, 92 insertions(+), 10 deletions(-) -- 2.7.4
[dpdk-dev] [PATCH v2 2/4] net/hns3: support 200G speed rate
The 200G device has a new device id 0xA228, so adds this device id
to pci table for pci driver can probe it. Similar to the network port
with other speed, the hns3 PMD driver gets 200G speed information
from firmware, and passes them to DPDK framework.
Signed-off-by: Wei Hu (Xavier)
---
drivers/net/hns3/hns3_cmd.h | 1 +
drivers/net/hns3/hns3_ethdev.c| 12 +++-
drivers/net/hns3/hns3_ethdev.h| 1 +
drivers/net/hns3/hns3_ethdev_vf.c | 1 +
4 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h
index b203e66..d70f42e 100644
--- a/drivers/net/hns3/hns3_cmd.h
+++ b/drivers/net/hns3/hns3_cmd.h
@@ -622,6 +622,7 @@ struct hns3_config_mac_mode_cmd {
#define HNS3_CFG_SPEED_40G 3
#define HNS3_CFG_SPEED_50G 4
#define HNS3_CFG_SPEED_100G5
+#define HNS3_CFG_SPEED_200G8
#define HNS3_CFG_SPEED_S 0
#define HNS3_CFG_SPEED_M GENMASK(5, 0)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index f218fb8..4712cc2 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2560,6 +2560,7 @@ hns3_dev_link_update(struct rte_eth_dev *eth_dev,
case ETH_SPEED_NUM_40G:
case ETH_SPEED_NUM_50G:
case ETH_SPEED_NUM_100G:
+ case ETH_SPEED_NUM_200G:
new_link.link_speed = mac->link_speed;
break;
default:
@@ -2789,6 +2790,9 @@ hns3_parse_speed(int speed_cmd, uint32_t *speed)
case HNS3_CFG_SPEED_100G:
*speed = ETH_SPEED_NUM_100G;
break;
+ case HNS3_CFG_SPEED_200G:
+ *speed = ETH_SPEED_NUM_200G;
+ break;
default:
return -EINVAL;
}
@@ -2811,7 +2815,8 @@ hns3_get_capability(struct hns3_hw *hw)
if (device_id == HNS3_DEV_ID_25GE_RDMA ||
device_id == HNS3_DEV_ID_50GE_RDMA ||
- device_id == HNS3_DEV_ID_100G_RDMA_MACSEC)
+ device_id == HNS3_DEV_ID_100G_RDMA_MACSEC ||
+ device_id == HNS3_DEV_ID_200G_RDMA)
hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_DCB_B, 1);
/* Get PCI revision id */
@@ -3027,6 +3032,10 @@ hns3_cfg_mac_speed_dup_hw(struct hns3_hw *hw, uint32_t
speed, uint8_t duplex)
hns3_set_field(req->speed_dup, HNS3_CFG_SPEED_M,
HNS3_CFG_SPEED_S, HNS3_CFG_SPEED_100G);
break;
+ case ETH_SPEED_NUM_200G:
+ hns3_set_field(req->speed_dup, HNS3_CFG_SPEED_M,
+ HNS3_CFG_SPEED_S, HNS3_CFG_SPEED_200G);
+ break;
default:
PMD_INIT_LOG(ERR, "invalid speed (%u)", speed);
return -EINVAL;
@@ -5589,6 +5598,7 @@ static const struct rte_pci_id pci_id_hns3_map[] = {
{ RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_25GE_RDMA) },
{ RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_50GE_RDMA) },
{ RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_100G_RDMA_MACSEC) },
+ { RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_200G_RDMA) },
{ .vendor_id = 0, /* sentinel */ },
};
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 31d34b0..0e665e5 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -23,6 +23,7 @@
#define HNS3_DEV_ID_25GE_RDMA 0xA222
#define HNS3_DEV_ID_50GE_RDMA 0xA224
#define HNS3_DEV_ID_100G_RDMA_MACSEC 0xA226
+#define HNS3_DEV_ID_200G_RDMA 0xA228
#define HNS3_DEV_ID_100G_VF0xA22E
#define HNS3_DEV_ID_100G_RDMA_PFC_VF 0xA22F
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c
b/drivers/net/hns3/hns3_ethdev_vf.c
index 54e5dac..b881bbe 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1893,6 +1893,7 @@ hns3vf_dev_link_update(struct rte_eth_dev *eth_dev,
case ETH_SPEED_NUM_40G:
case ETH_SPEED_NUM_50G:
case ETH_SPEED_NUM_100G:
+ case ETH_SPEED_NUM_200G:
new_link.link_speed = mac->link_speed;
break;
default:
--
2.7.4
[dpdk-dev] [PATCH v2 3/4] net/hns3: support keeping CRC
From: "Min Hu (Connor)"
CRC is the end of frame, which occupies 4 bytes. Keeping CRC is a feature
of MAC, which will not strip CRC field when receiving frames. The featrue
can be enabled using DEV_RX_OFFLOAD_KEEP_CRC offload by upper level
application. And the feature is only supported for hns3 PF PMD driver.
Signed-off-by: Min Hu (Connor)
Signed-off-by: Wei Hu (Xavier)
---
v1 -> v2:
fix typo, replacing 'recalulate' with 'recalculate'
---
drivers/net/hns3/hns3_ethdev.c| 10 +++-
drivers/net/hns3/hns3_ethdev_vf.c | 1 -
drivers/net/hns3/hns3_rxtx.c | 53 +--
drivers/net/hns3/hns3_rxtx.h | 3 +++
4 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 4712cc2..81e7730 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -4184,7 +4184,15 @@ hns3_cfg_mac_mode(struct hns3_hw *hw, bool enable)
hns3_set_bit(loop_en, HNS3_MAC_LINE_LP_B, 0);
hns3_set_bit(loop_en, HNS3_MAC_FCS_TX_B, val);
hns3_set_bit(loop_en, HNS3_MAC_RX_FCS_B, val);
- hns3_set_bit(loop_en, HNS3_MAC_RX_FCS_STRIP_B, val);
+
+ /*
+* If DEV_RX_OFFLOAD_KEEP_CRC offload is set, MAC will not strip CRC
+* when receiving frames. Otherwise, CRC will be stripped.
+*/
+ if (hw->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_KEEP_CRC)
+ hns3_set_bit(loop_en, HNS3_MAC_RX_FCS_STRIP_B, 0);
+ else
+ hns3_set_bit(loop_en, HNS3_MAC_RX_FCS_STRIP_B, val);
hns3_set_bit(loop_en, HNS3_MAC_TX_OVERSIZE_TRUNCATE_B, val);
hns3_set_bit(loop_en, HNS3_MAC_RX_OVERSIZE_TRUNCATE_B, val);
hns3_set_bit(loop_en, HNS3_MAC_TX_UNDER_MIN_ERR_B, val);
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c
b/drivers/net/hns3/hns3_ethdev_vf.c
index b881bbe..1d2941f 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -913,7 +913,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct
rte_eth_dev_info *info)
DEV_RX_OFFLOAD_SCTP_CKSUM |
DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |
DEV_RX_OFFLOAD_OUTER_UDP_CKSUM |
-DEV_RX_OFFLOAD_KEEP_CRC |
DEV_RX_OFFLOAD_SCATTER |
DEV_RX_OFFLOAD_VLAN_STRIP |
DEV_RX_OFFLOAD_VLAN_FILTER |
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index b0253d5..a1e9b1a 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -1312,6 +1312,12 @@ hns3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t
idx, uint16_t nb_desc,
rxq->ol3_csum_erros = 0;
rxq->ol4_csum_erros = 0;
+ /* CRC len set here is used for amending packet length */
+ if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_KEEP_CRC)
+ rxq->crc_len = RTE_ETHER_CRC_LEN;
+ else
+ rxq->crc_len = 0;
+
rte_spinlock_lock(&hw->lock);
dev->data->rx_queues[idx] = rxq;
rte_spinlock_unlock(&hw->lock);
@@ -1578,6 +1584,23 @@ hns3_rxd_to_vlan_tci(struct hns3_rx_queue *rxq, struct
rte_mbuf *mb,
}
}
+static inline void
+recalculate_data_len(struct rte_mbuf *first_seg, struct rte_mbuf *last_seg,
+ struct rte_mbuf *rxm, struct hns3_rx_queue *rxq,
+ uint16_t data_len)
+{
+ uint8_t crc_len = rxq->crc_len;
+
+ if (data_len <= crc_len) {
+ rte_pktmbuf_free_seg(rxm);
+ first_seg->nb_segs--;
+ last_seg->data_len = (uint16_t)(last_seg->data_len -
+ (crc_len - data_len));
+ last_seg->next = NULL;
+ } else
+ rxm->data_len = (uint16_t)(data_len - crc_len);
+}
+
uint16_t
hns3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
{
@@ -1708,7 +1731,11 @@ hns3_recv_pkts(void *rx_queue, struct rte_mbuf
**rx_pkts, uint16_t nb_pkts)
rxdp->rx.bd_base_info = 0;
rxdp->addr = dma_addr;
- /* Load remained descriptor data and extract necessary fields */
+ /*
+* Load remained descriptor data and extract necessary fields.
+* Data size from buffer description may contains CRC len,
+* packet len should subtract it.
+*/
data_len = (uint16_t)(rte_le_to_cpu_16(rxd.rx.size));
l234_info = rte_le_to_cpu_32(rxd.rx.l234_info);
ol_info = rte_le_to_cpu_32(rxd.rx.ol_info);
@@ -1729,9 +1756,31 @@ hns3_recv_pkts(void *rx_queue, struct rte_mbuf
**rx_pkts, uint16_t nb_pkts)
continue;
}
- /* The last buffer of the received packet */
+ /*
+* The last buf
[dpdk-dev] [PATCH v2 1/4] net/hns3: support copper media type
The hns3 network engine is built-in multiple SoCs, such as kunpeng 920,
kunpeng 930, etc. The PCI revision id is 0x21 in kunpeng 920, and the PCI
revision id is 0x30 in kunpeng 930.
Copper media type is supported for hns3 PF device in kunpeng 930 and later
SoCs. The configuration operation for PHY is implemented by firmware.
Signed-off-by: Wei Hu (Xavier)
---
drivers/net/hns3/hns3_ethdev.c | 6 +-
drivers/net/hns3/hns3_ethdev.h | 7 +++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 9575a05..f218fb8 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2823,6 +2823,9 @@ hns3_get_capability(struct hns3_hw *hw)
}
hw->revision = revision;
+ if (revision >= PCI_REVISION_ID_HIP09_A)
+ hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_COPPER_B, 1);
+
return 0;
}
@@ -2840,7 +2843,8 @@ hns3_get_board_configuration(struct hns3_hw *hw)
return ret;
}
- if (cfg.media_type == HNS3_MEDIA_TYPE_COPPER) {
+ if (cfg.media_type == HNS3_MEDIA_TYPE_COPPER &&
+ !hns3_dev_copper_supported(hw)) {
PMD_INIT_LOG(ERR, "media type is copper, not supported.");
return -EOPNOTSUPP;
}
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 3c991f4..31d34b0 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -30,6 +30,9 @@
#define HNS3_PCI_REVISION_ID 0x08
#define HNS3_PCI_REVISION_ID_LEN 1
+#define PCI_REVISION_ID_HIP08_B0x21
+#define PCI_REVISION_ID_HIP09_A0x30
+
#define HNS3_PF_FUNC_ID0
#define HNS3_1ST_VF_FUNC_ID1
@@ -530,10 +533,14 @@ struct hns3_adapter {
};
#define HNS3_DEV_SUPPORT_DCB_B 0x0
+#define HNS3_DEV_SUPPORT_COPPER_B 0x1
#define hns3_dev_dcb_supported(hw) \
hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_DCB_B)
+#define hns3_dev_copper_supported(hw) \
+ hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_COPPER_B)
+
#define HNS3_DEV_PRIVATE_TO_HW(adapter) \
(&((struct hns3_adapter *)adapter)->hw)
#define HNS3_DEV_PRIVATE_TO_ADAPTER(adapter) \
--
2.7.4
[dpdk-dev] [PATCH v8 02/24] ethdev: add a link status text representation
link status structure keeps complicated values which are hard to
represent to end user. e.g. link_speed has INT_MAX value which
means that speed is unknown. To simplify processing of the values
in application, new dpdk function is introduced.
This commit adds function which treat link status structure
and format it to text representation.
Signed-off-by: Ivan Dyukov
---
MAINTAINERS | 1 +
app/test/Makefile| 3 +
app/test/meson.build | 2 +
app/test/test_ethdev_link.c | 306 +++
lib/librte_ethdev/rte_ethdev.c | 174 +
lib/librte_ethdev/rte_ethdev.h | 56 +
lib/librte_ethdev/rte_ethdev_version.map | 4 +
7 files changed, 546 insertions(+)
create mode 100644 app/test/test_ethdev_link.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 5e706cd7e..f4fb31ea2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -393,6 +393,7 @@ T: git://dpdk.org/next/dpdk-next-net
F: lib/librte_ethdev/
F: devtools/test-null.sh
F: doc/guides/prog_guide/switch_representation.rst
+F: app/test/test_ethdev*
Flow API
M: Ori Kam
diff --git a/app/test/Makefile b/app/test/Makefile
index e5440774b..9f43b8c3c 100644
--- a/app/test/Makefile
+++ b/app/test/Makefile
@@ -251,6 +251,9 @@ SRCS-$(CONFIG_RTE_LIBRTE_SECURITY) += test_security.c
SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += test_ipsec.c test_ipsec_perf.c
SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += test_ipsec_sad.c
+
+SRCS-$(CONFIG_RTE_LIBRTE_ETHER) += test_ethdev_link.c
+
ifeq ($(CONFIG_RTE_LIBRTE_IPSEC),y)
LDLIBS += -lrte_ipsec
endif
diff --git a/app/test/meson.build b/app/test/meson.build
index 56591db4e..1e6acf701 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -39,6 +39,7 @@ test_sources = files('commands.c',
'test_efd.c',
'test_efd_perf.c',
'test_errno.c',
+ 'test_ethdev_link.c',
'test_event_crypto_adapter.c',
'test_event_eth_rx_adapter.c',
'test_event_ring.c',
@@ -199,6 +200,7 @@ fast_tests = [
['eal_flags_misc_autotest', false],
['eal_fs_autotest', true],
['errno_autotest', true],
+['ethdev_link_status', true],
['event_ring_autotest', true],
['fib_autotest', true],
['fib6_autotest', true],
diff --git a/app/test/test_ethdev_link.c b/app/test/test_ethdev_link.c
new file mode 100644
index 0..01e57a0f3
--- /dev/null
+++ b/app/test/test_ethdev_link.c
@@ -0,0 +1,306 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd All Rights Reserved
+ */
+
+#include
+#include
+
+#include
+#include "test.h"
+
+
+static int32_t
+test_link_status_up_default(void)
+{
+ int ret = 0;
+ struct rte_eth_link link_status = {
+ .link_speed = ETH_SPEED_NUM_2_5G,
+ .link_status = ETH_LINK_UP,
+ .link_autoneg = ETH_LINK_AUTONEG,
+ .link_duplex = ETH_LINK_FULL_DUPLEX
+ };
+ char text[128];
+
+ ret = rte_eth_link_to_str(text, 128, NULL, &link_status);
+ RTE_TEST_ASSERT(ret > 0, "Failed to format default string\n");
+ printf("Default link up #1: %s\n", text);
+ TEST_ASSERT_BUFFERS_ARE_EQUAL("Link up at 2.5 Gbit/s FDX Autoneg\n",
+ text, strlen(text), "Invalid default link status string");
+
+ link_status.link_duplex = ETH_LINK_HALF_DUPLEX;
+ link_status.link_autoneg = ETH_LINK_FIXED;
+ link_status.link_speed = ETH_SPEED_NUM_10M,
+ ret = rte_eth_link_to_str(text, 128, NULL, &link_status);
+ printf("Default link up #2: %s\n", text);
+ RTE_TEST_ASSERT(ret > 0, "Failed to format default string\n");
+ TEST_ASSERT_BUFFERS_ARE_EQUAL("Link up at 10 Mbit/s HDX Fixed\n",
+ text, strlen(text), "Invalid default link status "
+ "string with HDX");
+
+ link_status.link_speed = ETH_SPEED_NUM_UNKNOWN,
+ ret = rte_eth_link_to_str(text, 128, NULL, &link_status);
+ printf("Default link up #3: %s\n", text);
+ RTE_TEST_ASSERT(ret > 0, "Failed to format default string\n");
+ TEST_ASSERT_BUFFERS_ARE_EQUAL("Link up at Unknown speed HDX Fixed\n",
+ text, strlen(text), "Invalid default link status "
+ "string with HDX");
+ return TEST_SUCCESS;
+}
+
+static int32_t
+test_link_status_down_default(void)
+{
+ int ret = 0;
+ struct rte_eth_link link_status = {
+ .link_speed = ETH_SPEED_NUM_2_5G,
+ .link_status = ETH_LINK_DOWN,
+ .link_autoneg = ETH_LINK_AUTONEG,
+ .link_duplex = ETH_LINK_FULL_DUPLEX
+ };
+ char text[128];
+
+ ret = rte_eth_link_to_str(text, 128, NULL, &link_status);
+ RTE_TEST_ASSERT(ret > 0, "Failed to format default string\n");
+ TEST_ASSERT_BUFFERS_ARE_EQUAL("Link down\n",
+ text, strlen(text), "Invalid default link status string");
+
+ re
[dpdk-dev] [PATCH v8 03/24] app: UNKNOWN link speed print
Add usage of rte_eth_link_to_str function to example
applications and docs
Signed-off-by: Ivan Dyukov
---
app/proc-info/main.c | 9 +++--
app/test-pipeline/init.c | 11 +-
app/test-pmd/config.c | 20 +++
app/test-pmd/testpmd.c| 9 +
app/test/test_pmd_perf.c | 17 +++-
doc/guides/sample_app_ug/link_status_intr.rst | 10 +-
6 files changed, 33 insertions(+), 43 deletions(-)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index abeca4aab..4a4c572c3 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -685,12 +685,9 @@ show_port(void)
printf("Link get failed (port %u): %s\n",
i, rte_strerror(-ret));
} else {
- printf("\t -- link speed %d duplex %d,"
- " auto neg %d status %d\n",
- link.link_speed,
- link.link_duplex,
- link.link_autoneg,
- link.link_status);
+ rte_eth_link_printf("\t -- link speed: %M, duplex: %D,"
+ " auto neg: %A, status: %S\n",
+ &link);
}
printf("\t -- promiscuous (%d)\n",
rte_eth_promiscuous_get(i));
diff --git a/app/test-pipeline/init.c b/app/test-pipeline/init.c
index 67d54ae05..7abc62544 100644
--- a/app/test-pipeline/init.c
+++ b/app/test-pipeline/init.c
@@ -155,7 +155,7 @@ static void
app_ports_check_link(void)
{
uint32_t all_ports_up, i;
-
+ char link_status_text[50];
all_ports_up = 1;
for (i = 0; i < app.n_ports; i++) {
@@ -173,12 +173,11 @@ app_ports_check_link(void)
all_ports_up = 0;
continue;
}
-
- RTE_LOG(INFO, USER1, "Port %u (%u Gbps) %s\n",
+ rte_eth_link_to_str(link_status_text, 50, "(%G Gbps) %S",
+ &link);
+ RTE_LOG(INFO, USER1, "Port %u %s\n",
port,
- link.link_speed / 1000,
- link.link_status ? "UP" : "DOWN");
-
+ link_status_text);
if (link.link_status == ETH_LINK_DOWN)
all_ports_up = 0;
}
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index a7112c998..7ee8c4c4d 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -604,10 +604,9 @@ port_infos_display(portid_t port_id)
} else
printf("\nmemory allocation on the socket: %u",port->socket_id);
- printf("\nLink status: %s\n", (link.link_status) ? ("up") : ("down"));
- printf("Link speed: %u Mbps\n", (unsigned) link.link_speed);
- printf("Link duplex: %s\n", (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
+ rte_eth_link_printf("\nLink status: %S\n"
+ "Link speed: %M Mbps\n"
+ "Link duplex: %D\n", &link);
if (!rte_eth_dev_get_mtu(port_id, &mtu))
printf("MTU: %u\n", mtu);
@@ -730,6 +729,8 @@ port_summary_display(portid_t port_id)
struct rte_eth_link link;
struct rte_eth_dev_info dev_info;
char name[RTE_ETH_NAME_MAX_LEN];
+ char status_text[6];
+ char speed_text[12];
int ret;
if (port_id_is_invalid(port_id, ENABLED_WARN)) {
@@ -750,12 +751,14 @@ port_summary_display(portid_t port_id)
if (ret != 0)
return;
- printf("%-4d %02X:%02X:%02X:%02X:%02X:%02X %-12s %-14s %-8s %uMbps\n",
+ rte_eth_link_to_str(status_text, 6, "%S", &link);
+ rte_eth_link_to_str(speed_text, 12, "%M", &link);
+ printf("%-4d %02X:%02X:%02X:%02X:%02X:%02X %-12s %-14s %-8s %sMbps\n",
port_id, mac_addr.addr_bytes[0], mac_addr.addr_bytes[1],
mac_addr.addr_bytes[2], mac_addr.addr_bytes[3],
mac_addr.addr_bytes[4], mac_addr.addr_bytes[5], name,
- dev_info.driver_name, (link.link_status) ? ("up") : ("down"),
- (unsigned int) link.link_speed);
+ dev_info.driver_name, status_text,
+ speed_text);
}
void
@@ -3899,7 +3902,8 @@ set_queue_rate_limit(portid_t port_id, uint16_t
queue_idx, uint16_t rate)
ret = eth_link_get_nowait_print_err(port_id, &link);
if (ret < 0)
return 1;
- if (rate > link.link_speed) {
+ if (link.link_speed != ETH_SPEED_NUM_UNKNOWN &&
+ rate > link.link_speed) {
printf("Invalid rate value:%u bigger than link speed: %u\n",
[dpdk-dev] [PATCH v8 00/24] ethdev: allow unknown link speed
MAINTAINERS | 1 + app/proc-info/main.c | 9 +- app/test-pipeline/init.c | 11 ++- app/test-pmd/config.c| 20 +++-- app/test-pmd/testpmd.c | 9 +- app/test/Makefile| 3 + app/test/meson.build | 2 + app/test/test_ethdev_link.c | 299 + app/test/test_pmd_perf.c | 17 ++-- doc/guides/sample_app_ug/link_status_intr.rst| 10 +-- drivers/net/i40e/i40e_ethdev.c | 5 +- drivers/net/i40e/i40e_ethdev_vf.c| 10 +-- drivers/net/ice/ice_ethdev.c | 5 +- drivers/net/ixgbe/ixgbe_ethdev.c | 6 +- examples/bbdev_app/main.c| 8 +- examples/ioat/ioatfwd.c | 13 ++- examples/ip_fragmentation/main.c | 13 ++- examples/ip_pipeline/cli.c | 12 +-- examples/ip_reassembly/main.c| 12 +-- examples/ipsec-secgw/ipsec-secgw.c | 12 +-- examples/ipv4_multicast/main.c | 12 +-- examples/kni/main.c | 26 ++ examples/l2fwd-crypto/main.c | 12 +-- examples/l2fwd-event/main.c | 12 +-- examples/l2fwd-jobstats/main.c | 12 +-- examples/l2fwd-keepalive/main.c | 12 +-- examples/l2fwd/main.c| 12 +-- examples/l3fwd-acl/main.c| 12 +-- examples/l3fwd-graph/main.c | 14 +-- examples/l3fwd-power/main.c | 13 +-- examples/l3fwd/main.c| 12 +-- examples/link_status_interrupt/main.c| 30 +++ examples/multi_process/client_server_mp/mp_server/init.c | 14 ++- examples/multi_process/symmetric_mp/main.c | 12 +-- examples/ntb/ntb_fwd.c | 10 +-- examples/performance-thread/l3fwd-thread/main.c | 12 +-- examples/qos_sched/init.c| 10 +-- examples/server_node_efd/server/init.c | 15 ++-- examples/vm_power_manager/main.c | 14 ++- lib/librte_ethdev/rte_ethdev.c | 174 ++ lib/librte_ethdev/rte_ethdev.h | 76 ++--- lib/librte_ethdev/rte_ethdev_version.map | 4 + 42 files changed, 715 insertions(+), 282 deletions(-) v8 changes: * rename rte_eth_link_strf to rte_eth_link_to_str * refactor rte_eth_link_to_str according to review comments * fix codestyle * fix commit message in 02 patch * fix compile error in ntb application * merge "app" and "doc" commits v7 changes: * fix meson build * change _strf function. now it does not fails in case of unknown specifiers like %d. it just copy it to target string. * remove invalid_fmt unit test. * add unknown specifier test. * fix codestyle v6 changes: * fix spelling in comments according to checkpatch warning v5 changes: * rename rte_eth_link_format to rte_eth_link_strf * add '\n' to default strings * update remaining examples. patch with subj 'examples: new link status print format' contains examples which have no maintainers. TBD: update remaining nic drivers with 'unknown' speed. It should be provided in separate patchset. v4 changes: * refactor rte_eth_link_format using strlcat func instead of snprintf * added new checks to unit tests * few minor fixes according review comments TBD: update examples in 'example' folder with new status printing mechanism update remaining nic drivers with 'unknown' speed v3 changes: * remove rte_eth_link_prepare_text function * add rte_eth_link_format and rte_eth_link_printf functions * added unit tests for rte_eth_link_format function TBD: update examples in 'example' folder with new status printing mechanism update remaining nic drivers with 'unknown' speed v2 changes: * add function which format link status to textual representation * update drivers for Intel nics with 'unknown' speed TBD: update examples in 'example' folder with new status printing mechanism update remaining nic drivers with 'unknown' speed v1 changes: This is initial patchset which introduces UNKNOWN speed to dpdk applications. Also it contains changes related to printf formating. Patchset contains changes for app/ and doc/ folders. examples/ folder will be provided later.
[dpdk-dev] [PATCH v8 01/24] ethdev: allow unknown link speed
From: Thomas Monjalon
When querying the link information, the link status is
a mandatory major information.
Other boolean values are supposed to be accurate:
- duplex mode (half/full)
- negotiation (auto/fixed)
This API update is making explicit that the link speed information
is optional.
The value ETH_SPEED_NUM_NONE (0) was already part of the API.
The value ETH_SPEED_NUM_UNKNOWN (infinite) is added to cover
two different cases:
- speed is not known by the driver
- device is virtual
Suggested-by: Morten Brørup
Suggested-by: Benoit Ganne
Signed-off-by: Thomas Monjalon
Reviewed-by: Ferruh Yigit
---
lib/librte_ethdev/rte_ethdev.h | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index a49242bcd..2090af501 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -303,6 +303,7 @@ struct rte_eth_stats {
#define ETH_SPEED_NUM_56G 56000 /**< 56 Gbps */
#define ETH_SPEED_NUM_100G10 /**< 100 Gbps */
#define ETH_SPEED_NUM_200G20 /**< 200 Gbps */
+#define ETH_SPEED_NUM_UNKNOWN UINT32_MAX /**< Unknown */
/**
* A structure used to retrieve link-level information of an Ethernet port.
@@ -2262,15 +2263,16 @@ int rte_eth_allmulticast_disable(uint16_t port_id);
int rte_eth_allmulticast_get(uint16_t port_id);
/**
- * Retrieve the status (ON/OFF), the speed (in Mbps) and the mode (HALF-DUPLEX
- * or FULL-DUPLEX) of the physical link of an Ethernet device. It might need
- * to wait up to 9 seconds in it.
+ * Retrieve the link status (up/down), the duplex mode (half/full),
+ * the negotiation (auto/fixed), and if available, the speed (Mbps).
+ *
+ * It might need to wait up to 9 seconds.
+ * @see rte_eth_link_get_nowait.
*
* @param port_id
* The port identifier of the Ethernet device.
* @param link
- * A pointer to an *rte_eth_link* structure to be filled with
- * the status, the speed and the mode of the Ethernet device link.
+ * Link information written back.
* @return
* - (0) if successful.
* - (-ENOTSUP) if the function is not supported in PMD driver.
@@ -2279,15 +2281,13 @@ int rte_eth_allmulticast_get(uint16_t port_id);
int rte_eth_link_get(uint16_t port_id, struct rte_eth_link *link);
/**
- * Retrieve the status (ON/OFF), the speed (in Mbps) and the mode (HALF-DUPLEX
- * or FULL-DUPLEX) of the physical link of an Ethernet device. It is a no-wait
- * version of rte_eth_link_get().
+ * Retrieve the link status (up/down), the duplex mode (half/full),
+ * the negotiation (auto/fixed), and if available, the speed (Mbps).
*
* @param port_id
* The port identifier of the Ethernet device.
* @param link
- * A pointer to an *rte_eth_link* structure to be filled with
- * the status, the speed and the mode of the Ethernet device link.
+ * Link information written back.
* @return
* - (0) if successful.
* - (-ENOTSUP) if the function is not supported in PMD driver.
--
2.17.1
[dpdk-dev] [PATCH v8 07/24] examples: new link status print format
Add usage of rte_eth_link_to_str function to example
applications:
* ipv4_multicast
* l2fwd-jobstats
* l2fwd-keepalive
* l3fwd
* link_status_interrupt
Signed-off-by: Ivan Dyukov
---
examples/ipv4_multicast/main.c| 12 ---
examples/l2fwd-jobstats/main.c| 12 ---
examples/l2fwd-keepalive/main.c | 12 ---
examples/l3fwd/main.c | 12 ---
examples/link_status_interrupt/main.c | 30 +++
5 files changed, 28 insertions(+), 50 deletions(-)
diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c
index 7e255c35a..e32602521 100644
--- a/examples/ipv4_multicast/main.c
+++ b/examples/ipv4_multicast/main.c
@@ -572,6 +572,7 @@ check_all_ports_link_status(uint32_t port_mask)
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -591,14 +592,9 @@ check_all_ports_link_status(uint32_t port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf(
- "Port%d Link Up. Speed %u Mbps - %s\n",
- portid, link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n", portid);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", portid, link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c
index 47a3b0976..bb86fe654 100644
--- a/examples/l2fwd-jobstats/main.c
+++ b/examples/l2fwd-jobstats/main.c
@@ -689,6 +689,7 @@ check_all_ports_link_status(uint32_t port_mask)
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -708,14 +709,9 @@ check_all_ports_link_status(uint32_t port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf(
- "Port%d Link Up. Speed %u Mbps - %s\n",
- portid, link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n", portid);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", portid, link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c
index b2742633b..24c0f5df6 100644
--- a/examples/l2fwd-keepalive/main.c
+++ b/examples/l2fwd-keepalive/main.c
@@ -453,6 +453,7 @@ check_all_ports_link_status(uint32_t port_mask)
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -472,14 +473,9 @@ check_all_ports_link_status(uint32_t port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf(
- "Port%d Link Up. Speed %u Mbps - %s\n",
- portid, link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n", portid);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+
[dpdk-dev] [PATCH v8 08/24] examples/bbdev_app: new link status print format
Add usage of rte_eth_link_to_str function to example
applications
Signed-off-by: Ivan Dyukov
---
examples/bbdev_app/main.c | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/examples/bbdev_app/main.c b/examples/bbdev_app/main.c
index 68a46050c..ac7166bc9 100644
--- a/examples/bbdev_app/main.c
+++ b/examples/bbdev_app/main.c
@@ -313,6 +313,7 @@ check_port_link_status(uint16_t port_id)
uint8_t count;
struct rte_eth_link link;
int link_get_err = -EINVAL;
+ char link_status_text[60];
printf("\nChecking link status.");
fflush(stdout);
@@ -323,11 +324,8 @@ check_port_link_status(uint16_t port_id)
link_get_err = rte_eth_link_get_nowait(port_id, &link);
if (link_get_err >= 0 && link.link_status) {
- const char *dp = (link.link_duplex ==
- ETH_LINK_FULL_DUPLEX) ?
- "full-duplex" : "half-duplex";
- printf("\nPort %u Link Up - speed %u Mbps - %s\n",
- port_id, link.link_speed, dp);
+ rte_eth_link_to_str(link_status_text, 60, NULL, &link);
+ printf("\nPort %u %s", port_id, link_status_text);
return 0;
}
printf(".");
--
2.17.1
[dpdk-dev] [PATCH v8 04/24] net/ixgbe: return unknown speed in status
rte_ethdev has declared new NUM_UNKNOWN speed which
could be used in case when no speed information is available
Signed-off-by: Ivan Dyukov
Reviewed-by: Wei Zhao
---
drivers/net/ixgbe/ixgbe_ethdev.c | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 248f21d14..34a171116 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -4300,11 +4300,7 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
switch (link_speed) {
default:
case IXGBE_LINK_SPEED_UNKNOWN:
- if (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||
- hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L)
- link.link_speed = ETH_SPEED_NUM_10M;
- else
- link.link_speed = ETH_SPEED_NUM_100M;
+ link.link_speed = ETH_SPEED_NUM_UNKNOWN;
break;
case IXGBE_LINK_SPEED_100_FULL:
--
2.17.1
[dpdk-dev] [PATCH v8 05/24] net/i40e: return unknown speed in status
rte_ethdev has declared new NUM_UNKNOWN speed which could be used in case when no speed information is available and link is up. NUM_NONE should be returned, if link is down. Signed-off-by: Ivan Dyukov Acked-by: Jeff Guo --- drivers/net/i40e/i40e_ethdev.c| 5 - drivers/net/i40e/i40e_ethdev_vf.c | 10 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 472ce2a9e..f718356b5 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -2891,7 +2891,10 @@ update_link_aq(struct i40e_hw *hw, struct rte_eth_link *link, link->link_speed = ETH_SPEED_NUM_40G; break; default: - link->link_speed = ETH_SPEED_NUM_NONE; + if (link->link_status) + link->link_speed = ETH_SPEED_NUM_UNKNOWN; + else + link->link_speed = ETH_SPEED_NUM_NONE; break; } } diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index eca716a6a..cf931bf9c 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -2163,15 +2163,15 @@ i40evf_dev_link_update(struct rte_eth_dev *dev, new_link.link_speed = ETH_SPEED_NUM_40G; break; default: - new_link.link_speed = ETH_SPEED_NUM_NONE; + if (vf->link_up) + new_link.link_speed = ETH_SPEED_NUM_UNKNOWN; + else + new_link.link_speed = ETH_SPEED_NUM_NONE; break; } /* full duplex only */ new_link.link_duplex = ETH_LINK_FULL_DUPLEX; - new_link.link_status = vf->link_up && - new_link.link_speed != ETH_SPEED_NUM_NONE - ? ETH_LINK_UP - : ETH_LINK_DOWN; + new_link.link_status = vf->link_up ? ETH_LINK_UP : ETH_LINK_DOWN; new_link.link_autoneg = !(dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED); -- 2.17.1
[dpdk-dev] [PATCH v8 09/24] examples/ioat: new link status print format
Add usage of rte_eth_link_to_str function to example
applications
Signed-off-by: Ivan Dyukov
---
examples/ioat/ioatfwd.c | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/examples/ioat/ioatfwd.c b/examples/ioat/ioatfwd.c
index b66ee73bc..7d1164ebd 100644
--- a/examples/ioat/ioatfwd.c
+++ b/examples/ioat/ioatfwd.c
@@ -700,6 +700,7 @@ check_link_status(uint32_t port_mask)
uint16_t portid;
struct rte_eth_link link;
int ret, link_status = 0;
+ char link_status_text[60];
printf("\nChecking link status\n");
RTE_ETH_FOREACH_DEV(portid) {
@@ -715,15 +716,11 @@ check_link_status(uint32_t port_mask)
}
/* Print link status */
- if (link.link_status) {
- printf(
- "Port %d Link Up. Speed %u Mbps - %s\n",
- portid, link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
+ rte_eth_link_to_str(link_status_text, 60, NULL, &link);
+ printf("Port %d %s", portid, link_status_text);
+
+ if (link.link_status)
link_status = 1;
- } else
- printf("Port %d Link Down\n", portid);
}
return link_status;
}
--
2.17.1
[dpdk-dev] [PATCH v8 10/24] examples/ip_*: new link status print format
Add usage of rte_eth_link_to_str function to example
applications:
* ip_fragmentation
* ip_reassembly
* l3fwd-acl
Signed-off-by: Ivan Dyukov
---
examples/ip_fragmentation/main.c | 13 +
examples/ip_reassembly/main.c| 12
examples/l3fwd-acl/main.c| 12
3 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index 4afb97109..e6990830f 100644
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -593,6 +593,7 @@ check_all_ports_link_status(uint32_t port_mask)
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -612,14 +613,10 @@ check_all_ports_link_status(uint32_t port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf(
- "Port%d Link Up .Speed %u Mbps - %s\n",
- portid, link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n", portid);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", portid,
+ link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c
index 494d7ee77..7c02d3451 100644
--- a/examples/ip_reassembly/main.c
+++ b/examples/ip_reassembly/main.c
@@ -712,6 +712,7 @@ check_all_ports_link_status(uint32_t port_mask)
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -731,14 +732,9 @@ check_all_ports_link_status(uint32_t port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf(
- "Port%d Link Up. Speed %u Mbps - %s\n",
- portid, link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n", portid);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", portid, link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c
index f22fca732..427e291e6 100644
--- a/examples/l3fwd-acl/main.c
+++ b/examples/l3fwd-acl/main.c
@@ -1815,6 +1815,7 @@ check_all_ports_link_status(uint32_t port_mask)
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -1834,14 +1835,9 @@ check_all_ports_link_status(uint32_t port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf(
- "Port%d Link Up. Speed %u Mbps %s\n",
- portid, link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n", portid);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", portid, link_status_text);
continue;
}
/* c
[dpdk-dev] [PATCH v8 06/24] net/ice: return unknown speed in status
rte_ethdev has declared new NUM_UNKNOWN speed which could be used in case when no speed information is available and link is up. NUM_NONE should be returned, if link is down. Signed-off-by: Ivan Dyukov Reviewed-by: Ferruh Yigit --- drivers/net/ice/ice_ethdev.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index b51fa2f17..76f797de0 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -3135,8 +3135,11 @@ ice_link_update(struct rte_eth_dev *dev, int wait_to_complete) link.link_speed = ETH_SPEED_NUM_100G; break; case ICE_AQ_LINK_SPEED_UNKNOWN: - default: PMD_DRV_LOG(ERR, "Unknown link speed"); + link.link_speed = ETH_SPEED_NUM_UNKNOWN; + break; + default: + PMD_DRV_LOG(ERR, "None link speed"); link.link_speed = ETH_SPEED_NUM_NONE; break; } -- 2.17.1
[dpdk-dev] [PATCH v8 12/24] examples/ipsec-secgw: new link status print format
Add usage of rte_eth_link_to_str function to example
applications
Signed-off-by: Ivan Dyukov
---
examples/ipsec-secgw/ipsec-secgw.c | 12
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/examples/ipsec-secgw/ipsec-secgw.c
b/examples/ipsec-secgw/ipsec-secgw.c
index f777ce2af..de10dfe0e 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -1775,6 +1775,7 @@ check_all_ports_link_status(uint32_t port_mask)
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -1794,14 +1795,9 @@ check_all_ports_link_status(uint32_t port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf(
- "Port%d Link Up - speed %u Mbps -%s\n",
- portid, link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n", portid);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", portid, link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
--
2.17.1
[dpdk-dev] [PATCH v8 14/24] examples/l2fwd-crypt: new link status print format
Add usage of rte_eth_link_to_str function to example
applications
Signed-off-by: Ivan Dyukov
---
examples/l2fwd-crypto/main.c | 12
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c
index 827da9b3e..cdb4f18ab 100644
--- a/examples/l2fwd-crypto/main.c
+++ b/examples/l2fwd-crypto/main.c
@@ -1734,6 +1734,7 @@ check_all_ports_link_status(uint32_t port_mask)
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -1753,14 +1754,9 @@ check_all_ports_link_status(uint32_t port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf(
- "Port%d Link Up. Speed %u Mbps - %s\n",
- portid, link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n", portid);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", portid, link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
--
2.17.1
[dpdk-dev] [PATCH v8 11/24] examples/ip_pipeline: new link status print format
Add usage of rte_eth_link_to_str function to example applications Signed-off-by: Ivan Dyukov --- examples/ip_pipeline/cli.c | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/examples/ip_pipeline/cli.c b/examples/ip_pipeline/cli.c index d79699e2e..236553aae 100644 --- a/examples/ip_pipeline/cli.c +++ b/examples/ip_pipeline/cli.c @@ -249,7 +249,8 @@ print_link_info(struct link *link, char *out, size_t out_size) struct rte_eth_link eth_link; uint16_t mtu; int ret; - + char link_speed_text[16]; + char link_status_text[10]; memset(&stats, 0, sizeof(stats)); rte_eth_stats_get(link->port_id, &stats); @@ -268,18 +269,19 @@ print_link_info(struct link *link, char *out, size_t out_size) } rte_eth_dev_get_mtu(link->port_id, &mtu); - + rte_eth_link_to_str(link_speed_text, 16, "%M", ð_link); + rte_eth_link_to_str(link_status_text, 10, "%S", ð_link); snprintf(out, out_size, "\n" "%s: flags=<%s> mtu %u\n" "\tether %02X:%02X:%02X:%02X:%02X:%02X rxqueues %u txqueues %u\n" - "\tport# %u speed %u Mbps\n" + "\tport# %u speed %s Mbps\n" "\tRX packets %" PRIu64" bytes %" PRIu64"\n" "\tRX errors %" PRIu64" missed %" PRIu64" no-mbuf %" PRIu64"\n" "\tTX packets %" PRIu64" bytes %" PRIu64"\n" "\tTX errors %" PRIu64"\n", link->name, - eth_link.link_status == 0 ? "DOWN" : "UP", + link_status_text, mtu, mac_addr.addr_bytes[0], mac_addr.addr_bytes[1], mac_addr.addr_bytes[2], mac_addr.addr_bytes[3], @@ -287,7 +289,7 @@ print_link_info(struct link *link, char *out, size_t out_size) link->n_rxq, link->n_txq, link->port_id, - eth_link.link_speed, + link_speed_text, stats.ipackets, stats.ibytes, stats.ierrors, -- 2.17.1
[dpdk-dev] [PATCH v8 13/24] examples/kni: new link status print format
Add usage of rte_eth_link_to_str function to example
applications
Signed-off-by: Ivan Dyukov
---
examples/kni/main.c | 26 +-
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/examples/kni/main.c b/examples/kni/main.c
index f5d12a5b8..679b158d4 100644
--- a/examples/kni/main.c
+++ b/examples/kni/main.c
@@ -661,6 +661,7 @@ check_all_ports_link_status(uint32_t port_mask)
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status\n");
fflush(stdout);
@@ -680,14 +681,9 @@ check_all_ports_link_status(uint32_t port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf(
- "Port%d Link Up - speed %uMbps - %s\n",
- portid, link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n", portid);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", portid, link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
@@ -717,19 +713,15 @@ check_all_ports_link_status(uint32_t port_mask)
static void
log_link_state(struct rte_kni *kni, int prev, struct rte_eth_link *link)
{
+ char link_status_text[60];
if (kni == NULL || link == NULL)
return;
- if (prev == ETH_LINK_DOWN && link->link_status == ETH_LINK_UP) {
- RTE_LOG(INFO, APP, "%s NIC Link is Up %d Mbps %s %s.\n",
+ rte_eth_link_to_str(link_status_text, 60, NULL, link);
+ if (prev != link->link_status)
+ RTE_LOG(INFO, APP, "%s NIC %s",
rte_kni_get_name(kni),
- link->link_speed,
- link->link_autoneg ? "(AutoNeg)" : "(Fixed)",
- link->link_duplex ? "Full Duplex" : "Half Duplex");
- } else if (prev == ETH_LINK_UP && link->link_status == ETH_LINK_DOWN) {
- RTE_LOG(INFO, APP, "%s NIC Link is Down.\n",
- rte_kni_get_name(kni));
- }
+ link_status_text);
}
/*
--
2.17.1
[dpdk-dev] [PATCH v8 16/24] examples/l2fwd: new link status print format
Add usage of rte_eth_link_to_str function to example
applications
Signed-off-by: Ivan Dyukov
---
examples/l2fwd/main.c | 12
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c
index e04c601b5..dd9ca43a0 100644
--- a/examples/l2fwd/main.c
+++ b/examples/l2fwd/main.c
@@ -571,6 +571,7 @@ check_all_ports_link_status(uint32_t port_mask)
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -594,14 +595,9 @@ check_all_ports_link_status(uint32_t port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf(
- "Port%d Link Up. Speed %u Mbps - %s\n",
- portid, link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n", portid);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", portid, link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
--
2.17.1
[dpdk-dev] [PATCH v8 15/24] examples/l2fwd-event: new link status print format
Add usage of rte_eth_link_to_str function to example
applications
Signed-off-by: Ivan Dyukov
---
examples/l2fwd-event/main.c | 12
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/examples/l2fwd-event/main.c b/examples/l2fwd-event/main.c
index 4fe500333..3849aaae0 100644
--- a/examples/l2fwd-event/main.c
+++ b/examples/l2fwd-event/main.c
@@ -366,6 +366,7 @@ check_all_ports_link_status(struct l2fwd_resources *rsrc,
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status...");
fflush(stdout);
@@ -389,14 +390,9 @@ check_all_ports_link_status(struct l2fwd_resources *rsrc,
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf(
- "Port%d Link Up. Speed %u Mbps - %s\n",
- port_id, link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n", port_id);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", port_id, link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
--
2.17.1
[dpdk-dev] [PATCH v8 22/24] examples/qos_sched: new link status print format
Add usage of rte_eth_link_to_str function to example
applications
Signed-off-by: Ivan Dyukov
---
examples/qos_sched/init.c | 10 ++
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c
index 9626c15b8..4bb975fc9 100644
--- a/examples/qos_sched/init.c
+++ b/examples/qos_sched/init.c
@@ -160,14 +160,8 @@ app_init_port(uint16_t portid, struct rte_mempool *mp)
"rte_eth_link_get: err=%d, port=%u: %s\n",
ret, portid, rte_strerror(-ret));
- if (link.link_status) {
- printf(" Link Up - speed %u Mbps - %s\n",
- (uint32_t) link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- } else {
- printf(" Link Down\n");
- }
+ rte_eth_link_printf(NULL, &link);
+
ret = rte_eth_promiscuous_enable(portid);
if (ret != 0)
rte_exit(EXIT_FAILURE,
--
2.17.1
[dpdk-dev] [PATCH v8 18/24] examples/l3fwd-power: new link status print format
Add usage of rte_eth_link_to_str function to example
applications
Signed-off-by: Ivan Dyukov
---
examples/l3fwd-power/main.c | 13 -
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 9db94ce04..f5bf0a92d 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -1945,6 +1945,7 @@ check_all_ports_link_status(uint32_t port_mask)
uint16_t portid;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -1964,15 +1965,9 @@ check_all_ports_link_status(uint32_t port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf("Port %d Link Up - speed %u "
- "Mbps - %s\n", (uint8_t)portid,
- (unsigned)link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n",
- (uint8_t)portid);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", portid, link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
--
2.17.1
[dpdk-dev] [PATCH v8 20/24] examples/ntb: new link status print format
Add usage of rte_eth_link_strf function to example
applications
Signed-off-by: Ivan Dyukov
---
examples/ntb/ntb_fwd.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/ntb/ntb_fwd.c b/examples/ntb/ntb_fwd.c
index eba8ebf9f..1cbaace58 100644
--- a/examples/ntb/ntb_fwd.c
+++ b/examples/ntb/ntb_fwd.c
@@ -729,6 +729,7 @@ start_pkt_fwd(void)
struct rte_eth_link eth_link;
uint32_t lcore_id;
int ret, i;
+ char link_status_text[60];
ret = ntb_fwd_config_setup();
if (ret < 0) {
@@ -747,11 +748,10 @@ start_pkt_fwd(void)
return;
}
if (eth_link.link_status) {
- printf("Eth%u Link Up. Speed %u Mbps - %s\n",
- eth_port_id, eth_link.link_speed,
- (eth_link.link_duplex ==
-ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ ð_link);
+ printf("Eth%u %s", eth_port_id,
+ link_status_text);
break;
}
}
--
2.17.1
[dpdk-dev] [PATCH v8 17/24] examples/l3fwd-graph: new link status print format
Add usage of rte_eth_link_to_str function to example
applications
Signed-off-by: Ivan Dyukov
---
examples/l3fwd-graph/main.c | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/examples/l3fwd-graph/main.c b/examples/l3fwd-graph/main.c
index c70270c4d..8af835e15 100644
--- a/examples/l3fwd-graph/main.c
+++ b/examples/l3fwd-graph/main.c
@@ -599,6 +599,7 @@ check_all_ports_link_status(uint32_t port_mask)
struct rte_eth_link link;
uint16_t portid;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -623,16 +624,9 @@ check_all_ports_link_status(uint32_t port_mask)
}
/* Print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf("Port%d Link Up. Speed %u Mbps "
- "-%s\n",
- portid, link.link_speed,
- (link.link_duplex ==
- ETH_LINK_FULL_DUPLEX)
- ? ("full-duplex")
- : ("half-duplex\n"));
- else
- printf("Port %d Link Down\n", portid);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", portid, link_status_text);
continue;
}
/* Clear all_ports_up flag if any link down */
--
2.17.1
[dpdk-dev] [PATCH v8 19/24] examples/multi_proc*: new link status print format
Add usage of rte_eth_link_to_str function to example
applications
Signed-off-by: Ivan Dyukov
---
.../client_server_mp/mp_server/init.c | 14 +-
examples/multi_process/symmetric_mp/main.c | 12
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/examples/multi_process/client_server_mp/mp_server/init.c
b/examples/multi_process/client_server_mp/mp_server/init.c
index c2ec07ac6..57f3c24a8 100644
--- a/examples/multi_process/client_server_mp/mp_server/init.c
+++ b/examples/multi_process/client_server_mp/mp_server/init.c
@@ -185,6 +185,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t
port_mask)
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -204,15 +205,10 @@ check_all_ports_link_status(uint16_t port_num, uint32_t
port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf("Port %d Link Up - speed %u "
- "Mbps - %s\n",
ports->id[portid],
- (unsigned)link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n",
- (uint8_t)ports->id[portid]);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", (uint8_t)ports->id[portid],
+ link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
diff --git a/examples/multi_process/symmetric_mp/main.c
b/examples/multi_process/symmetric_mp/main.c
index 9a16e198c..2cfed33d3 100644
--- a/examples/multi_process/symmetric_mp/main.c
+++ b/examples/multi_process/symmetric_mp/main.c
@@ -365,6 +365,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t
port_mask)
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -384,14 +385,9 @@ check_all_ports_link_status(uint16_t port_num, uint32_t
port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf(
- "Port%d Link Up. Speed %u Mbps - %s\n",
- portid, link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n", portid);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", portid, link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
--
2.17.1
[dpdk-dev] [PATCH v8 24/24] examples/vm_power_*: new link status print format
Add usage of rte_eth_link_to_str function to example
applications
Signed-off-by: Ivan Dyukov
---
examples/vm_power_manager/main.c | 14 +-
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c
index 273bfec29..b4b960151 100644
--- a/examples/vm_power_manager/main.c
+++ b/examples/vm_power_manager/main.c
@@ -244,6 +244,7 @@ check_all_ports_link_status(uint32_t port_mask)
uint16_t portid, count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -267,15 +268,10 @@ check_all_ports_link_status(uint32_t port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf("Port %d Link Up - speed %u "
- "Mbps - %s\n", (uint16_t)portid,
- (unsigned int)link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n",
- (uint16_t)portid);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", portid,
+ link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
--
2.17.1
[dpdk-dev] [PATCH v8 23/24] examples/server_nod*: new link status print format
Add usage of rte_eth_link_to_str function to example
applications
Signed-off-by: Ivan Dyukov
---
examples/server_node_efd/server/init.c | 15 +--
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/examples/server_node_efd/server/init.c
b/examples/server_node_efd/server/init.c
index 378a74fa5..b62ddf68b 100644
--- a/examples/server_node_efd/server/init.c
+++ b/examples/server_node_efd/server/init.c
@@ -247,6 +247,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t
port_mask)
uint16_t portid;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -266,16 +267,10 @@ check_all_ports_link_status(uint16_t port_num, uint32_t
port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf(
- "Port%d Link Up. Speed %u Mbps - %s\n",
- info->id[portid],
- link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n",
- info->id[portid]);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", info->id[portid],
+ link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
--
2.17.1
[dpdk-dev] [PATCH v8 21/24] example/performance*: new link status print format
Add usage of rte_eth_link_to_str function to example
applications
Signed-off-by: Ivan Dyukov
---
examples/performance-thread/l3fwd-thread/main.c | 12
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/examples/performance-thread/l3fwd-thread/main.c
b/examples/performance-thread/l3fwd-thread/main.c
index 84c1d7b3a..8e1492dde 100644
--- a/examples/performance-thread/l3fwd-thread/main.c
+++ b/examples/performance-thread/l3fwd-thread/main.c
@@ -3433,6 +3433,7 @@ check_all_ports_link_status(uint32_t port_mask)
uint8_t count, all_ports_up, print_flag = 0;
struct rte_eth_link link;
int ret;
+ char link_status_text[60];
printf("\nChecking link status");
fflush(stdout);
@@ -3452,14 +3453,9 @@ check_all_ports_link_status(uint32_t port_mask)
}
/* print link status if flag set */
if (print_flag == 1) {
- if (link.link_status)
- printf(
- "Port%d Link Up. Speed %u Mbps - %s\n",
- portid, link.link_speed,
- (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
- ("full-duplex") : ("half-duplex"));
- else
- printf("Port %d Link Down\n", portid);
+ rte_eth_link_to_str(link_status_text, 60, NULL,
+ &link);
+ printf("Port %d %s", portid, link_status_text);
continue;
}
/* clear all_ports_up flag if any link down */
--
2.17.1
Re: [dpdk-dev] [PATCH v8 02/24] ethdev: add a link status text representation
11/07/2020 12:43, Ivan Dyukov: > +__rte_experimental > +int rte_eth_link_printf(const char *const fmt, > + const struct rte_eth_link *eth_link); > Maybe I missed your reply, I still don't understand the need for this function.
Re: [dpdk-dev] [PATCH v3 0/7] Add interrupt-only mode to l3fwd-power
19/06/2020 12:53, Anatoly Burakov: > Since 20.05, l3fwd-power has become much more stringent about > whether it allows initialization without initializing the > librte_power library with it. This means that while previously > the app could have been used to test RX interrupts functionality > even if the app itself was in a half-working state, it is now > no longer possible to do so. > > To address this use case, we're adding an interrupt-only mode > that does not rely on librte_power or telemetry. This enables > using l3fwd-power in environments where librte_power is not > expected to work (such as inside a VM or on non-IA > architectures). The RX/TX path is basically copy paste from > legacy RX/TX path but with librte_power bits taken out. > > There seem to be two opposing schools of thought on whether we > should have more or less examples. This patchset goes in the > "less" direction where we add a new mode to an existing app, > rather than creating a new one like it could be argued it > deserves. > > v3: > - Added log messages for autodetect > - Fixed wrong comment in patch 7 > > v2: > - Add API to probe support for a specific power env > - Add autodetection for the default mode > - Add ability to request legacy mode specifically > - Fix some code style issues > > Anatoly Burakov (7): > l3fwd-power: disable interrupts by default > l3fwd-power: only allow supported power library envs > l3fwd-power: code style and flow fixes > l3fwd-power: add support for requesting legacy mode > l3fwd-power: add interrupt-only mode > power: add API to probe support for a specific env > l3fwd-power: add auto-selection of default mode Applied with following titles: examples/l3fwd-power: disable interrupts by default examples/l3fwd-power: allow only supported environments examples/l3fwd-power: fix style and control flow examples/l3fwd-power: add legacy mode option examples/l3fwd-power: add interrupt-only mode power: add environment capability probing examples/l3fwd-power: select default mode automatically
Re: [dpdk-dev] [PATCH] lpm: do not return defer queue handle to the user
On Sat, Jul 11, 2020 at 9:42 AM Ruifeng Wang wrote: > > There is no need to return defer queue handle in rte_lpm_rcu_qsbr_add API, > since enough flexibility has been provided to configure the defer queue. > > Signed-off-by: Ruifeng Wang > Reviewed-by: Honnappa Nagarahalli > --- > This is a followup patch of LPM RCU reclamation series [1]. > [1] http://patches.dpdk.org/cover/73673/ Applied, thanks Ruifeng. -- David Marchand
Re: [dpdk-dev] [PATCH v2 03/29] net/dpaa2: enable timestamp for Rx offload case as well
07/07/2020 11:22, Hemant Agrawal: > From: Gagandeep Singh > > This patch enables the packet timestamping > conditionally when Rx offload is enabled for timestamp. > > Signed-off-by: Gagandeep Singh > --- > drivers/net/dpaa2/dpaa2_ethdev.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c > b/drivers/net/dpaa2/dpaa2_ethdev.c > index a1f19194d..8edd4b3cd 100644 > --- a/drivers/net/dpaa2/dpaa2_ethdev.c > +++ b/drivers/net/dpaa2/dpaa2_ethdev.c > @@ -524,8 +524,10 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev) > return ret; > } > > +#if !defined(RTE_LIBRTE_IEEE1588) > if (rx_offloads & DEV_RX_OFFLOAD_TIMESTAMP) > - dpaa2_enable_ts = true; > +#endif > + dpaa2_enable_ts = true; I don't understand this patch at all. There is no comment in the code, and the commit log is not very explanatory. You are lucky Ferruh is less strict than me. I remember I already said I was bored of the lack of explanations in NXP drivers.
Re: [dpdk-dev] [PATCH] eal/linux: truncate thread name
On Fri, Jul 10, 2020 at 2:41 PM Thomas Monjalon wrote: > 10/07/2020 11:45, David Marchand: > > pthread_setname_np refuses names larger than 16 bytes (\0 included). > > Rather than return an error, truncate the name to this limit in the > > rte_thread_setname helper. > Acked-by: Thomas Monjalon Applied. -- David Marchand
[dpdk-dev] [PATCH v3] net/ice: fix invalid RSS type
When a RSS rule with only SRC/DST_ONLY or IPV6 prefix RSS type,
it should return failure. Besides, when a RSS rule with symmetric
hash function, the RSS type shouldn't carry with SRC/DST_ONLY or
IPV6 prefix. This patch adds invalid RSS type check for the two
cases.
Fixes: dfdc589f6ee0 ("net/ice: refactor PF hash flow")
Signed-off-by: Simei Su
---
v3:
* Add invalid RSS type check for symmetric case.
* Consider IPV6 prefix.
* Refine commit log.
v2:
* Add specific macro value in check rather than hard code.
---
drivers/net/ice/ice_hash.c | 23 +++
1 file changed, 23 insertions(+)
diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index e57feff..01311b4 100644
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -1049,13 +1049,36 @@ struct ice_hash_match_type ice_hash_type_list[] = {
combine_type = ETH_RSS_L2_SRC_ONLY |
ETH_RSS_L2_DST_ONLY |
RTE_ETH_RSS_L3_PRE32|
+ RTE_ETH_RSS_L3_PRE40|
RTE_ETH_RSS_L3_PRE48|
+ RTE_ETH_RSS_L3_PRE56|
RTE_ETH_RSS_L3_PRE64|
+ RTE_ETH_RSS_L3_PRE96|
ETH_RSS_L3_SRC_ONLY |
ETH_RSS_L3_DST_ONLY |
ETH_RSS_L4_SRC_ONLY |
ETH_RSS_L4_DST_ONLY;
+ /* Check if only SRC/DST_ONLY or ipv6 prefix exists. */
+ if ((rss_type & ~combine_type) == 0)
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
+ "invalid rss types");
+
+ /**
+* Check if SRC/DST_ONLY or ipv6 prefix is set for
+* SYMMETRIC_TOEPLITZ hash function.
+*/
+ if (rss->func ==
+ RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) {
+ if (rss_type & combine_type)
+ return rte_flow_error_set(error,
+ ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ action,
+ "invalid rss types");
+ }
+
/* Check if rss types match pattern. */
if (rss_type & ~combine_type & ~m->eth_rss_hint) {
return rte_flow_error_set(error,
--
1.8.3.1
Re: [dpdk-dev] [PATCH v3 0/4] introduce global debug flag
09/07/2020 15:48, Lukasz Wojciechowski:
> This set of patches introduces a global rte_debug flag for dpdk.
> This will allow easy switch to debug build configuration using a single
> flag. In the debug mode a RTE_DEBUG macro is defined to 1
> and for every enabled to be built library a RTE_DEBUG_{library name}
> and for every enabled to be built driver
> a RTE_DEBUG_{driver_class}_{driver_name} is also defined.
> These macros can be used to place a debug code
> inside #ifdef #endif clauses.
>
> The following requirements were discussed on the mailing list:
> 1) The global debug flag is required to enable all the sanity checks
> and validations that are normally not used due to performance reasons
>
> 2) The best option would be to have a single flag - not to introduce
> too many build options
>
> 3) This option should be separated from meson "debug" option
> (used for build with symbols) and can be called "rte_debug"
>
> 4) The currently existing DEBUG macros should not be replaced with
> a RTE_DEBUG macro. This would allow to still enable them using
> CFLAGS="-D..." to test a single module (library, driver).
Please can we clarify this point?
You mean not replacing driver macros with the global RTE_DEBUG?
But we agree (next point) to replace existing macros?
> 5) Currently existing options' names should be standardized
> to RTE_DEBUG_{library/driver name}, so they can be automatically enabled
> when rte_debug is set. Standardized names would allow easy usage
> in other modules.
>
> 6) The debug functionality should be encapsulated in:
> if (rte_log_can_log(...)) {
> ...
> }
> for possibility to be filtered out in runtime.
>
>
> Because of the hot discussion of v1 version of patches, I limit
> the v2 version to mbuf library changes only, to see how it will impact
> the performance with rte_log_can_log usage and to get opinions.
>
> v3 contains mbuf performance tests, which might help dpdk developers
> community to decide if drop of performance related to rte_log_can_log
> can be accepted.
>
> If agreement is reached, next steps would be to follow changes
> in other libraries and drivers.
If I understand well, it makes no sense to apply this v3,
without having the rest of the code converted?
Re: [dpdk-dev] [PATCH v8 02/24] ethdev: add a link status text representation
11.07.2020 14:27, Thomas Monjalon пишет: > 11/07/2020 12:43, Ivan Dyukov: >> +__rte_experimental >> +int rte_eth_link_printf(const char *const fmt, >> + const struct rte_eth_link *eth_link); >> > Maybe I missed your reply, > I still don't understand the need for this function. > > > > I used it few times in apps in this patchset. It allows to avoid code duplication in examples. i.e. declare array, call rte_eth_link_to_str, call printf. It's simple and usefull function. Why not?
Re: [dpdk-dev] [PATCH v2] app/procinfo: enhance port mempool and crypto info
On Sat, 11 Jul 2020 15:23:43 +0530 Hemant Agrawal wrote: > This patch enhances the port info for more details about > the port and queues. > This patch also add support to get info about the mempool > ops and security context for crypto devices. > > Signed-off-by: Hemant Agrawal What ever happened to my procinfo patch series. https://patchwork.dpdk.org/patch/69877/
