[dpdk-dev] [PATCH] net/octeontx2: add support VLAN insert and strip action
From: Kiran Kumar K
Adding support for RTE Flow VLAN insert and strip actions for octeontx2
device.
Signed-off-by: Kiran Kumar K
---
doc/guides/nics/octeontx2.rst | 68 +++--
drivers/net/octeontx2/otx2_flow.c | 126
drivers/net/octeontx2/otx2_flow.h | 6 ++
drivers/net/octeontx2/otx2_flow_parse.c | 76 --
drivers/net/octeontx2/otx2_flow_utils.c | 15 +--
5 files changed, 237 insertions(+), 54 deletions(-)
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index bb591a8b7..f3be79bbb 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -385,38 +385,46 @@ Actions:
.. table:: Ingress action types
- +++
- | # | Action Type|
- +++
- | 1 | RTE_FLOW_ACTION_TYPE_VOID |
- +++
- | 2 | RTE_FLOW_ACTION_TYPE_MARK |
- +++
- | 3 | RTE_FLOW_ACTION_TYPE_FLAG |
- +++
- | 4 | RTE_FLOW_ACTION_TYPE_COUNT |
- +++
- | 5 | RTE_FLOW_ACTION_TYPE_DROP |
- +++
- | 6 | RTE_FLOW_ACTION_TYPE_QUEUE |
- +++
- | 7 | RTE_FLOW_ACTION_TYPE_RSS |
- +++
- | 8 | RTE_FLOW_ACTION_TYPE_SECURITY |
- +++
- | 9 | RTE_FLOW_ACTION_TYPE_PF|
- +++
- | 10 | RTE_FLOW_ACTION_TYPE_VF|
- +++
+ ++-+
+ | # | Action Type |
+ ++=+
+ | 1 | RTE_FLOW_ACTION_TYPE_VOID |
+ ++-+
+ | 2 | RTE_FLOW_ACTION_TYPE_MARK |
+ ++-+
+ | 3 | RTE_FLOW_ACTION_TYPE_FLAG |
+ ++-+
+ | 4 | RTE_FLOW_ACTION_TYPE_COUNT |
+ ++-+
+ | 5 | RTE_FLOW_ACTION_TYPE_DROP |
+ ++-+
+ | 6 | RTE_FLOW_ACTION_TYPE_QUEUE |
+ ++-+
+ | 7 | RTE_FLOW_ACTION_TYPE_RSS|
+ ++-+
+ | 8 | RTE_FLOW_ACTION_TYPE_SECURITY |
+ ++-+
+ | 9 | RTE_FLOW_ACTION_TYPE_PF |
+ ++-+
+ | 10 | RTE_FLOW_ACTION_TYPE_VF |
+ ++-+
+ | 11 | RTE_FLOW_ACTION_TYPE_OF_POP_VLAN|
+ ++-+
.. _table_octeontx2_supported_egress_action_types:
.. table:: Egress action types
- +++
- | # | Action Type|
- +++
- | 1 | RTE_FLOW_ACTION_TYPE_COUNT |
- +++
- | 2 | RTE_FLOW_ACTION_TYPE_DROP |
- +++
+ ++-+
+ | # | Action Type |
+ ++=+
+ | 1 | RTE_FLOW_ACTION_TYPE_COUNT |
+ ++-+
+ | 2 | RTE_FLOW_ACTION_TYPE_DROP |
+ ++-+
+ | 3 | RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN |
+ ++-+
+ | 4 | RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID|
+ ++-+
+ | 5 | RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP|
+ ++-+
diff --git a/drivers/net/octeontx2/otx2_flow.c
b/drivers/net/octeontx2/otx2_flow.c
index 13a76e441..9b32b2acc 100644
--- a/drivers/net/octeontx2/otx2_flow.c
+++ b/drivers/net/octeontx2/otx2_flow.c
@@ -6,6 +6,8 @@
#include "otx2_ethdev_sec.h"
#include "otx2_flow.h"
+enum flow_vtag_cfg_dir { VTAG_TX, VTAG_RX };
+
int
otx2_flow_free_all_resources(struct otx2_eth_dev *hw)
{
@@ -460,6 +462,109 @@ otx2_flow_validate(struct rte_eth_dev *dev,
&parse_state);
}
+static int
+flow_program_vtag_action(struct rte_eth_dev *eth_dev,
+const struct rte_flow_action actions[],
+struct rte_flow *flow)
+{
+ uint16_t vlan_id = 0, vlan_ethtype = RTE_ETHER_TYPE_VLAN;
+ struct otx2_eth_dev *dev = eth_dev->data->dev_private;
+ union {
+
[dpdk-dev] [PATCH] vdpa/mlx5: fix event channel setup
During vdap device setup, if some error happens, event channel release
stuck at polling event channel.
Event channel fd is set to nonblocking in cqe setup, so if any error
happens before this function and after event channel created, the
pooling before releasing resources will stuck.
This patch moves event channel to non-blocking mode right after
creation.
Fixes: 8395927cdf ("vdpa/mlx5: prepare HW queues")
Cc: ma...@nvidia.com
Signed-off-by: Xueming Li
---
drivers/vdpa/mlx5/mlx5_vdpa_event.c | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_event.c
b/drivers/vdpa/mlx5/mlx5_vdpa_event.c
index 5a2d4fb1ec..bda547ffe0 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa_event.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa_event.c
@@ -51,6 +51,8 @@ mlx5_vdpa_event_qp_global_release(struct mlx5_vdpa_priv *priv)
static int
mlx5_vdpa_event_qp_global_prepare(struct mlx5_vdpa_priv *priv)
{
+ int flags, ret;
+
if (priv->eventc)
return 0;
if (mlx5_glue->devx_query_eqn(priv->ctx, 0, &priv->eqn)) {
@@ -66,6 +68,12 @@ mlx5_vdpa_event_qp_global_prepare(struct mlx5_vdpa_priv
*priv)
rte_errno);
goto error;
}
+ flags = fcntl(priv->eventc->fd, F_GETFL);
+ ret = fcntl(priv->eventc->fd, F_SETFL, flags | O_NONBLOCK);
+ if (ret) {
+ DRV_LOG(ERR, "Failed to change event channel FD.");
+ goto error;
+ }
priv->uar = mlx5_glue->devx_alloc_uar(priv->ctx, 0);
if (!priv->uar) {
rte_errno = errno;
@@ -376,7 +384,6 @@ mlx5_vdpa_interrupt_handler(void *cb_arg)
int
mlx5_vdpa_cqe_event_setup(struct mlx5_vdpa_priv *priv)
{
- int flags;
int ret;
if (!priv->eventc)
@@ -393,12 +400,6 @@ mlx5_vdpa_cqe_event_setup(struct mlx5_vdpa_priv *priv)
return -1;
}
}
- flags = fcntl(priv->eventc->fd, F_GETFL);
- ret = fcntl(priv->eventc->fd, F_SETFL, flags | O_NONBLOCK);
- if (ret) {
- DRV_LOG(ERR, "Failed to change event channel FD.");
- goto error;
- }
priv->intr_handle.fd = priv->eventc->fd;
priv->intr_handle.type = RTE_INTR_HANDLE_EXT;
if (rte_intr_callback_register(&priv->intr_handle,
--
2.17.1
[dpdk-dev] [PATCH v1 08/13] net/mlx5: call meter detach only if DR is supported
Flow metering is supported only in direct rules (DR). Currently the APIs
of meter actions create and modify are under #ifdef
HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER, while detaching the meter action
is executed unconditionally. This commit adds the same ifdef to API
mlx5_flow_meter_detach().
This commit avoids compilation failure of non-Linux operating systems
which do not support DR.
Signed-off-by: Ophir Munk
Acked-by: Matan Azrad
---
drivers/net/mlx5/mlx5_flow_meter.c | 4
1 file changed, 4 insertions(+)
diff --git a/drivers/net/mlx5/mlx5_flow_meter.c
b/drivers/net/mlx5/mlx5_flow_meter.c
index bf34687..b36bc7b 100644
--- a/drivers/net/mlx5/mlx5_flow_meter.c
+++ b/drivers/net/mlx5/mlx5_flow_meter.c
@@ -1221,6 +1221,7 @@ mlx5_flow_meter_attach(struct mlx5_priv *priv, uint32_t
meter_id,
void
mlx5_flow_meter_detach(struct mlx5_flow_meter *fm)
{
+#ifdef HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER
MLX5_ASSERT(fm->ref_cnt);
if (--fm->ref_cnt)
return;
@@ -1230,6 +1231,9 @@ mlx5_flow_meter_detach(struct mlx5_flow_meter *fm)
fm->ingress = 0;
fm->egress = 0;
fm->transfer = 0;
+#else
+ (void)fm;
+#endif
}
/**
--
2.8.4
[dpdk-dev] [PATCH v1 10/13] net/mlx5: remove more DV dependencies
Several DV-based structs of type 'struct mlx5dv_devx_XXX' are replaced
with 'void *' to enable compilation under non-Linux operating systems.
New getter functions were added to retrieve the specific fields that
were previously accessed directly.
Replaced structs:
'struct mlx5dv_pp *'
'struct mlx5dv_devx_event_channel *'
'struct mlx5dv_devx_umem *'
'struct mlx5dv_devx_uar *'
Signed-off-by: Ophir Munk
Acked-by: Matan Azrad
---
drivers/common/mlx5/linux/mlx5_common_os.h | 91 ++
drivers/net/mlx5/mlx5.c| 14 +++--
drivers/net/mlx5/mlx5.h| 12 ++--
drivers/net/mlx5/mlx5_rxtx.h | 10 ++--
drivers/net/mlx5/mlx5_txpp.c | 38 +++--
drivers/net/mlx5/mlx5_txq.c| 17 +++---
6 files changed, 144 insertions(+), 38 deletions(-)
diff --git a/drivers/common/mlx5/linux/mlx5_common_os.h
b/drivers/common/mlx5/linux/mlx5_common_os.h
index 55c0902..8301d90 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.h
+++ b/drivers/common/mlx5/linux/mlx5_common_os.h
@@ -90,4 +90,95 @@ mlx5_os_get_umem_id(void *umem)
return 0;
return ((struct mlx5dv_devx_umem *)umem)->umem_id;
}
+
+/**
+ * Get fd. Given a pointer to DevX channel object of type
+ * 'struct mlx5dv_devx_event_channel*' - return its fd.
+ *
+ * @param[in] channel
+ *Pointer to channel object.
+ *
+ * @return
+ *The fd if channel is valid, 0 otherwise.
+ */
+static inline int
+mlx5_os_get_devx_channel_fd(void *channel)
+{
+ if (!channel)
+ return 0;
+ return ((struct mlx5dv_devx_event_channel *)channel)->fd;
+}
+
+/**
+ * Get mmap offset. Given a pointer to an DevX UAR object of type
+ * 'struct mlx5dv_devx_uar *' - return its mmap offset.
+ *
+ * @param[in] uar
+ *Pointer to UAR object.
+ *
+ * @return
+ *The mmap offset if uar is valid, 0 otherwise.
+ */
+static inline off_t
+mlx5_os_get_devx_uar_mmap_offset(void *uar)
+{
+ if (!uar)
+ return 0;
+ return ((struct mlx5dv_devx_uar *)uar)->mmap_off;
+}
+
+/**
+ * Get base addr pointer. Given a pointer to an UAR object of type
+ * 'struct mlx5dv_devx_uar *' - return its base address.
+ *
+ * @param[in] uar
+ *Pointer to an UAR object.
+ *
+ * @return
+ *The base address if UAR is valid, 0 otherwise.
+ */
+static inline void *
+mlx5_os_get_devx_uar_base_addr(void *uar)
+{
+ if (!uar)
+ return 0;
+ return ((struct mlx5dv_devx_uar *)uar)->base_addr;
+}
+
+/**
+ * Get reg addr pointer. Given a pointer to an UAR object of type
+ * 'struct mlx5dv_devx_uar *' - return its reg address.
+ *
+ * @param[in] uar
+ *Pointer to an UAR object.
+ *
+ * @return
+ *The reg address if UAR is valid, 0 otherwise.
+ */
+static inline void *
+mlx5_os_get_devx_uar_reg_addr(void *uar)
+{
+ if (!uar)
+ return 0;
+ return ((struct mlx5dv_devx_uar *)uar)->reg_addr;
+}
+
+/**
+ * Get page id. Given a pointer to an UAR object of type
+ * 'struct mlx5dv_devx_uar *' - return its page id.
+ *
+ * @param[in] uar
+ *Pointer to an UAR object.
+ *
+ * @return
+ *The page id if UAR is valid, 0 otherwise.
+ */
+static inline uint32_t
+mlx5_os_get_devx_uar_page_id(void *uar)
+{
+ if (!uar)
+ return 0;
+ return ((struct mlx5dv_devx_uar *)uar)->page_id;
+}
+
#endif /* RTE_PMD_MLX5_COMMON_OS_H_ */
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index fdda6ff..4a807fb 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -723,6 +723,7 @@ mlx5_alloc_rxtx_uars(struct mlx5_dev_ctx_shared *sh,
{
uint32_t uar_mapping, retry;
int err = 0;
+ void *base_addr;
for (retry = 0; retry < MLX5_ALLOC_UAR_RETRY; ++retry) {
#ifdef MLX5DV_UAR_ALLOC_TYPE_NC
@@ -781,7 +782,8 @@ mlx5_alloc_rxtx_uars(struct mlx5_dev_ctx_shared *sh,
err = ENOMEM;
goto exit;
}
- if (sh->tx_uar->base_addr)
+ base_addr = mlx5_os_get_devx_uar_base_addr(sh->tx_uar);
+ if (base_addr)
break;
/*
* The UARs are allocated by rdma_core within the
@@ -820,7 +822,8 @@ mlx5_alloc_rxtx_uars(struct mlx5_dev_ctx_shared *sh,
err = ENOMEM;
goto exit;
}
- if (sh->devx_rx_uar->base_addr)
+ base_addr = mlx5_os_get_devx_uar_base_addr(sh->devx_rx_uar);
+ if (base_addr)
break;
/*
* The UARs are allocated by rdma_core within the
@@ -943,8 +946,11 @@ mlx5_alloc_shared_dev_ctx(const struct mlx5_dev_spawn_data
*spawn,
err = mlx5_alloc_rxtx_uars(sh, config);
if (err)
goto error;
- MLX5_ASSERT(sh->tx_uar && sh->tx_uar->base_addr);
- MLX5_ASSERT(sh->devx_r
Re: [dpdk-dev] [PATCH] net: add a new network PMD named txgbe
Hi Ferruh, Thanks for your suggestion. I'll split the patch into a patchset as soon as possible. -Original Message- From: Ferruh Yigit Sent: Thursday, August 20, 2020 7:49 PM To: Jiawen Wu ; dev@dpdk.org Cc: jianw...@trustnetic.com; yuhongzh...@trustnetic.com Subject: Re: [PATCH] net: add a new network PMD named txgbe On 8/20/2020 4:02 AM, Jiawen Wu wrote: > This is a new network PMD named txgbe provides poll mode driver support for > Wangxun 10Gb Ethernet NICs. > > Beijing WangXun Technology Co., Ltd. is a high-tech company specializing in > the design of high-end integrated circuit chips and providing independent > innovation solutions for enterprise network and storage products. Founded in > May 2014, the company is headquartered in Beijing YuQuanHuiGu Science and > Technology Park, with branches in Hangzhou City. Welcome to reach us on > website https://www.net-swift.com. > > This patch is created base on the main branch in main repository. Our goal is > to validate and commit txgbe driver into the 20.11 official release, and then > continue the development and maintenance in community. > > Waiting for your reviews sincerely. > > Signed-off-by: Jiawen Wu Hi Jiawen, Thanks for the patch. Without looking into any detail, a very high level comment is, it is very hard to review a new PMD (40K+ loc) as a single patch. Can you please split the patch into multiple patches, which gradually build the PMD by adding a feature with each patch, starting from an empty skeleton. Last as few upstreamed PMDs as example: ionic: https://patches.dpdk.org/project/dpdk/list/?series=8206&state=%2A&archive=both pfe: https://patches.dpdk.org/project/dpdk/list/?series=6777&state=%2A&archive=both octeontx2 (one of the good samples I suggest checking): https://patches.dpdk.org/project/dpdk/list/?series=5302&state=%2A&archive=both Also you can skip all Makefile build system related changes, since it will be removed in this release, no need to spend time for it. Thanks, ferruh
[dpdk-dev] [PATCH v1 12/13] net/mlx5: separate vlan strip modification
When updating a queue vlan stripping offload - either the WQ is modified
in Verbs or the RQ is modified in DevX. Add a vlan stripping modify
callback to 'struct mlx5_obj_ops' and assign it with the specic Verbs
and DevX implementations: 'rxq_obj_modify_wq_vlan_strip' and
'rxq_obj_modify_rq_vlan_strip' respectively.
Signed-off-by: Ophir Munk
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_verbs.c | 28 ++
drivers/net/mlx5/mlx5.h | 6 +
drivers/net/mlx5/mlx5_devx.c| 48 +
drivers/net/mlx5/mlx5_devx.h| 12 ++
drivers/net/mlx5/mlx5_vlan.c| 27 -
5 files changed, 98 insertions(+), 23 deletions(-)
create mode 100644 drivers/net/mlx5/mlx5_devx.c
create mode 100644 drivers/net/mlx5/mlx5_devx.h
diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c
b/drivers/net/mlx5/linux/mlx5_verbs.c
index d41b0fe..6271f0f 100644
--- a/drivers/net/mlx5/linux/mlx5_verbs.c
+++ b/drivers/net/mlx5/linux/mlx5_verbs.c
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
#include
/**
* Register mr. Given protection domain pointer, pointer to addr and length
@@ -61,3 +62,30 @@ const struct mlx5_verbs_ops mlx5_verbs_ops = {
.reg_mr = mlx5_reg_mr,
.dereg_mr = mlx5_dereg_mr,
};
+
+/**
+ * Modify Rx WQ vlan stripping offload
+ *
+ * @param rxq_obj
+ * Rx queue object.
+ *
+ * @return 0 on success, non-0 otherwise
+ */
+static int
+mlx5_rxq_obj_modify_wq_vlan_strip(struct mlx5_rxq_obj *rxq_obj, int on)
+{
+ uint16_t vlan_offloads =
+ (on ? IBV_WQ_FLAGS_CVLAN_STRIPPING : 0) |
+ 0;
+ struct ibv_wq_attr mod;
+ mod = (struct ibv_wq_attr){
+ .attr_mask = IBV_WQ_ATTR_FLAGS,
+ .flags_mask = IBV_WQ_FLAGS_CVLAN_STRIPPING,
+ .flags = vlan_offloads,
+ };
+ return mlx5_glue->modify_wq(rxq_obj->wq, &mod);
+}
+
+struct mlx5_obj_ops ibv_obj_ops = {
+ .rxq_obj_modify_vlan_strip = mlx5_rxq_obj_modify_wq_vlan_strip,
+};
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 34d7a15..431f861 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -676,6 +676,11 @@ TAILQ_HEAD(mlx5_flow_meters, mlx5_flow_meter);
#define MLX5_PROC_PRIV(port_id) \
((struct mlx5_proc_priv *)rte_eth_devices[port_id].process_private)
+/* HW objects operations structure. */
+struct mlx5_obj_ops {
+ int (*rxq_obj_modify_vlan_strip)(struct mlx5_rxq_obj *rxq_obj, int on);
+};
+
struct mlx5_priv {
struct rte_eth_dev_data *dev_data; /* Pointer to device data. */
struct mlx5_dev_ctx_shared *sh; /* Shared device context. */
@@ -719,6 +724,7 @@ struct mlx5_priv {
void *rss_desc; /* Intermediate rss description resources. */
int flow_idx; /* Intermediate device flow index. */
int flow_nested_idx; /* Intermediate device flow index, nested. */
+ struct mlx5_obj_ops *obj_ops; /* HW objects operations. */
LIST_HEAD(rxq, mlx5_rxq_ctrl) rxqsctrl; /* DPDK Rx queues. */
LIST_HEAD(rxqobj, mlx5_rxq_obj) rxqsobj; /* Verbs/DevX Rx queues. */
uint32_t hrxqs; /* Verbs Hash Rx queues. */
diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
new file mode 100644
index 000..7340412
--- /dev/null
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -0,0 +1,48 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2020 Mellanox Technologies, Ltd
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+#include "mlx5.h"
+#include "mlx5_common_os.h"
+#include "mlx5_rxtx.h"
+#include "mlx5_utils.h"
+#include "mlx5_devx.h"
+
+/**
+ * Modify RQ vlan stripping offload
+ *
+ * @param rxq_obj
+ * Rx queue object.
+ *
+ * @return 0 on success, non-0 otherwise
+ */
+static int
+mlx5_rxq_obj_modify_rq_vlan_strip(struct mlx5_rxq_obj *rxq_obj, int on)
+{
+ struct mlx5_devx_modify_rq_attr rq_attr;
+
+ memset(&rq_attr, 0, sizeof(rq_attr));
+ rq_attr.rq_state = MLX5_RQC_STATE_RDY;
+ rq_attr.state = MLX5_RQC_STATE_RDY;
+ rq_attr.vsd = (on ? 0 : 1);
+ rq_attr.modify_bitmask = MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_VSD;
+ return mlx5_devx_cmd_modify_rq(rxq_obj->rq, &rq_attr);
+}
+
+struct mlx5_obj_ops devx_obj_ops = {
+ .rxq_obj_modify_vlan_strip = mlx5_rxq_obj_modify_rq_vlan_strip,
+};
diff --git a/drivers/net/mlx5/mlx5_devx.h b/drivers/net/mlx5/mlx5_devx.h
new file mode 100644
index 000..844985c
--- /dev/null
+++ b/drivers/net/mlx5/mlx5_devx.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2020 Mellanox Technologies, Ltd
+ */
+
+#ifndef RTE_PMD_MLX5_DEVX_H_
+#define RTE_PMD_MLX5_DEVX_H_
+
+#include "mlx5.h"
+
+extern struct mlx5_obj_ops devx_obj_ops;
+
+#endif /* RTE_PMD_MLX5_DEVX_H_ */
diff --git a/drivers/net/mlx5/mlx5_vlan.c b/drivers/net/mlx5/mlx5_vlan.c
index 89983a4..ea89599 10064
[dpdk-dev] DPDK 20.11 NVIDIA Mellanox Roadmap
Below is NVIDIA Mellanox's roadmap for DPDK20.11, which we are currently working on: rte_flow API updates: == [1] Support flow-based traffic sampling and mirroring: Packets of a given classification, can be cloned at a given sampling rate and forwarded to a vport or queue. Mirroring is provided through setting of sampling rate to 100% of the traffic. Motivation: Enable monitoring and statistics on classified traffic for business or lawful interception. Examples: Monitor hairpin traffic that does not reach the application; Mirror traffic for lawful interception use case; [2] Add rte_flow API for matching on frag/non-frag packets on both IPv4 and IPv6 Support for Ipv4/6, TCP/UDP/ICMP fragmented and non-fragmented packet. Supported modes: No Fragment, First Fragment, Next Fragment. Motivation: Allow DPDK applications that are using frag modes (e.g. OVS-DPDK) to define it through DPDK rte_flow API. [3] Add support for extension header in Geneve tunneling Support matching on Geneve options header - TLV and data. [4] Support Hairpin between different ports in NIC mode Extend current support from "hairpin in the same port" to "hairpin with a different ports on the same NIC". Motivation: Provide better utilization of network resources (physical ports) and allow flexible alignment with security, network isolation and balancing practices. rte_flow new APIs: === [5] Extend the DPDK flow action API to enable support of a shared rte_flow_action context A modification of a single rte_flow_action context replaces the current approach which requires multiple modifications of (identical) flow actions. Motivation: When multiple flow rules such as RSS have the same action, this action is cloned and used on each of the flows. Prior to the proposed change, any update to the RSS action (e.g. adding/removing queue) required reconfiguration of all the flows. This re-configuration is non-efficient, and the newly proposed APIs provide means to influence all the relevant flows through a single change in the shared action context that is being used by all the relevant flows. [6] Allow synced rte_flow rule-management (create/destroy) Add capability to enforce synchronous rule insertion to simplify DPDK software rule-management. functions in scope: rte_flow_create/destroy. [7] Add Connection Tracking (CT) abstraction layer for CT offloading Implementation logic is vendor-specific and thus shall be implemented in the PMD by each vendor. Motivation: Allow DPDK application (e.g. OVS-DPDK) to offload the Connection Tracking logic to the NIC. [8] Add v-tunnel abstraction layer for tunnel offloading Implementation logic is vendor-specific and thus shall be implemented in the PMD by each vendor. Motivation: Allow DPDK application (e.g. OVS-DPDK) to do tunnel offloading. ethdev API update: === [9] Support buffer split to multiple destinations Provide means to split the buffer in the receive queue and send it to multiple destinations to be handled by CPU, GPU and potentially others. Motivation: Accelerate packet handling by sending the data directly to its processor. mlx5 PMD updates: [*] mlx5 PMD will support the rte_flow update changes listed above. Enhanced functionality: [10] Provide visibility on Rx queue status Extend current function (rx_descriptor_status(), rx_descriptor_count (implementation to support vectorized and mprq modes) Motivation: Provides DPDK software with additional monitoring capabilities of the Rx queue status. Performance improvement [11] Add mlx5 PMD use of vectorized instructions when using Striding RQ (MPRQ) Motivation: Performance improvement and CPU cycles reduction [12] Added native DPDK support for multi-threaded rte_flow API Motivation: Allow rules insertions and deletions from multiple threads with native sync/lock and inherent improved insertion rate. [13] Improve performance for aging mechanism, reduce memory consumption for flow and CPU cycles for logic Motivation: Improve performance by reducing latency of counters reading when such is not required [14] Improved PCIe performance with flow-tags [15] Improved PCIe performance with mixed protocols (TCP/UDP) New DPDK PMD for compression/decompression support: === [16] Implement look aside compression/decompression to support existing rte_compress API Implementation for compress/decompress/dma actions testpmd updates: === [*] testpmd updated to support the changes listed above. Best regards, Gal Cohen
[dpdk-dev] [PATCH v2 1/3] eal: add API for bus close
From: Rohit Raj
As per the current code we have API for bus probe, but the
bus close API is missing. This breaks the multi process
scenarios as objects are not cleaned while terminating the
secondary processes.
This patch adds a new API rte_bus_close() for cleanup of
bus objects which were acquired during probe.
Signed-off-by: Rohit Raj
---
v2:
* Moved rte_bus_close call to rte_eal_cleanup path.
lib/librte_eal/common/eal_common_bus.c | 34 +-
lib/librte_eal/include/rte_bus.h | 25 ++-
lib/librte_eal/linux/eal.c | 1 +
lib/librte_eal/rte_eal_version.map | 3 +++
4 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_bus.c
b/lib/librte_eal/common/eal_common_bus.c
index baa5b532a..4c8c7eecc 100644
--- a/lib/librte_eal/common/eal_common_bus.c
+++ b/lib/librte_eal/common/eal_common_bus.c
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2016 NXP
+ * Copyright 2016,2020 NXP
*/
#include
@@ -56,6 +56,38 @@ rte_bus_scan(void)
return 0;
}
+int
+rte_bus_close(void)
+{
+ int ret;
+ struct rte_bus *bus, *vbus = NULL;
+
+ TAILQ_FOREACH(bus, &rte_bus_list, next) {
+ if (!strcmp(bus->name, "vdev")) {
+ vbus = bus;
+ continue;
+ }
+
+ if (bus->close) {
+ ret = bus->close();
+ if (ret)
+ RTE_LOG(ERR, EAL, "Bus (%s) close failed.\n",
+ bus->name);
+ }
+ }
+
+ if (vbus) {
+ if (vbus->close) {
+ ret = vbus->close();
+ if (ret)
+ RTE_LOG(ERR, EAL, "Bus (%s) close failed.\n",
+ vbus->name);
+ }
+ }
+
+ return 0;
+}
+
/* Probe all devices of all buses */
int
rte_bus_probe(void)
diff --git a/lib/librte_eal/include/rte_bus.h b/lib/librte_eal/include/rte_bus.h
index d3034d0ed..af4787b18 100644
--- a/lib/librte_eal/include/rte_bus.h
+++ b/lib/librte_eal/include/rte_bus.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2016 NXP
+ * Copyright 2016,2020 NXP
*/
#ifndef _RTE_BUS_H_
@@ -67,6 +67,18 @@ typedef int (*rte_bus_scan_t)(void);
*/
typedef int (*rte_bus_probe_t)(void);
+/**
+ * Implementation specific close function which is responsible for closing
+ * devices on that bus.
+ *
+ * This is called while iterating over each registered bus.
+ *
+ * @return
+ * 0 for successful close
+ * !0 for any error while closing
+ */
+typedef int (*rte_bus_close_t)(void);
+
/**
* Device iterator to find a device on a bus.
*
@@ -248,6 +260,7 @@ struct rte_bus {
const char *name;/**< Name of the bus */
rte_bus_scan_t scan; /**< Scan for devices attached to bus */
rte_bus_probe_t probe; /**< Probe devices on bus */
+ rte_bus_close_t close; /**< Close devices on bus */
rte_bus_find_device_t find_device; /**< Find a device on the bus */
rte_bus_plug_t plug; /**< Probe single device for drivers */
rte_bus_unplug_t unplug; /**< Remove single device from driver */
@@ -301,6 +314,16 @@ int rte_bus_scan(void);
*/
int rte_bus_probe(void);
+/**
+ * For each device on the buses, call the device specific close.
+ *
+ * @return
+ * 0 for successful close
+ * !0 otherwise
+ */
+__rte_experimental
+int rte_bus_close(void);
+
/**
* Dump information of all the buses registered with EAL.
*
diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c
index 0960f01d0..a8a63d8ca 100644
--- a/lib/librte_eal/linux/eal.c
+++ b/lib/librte_eal/linux/eal.c
@@ -1357,6 +1357,7 @@ rte_eal_cleanup(void)
if (rte_eal_process_type() == RTE_PROC_PRIMARY)
rte_memseg_walk(mark_freeable, NULL);
+ rte_bus_close();
rte_service_finalize();
rte_mp_channel_cleanup();
rte_trace_save();
diff --git a/lib/librte_eal/rte_eal_version.map
b/lib/librte_eal/rte_eal_version.map
index bf0c17c23..6a6d993a1 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -403,6 +403,9 @@ EXPERIMENTAL {
rte_mp_disable;
rte_thread_register;
rte_thread_unregister;
+
+ # added in 20.11
+ rte_bus_close;
};
INTERNAL {
--
2.17.1
[dpdk-dev] [PATCH v2 2/3] examples/multi_process: cleanup bus objects while terminating app
From: Rohit Raj
Certain bus objects may need to be closed and re-acquired
while terminating and rerunning the client application.
Hence a signal handler is required to catch the termination
of the App and hence closing the bus objects.
This patch adds the missing signal handler in the client
app and closes the Bus objects in both client and server
applications when the signal Handler is called.
Signed-off-by: Rohit Raj
---
.../multi_process/client_server_mp/mp_client/client.c | 11 +++
.../multi_process/client_server_mp/mp_server/main.c | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/examples/multi_process/client_server_mp/mp_client/client.c
b/examples/multi_process/client_server_mp/mp_client/client.c
index 361d90b54..c37516b4c 100644
--- a/examples/multi_process/client_server_mp/mp_client/client.c
+++ b/examples/multi_process/client_server_mp/mp_client/client.c
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include
#include
@@ -196,6 +197,14 @@ handle_packet(struct rte_mbuf *buf)
}
+static void
+signal_handler(int signal)
+{
+ if (signal == SIGINT)
+ rte_eal_cleanup();
+ exit(0);
+}
+
/*
* Application main function - loops through
* receiving and processing packets. Never returns
@@ -217,6 +226,8 @@ main(int argc, char *argv[])
argc -= retval;
argv += retval;
+ signal(SIGINT, signal_handler);
+
if (parse_app_args(argc, argv) < 0)
rte_exit(EXIT_FAILURE, "Invalid command-line arguments\n");
diff --git a/examples/multi_process/client_server_mp/mp_server/main.c
b/examples/multi_process/client_server_mp/mp_server/main.c
index 280dab867..b0241cc20 100644
--- a/examples/multi_process/client_server_mp/mp_server/main.c
+++ b/examples/multi_process/client_server_mp/mp_server/main.c
@@ -275,11 +275,13 @@ signal_handler(int signal)
{
uint16_t port_id;
- if (signal == SIGINT)
+ if (signal == SIGINT) {
RTE_ETH_FOREACH_DEV(port_id) {
rte_eth_dev_stop(port_id);
rte_eth_dev_close(port_id);
}
+ rte_eal_cleanup();
+ }
exit(0);
}
--
2.17.1
[dpdk-dev] [PATCH v2 3/3] bus/fslmc: support bus close API
From: Rohit Raj
This patch add support for closing the bus objects which
were acquired In the bus probe.
Some devices need to be cleaned while in both primary and
secondary process and while some need to be cleaned only in
case of primary process.
The devices are closed as per the white list used while
creating the objects in a particular process.
Signed-off-by: Rohit Raj
Acked-by: Sachin Saxena
---
drivers/bus/fslmc/fslmc_bus.c | 15 +++-
drivers/bus/fslmc/fslmc_vfio.c | 89 -
drivers/bus/fslmc/fslmc_vfio.h | 3 +-
drivers/bus/fslmc/mc/fsl_dpcon.h| 1 +
drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c| 31 ++-
drivers/bus/fslmc/portal/dpaa2_hw_dpci.c| 32 +++-
drivers/bus/fslmc/portal/dpaa2_hw_dpio.c| 34
drivers/bus/fslmc/rte_bus_fslmc_version.map | 1 +
drivers/bus/fslmc/rte_fslmc.h | 5 +-
drivers/event/dpaa2/dpaa2_hw_dpcon.c| 32 +++-
drivers/net/dpaa2/dpaa2_mux.c | 18 -
11 files changed, 253 insertions(+), 8 deletions(-)
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index beb3dd008..9d3da6be3 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
*
- * Copyright 2016,2018-2019 NXP
+ * Copyright 2016,2018-2020 NXP
*
*/
@@ -365,6 +365,18 @@ rte_fslmc_match(struct rte_dpaa2_driver *dpaa2_drv,
return 1;
}
+static int
+rte_fslmc_close(void)
+{
+ int ret = 0;
+
+ ret = fslmc_vfio_close_group();
+ if (ret)
+ DPAA2_BUS_ERR("Unable to close devices %d", ret);
+
+ return 0;
+}
+
static int
rte_fslmc_probe(void)
{
@@ -637,6 +649,7 @@ struct rte_fslmc_bus rte_fslmc_bus = {
.bus = {
.scan = rte_fslmc_scan,
.probe = rte_fslmc_probe,
+ .close = rte_fslmc_close,
.parse = rte_fslmc_parse,
.find_device = rte_fslmc_find_device,
.get_iommu_class = rte_dpaa2_get_iommu_class,
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index 9134ec552..34ccc9db3 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 2015-2016 Freescale Semiconductor, Inc. All rights reserved.
- * Copyright 2016-2019 NXP
+ * Copyright 2016-2020 NXP
*
*/
@@ -692,6 +692,54 @@ rte_dpaa2_vfio_setup_intr(struct rte_intr_handle
*intr_handle,
return -1;
}
+static void
+fslmc_close_iodevices(struct rte_dpaa2_device *dev)
+{
+ struct rte_dpaa2_object *object = NULL;
+ struct rte_dpaa2_driver *drv;
+ int ret, probe_all;
+
+ switch (dev->dev_type) {
+ case DPAA2_IO:
+ case DPAA2_CON:
+ case DPAA2_CI:
+ case DPAA2_BPOOL:
+ case DPAA2_MUX:
+ TAILQ_FOREACH(object, &dpaa2_obj_list, next) {
+ if (dev->dev_type == object->dev_type)
+ object->close(dev->object_id);
+ else
+ continue;
+ }
+ break;
+ case DPAA2_ETH:
+ case DPAA2_CRYPTO:
+ case DPAA2_QDMA:
+ probe_all = rte_fslmc_bus.bus.conf.scan_mode !=
+ RTE_BUS_SCAN_WHITELIST;
+ TAILQ_FOREACH(drv, &rte_fslmc_bus.driver_list, next) {
+ if (drv->drv_type != dev->dev_type)
+ continue;
+ if (rte_dev_is_probed(&dev->device))
+ continue;
+ if (probe_all ||
+ (dev->device.devargs &&
+dev->device.devargs->policy ==
+RTE_DEV_WHITELISTED)) {
+ ret = drv->remove(dev);
+ if (ret)
+ DPAA2_BUS_ERR("Unable to remove");
+ }
+ }
+ break;
+ default:
+ break;
+ }
+
+ DPAA2_BUS_LOG(DEBUG, "Device (%s) Closed",
+ dev->device.name);
+}
+
/*
* fslmc_process_iodevices for processing only IO (ETH, CRYPTO, and possibly
* EVENT) devices.
@@ -796,6 +844,45 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev)
return ret;
}
+int
+fslmc_vfio_close_group(void)
+{
+ struct rte_dpaa2_device *dev, *dev_temp;
+
+ TAILQ_FOREACH_SAFE(dev, &rte_fslmc_bus.device_list, next, dev_temp) {
+ if (dev->device.devargs &&
+ dev->device.devargs->policy == RTE_DEV_BLACKLISTED) {
+ DPAA2_BUS_LOG(DEBUG, "%s Blacklisted, skipping",
+ dev->device.name);
+ TAILQ_REMOVE(&rte_fslmc_bus.device_list
[dpdk-dev] [PATCH 2/2] eal: remove RTE CIO barriers
Remove the deprecated rte_cio_[rw]mb APIs.
Signed-off-by: Phil Yang
Reviewed-by: Ruifeng Wang
---
lib/librte_eal/arm/include/rte_atomic_32.h | 4 ---
lib/librte_eal/arm/include/rte_atomic_64.h | 4 ---
lib/librte_eal/include/generic/rte_atomic.h | 39 -
lib/librte_eal/ppc/include/rte_atomic.h | 4 ---
lib/librte_eal/x86/include/rte_atomic.h | 4 ---
5 files changed, 55 deletions(-)
diff --git a/lib/librte_eal/arm/include/rte_atomic_32.h
b/lib/librte_eal/arm/include/rte_atomic_32.h
index 368f10c..9d0568d 100644
--- a/lib/librte_eal/arm/include/rte_atomic_32.h
+++ b/lib/librte_eal/arm/include/rte_atomic_32.h
@@ -33,10 +33,6 @@ extern "C" {
#define rte_io_rmb() rte_rmb()
-#define rte_cio_wmb() rte_wmb()
-
-#define rte_cio_rmb() rte_rmb()
-
static __rte_always_inline void
rte_atomic_thread_fence(int memory_order)
{
diff --git a/lib/librte_eal/arm/include/rte_atomic_64.h
b/lib/librte_eal/arm/include/rte_atomic_64.h
index 5cae52d..c518559 100644
--- a/lib/librte_eal/arm/include/rte_atomic_64.h
+++ b/lib/librte_eal/arm/include/rte_atomic_64.h
@@ -37,10 +37,6 @@ extern "C" {
#define rte_io_rmb() rte_rmb()
-#define rte_cio_wmb() rte_wmb()
-
-#define rte_cio_rmb() rte_rmb()
-
static __rte_always_inline void
rte_atomic_thread_fence(int memory_order)
{
diff --git a/lib/librte_eal/include/generic/rte_atomic.h
b/lib/librte_eal/include/generic/rte_atomic.h
index 95270f1..d1255b2 100644
--- a/lib/librte_eal/include/generic/rte_atomic.h
+++ b/lib/librte_eal/include/generic/rte_atomic.h
@@ -107,45 +107,6 @@ static inline void rte_io_wmb(void);
static inline void rte_io_rmb(void);
///@}
-/** @name Coherent I/O Memory Barrier
- *
- * Coherent I/O memory barrier is a lightweight version of I/O memory
- * barriers which are system-wide data synchronization barriers. This
- * is for only coherent memory domain between lcore and I/O device but
- * it is same as the I/O memory barriers in most of architectures.
- * However, some architecture provides even lighter barriers which are
- * somewhere in between I/O memory barriers and SMP memory barriers.
- * For example, in case of ARMv8, DMB(data memory barrier) instruction
- * can have different shareability domains - inner-shareable and
- * outer-shareable. And inner-shareable DMB fits for SMP memory
- * barriers and outer-shareable DMB for coherent I/O memory barriers,
- * which acts on coherent memory.
- *
- * In most cases, I/O memory barriers are safer but if operations are
- * on coherent memory instead of incoherent MMIO region of a device,
- * then coherent I/O memory barriers can be used and this could bring
- * performance gain depending on architectures.
- */
-///@{
-/**
- * Write memory barrier for coherent memory between lcore and I/O device
- *
- * Guarantees that the STORE operations on coherent memory that
- * precede the rte_cio_wmb() call are visible to I/O device before the
- * STORE operations that follow it.
- */
-static inline void rte_cio_wmb(void);
-
-/**
- * Read memory barrier for coherent memory between lcore and I/O device
- *
- * Guarantees that the LOAD operations on coherent memory updated by
- * I/O device that precede the rte_cio_rmb() call are visible to CPU
- * before the LOAD operations that follow it.
- */
-static inline void rte_cio_rmb(void);
-///@}
-
#endif /* __DOXYGEN__ */
/**
diff --git a/lib/librte_eal/ppc/include/rte_atomic.h
b/lib/librte_eal/ppc/include/rte_atomic.h
index 527fcaf..a919899 100644
--- a/lib/librte_eal/ppc/include/rte_atomic.h
+++ b/lib/librte_eal/ppc/include/rte_atomic.h
@@ -36,10 +36,6 @@ extern "C" {
#define rte_io_rmb() rte_rmb()
-#define rte_cio_wmb() rte_wmb()
-
-#define rte_cio_rmb() rte_rmb()
-
static __rte_always_inline void
rte_atomic_thread_fence(int memory_order)
{
diff --git a/lib/librte_eal/x86/include/rte_atomic.h
b/lib/librte_eal/x86/include/rte_atomic.h
index 62ea393..b7d6b06 100644
--- a/lib/librte_eal/x86/include/rte_atomic.h
+++ b/lib/librte_eal/x86/include/rte_atomic.h
@@ -79,10 +79,6 @@ rte_smp_mb(void)
#define rte_io_rmb() rte_compiler_barrier()
-#define rte_cio_wmb() rte_compiler_barrier()
-
-#define rte_cio_rmb() rte_compiler_barrier()
-
/**
* Synchronization fence between threads based on the specified memory order.
*
--
2.7.4
[dpdk-dev] [PATCH 1/2] drivers: replace RTE CIO barriers with RTE IO barriers
Replace the deprecated rte_cio_[rw]mb barriers with rte_io_[rw]mb
barriers.
Signed-off-by: Phil Yang
Signed-off-by: Joyce Kong
---
drivers/common/mlx5/mlx5_common.h | 2 +-
drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 2 +-
drivers/crypto/octeontx2/otx2_cryptodev_sec.c | 4 ++--
drivers/event/octeontx/ssovf_worker.c | 6 +++---
drivers/event/octeontx2/otx2_worker.h | 2 +-
drivers/net/bnxt/bnxt_hwrm.c | 2 +-
drivers/net/bnxt/bnxt_ring.h | 6 +++---
drivers/net/e1000/em_rxtx.c | 2 +-
drivers/net/i40e/i40e_rxtx.c | 2 +-
drivers/net/i40e/i40e_rxtx_vec_neon.c | 4 ++--
drivers/net/mlx5/mlx5_flow.c | 2 +-
drivers/net/mlx5/mlx5_flow_dv.c | 2 +-
drivers/net/mlx5/mlx5_rxq.c | 12 ++--
drivers/net/mlx5/mlx5_rxtx.c | 16
drivers/net/mlx5/mlx5_rxtx.h | 2 +-
drivers/net/mlx5/mlx5_rxtx_vec.h | 2 +-
drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 2 +-
drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 4 ++--
drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 2 +-
drivers/net/mlx5/mlx5_txq.c | 4 ++--
drivers/net/octeontx/octeontx_rxtx.h | 2 +-
drivers/net/octeontx2/otx2_ethdev_sec.c | 2 +-
drivers/net/octeontx2/otx2_ethdev_sec_tx.h| 2 +-
drivers/net/octeontx2/otx2_rx.c | 2 +-
drivers/net/octeontx2/otx2_tx.c | 6 +++---
drivers/net/virtio/virtio_rxtx.c | 2 +-
drivers/net/virtio/virtio_rxtx_simple_neon.c | 2 +-
drivers/net/virtio/virtqueue.h| 26 +-
drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c | 4 ++--
drivers/regex/mlx5/mlx5_regex_fastpath.c | 4 ++--
30 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.h
b/drivers/common/mlx5/mlx5_common.h
index 2cdb226..ed44a45 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -193,7 +193,7 @@ check_cqe(volatile struct mlx5_cqe *cqe, const uint16_t
cqes_n,
if (unlikely((op_owner != (!!(idx))) || (op_code == MLX5_CQE_INVALID)))
return MLX5_CQE_STATUS_HW_OWN;
- rte_cio_rmb();
+ rte_io_rmb();
if (unlikely(op_code == MLX5_CQE_RESP_ERR ||
op_code == MLX5_CQE_REQ_ERR))
return MLX5_CQE_STATUS_ERR;
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
index 9d51b17..df39cde 100644
--- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
@@ -469,7 +469,7 @@ otx2_cpt_enqueue_req(const struct otx2_cpt_qp *qp,
* buffer immediately, a DMB is not required to push out
* LMTSTs.
*/
- rte_cio_wmb();
+ rte_io_wmb();
lmt_status = otx2_lmt_submit(qp->lf_nq_reg);
} while (lmt_status == 0);
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_sec.c
b/drivers/crypto/octeontx2/otx2_cryptodev_sec.c
index 0741a59..72e6c41 100644
--- a/drivers/crypto/octeontx2/otx2_cryptodev_sec.c
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_sec.c
@@ -107,7 +107,7 @@ otx2_cpt_enq_sa_write(struct otx2_sec_session_ipsec_lp *lp,
inst.u64[3] = 0;
inst.res_addr = rte_mempool_virt2iova(res);
- rte_cio_wmb();
+ rte_io_wmb();
do {
/* Copy CPT command to LMTLINE */
@@ -124,7 +124,7 @@ otx2_cpt_enq_sa_write(struct otx2_sec_session_ipsec_lp *lp,
otx2_err("Request timed out");
return -ETIMEDOUT;
}
- rte_cio_rmb();
+ rte_io_rmb();
}
if (unlikely(res->compcode != CPT_9X_COMP_E_GOOD)) {
diff --git a/drivers/event/octeontx/ssovf_worker.c
b/drivers/event/octeontx/ssovf_worker.c
index 18b7926..3dfe665 100644
--- a/drivers/event/octeontx/ssovf_worker.c
+++ b/drivers/event/octeontx/ssovf_worker.c
@@ -286,17 +286,17 @@ __sso_event_tx_adapter_enqueue(void *port, struct
rte_event ev[],
switch (ev->sched_type) {
case SSO_SYNC_ORDERED:
ssows_swtag_norm(ws, ev->event, SSO_SYNC_ATOMIC);
- rte_cio_wmb();
+ rte_io_wmb();
ssows_swtag_wait(ws);
break;
case SSO_SYNC_UNTAGGED:
ssows_swtag_full(ws, ev->u64, ev->event, SSO_SYNC_ATOMIC,
ev->queue_id);
- rte_cio_wmb();
+ rte_io_wmb();
ssows_swtag_wait(ws);
break;
case SSO_SYNC_ATOMIC:
- rte_cio_wmb();
+ rte_io_wmb();
break;
}
diff --git a/drivers/event/octeontx2/otx2_worker.h
b/drivers/event/octeontx2/otx2_worker.h
index 924ff7f..cde
[dpdk-dev] [PATCH 4/7] ethdev: mark internal functions
Some ethdev functions are for drivers only, not for applications. Since we have '__rte_internal' tag available now, marking internal functions with it and moving functions to INTERNAL section in linker script. This is also good for documenting the internal functions. Some internal APIs seems marked as experimental, but it doesn't make sense to have internals APIs as experimental, updating their tag and doxygen comments. Signed-off-by: Ferruh Yigit --- doc/guides/rel_notes/deprecation.rst | 6 - lib/librte_ethdev/rte_ethdev.h | 3 +-- lib/librte_ethdev/rte_ethdev_driver.h| 33 ++-- lib/librte_ethdev/rte_ethdev_version.map | 30 ++--- lib/librte_ethdev/rte_flow_driver.h | 4 +-- 5 files changed, 29 insertions(+), 47 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index d40b95bfa9..35c06d30ef 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -227,12 +227,6 @@ Deprecation Notices following the IPv6 header, as proposed in RFC https://mails.dpdk.org/archives/dev/2020-August/177257.html. -* ethdev: Some internal APIs for driver usage are exported in the .map file. - Now DPDK has ``__rte_internal`` marker so we can mark internal APIs and move - them to the INTERNAL block in .map. Although these APIs are internal it will - break the ABI checks, that is why change is planned for 20.11. - The list of internal APIs are mainly ones listed in ``rte_ethdev_driver.h``. - * traffic manager: All traffic manager API's in ``rte_tm.h`` were mistakenly made ABI stable in the v19.11 release. The TM maintainer and other contributors have agreed to keep the TM APIs as experimental in expectation of additional spec diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index 2ce186610b..ce2e0ec0e4 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -1723,8 +1723,7 @@ rte_eth_find_next_of(uint16_t port_id_start, */ __rte_experimental uint16_t -rte_eth_find_next_sibling(uint16_t port_id_start, - uint16_t ref_port_id); +rte_eth_find_next_sibling(uint16_t port_id_start, uint16_t ref_port_id); /** * Macro to iterate over all ethdev ports sharing the same rte_device diff --git a/lib/librte_ethdev/rte_ethdev_driver.h b/lib/librte_ethdev/rte_ethdev_driver.h index b006cbbe92..3d1bc33272 100644 --- a/lib/librte_ethdev/rte_ethdev_driver.h +++ b/lib/librte_ethdev/rte_ethdev_driver.h @@ -759,6 +759,7 @@ int rte_eth_dev_is_tx_hairpin_queue(struct rte_eth_dev *dev, uint16_t queue_id); * @return * - The pointer to the ethdev slot, on success. NULL on error */ +__rte_internal struct rte_eth_dev *rte_eth_dev_allocated(const char *name); /** @@ -770,6 +771,7 @@ struct rte_eth_dev *rte_eth_dev_allocated(const char *name); * @return * - Slot in the rte_dev_devices array for a new device; */ +__rte_internal struct rte_eth_dev *rte_eth_dev_allocate(const char *name); /** @@ -783,6 +785,7 @@ struct rte_eth_dev *rte_eth_dev_allocate(const char *name); *device. * - Error: Null pointer. */ +__rte_internal struct rte_eth_dev *rte_eth_dev_attach_secondary(const char *name); /** @@ -801,6 +804,7 @@ struct rte_eth_dev *rte_eth_dev_attach_secondary(const char *name); * @return * - 0 on success, negative on error */ +__rte_internal int rte_eth_dev_release_port(struct rte_eth_dev *eth_dev); /** @@ -814,6 +818,7 @@ int rte_eth_dev_release_port(struct rte_eth_dev *eth_dev); * @return * void */ +__rte_internal void _rte_eth_dev_reset(struct rte_eth_dev *dev); /** @@ -833,6 +838,7 @@ void _rte_eth_dev_reset(struct rte_eth_dev *dev); * @return * int */ +__rte_internal int _rte_eth_dev_callback_process(struct rte_eth_dev *dev, enum rte_eth_event_type event, void *ret_param); @@ -848,6 +854,7 @@ int _rte_eth_dev_callback_process(struct rte_eth_dev *dev, * @param dev * New ethdev port. */ +__rte_internal void rte_eth_dev_probing_finish(struct rte_eth_dev *dev); /** @@ -869,6 +876,7 @@ void rte_eth_dev_probing_finish(struct rte_eth_dev *dev); * @param socket_id * The *socket_id* argument is the socket identifier in case of NUMA. */ +__rte_internal const struct rte_memzone * rte_eth_dma_zone_reserve(const struct rte_eth_dev *eth_dev, const char *name, uint16_t queue_id, size_t size, @@ -955,9 +963,6 @@ rte_eth_linkstatus_get(const struct rte_eth_dev *dev, } /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice. - * * Allocate an unique switch domain identifier. * * A pool of switch domain identifiers which can be allocated on request. This @@ -971,14 +976,11 @@ rte_eth_linkstatus_get(const struct rte_eth_dev *dev, * @return * Negative errno value on error, 0 on success. */ -__rte_experimental +__rte_internal int rte_eth_switc
[dpdk-dev] [PATCH 1/7] ethdev: remove legacy descriptor status check API
Removing 'rte_eth_rx_descriptor_done()' API and relevant 'rx_descriptor_done' function pointer from 'struct eth_dev_ops'. Deprecation notice is to deprecate the API in 20.11 and remove one year later, this is useful to prevent new applications use the API but keep the support for old application. But since 20.11 have the ABI break and most of the applications need to re-compile anyway will prevent them to use the API, the affect will be same as removing the API. So removing it in the 20.11 to reduce the churn. 'rx_descriptor_done' implementations removed from PMDs. Signed-off-by: Ferruh Yigit --- doc/guides/nics/features.rst| 6 +- doc/guides/rel_notes/deprecation.rst| 5 - drivers/net/e1000/e1000_ethdev.h| 4 drivers/net/e1000/em_ethdev.c | 1 - drivers/net/e1000/em_rxtx.c | 17 drivers/net/e1000/igb_ethdev.c | 2 -- drivers/net/e1000/igb_rxtx.c| 17 drivers/net/enic/enic_ethdev.c | 1 - drivers/net/fm10k/fm10k.h | 3 --- drivers/net/fm10k/fm10k_ethdev.c| 1 - drivers/net/fm10k/fm10k_rxtx.c | 25 drivers/net/i40e/i40e_ethdev.c | 1 - drivers/net/i40e/i40e_ethdev_vf.c | 1 - drivers/net/i40e/i40e_rxtx.c| 26 - drivers/net/i40e/i40e_rxtx.h| 1 - drivers/net/igc/igc_ethdev.c| 1 - drivers/net/igc/igc_txrx.c | 18 - drivers/net/igc/igc_txrx.h | 2 -- drivers/net/ixgbe/ixgbe_ethdev.c| 2 -- drivers/net/ixgbe/ixgbe_ethdev.h| 2 -- drivers/net/ixgbe/ixgbe_rxtx.c | 18 - drivers/net/octeontx2/otx2_ethdev.c | 1 - drivers/net/octeontx2/otx2_ethdev.h | 1 - drivers/net/octeontx2/otx2_ethdev_ops.c | 12 drivers/net/sfc/sfc_ethdev.c| 17 drivers/net/virtio/virtio_ethdev.c | 1 - drivers/net/virtio/virtio_ethdev.h | 2 -- drivers/net/virtio/virtio_rxtx.c| 9 - lib/librte_ethdev/rte_ethdev.h | 25 lib/librte_ethdev/rte_ethdev_core.h | 4 30 files changed, 1 insertion(+), 225 deletions(-) diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst index edd21c4d8e..701c592b26 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -642,14 +642,10 @@ Rx descriptor status Supports check the status of a Rx descriptor. When ``rx_descriptor_status`` is -used, status can be "Available", "Done" or "Unavailable". When -``rx_descriptor_done`` is used, status can be "DD bit is set" or "DD bit is -not set". +used, status can be "Available", "Done" or "Unavailable". * **[implements] eth_dev_ops**: ``rx_descriptor_status``. * **[related]API**: ``rte_eth_rx_descriptor_status()``. -* **[implements] eth_dev_ops**: ``rx_descriptor_done``. -* **[related]API**: ``rte_eth_rx_descriptor_done()``. .. _nic_features_tx_descriptor_status: diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 345c38d5b6..811eaad6ce 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -220,11 +220,6 @@ Deprecation Notices for HW. This change is planned for 20.11. For more details: https://mails.dpdk.org/archives/dev/2020-July/176135.html. -* ethdev: ``rx_descriptor_done`` dev_ops and ``rte_eth_rx_descriptor_done`` - will be deprecated in 20.11 and will be removed in 21.11. - Existing ``rte_eth_rx_descriptor_status`` and ``rte_eth_tx_descriptor_status`` - APIs can be used as replacement. - * ethdev: The port mirroring API can be replaced with a more fine grain flow API. The structs ``rte_eth_mirror_conf``, ``rte_eth_vlan_mirror`` and the functions ``rte_eth_mirror_rule_set``, ``rte_eth_mirror_rule_reset`` will be marked diff --git a/drivers/net/e1000/e1000_ethdev.h b/drivers/net/e1000/e1000_ethdev.h index 1e41ae9de1..dce365226b 100644 --- a/drivers/net/e1000/e1000_ethdev.h +++ b/drivers/net/e1000/e1000_ethdev.h @@ -384,8 +384,6 @@ int eth_igb_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, uint32_t eth_igb_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id); -int eth_igb_rx_descriptor_done(void *rx_queue, uint16_t offset); - int eth_igb_rx_descriptor_status(void *rx_queue, uint16_t offset); int eth_igb_tx_descriptor_status(void *tx_queue, uint16_t offset); @@ -461,8 +459,6 @@ int eth_em_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, uint32_t eth_em_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id); -int eth_em_rx_descriptor_done(void *rx_queue, uint16_t offset); - int eth_em_rx_descriptor_status(void *rx_queue, uint16_t offset); int eth_em_tx_descriptor_status(void *tx_queue, uint16_t offset); diff --git a/drive
[dpdk-dev] [PATCH 3/7] ethdev: make device operations struct private
Hiding the 'struct eth_dev_ops' from applications. Removing relevant deprecation notice. Signed-off-by: Ferruh Yigit --- doc/guides/rel_notes/deprecation.rst | 9 - drivers/net/i40e/i40e_vf_representor.c | 1 + drivers/net/ixgbe/ixgbe_vf_representor.c | 1 + lib/librte_ethdev/rte_ethdev_core.h | 708 +-- lib/librte_ethdev/rte_ethdev_driver.h| 694 ++ lib/librte_ethdev/rte_flow_driver.h | 1 + lib/librte_ethdev/rte_mtr_driver.h | 1 + lib/librte_ethdev/rte_tm_driver.h| 1 + 8 files changed, 706 insertions(+), 710 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 811eaad6ce..d40b95bfa9 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -163,15 +163,6 @@ Deprecation Notices Due to adoption of C11 atomic builtins, the field ``refcnt_atomic`` will be replaced with ``refcnt`` of type ``uint16_t`` in DPDK 20.11. -* ethdev: Split the ``struct eth_dev_ops`` struct to hide it as much as possible - will be done in 20.11. - Currently the ``struct eth_dev_ops`` struct is accessible by the application - because some inline functions, like ``rte_eth_tx_descriptor_status()``, - access the struct directly. - The struct will be separate in two, the ops used by inline functions will be - moved next to Rx/Tx burst functions, rest of the ``struct eth_dev_ops`` struct - will be moved to header file for drivers to hide it from applications. - * ethdev: the legacy filter API, including ``rte_eth_dev_filter_supported()``, ``rte_eth_dev_filter_ctrl()`` as well as filter types MACVLAN, ETHERTYPE, FLEXIBLE, SYN, NTUPLE, TUNNEL, FDIR, diff --git a/drivers/net/i40e/i40e_vf_representor.c b/drivers/net/i40e/i40e_vf_representor.c index 083bc1a5f3..f09d4d8798 100644 --- a/drivers/net/i40e/i40e_vf_representor.c +++ b/drivers/net/i40e/i40e_vf_representor.c @@ -7,6 +7,7 @@ #include #include +#include "rte_ethdev_driver.h" #include "base/i40e_type.h" #include "base/virtchnl.h" #include "i40e_ethdev.h" diff --git a/drivers/net/ixgbe/ixgbe_vf_representor.c b/drivers/net/ixgbe/ixgbe_vf_representor.c index dbbef294ae..edb5d43846 100644 --- a/drivers/net/ixgbe/ixgbe_vf_representor.c +++ b/drivers/net/ixgbe/ixgbe_vf_representor.c @@ -6,6 +6,7 @@ #include #include +#include "rte_ethdev_driver.h" #include "base/ixgbe_type.h" #include "base/ixgbe_vf.h" #include "ixgbe_ethdev.h" diff --git a/lib/librte_ethdev/rte_ethdev_core.h b/lib/librte_ethdev/rte_ethdev_core.h index 275d51006b..0a2a43803f 100644 --- a/lib/librte_ethdev/rte_ethdev_core.h +++ b/lib/librte_ethdev/rte_ethdev_core.h @@ -21,319 +21,8 @@ struct rte_eth_dev_callback; /** @internal Structure to keep track of registered callbacks */ TAILQ_HEAD(rte_eth_dev_cb_list, rte_eth_dev_callback); -/* - * Definitions of all functions exported by an Ethernet driver through the - * the generic structure of type *eth_dev_ops* supplied in the *rte_eth_dev* - * structure associated with an Ethernet device. - */ struct rte_eth_dev; -typedef int (*eth_dev_configure_t)(struct rte_eth_dev *dev); -/**< @internal Ethernet device configuration. */ - -typedef int (*eth_dev_start_t)(struct rte_eth_dev *dev); -/**< @internal Function used to start a configured Ethernet device. */ - -typedef void (*eth_dev_stop_t)(struct rte_eth_dev *dev); -/**< @internal Function used to stop a configured Ethernet device. */ - -typedef int (*eth_dev_set_link_up_t)(struct rte_eth_dev *dev); -/**< @internal Function used to link up a configured Ethernet device. */ - -typedef int (*eth_dev_set_link_down_t)(struct rte_eth_dev *dev); -/**< @internal Function used to link down a configured Ethernet device. */ - -typedef void (*eth_dev_close_t)(struct rte_eth_dev *dev); -/**< @internal Function used to close a configured Ethernet device. */ - -typedef int (*eth_dev_reset_t)(struct rte_eth_dev *dev); -/** <@internal Function used to reset a configured Ethernet device. */ - -typedef int (*eth_is_removed_t)(struct rte_eth_dev *dev); -/**< @internal Function used to detect an Ethernet device removal. */ - -/** - * @internal - * Function used to enable the Rx promiscuous mode of an Ethernet device. - * - * @param dev - * ethdev handle of port. - * - * @return - * Negative errno value on error, 0 on success. - * - * @retval 0 - * Success, promiscuous mode is enabled. - * @retval -ENOTSUP - * Promiscuous mode is not supported. - * @retval -ENODEV - * Device is gone. - * @retval -E_RTE_SECONDARY - * Function was called from a secondary process instance and not supported. - * @retval -ETIMEDOUT - * Attempt to enable promiscuos mode failed because of timeout. - * @retval -EAGAIN - * Failed to enable promiscuous mode. - */ -typedef int (*eth_promiscuous_enable_t)(struct rte_eth_dev *dev); - -/** - * @internal - * Function used to disable the Rx promiscuous mode of an Ethernet device. - * -
[dpdk-dev] [PATCH 6/7] ethdev: remove invalid symbols from map file
These are sturct type names, not object names. Removing them from .map
file.
Fixes: 9d41beed24b0 ("lib: provide initial versioning")
Cc: sta...@dpdk.org
Signed-off-by: Ferruh Yigit
---
lib/librte_ethdev/rte_ethdev_version.map | 2 --
1 file changed, 2 deletions(-)
diff --git a/lib/librte_ethdev/rte_ethdev_version.map
b/lib/librte_ethdev/rte_ethdev_version.map
index 5db3fb156a..a85986a2a2 100644
--- a/lib/librte_ethdev/rte_ethdev_version.map
+++ b/lib/librte_ethdev/rte_ethdev_version.map
@@ -81,7 +81,6 @@ DPDK_21 {
rte_eth_iterator_next;
rte_eth_led_off;
rte_eth_led_on;
- rte_eth_link;
rte_eth_link_get;
rte_eth_link_get_nowait;
rte_eth_macaddr_get;
@@ -96,7 +95,6 @@ DPDK_21 {
rte_eth_rx_queue_setup;
rte_eth_set_queue_rate_limit;
rte_eth_speed_bitflag;
- rte_eth_stats;
rte_eth_stats_get;
rte_eth_stats_reset;
rte_eth_timesync_adjust_time;
--
2.25.4
[dpdk-dev] [PATCH 5/7] ethdev: use hairpin helper functions
Hairpin helper functions were not used by drivers, but it was used only
local to ethdev. They are:
'rte_eth_dev_is_rx_hairpin_queue()'
'rte_eth_dev_is_tx_hairpin_queue()'
Exposing them as internal APIs and update mlx5 driver (only user of
hairpin) to use them.
Signed-off-by: Ferruh Yigit
---
drivers/net/mlx5/mlx5_rxq.c | 4 ++--
drivers/net/mlx5/mlx5_txq.c | 4 ++--
lib/librte_ethdev/rte_ethdev_driver.h| 2 ++
lib/librte_ethdev/rte_ethdev_version.map | 2 ++
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 79eb8f8d72..4b200579dd 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -542,7 +542,7 @@ mlx5_rx_queue_stop(struct rte_eth_dev *dev, uint16_t idx)
eth_rx_burst_t pkt_burst = dev->rx_pkt_burst;
int ret;
- if (dev->data->rx_queue_state[idx] == RTE_ETH_QUEUE_STATE_HAIRPIN) {
+ if (rte_eth_dev_is_rx_hairpin_queue(dev, idx)) {
DRV_LOG(ERR, "Hairpin queue can't be stopped");
rte_errno = EINVAL;
return -EINVAL;
@@ -653,7 +653,7 @@ mlx5_rx_queue_start(struct rte_eth_dev *dev, uint16_t idx)
{
int ret;
- if (dev->data->rx_queue_state[idx] == RTE_ETH_QUEUE_STATE_HAIRPIN) {
+ if (rte_eth_dev_is_rx_hairpin_queue(dev, idx)) {
DRV_LOG(ERR, "Hairpin queue can't be started");
rte_errno = EINVAL;
return -EINVAL;
diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index 21fe16b7ed..9d5f4d35b2 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -244,7 +244,7 @@ mlx5_tx_queue_stop(struct rte_eth_dev *dev, uint16_t idx)
{
int ret;
- if (dev->data->tx_queue_state[idx] == RTE_ETH_QUEUE_STATE_HAIRPIN) {
+ if (rte_eth_dev_is_tx_hairpin_queue(dev, idx)) {
DRV_LOG(ERR, "Hairpin queue can't be stopped");
rte_errno = EINVAL;
return -EINVAL;
@@ -371,7 +371,7 @@ mlx5_tx_queue_start(struct rte_eth_dev *dev, uint16_t idx)
{
int ret;
- if (dev->data->tx_queue_state[idx] == RTE_ETH_QUEUE_STATE_HAIRPIN) {
+ if (rte_eth_dev_is_tx_hairpin_queue(dev, idx)) {
DRV_LOG(ERR, "Hairpin queue can't be started");
rte_errno = EINVAL;
return -EINVAL;
diff --git a/lib/librte_ethdev/rte_ethdev_driver.h
b/lib/librte_ethdev/rte_ethdev_driver.h
index 3d1bc33272..5dfe9fdf1a 100644
--- a/lib/librte_ethdev/rte_ethdev_driver.h
+++ b/lib/librte_ethdev/rte_ethdev_driver.h
@@ -734,6 +734,7 @@ struct eth_dev_ops {
* @return
* - (1) if the queue is hairpin queue, 0 otherwise.
*/
+__rte_internal
int rte_eth_dev_is_rx_hairpin_queue(struct rte_eth_dev *dev, uint16_t
queue_id);
/**
@@ -748,6 +749,7 @@ int rte_eth_dev_is_rx_hairpin_queue(struct rte_eth_dev
*dev, uint16_t queue_id);
* @return
* - (1) if the queue is hairpin queue, 0 otherwise.
*/
+__rte_internal
int rte_eth_dev_is_tx_hairpin_queue(struct rte_eth_dev *dev, uint16_t
queue_id);
/**
diff --git a/lib/librte_ethdev/rte_ethdev_version.map
b/lib/librte_ethdev/rte_ethdev_version.map
index 6a84f3d76d..5db3fb156a 100644
--- a/lib/librte_ethdev/rte_ethdev_version.map
+++ b/lib/librte_ethdev/rte_ethdev_version.map
@@ -237,6 +237,8 @@ INTERNAL {
rte_eth_dev_attach_secondary;
rte_eth_dev_create;
rte_eth_dev_destroy;
+ rte_eth_dev_is_rx_hairpin_queue;
+ rte_eth_dev_is_tx_hairpin_queue;
rte_eth_dev_probing_finish;
rte_eth_dev_release_port;
rte_eth_devargs_parse;
--
2.25.4
[dpdk-dev] [PATCH 2/7] ethdev: move inline device operations
This patch is a preparation to hide the 'struct eth_dev_ops' from
applications by moving some device operations from 'struct eth_dev_ops'
to 'struct rte_eth_dev'.
Mentioned ethdev APIs are in the data path and implemented as inline
because of performance reasons.
Exposing 'struct eth_dev_ops' to applications is bad because it is a
contract between ethdev and PMDs, not really needs to be known by
applications, also changes in the struct causing ABI breakages which
shouldn't.
To be able to both keep APIs inline and hide the 'struct eth_dev_ops',
moving device operations used in ethdev inline APIs to 'struct
rte_eth_dev' to the same level with Rx/Tx burst functions.
The list of dev_ops moved:
eth_rx_queue_count_t rx_queue_count;
eth_rx_descriptor_status_t rx_descriptor_status;
eth_tx_descriptor_status_t tx_descriptor_status;
Signed-off-by: Ferruh Yigit
---
drivers/net/ark/ark_ethdev.c| 2 +-
drivers/net/atlantic/atl_ethdev.c | 9 +
drivers/net/axgbe/axgbe_ethdev.c| 5 +++--
drivers/net/bnxt/bnxt_ethdev.c | 6 +++---
drivers/net/dpaa/dpaa_ethdev.c | 2 +-
drivers/net/dpaa2/dpaa2_ethdev.c| 2 +-
drivers/net/e1000/em_ethdev.c | 6 +++---
drivers/net/e1000/igb_ethdev.c | 10 +-
drivers/net/enic/enic_ethdev.c | 2 +-
drivers/net/fm10k/fm10k_ethdev.c| 6 +++---
drivers/net/i40e/i40e_ethdev.c | 6 +++---
drivers/net/i40e/i40e_ethdev_vf.c | 6 +++---
drivers/net/iavf/iavf_ethdev.c | 6 +++---
drivers/net/ice/ice_ethdev.c| 6 +++---
drivers/net/igc/igc_ethdev.c| 6 +++---
drivers/net/ixgbe/ixgbe_ethdev.c| 10 +-
drivers/net/mlx5/linux/mlx5_os.c| 12 +---
drivers/net/mlx5/mlx5_flow.c| 4
drivers/net/netvsc/hn_ethdev.c | 6 +++---
drivers/net/nfp/nfp_net.c | 2 +-
drivers/net/octeontx2/otx2_ethdev.c | 6 +++---
drivers/net/qede/qede_ethdev.c | 3 +--
drivers/net/sfc/sfc_ethdev.c| 12 ++--
drivers/net/thunderx/nicvf_ethdev.c | 2 +-
drivers/net/vhost/rte_eth_vhost.c | 2 +-
lib/librte_ethdev/rte_ethdev.h | 12 ++--
lib/librte_ethdev/rte_ethdev_core.h | 11 +--
27 files changed, 82 insertions(+), 80 deletions(-)
diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
index b32ccd8677..ce7f6e4803 100644
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -132,7 +132,6 @@ static const struct eth_dev_ops ark_eth_dev_ops = {
.dev_infos_get = eth_ark_dev_info_get,
.rx_queue_setup = eth_ark_dev_rx_queue_setup,
- .rx_queue_count = eth_ark_dev_rx_queue_count,
.tx_queue_setup = eth_ark_tx_queue_setup,
.link_update = eth_ark_dev_link_update,
@@ -318,6 +317,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
return -1;
dev->dev_ops = &ark_eth_dev_ops;
+ dev->rx_queue_count = eth_ark_dev_rx_queue_count;
dev->data->mac_addrs = rte_zmalloc("ark", RTE_ETHER_ADDR_LEN, 0);
if (!dev->data->mac_addrs) {
diff --git a/drivers/net/atlantic/atl_ethdev.c
b/drivers/net/atlantic/atl_ethdev.c
index d3b00ab295..540b106045 100644
--- a/drivers/net/atlantic/atl_ethdev.c
+++ b/drivers/net/atlantic/atl_ethdev.c
@@ -313,10 +313,6 @@ static const struct eth_dev_ops atl_eth_dev_ops = {
.rx_queue_intr_enable = atl_dev_rx_queue_intr_enable,
.rx_queue_intr_disable = atl_dev_rx_queue_intr_disable,
- .rx_queue_count = atl_rx_queue_count,
- .rx_descriptor_status = atl_dev_rx_descriptor_status,
- .tx_descriptor_status = atl_dev_tx_descriptor_status,
-
/* EEPROM */
.get_eeprom_length= atl_dev_get_eeprom_length,
.get_eeprom = atl_dev_get_eeprom,
@@ -373,6 +369,11 @@ eth_atl_dev_init(struct rte_eth_dev *eth_dev)
PMD_INIT_FUNC_TRACE();
eth_dev->dev_ops = &atl_eth_dev_ops;
+
+ eth_dev->rx_queue_count = atl_rx_queue_count;
+ eth_dev->rx_descriptor_status = atl_dev_rx_descriptor_status;
+ eth_dev->tx_descriptor_status = atl_dev_tx_descriptor_status;
+
eth_dev->rx_pkt_burst = &atl_recv_pkts;
eth_dev->tx_pkt_burst = &atl_xmit_pkts;
eth_dev->tx_pkt_prepare = &atl_prep_pkts;
diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c
index 0c25739f82..02ceb95754 100644
--- a/drivers/net/axgbe/axgbe_ethdev.c
+++ b/drivers/net/axgbe/axgbe_ethdev.c
@@ -224,8 +224,6 @@ static const struct eth_dev_ops axgbe_eth_dev_ops = {
.rxq_info_get = axgbe_rxq_info_get,
.txq_info_get = axgbe_txq_info_get,
.dev_supported_ptypes_get = axgbe_dev_supported_ptypes_get,
- .rx_descriptor_status = axgbe_dev_rx_descriptor_status,
- .tx_descriptor_status = axgbe_dev_tx_descriptor_status,
.mtu_set= axgb_mtu_set,
};
@@ -1632,6 +1630,9 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev
[dpdk-dev] [PATCH 7/7] ethdev: remove underscore prefix from internal API
'_rte_eth_dev_callback_process()' & '_rte_eth_dev_reset()' internal APIs
has unconventional underscore ('_') prefix.
Although this is not documented most probably this is to mark them as
internal. Since we have '__rte_internal' flag to mark this, removing '_'
from API names.
For '_rte_eth_dev_reset()', there is already a public API named
'rte_eth_dev_reset()', so renaming '_rte_eth_dev_reset()' to
'rte_eth_dev_internal_reset'.
Signed-off-by: Ferruh Yigit
---
app/test/virtual_pmd.c | 4 ++--
doc/guides/prog_guide/poll_mode_drv.rst | 4 ++--
drivers/net/atlantic/atl_ethdev.c| 5 ++---
drivers/net/bnxt/bnxt_ethdev.c | 6 +++---
drivers/net/bnxt/rte_pmd_bnxt.c | 4 ++--
drivers/net/bonding/rte_eth_bond_pmd.c | 8
drivers/net/dpaa/dpaa_ethdev.c | 2 +-
drivers/net/dpaa2/dpaa2_ethdev.c | 3 +--
drivers/net/e1000/em_ethdev.c| 2 +-
drivers/net/e1000/igb_ethdev.c | 7 +++
drivers/net/ena/ena_ethdev.c | 4 ++--
drivers/net/enic/enic_main.c | 2 +-
drivers/net/failsafe/failsafe_ether.c| 6 +++---
drivers/net/fm10k/fm10k_ethdev.c | 11 ---
drivers/net/hinic/base/hinic_pmd_hwdev.c | 6 +++---
drivers/net/i40e/i40e_ethdev.c | 2 +-
drivers/net/i40e/i40e_ethdev_vf.c| 4 ++--
drivers/net/i40e/i40e_pf.c | 2 +-
drivers/net/iavf/iavf_vchnl.c| 5 ++---
drivers/net/ice/ice_ethdev.c | 4 ++--
drivers/net/igc/igc_ethdev.c | 3 +--
drivers/net/ixgbe/ixgbe_ethdev.c | 10 --
drivers/net/ixgbe/ixgbe_pf.c | 5 ++---
drivers/net/mlx4/mlx4_intr.c | 10 +-
drivers/net/mlx5/linux/mlx5_ethdev_os.c | 4 ++--
drivers/net/mlx5/mlx5_flow.c | 2 +-
drivers/net/netvsc/hn_rndis.c| 2 +-
drivers/net/nfp/nfp_net.c| 2 +-
drivers/net/octeontx/octeontx_ethdev.c | 6 +++---
drivers/net/octeontx2/otx2_link.c| 2 +-
drivers/net/qede/qede_main.c | 3 +--
drivers/net/sfc/sfc_intr.c | 12 ++--
drivers/net/thunderx/nicvf_ethdev.c | 6 +++---
drivers/net/vhost/rte_eth_vhost.c| 6 +++---
drivers/net/virtio/virtio_ethdev.c | 6 +++---
drivers/net/vmxnet3/vmxnet3_ethdev.c | 6 +++---
lib/librte_ethdev/rte_ethdev.c | 8
lib/librte_ethdev/rte_ethdev_driver.h| 4 ++--
lib/librte_ethdev/rte_ethdev_version.map | 4 ++--
39 files changed, 90 insertions(+), 102 deletions(-)
diff --git a/app/test/virtual_pmd.c b/app/test/virtual_pmd.c
index 79156cb85a..b49089a33c 100644
--- a/app/test/virtual_pmd.c
+++ b/app/test/virtual_pmd.c
@@ -474,8 +474,8 @@ virtual_ethdev_simulate_link_status_interrupt(uint16_t
port_id,
vrtl_eth_dev->data->dev_link.link_status = link_status;
- _rte_eth_dev_callback_process(vrtl_eth_dev, RTE_ETH_EVENT_INTR_LSC,
- NULL);
+ rte_eth_dev_callback_process(vrtl_eth_dev, RTE_ETH_EVENT_INTR_LSC,
+NULL);
}
int
diff --git a/doc/guides/prog_guide/poll_mode_drv.rst
b/doc/guides/prog_guide/poll_mode_drv.rst
index 6fae39f904..86e0a141e6 100644
--- a/doc/guides/prog_guide/poll_mode_drv.rst
+++ b/doc/guides/prog_guide/poll_mode_drv.rst
@@ -600,9 +600,9 @@ thread safety all these operations should be called from
the same thread.
For example when PF is reset, the PF sends a message to notify VFs of
this event and also trigger an interrupt to VFs. Then in the interrupt
service routine the VFs detects this notification message and calls
-_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET, NULL).
+rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET, NULL).
This means that a PF reset triggers an RTE_ETH_EVENT_INTR_RESET
-event within VFs. The function _rte_eth_dev_callback_process() will
+event within VFs. The function rte_eth_dev_callback_process() will
call the registered callback function. The callback function can trigger
the application to handle all operations the VF reset requires including
stopping Rx/Tx queues and calling rte_eth_dev_reset().
diff --git a/drivers/net/atlantic/atl_ethdev.c
b/drivers/net/atlantic/atl_ethdev.c
index 540b106045..2fca9140d7 100644
--- a/drivers/net/atlantic/atl_ethdev.c
+++ b/drivers/net/atlantic/atl_ethdev.c
@@ -1395,8 +1395,7 @@ atl_dev_interrupt_action(struct rte_eth_dev *dev,
/* Notify userapp if link status changed */
if (!atl_dev_link_update(dev, 0)) {
atl_dev_link_status_print(dev);
- _rte_eth_dev_callback_process(dev,
- RTE_ETH_EVENT_INTR_LSC, NULL);
+ rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
} else {
if (hw->aq_fw_ops->send_macsec_req == NULL)
goto done;
@@ -1422,7 +1421,7 @@ atl_dev_interrupt_action(struct rte_eth_dev *
Re: [dpdk-dev] [PATCH v2 17/18] raw/ioat: add xstats tracking for idxd devices
On 21/08/2020 17:29, Bruce Richardson wrote:
Add update of the relevant stats for the data path functions and point the
overall device struct xstats function pointers to the existing ioat
functions.
At this point, all necessary hooks for supporting the existing unit tests
are in place so call them for each device.
Signed-off-by: Bruce Richardson
---
drivers/raw/ioat/idxd_pci.c| 3 +++
drivers/raw/ioat/idxd_vdev.c | 3 +++
drivers/raw/ioat/ioat_rawdev_test.c| 2 +-
drivers/raw/ioat/rte_ioat_rawdev_fns.h | 30 +++---
4 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/drivers/raw/ioat/rte_ioat_rawdev_fns.h
b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
index 66e3f1a836..db8608fa6b 100644
--- a/drivers/raw/ioat/rte_ioat_rawdev_fns.h
+++ b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
@@ -182,6 +182,8 @@ struct rte_idxd_user_hdl {
*/
struct rte_idxd_rawdev {
enum rte_ioat_dev_type type;
+ struct rte_ioat_xstats xstats;
+
void *portal; /* address to write the batch descriptor */
/* counters to track the batches and the individual op handles */
@@ -330,19 +332,15 @@ __idxd_enqueue_copy(int dev_id, rte_iova_t src,
rte_iova_t dst,
IDXD_FLAG_CACHE_CONTROL;
/* check for room in the handle ring */
- if (((idxd->next_free_hdl + 1) & (idxd->hdl_ring_sz - 1)) ==
idxd->next_ret_hdl) {
- rte_errno = ENOSPC;
- return 0;
- }
- if (b->op_count >= BATCH_SIZE) {
- rte_errno = ENOSPC;
- return 0;
- }
+ if (((idxd->next_free_hdl + 1) & (idxd->hdl_ring_sz - 1)) ==
idxd->next_ret_hdl)
+ goto failed;
+
+ if (b->op_count >= BATCH_SIZE)
+ goto failed;
+
/* check that we can actually use the current batch */
- if (b->submitted) {
- rte_errno = ENOSPC;
- return 0;
- }
+ if (b->submitted)
+ goto failed;
This 'cleanup' can be done when initially adding the function in patch
"raw/ioat: add data path for idxd devices", allowing for this patch to
be more concise.
/Kevin
[dpdk-dev] [PATCH v4 0/3] minor updates for getting queue info
This series include 3 patches. One patch is a minor update to add checking whether the related Tx or Rx queue has been setuped in the rte_eth_rx_queue_info_get and rte_eth_tx_queue_info_get API function to avoid illegal address access. And the other two patches for hns3 PMD driver. Huisong Li (1): net/hns3: support getting Tx and Rx queue information Wei Hu (Xavier) (2): net/hns3: report Rx drop packets enable configuration ethdev: check if queue setupped when getting queue info drivers/net/hns3/hns3_ethdev.c| 11 + drivers/net/hns3/hns3_ethdev_vf.c | 11 + drivers/net/hns3/hns3_rxtx.c | 37 +++ drivers/net/hns3/hns3_rxtx.h | 5 - lib/librte_ethdev/rte_ethdev.c| 16 + 5 files changed, 79 insertions(+), 1 deletion(-) -- 2.27.0
[dpdk-dev] [PATCH v4 3/3] ethdev: check if queue setupped when getting queue info
From: "Wei Hu (Xavier)"
This patch adds checking whether the related Tx or Rx queue has been
setuped in the rte_eth_rx_queue_info_get and rte_eth_tx_queue_info_get
API function to avoid illegal address access.
Signed-off-by: Wei Hu (Xavier)
---
lib/librte_ethdev/rte_ethdev.c | 16
1 file changed, 16 insertions(+)
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 7858ad5f1..0503c7929 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -4670,6 +4670,14 @@ rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t
queue_id,
return -EINVAL;
}
+ if (dev->data->rx_queues[queue_id] == NULL) {
+ RTE_ETHDEV_LOG(ERR,
+ "Rx queue %"PRIu16" of device with port_id=%"
+ PRIu16" has not been setuped\n",
+ queue_id, port_id);
+ return -EINVAL;
+ }
+
if (rte_eth_dev_is_rx_hairpin_queue(dev, queue_id)) {
RTE_ETHDEV_LOG(INFO,
"Can't get hairpin Rx queue %"PRIu16" info of device
with port_id=%"PRIu16"\n",
@@ -4701,6 +4709,14 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t
queue_id,
return -EINVAL;
}
+ if (dev->data->tx_queues[queue_id] == NULL) {
+ RTE_ETHDEV_LOG(ERR,
+ "Tx queue %"PRIu16" of device with port_id=%"
+ PRIu16" has not been setuped\n",
+ queue_id, port_id);
+ return -EINVAL;
+ }
+
if (rte_eth_dev_is_tx_hairpin_queue(dev, queue_id)) {
RTE_ETHDEV_LOG(INFO,
"Can't get hairpin Tx queue %"PRIu16" info of device
with port_id=%"PRIu16"\n",
--
2.27.0
[dpdk-dev] [PATCH v4 1/3] net/hns3: report Rx drop packets enable configuration
From: "Wei Hu (Xavier)"
Currently, if there are not available Rx buffer descriptors in receiving
direction based on hns3 network engine, incoming packets will always be
dropped by hardware. This patch reports the '.rx_drop_en' information to
DPDK framework in the '.dev_infos_get', '.rxq_info_get' and
'.rx_queue_setup' ops implementation function.
Signed-off-by: Huisong Li
Signed-off-by: Wei Hu (Xavier)
---
drivers/net/hns3/hns3_ethdev.c| 9 +
drivers/net/hns3/hns3_ethdev_vf.c | 9 +
drivers/net/hns3/hns3_rxtx.c | 6 ++
3 files changed, 24 insertions(+)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 81e773046..bcbbd7e81 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2495,6 +2495,15 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct
rte_eth_dev_info *info)
.nb_mtu_seg_max = HNS3_MAX_NON_TSO_BD_PER_PKT,
};
+ info->default_rxconf = (struct rte_eth_rxconf) {
+ /*
+* If there are no available Rx buffer descriptors, incoming
+* packets are always dropped by hardware based on hns3 network
+* engine.
+*/
+ .rx_drop_en = 1,
+ };
+
info->vmdq_queue_num = 0;
info->reta_size = HNS3_RSS_IND_TBL_SIZE;
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c
b/drivers/net/hns3/hns3_ethdev_vf.c
index 1d2941f0e..3156ed7f5 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -947,6 +947,15 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct
rte_eth_dev_info *info)
.nb_mtu_seg_max = HNS3_MAX_NON_TSO_BD_PER_PKT,
};
+ info->default_rxconf = (struct rte_eth_rxconf) {
+ /*
+* If there are no available Rx buffer descriptors, incoming
+* packets are always dropped by hardware based on hns3 network
+* engine.
+*/
+ .rx_drop_en = 1,
+ };
+
info->vmdq_queue_num = 0;
info->reta_size = HNS3_RSS_IND_TBL_SIZE;
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index c0f798159..3e5e32e38 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -1251,6 +1251,12 @@ hns3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t
idx, uint16_t nb_desc,
return -EINVAL;
}
+ if (conf->rx_drop_en == 0)
+ hns3_warn(hw, "if there are no available Rx descriptors,"
+ "incoming packets are always dropped. input parameter"
+ " conf->rx_drop_en(%u) is uneffective.",
+ conf->rx_drop_en);
+
if (dev->data->rx_queues[idx]) {
hns3_rx_queue_release(dev->data->rx_queues[idx]);
dev->data->rx_queues[idx] = NULL;
--
2.27.0
[dpdk-dev] [PATCH v4 2/3] net/hns3: support getting Tx and Rx queue information
From: Huisong Li
This patch adds support for querying Rx/Tx queue information.
Signed-off-by: Huisong Li
Signed-off-by: Wei Hu (Xavier)
---
v3 -> v4:
remove unused variable ‘hw’ in hns3_rxq_info_get
and hns3_rxq_info_get function.
---
drivers/net/hns3/hns3_ethdev.c| 2 ++
drivers/net/hns3/hns3_ethdev_vf.c | 2 ++
drivers/net/hns3/hns3_rxtx.c | 31 +++
drivers/net/hns3/hns3_rxtx.h | 5 -
4 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index bcbbd7e81..fab1914c3 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -5422,6 +5422,8 @@ static const struct eth_dev_ops hns3_eth_dev_ops = {
.tx_queue_release = hns3_dev_tx_queue_release,
.rx_queue_intr_enable = hns3_dev_rx_queue_intr_enable,
.rx_queue_intr_disable = hns3_dev_rx_queue_intr_disable,
+ .rxq_info_get = hns3_rxq_info_get,
+ .txq_info_get = hns3_txq_info_get,
.dev_configure = hns3_dev_configure,
.flow_ctrl_get = hns3_flow_ctrl_get,
.flow_ctrl_set = hns3_flow_ctrl_set,
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c
b/drivers/net/hns3/hns3_ethdev_vf.c
index 3156ed7f5..60b576b02 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -2482,6 +2482,8 @@ static const struct eth_dev_ops hns3vf_eth_dev_ops = {
.tx_queue_release = hns3_dev_tx_queue_release,
.rx_queue_intr_enable = hns3_dev_rx_queue_intr_enable,
.rx_queue_intr_disable = hns3_dev_rx_queue_intr_disable,
+ .rxq_info_get = hns3_rxq_info_get,
+ .txq_info_get = hns3_txq_info_get,
.dev_configure = hns3vf_dev_configure,
.mac_addr_add = hns3vf_add_mac_addr,
.mac_addr_remove= hns3vf_remove_mac_addr,
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index 3e5e32e38..fc1a256f3 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -2820,3 +2820,34 @@ void hns3_set_rxtx_function(struct rte_eth_dev *eth_dev)
eth_dev->tx_pkt_prepare = hns3_dummy_rxtx_burst;
}
}
+
+void
+hns3_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+ struct rte_eth_rxq_info *qinfo)
+{
+ struct hns3_rx_queue *rxq = dev->data->rx_queues[queue_id];
+
+ qinfo->mp = rxq->mb_pool;
+ qinfo->nb_desc = rxq->nb_rx_desc;
+ qinfo->scattered_rx = dev->data->scattered_rx;
+
+ /*
+* If there are no available Rx buffer descriptors, incoming packets
+* are always dropped by hardware based on hns3 network engine.
+*/
+ qinfo->conf.rx_drop_en = 1;
+ qinfo->conf.offloads = dev->data->dev_conf.rxmode.offloads;
+ qinfo->conf.rx_free_thresh = rxq->rx_free_thresh;
+ qinfo->conf.rx_deferred_start = rxq->rx_deferred_start;
+}
+
+void
+hns3_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+ struct rte_eth_txq_info *qinfo)
+{
+ struct hns3_tx_queue *txq = dev->data->tx_queues[queue_id];
+
+ qinfo->nb_desc = txq->nb_tx_desc;
+ qinfo->conf.offloads = dev->data->dev_conf.txmode.offloads;
+ qinfo->conf.tx_deferred_start = txq->tx_deferred_start;
+}
diff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h
index 0d20a27c8..f1fb3b56a 100644
--- a/drivers/net/hns3/hns3_rxtx.h
+++ b/drivers/net/hns3/hns3_rxtx.h
@@ -402,5 +402,8 @@ int hns3_set_fake_rx_or_tx_queues(struct rte_eth_dev *dev,
uint16_t nb_rx_q,
int hns3_config_gro(struct hns3_hw *hw, bool en);
int hns3_restore_gro_conf(struct hns3_hw *hw);
void hns3_update_all_queues_pvid_state(struct hns3_hw *hw);
-
+void hns3_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+ struct rte_eth_rxq_info *qinfo);
+void hns3_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+ struct rte_eth_txq_info *qinfo);
#endif /* _HNS3_RXTX_H_ */
--
2.27.0
[dpdk-dev] [PATCH] net/qede: fix dereference before null check
From: Yunjian Wang
Coverity flags that 'fp->sb_info' variable is used before
it's checked for NULL. This patch fixes this issue.
Coverity issue: 260413
Fixes: 4c4bdadfa9e7 ("net/qede: refactoring multi-queue implementation")
Cc: sta...@dpdk.org
Signed-off-by: Yunjian Wang
---
drivers/net/qede/qede_rxtx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index ea264f59d..75d78cebb 100644
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -676,9 +676,9 @@ void qede_dealloc_fp_resc(struct rte_eth_dev *eth_dev)
for (sb_idx = 0; sb_idx < QEDE_RXTX_MAX(qdev); sb_idx++) {
fp = &qdev->fp_array[sb_idx];
- DP_INFO(edev, "Free sb_info index 0x%x\n",
- fp->sb_info->igu_sb_id);
if (fp->sb_info) {
+ DP_INFO(edev, "Free sb_info index 0x%x\n",
+ fp->sb_info->igu_sb_id);
OSAL_DMA_FREE_COHERENT(edev, fp->sb_info->sb_virt,
fp->sb_info->sb_phys,
sizeof(struct status_block));
--
2.23.0
[dpdk-dev] DPDK 20.11 NVIDIA Mellanox Roadmap
Below is NVIDIA Mellanox's roadmap for DPDK20.11, which we are currently working on:  rte_flow API updates: == [1] Support flow-based traffic sampling and mirroring: Packets of a given classification can be cloned at a given sampling rate and forwarded to a vport or queue. Mirroring is provided through the setting of the sampling rate to 100% of the traffic. Motivation: Enable monitoring and statistics on classified traffic for business or lawful interception. Examples: Monitor hairpin traffic that does not reach the application; Mirror traffic for lawful interception use case;  [2] Add rte_flow API for matching on frag/non-frag packets on both IPv4 and IPv6 Support for Ipv4/6, TCP/UDP/ICMP fragmented, and non-fragmented packet. Supported modes: No Fragment, First Fragment, Next Fragment. Motivation: Allow DPDK applications that are using frag modes (e.g. OVS-DPDK) to define it through DPDK rte_flow API.  [3] Add support for extension header in Geneve tunneling Support matching on Geneve options header - TLV and data.  [4] Support Hairpin between different ports in NIC mode Extend current support from "hairpin in the same port" to "hairpin with different ports on the same NIC". Motivation: Provide better utilization of network resources (physical ports) and allow flexible alignment with security, network isolation, and balancing practices.   rte_flow new APIs: === [5] Extend the DPDK flow action API to enable support of a shared rte_flow_action context A modification of a single rte_flow_action context replaces the current approach which requires multiple modifications of (identical) flow actions.  Motivation: When multiple flow rules such as RSS have the same action, this action is cloned and used on each of the flows. Prior to the proposed change, any update to the RSS action (e.g. adding/removing queue) required reconfiguration of all the flows. This re-configuration is non-efficient, and the newly proposed APIs provide means to influence all the relevant flows through a single change in the shared action context that is being used by all the relevant flows.  [6] Allow synced rte_flow rule-management (create/destroy) Add the capability to enforce synchronous rule insertion to simplify DPDK software rule-management. functions in scope: rte_flow_create/destroy.  [7] Add Connection Tracking (CT) abstraction layer for CT offloading Implementation logic is vendor-specific and thus shall be implemented in the PMD by each vendor. Motivation: Allow DPDK application (e.g. OVS-DPDK) to offload the Connection Tracking logic to the NIC.  [8] Add v-tunnel abstraction layer for tunnel offloading Implementation logic is vendor-specific and thus shall be implemented in the PMD by each vendor. Motivation: Allow DPDK application (e.g. OVS-DPDK) to do tunnel offloading.   ethdev API update: === [9] Support buffer split to multiple destinations Provide means to split the buffer in the receive queue and send it to multiple destinations to be handled by CPU, GPU and potentially others. Motivation: Accelerate packet handling by sending the data directly to its processor.   mlx5 PMD updates: [*] mlx5 PMD will support the rte_flow update changes listed above.  Enhanced functionality: [10] Provide visibility on Rx queue status Extend current function (rx_descriptor_status(), rx_descriptor_count (implementation to support vectorized and mprq modes) Motivation: Provides DPDK software with additional monitoring capabilities of the Rx queue status.  Performance improvement [11] Add mlx5 PMD use of vectorized instructions when using Striding RQ (MPRQ) Motivation: Performance improvement and CPU cycles reduction  [12] Added native DPDK support for multi-threaded rte_flow API Motivation: Allow rules insertions and deletions from multiple threads with native sync/lock and inherent improved insertion rate.  [13] Improve performance for aging mechanism, reduce memory consumption for flow and CPU cycles for logic Motivation: Improve performance by reducing the latency of counters reading when such is not required  [14] Improved PCIe performance with flow-tags  [15] Improved PCIe performance with mixed traffic (IPv4/IPv6) and mixed protocols (TCP/UDP)  New DPDK PMD for compression/decompression support: === [16] Implement look aside compression/decompression to support existing rte_compress API Implementation for compress/decompress/dma actions  testpmd updates: === [*] testpmd updated to support the changes listed above.
Re: [dpdk-dev] [dpdk-stable] [PATCH] net/qede: fix dereference before null check
On 8/24/2020 12:46 PM, wangyunjian wrote:
> From: Yunjian Wang
>
> Coverity flags that 'fp->sb_info' variable is used before
> it's checked for NULL. This patch fixes this issue.
>
> Coverity issue: 260413
> Fixes: 4c4bdadfa9e7 ("net/qede: refactoring multi-queue implementation")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Yunjian Wang
Reviewed-by: Ferruh Yigit
[dpdk-dev] [PATCH] net/hinic: fix negative array index read
From: Yunjian Wang
Negative array index read using variable 'i' as an index to array
'filter_info->pkt_filters'. Fixed by add return value check.
Coverity issue: 350364
Fixes: f4ca3fd54c4d ("net/hinic: create and destroy flow director filter")
Cc: sta...@dpdk.org
Signed-off-by: Yunjian Wang
---
drivers/net/hinic/hinic_pmd_flow.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/hinic/hinic_pmd_flow.c
b/drivers/net/hinic/hinic_pmd_flow.c
index 503a32fff..70fd4450c 100644
--- a/drivers/net/hinic/hinic_pmd_flow.c
+++ b/drivers/net/hinic/hinic_pmd_flow.c
@@ -2351,6 +2351,8 @@ hinic_add_del_ethertype_filter(struct rte_eth_dev *dev,
ethertype_filter.pkt_proto = filter->ether_type;
i = hinic_ethertype_filter_lookup(filter_info,
ðertype_filter);
+ if (i < 0)
+ return -EINVAL;
if ((filter_info->type_mask & (1 << i))) {
filter_info->pkt_filters[i].enable = FALSE;
--
2.23.0
Re: [dpdk-dev] [dpdk-stable] [PATCH] net/hinic: fix negative array index read
On 8/24/2020 1:43 PM, wangyunjian wrote:
> From: Yunjian Wang
>
> Negative array index read using variable 'i' as an index to array
> 'filter_info->pkt_filters'. Fixed by add return value check.
>
> Coverity issue: 350364
> Fixes: f4ca3fd54c4d ("net/hinic: create and destroy flow director filter")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Yunjian Wang
Reviewed-by: Ferruh Yigit
[dpdk-dev] [PATCH] bus/dpaa: remove logically dead code
From: Yunjian Wang
This patch removes logically dead code reported by coverity.
Coverity issue: 349930
Fixes: b9c94167904f ("bus/dpaa: decouple FQ portal alloc and init")
Cc: sta...@dpdk.org
Signed-off-by: Yunjian Wang
---
drivers/bus/dpaa/base/qbman/qman_driver.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c
b/drivers/bus/dpaa/base/qbman/qman_driver.c
index 1166d68e2..a466c698f 100644
--- a/drivers/bus/dpaa/base/qbman/qman_driver.c
+++ b/drivers/bus/dpaa/base/qbman/qman_driver.c
@@ -189,8 +189,6 @@ struct qman_portal *fsl_qman_fq_portal_create(int *fd)
*fd = q_fd;
return portal;
err:
- if (portal)
- qman_free_global_portal(portal);
if (q_fd)
close(q_fd);
process_portal_unmap(&q_map.addr);
--
2.23.0
[dpdk-dev] [PATCH 2/2] net/ark: remove RTE_LIBRTE_ARK_PAD_TX configuration macro
Replace behavior with RTE_LIBRTE_ARK_MIN_TX_PKTLEN
with a default value of 0.
Update documentation as needed.
Signed-off-by: Ed Czeck
---
doc/guides/nics/ark.rst | 13 --
drivers/net/ark/ark_ethdev_tx.c | 44 +++--
drivers/net/ark/ark_logs.h | 8 --
3 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst
index c3ffcbbc2..f4d4539e5 100644
--- a/doc/guides/nics/ark.rst
+++ b/doc/guides/nics/ark.rst
@@ -129,8 +129,10 @@ Configuration Information
* **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables inclusion
of the ARK PMD driver in the DPDK compilation.
- * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y): When enabled TX
- packets are padded to 60 bytes to support downstream MACS.
+ * **CONFIG_RTE_LIBRTE_ARK_MIN_TX_PKTLEN** (default 0): Sets the minimum
+packet length for tx packets to the FPGA. Packets less than this
+length are padded to meet the requirement. This allows padding to
+be offloaded or remain in host software.
Building DPDK
@@ -144,6 +146,13 @@ By default the ARK PMD library will be built into the DPDK
library.
For configuring and using UIO and VFIO frameworks, please also refer :ref:`the
documentation that comes with DPDK suite `.
+To build with a non-zero minimum tx packet length, set the above macro in your
+CFLAGS environment prior to the meson build step. I.e.,
+
+export CFLAGS="-DRTE_LIBRTE_ARK_MIN_TX_PKTLEN=60"
+meson build
+
+
Supported ARK RTL PCIe Instances
diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c
index 72624deb3..d24d7ac21 100644
--- a/drivers/net/ark/ark_ethdev_tx.c
+++ b/drivers/net/ark/ark_ethdev_tx.c
@@ -15,6 +15,13 @@
#define ARK_TX_MAX_NOCHAIN (RTE_MBUF_DEFAULT_DATAROOM)
+#ifndef RTE_LIBRTE_ARK_MIN_TX_PKTLEN
+#define ARK_MIN_TX_PKTLEN 0
+#else
+#define ARK_MIN_TX_PKTLEN RTE_LIBRTE_ARK_MIN_TX_PKTLEN
+#endif
+
+
/* * */
struct ark_tx_queue {
struct ark_tx_meta *meta_q;
@@ -91,6 +98,7 @@ eth_ark_xmit_pkts(void *vtxq, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts)
uint32_t prod_index_limit;
int stat;
uint16_t nb;
+ const uint32_t min_pkt_len = ARK_MIN_TX_PKTLEN;
queue = (struct ark_tx_queue *)vtxq;
@@ -104,27 +112,25 @@ eth_ark_xmit_pkts(void *vtxq, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts)
++nb) {
mbuf = tx_pkts[nb];
- if (ARK_TX_PAD_TO_60) {
- if (unlikely(rte_pktmbuf_pkt_len(mbuf) < 60)) {
- /* this packet even if it is small can be split,
-* be sure to add to the end mbuf
+ if (unlikely(rte_pktmbuf_pkt_len(mbuf) < min_pkt_len)) {
+ /* this packet even if it is small can be split,
+* be sure to add to the end mbuf
+*/
+ uint16_t to_add = min_pkt_len -
+ rte_pktmbuf_pkt_len(mbuf);
+ char *appended =
+ rte_pktmbuf_append(mbuf, to_add);
+
+ if (appended == 0) {
+ /* This packet is in error,
+* we cannot send it so just
+* count it and delete it.
*/
- uint16_t to_add =
- 60 - rte_pktmbuf_pkt_len(mbuf);
- char *appended =
- rte_pktmbuf_append(mbuf, to_add);
-
- if (appended == 0) {
- /* This packet is in error,
-* we cannot send it so just
-* count it and delete it.
-*/
- queue->tx_errors += 1;
- rte_pktmbuf_free(mbuf);
- continue;
- }
- memset(appended, 0, to_add);
+ queue->tx_errors += 1;
+ rte_pktmbuf_free(mbuf);
+ continue;
}
+ memset(appended, 0, to_add);
}
if (unlikely(mbuf->nb_segs != 1)) {
diff --git a/drivers/net/ark/ark_logs.h b/drivers/net/ark/ark_logs.h
index c3d7e7d39..ca46d86c9 100644
--- a/drivers/net/ark/ark_logs.h
+++ b/drivers/net/ark/ark_logs.h
@@ -8,14 +8,6 @@
#include
#include
-
-/* Configuration option to pad TX packets to 60 bytes */
-#ifdef RTE_LIBRTE_ARK_PAD_TX
-#de
[dpdk-dev] [PATCH 1/2] net/ark: remove compile time log macros in favor of run time log control
Use ARK_PMD_LOG in place of PMD_DRV_LOG, PMD_DEBUG_LOG, PMD_FUNC_LOG,
PMD_STATS_LOG, PMD_RX_LOG, and PMD_TX_LOG.
Review and adjust log levels and messages as needed.
Signed-off-by: Ed Czeck
---
doc/guides/nics/ark.rst | 13 --
drivers/net/ark/ark_ddm.c | 12 ++---
drivers/net/ark/ark_ethdev.c| 77 +++--
drivers/net/ark/ark_ethdev_rx.c | 46 ++--
drivers/net/ark/ark_ethdev_tx.c | 10 ++---
drivers/net/ark/ark_logs.h | 63 +++
drivers/net/ark/ark_mpu.c | 32 --
drivers/net/ark/ark_pktchkr.c | 36 +++
drivers/net/ark/ark_pktdir.c| 2 +-
drivers/net/ark/ark_pktgen.c| 22 +-
drivers/net/ark/ark_rqp.c | 4 +-
drivers/net/ark/ark_udm.c | 18
12 files changed, 125 insertions(+), 210 deletions(-)
diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst
index 06e8c3374..c3ffcbbc2 100644
--- a/doc/guides/nics/ark.rst
+++ b/doc/guides/nics/ark.rst
@@ -132,19 +132,6 @@ Configuration Information
* **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y): When enabled TX
packets are padded to 60 bytes to support downstream MACS.
- * **CONFIG_RTE_LIBRTE_ARK_DEBUG_RX** (default n): Enables or disables debug
- logging and internal checking of RX ingress logic within the ARK PMD
driver.
-
- * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TX** (default n): Enables or disables debug
- logging and internal checking of TX egress logic within the ARK PMD
driver.
-
- * **CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS** (default n): Enables or disables
debug
- logging of detailed packet and performance statistics gathered in
- the PMD and FPGA.
-
- * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE** (default n): Enables or disables
debug
- logging of detailed PMD events and status.
-
Building DPDK
-
diff --git a/drivers/net/ark/ark_ddm.c b/drivers/net/ark/ark_ddm.c
index 57026f8d1..91d1179d8 100644
--- a/drivers/net/ark/ark_ddm.c
+++ b/drivers/net/ark/ark_ddm.c
@@ -13,19 +13,19 @@ ark_ddm_verify(struct ark_ddm_t *ddm)
{
uint32_t hw_const;
if (sizeof(struct ark_ddm_t) != ARK_DDM_EXPECTED_SIZE) {
- PMD_DRV_LOG(ERR, "ARK: DDM structure looks incorrect %d vs
%zd\n",
+ ARK_PMD_LOG(ERR, "DDM structure looks incorrect %d vs %zd\n",
ARK_DDM_EXPECTED_SIZE, sizeof(struct ark_ddm_t));
return -1;
}
hw_const = ddm->cfg.const0;
if (hw_const == ARK_DDM_CONST1) {
- PMD_DRV_LOG(ERR,
+ ARK_PMD_LOG(ERR,
"ARK: DDM module is version 1, "
"PMD expects version 2\n");
return -1;
} else if (hw_const != ARK_DDM_CONST2) {
- PMD_DRV_LOG(ERR,
+ ARK_PMD_LOG(ERR,
"ARK: DDM module not found as expected 0x%08x\n",
ddm->cfg.const0);
return -1;
@@ -63,7 +63,7 @@ ark_ddm_reset(struct ark_ddm_t *ddm)
status = ark_ddm_stop(ddm, 1);
if (status != 0) {
- PMD_DEBUG_LOG(INFO, "%s stop failed doing forced reset\n",
+ ARK_PMD_LOG(NOTICE, "%s stop failed doing forced reset\n",
__func__);
ddm->cfg.command = 4;
usleep(10);
@@ -87,7 +87,7 @@ ark_ddm_stats_reset(struct ark_ddm_t *ddm)
void
ark_ddm_dump(struct ark_ddm_t *ddm, const char *msg)
{
- PMD_FUNC_LOG(DEBUG, "%s Stopped: %d\n", msg,
+ ARK_PMD_LOG(DEBUG, "%s Stopped: %d\n", msg,
ark_ddm_is_stopped(ddm)
);
}
@@ -97,7 +97,7 @@ ark_ddm_dump_stats(struct ark_ddm_t *ddm, const char *msg)
{
struct ark_ddm_stats_t *stats = &ddm->stats;
- PMD_STATS_LOG(INFO, "DDM Stats: %s"
+ ARK_PMD_LOG(INFO, "DDM Stats: %s"
ARK_SU64 ARK_SU64 ARK_SU64
"\n", msg,
"Bytes:", stats->tx_byte_count,
diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
index b32ccd867..646427d0c 100644
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -164,26 +164,26 @@ check_for_ext(struct ark_adapter *ark)
const char *dllpath = getenv("ARK_EXT_PATH");
if (dllpath == NULL) {
- PMD_DEBUG_LOG(DEBUG, "ARK EXT NO dll path specified\n");
+ ARK_PMD_LOG(DEBUG, "EXT NO dll path specified\n");
return 0;
}
- PMD_DRV_LOG(INFO, "ARK EXT found dll path at %s\n", dllpath);
+ ARK_PMD_LOG(NOTICE, "EXT found dll path at %s\n", dllpath);
/* Open and load the .so */
ark->d_handle = dlopen(dllpath, RTLD_LOCAL | RTLD_LAZY);
if (ark->d_handle == NULL) {
- PMD_DRV_LOG(ERR, "Could not load user extension %s\n",
+ ARK_PMD_LOG(ERR, "Could not load user extension %s\n"
Re: [dpdk-dev] [dpdk-stable] 19.11.4 patches review and test
On Mon, 2020-08-24 at 15:22 +0200, Christian Ehrhardt wrote: > On Tue, Aug 18, 2020 at 8:12 PM Luca Boccassi wrote: > > Hi all, > > > > Here is a list of patches targeted for stable release 19.11.4. > > > > The planned date for the final release is August 31st. > > > > Please help with testing and validation of your use cases and report > > any issues/results with reply-all to this mail. For the final release > > the fixes and reported validations will be added to the release notes. > > > > A release candidate tarball can be found at: > > > > https://dpdk.org/browse/dpdk-stable/tag/?id=v19.11.4-rc1 > > Build tested on all Ubuntu architectures and pushed through some > OVS-DPDK based tests on x86. > Working fine in these setups. Thank you! -- Kind regards, Luca Boccassi
Re: [dpdk-dev] 19.11.4 patches review and test
On Tue, Aug 18, 2020 at 8:12 PM Luca Boccassi wrote: > > Hi all, > > Here is a list of patches targeted for stable release 19.11.4. > > The planned date for the final release is August 31st. > > Please help with testing and validation of your use cases and report > any issues/results with reply-all to this mail. For the final release > the fixes and reported validations will be added to the release notes. > > A release candidate tarball can be found at: > > https://dpdk.org/browse/dpdk-stable/tag/?id=v19.11.4-rc1 Build tested on all Ubuntu architectures and pushed through some OVS-DPDK based tests on x86. Working fine in these setups. > These patches are located at branch 19.11 of dpdk-stable repo: > https://dpdk.org/browse/dpdk-stable/ > > Thanks. > > Luca Boccassi > > --- > Adam Dybkowski (7): > test/crypto: fix asymmetric session mempool creation > crypto/qat: fix AES-XTS capabilities > crypto/qat: handle mixed hash-cipher requests on GEN3 > test/crypto: add mixed encypted-digest > common/qat: get firmware version > crypto/qat: handle mixed hash-cipher on GEN2 > common/qat: fix uninitialized variable > > Akhil Goyal (4): > crypto/dpaax_sec: fix 18-bit PDCP cases with HFN override > crypto/dpaax_sec: fix inline query for descriptors > crypto/dpaa2_sec: fix HFN override > common/dpaax: fix 12-bit null auth case > > Alan Dewar (1): > sched: fix port time rounding > > Alexander Kozyrev (3): > net/mlx5: fix vectorized Rx burst termination > net/mlx5: do not select legacy MPW implicitly > net/mlx5: fix descriptors number adjustment > > Ali Alnubani (2): > net/mlx5: fix typos in meter error messages > doc: fix a typo in mlx5 guide > > Alvin Zhang (1): > net/i40e: fix queue pairs configuration in VF > > Andrew Rybchenko (1): > net/sfc: do not enforce hash offload in RSS multi-queue > > Ankur Dwivedi (2): > common/cpt: fix encryption offset > test/crypto: change cipher offset for ESN vector > > Apeksha Gupta (2): > app/eventdev: fix capability check in pipeline ATQ test > event/dpaa2: add all-types queue capability flag > > Archana Muniganti (2): > examples/fips_validation: fix TDES interim callback > examples/fips_validation: fix count overwrite for TDES > > Archit Pandey (1): > sched: fix 64-bit rate > > Arek Kusztal (4): > drivers/qat: improve multi process on qat > drivers/qat: add multi process handling of driver id > drivers/qat: add handling of capabilities in multi process > crypto/qat: add minimum enq threshold > > Ayuj Verma (1): > examples/fips_validation: fix parsing of TDES vectors > > Bruce Richardson (12): > test: fix build with ring PMD but no bond PMD > mem: fix 32-bit init config with meson > rawdev: allow getting info for unknown device > rawdev: fill NUMA socket ID in info > rawdev: export dump function in map file > doc: rebuild with meson whenever a file changes > build: always link whole DPDK static libraries > devtools: test static linkage with pkg-config > build/pkg-config: move pkg-config file creation > build/pkg-config: output drivers first for static build > build/pkg-config: improve static linking flags > build/pkg-config: prevent overlinking > > Chas Williams (1): > net/netvsc: fix crash during Tx > > Chenbo Xia (1): > net/virtio-user: check tap system call setting > > Chengchang Tang (5): > net/hns3: clear promiscuous on PF uninit > net/hns3: remove unsupported VLAN capabilities > net/hns3: fix VLAN strip configuration when setting PVID > net/hns3: remove restriction on setting VF MTU > net/hns3: fix adding multicast MAC address > > Chenmin Sun (1): > net/i40e: fix flow director Rx writeback packet > > Ciara Loftus (1): > net/af_xdp: remove mempool freeing on umem destruction > > David Marchand (7): > eal/windows: fix symbol export > eal: remove redundant newline in alert message > net/mlx5: remove redundant newline from logs > net/mvpp2: fix non-EAL thread support > devtools: fix path in forbidden token check > lib: remind experimental status in headers > net/bonding: fix socket ID check > > Dekel Peled (2): > net/mlx5: fix VLAN pop with decap action validation > net/mlx5: fix VLAN push action on hairpin queue > > Devendra Singh Rawat (1): > net/qede: fix multicast drop in promiscuous mode > > Dong Zhou (1): > net/mlx5: fix LRO checksum > > Dongyang Pan (1): > net/bonding: delete redundant code > > Fady Bader (1): > meter: remove inline functions from export list > > Feifei Wang (1): > test/ring: fix statistics in bulk enq/dequeue > > Ferruh Yigit (4): > net/iavf: fix uninitialized variable > net/ixgbe/base: remove dead code > ethdev: fix log type for some error
Re: [dpdk-dev] [PATCH 1/2] net/ark: remove compile time log macros in favor of run time log control
On 8/24/2020 2:36 PM, Ed Czeck wrote: > Use ARK_PMD_LOG in place of PMD_DRV_LOG, PMD_DEBUG_LOG, PMD_FUNC_LOG, > PMD_STATS_LOG, PMD_RX_LOG, and PMD_TX_LOG. > Review and adjust log levels and messages as needed. > > Signed-off-by: Ed Czeck > --- > doc/guides/nics/ark.rst | 13 -- > drivers/net/ark/ark_ddm.c | 12 ++--- > drivers/net/ark/ark_ethdev.c| 77 +++-- > drivers/net/ark/ark_ethdev_rx.c | 46 ++-- > drivers/net/ark/ark_ethdev_tx.c | 10 ++--- > drivers/net/ark/ark_logs.h | 63 +++ > drivers/net/ark/ark_mpu.c | 32 -- > drivers/net/ark/ark_pktchkr.c | 36 +++ > drivers/net/ark/ark_pktdir.c| 2 +- > drivers/net/ark/ark_pktgen.c| 22 +- > drivers/net/ark/ark_rqp.c | 4 +- > drivers/net/ark/ark_udm.c | 18 > 12 files changed, 125 insertions(+), 210 deletions(-) > > diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst > index 06e8c3374..c3ffcbbc2 100644 > --- a/doc/guides/nics/ark.rst > +++ b/doc/guides/nics/ark.rst > @@ -132,19 +132,6 @@ Configuration Information > * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y): When enabled TX > packets are padded to 60 bytes to support downstream MACS. > > - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_RX** (default n): Enables or disables > debug > - logging and internal checking of RX ingress logic within the ARK PMD > driver. > - > - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TX** (default n): Enables or disables > debug > - logging and internal checking of TX egress logic within the ARK PMD > driver. > - > - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS** (default n): Enables or disables > debug > - logging of detailed packet and performance statistics gathered in > - the PMD and FPGA. > - > - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE** (default n): Enables or disables > debug > - logging of detailed PMD events and status. > - Can you please remove these config option from 'config/common_base'?
Re: [dpdk-dev] [PATCH 1/2] net/ark: remove compile time log macros in favor of run time log control
On Mon, Aug 24, 2020 at 03:37:53PM +0100, Ferruh Yigit wrote: > On 8/24/2020 2:36 PM, Ed Czeck wrote: > > Use ARK_PMD_LOG in place of PMD_DRV_LOG, PMD_DEBUG_LOG, PMD_FUNC_LOG, > > PMD_STATS_LOG, PMD_RX_LOG, and PMD_TX_LOG. > > Review and adjust log levels and messages as needed. > > > > Signed-off-by: Ed Czeck > > --- > > doc/guides/nics/ark.rst | 13 -- > > drivers/net/ark/ark_ddm.c | 12 ++--- > > drivers/net/ark/ark_ethdev.c| 77 +++-- > > drivers/net/ark/ark_ethdev_rx.c | 46 ++-- > > drivers/net/ark/ark_ethdev_tx.c | 10 ++--- > > drivers/net/ark/ark_logs.h | 63 +++ > > drivers/net/ark/ark_mpu.c | 32 -- > > drivers/net/ark/ark_pktchkr.c | 36 +++ > > drivers/net/ark/ark_pktdir.c| 2 +- > > drivers/net/ark/ark_pktgen.c| 22 +- > > drivers/net/ark/ark_rqp.c | 4 +- > > drivers/net/ark/ark_udm.c | 18 > > 12 files changed, 125 insertions(+), 210 deletions(-) > > > > diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst > > index 06e8c3374..c3ffcbbc2 100644 > > --- a/doc/guides/nics/ark.rst > > +++ b/doc/guides/nics/ark.rst > > @@ -132,19 +132,6 @@ Configuration Information > > * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y): When enabled TX > > packets are padded to 60 bytes to support downstream MACS. > > > > - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_RX** (default n): Enables or disables > > debug > > - logging and internal checking of RX ingress logic within the ARK PMD > > driver. > > - > > - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TX** (default n): Enables or disables > > debug > > - logging and internal checking of TX egress logic within the ARK PMD > > driver. > > - > > - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS** (default n): Enables or > > disables debug > > - logging of detailed packet and performance statistics gathered in > > - the PMD and FPGA. > > - > > - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE** (default n): Enables or > > disables debug > > - logging of detailed PMD events and status. > > - > > Can you please remove these config option from 'config/common_base'? > Given that the file is scheduled for deletion fairly soon, not sure if that is worthwhile doing.
Re: [dpdk-dev] [PATCH 2/2] net/ark: remove RTE_LIBRTE_ARK_PAD_TX configuration macro
On 8/24/2020 2:36 PM, Ed Czeck wrote: > Replace behavior with RTE_LIBRTE_ARK_MIN_TX_PKTLEN > with a default value of 0. > Update documentation as needed. > > Signed-off-by: Ed Czeck > --- > doc/guides/nics/ark.rst | 13 -- > drivers/net/ark/ark_ethdev_tx.c | 44 +++-- > drivers/net/ark/ark_logs.h | 8 -- > 3 files changed, 36 insertions(+), 29 deletions(-) > > diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst > index c3ffcbbc2..f4d4539e5 100644 > --- a/doc/guides/nics/ark.rst > +++ b/doc/guides/nics/ark.rst > @@ -129,8 +129,10 @@ Configuration Information > * **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables inclusion > of the ARK PMD driver in the DPDK compilation. > > - * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y): When enabled TX > - packets are padded to 60 bytes to support downstream MACS. > + * **CONFIG_RTE_LIBRTE_ARK_MIN_TX_PKTLEN** (default 0): Sets the minimum > +packet length for tx packets to the FPGA. Packets less than this > +length are padded to meet the requirement. This allows padding to > +be offloaded or remain in host software. > There is no 'CONFIG_RTE_LIBRTE_ARK_MIN_TX_PKTLEN' option, I think it is confusing to add it to documentation. There is already some documentation in below for 'RTE_LIBRTE_ARK_MIN_TX_PKTLEN', what do you think removing this part? And can you please remove 'CONFIG_RTE_LIBRTE_ARK_PAD_TX' form 'config/common_base'? Another option is, do you think does it help your users to keep the config name same, like keep the 'CONFIG_RTE_LIBRTE_ARK_PAD_TX' as 'RTE_LIBRTE_ARK_PAD_TX' for the meson CFLAGs, instead of renaming it to 'RTE_LIBRTE_ARK_MIN_TX_PKTLEN'?
[dpdk-dev] Misuses of dev_info->if_index in embedded drivers.
The use of if_index in some drivers is wrong.
It does not match the user expectation in the documentation.
This code:
dpaa2/dpaa2_ethdev.c: dev_info->if_index = priv->hw_id;
pfe/pfe_ethdev.c: dev_info->if_index = internals->id;
Does match:
struct rte_eth_dev_info {
struct rte_device *device; /** Generic device information */
const char *driver_name; /**< Device Driver name. */
unsigned int if_index; /**< Index to bound host interface, or 0 if none.
Use if_indextoname() to translate into an interface name. */
Also, this code is unnecessary.
Re: [dpdk-dev] [PATCH 1/2] net/ark: remove compile time log macros in favor of run time log control
On 8/24/2020 3:40 PM, Bruce Richardson wrote: > On Mon, Aug 24, 2020 at 03:37:53PM +0100, Ferruh Yigit wrote: >> On 8/24/2020 2:36 PM, Ed Czeck wrote: >>> Use ARK_PMD_LOG in place of PMD_DRV_LOG, PMD_DEBUG_LOG, PMD_FUNC_LOG, >>> PMD_STATS_LOG, PMD_RX_LOG, and PMD_TX_LOG. >>> Review and adjust log levels and messages as needed. >>> >>> Signed-off-by: Ed Czeck >>> --- >>> doc/guides/nics/ark.rst | 13 -- >>> drivers/net/ark/ark_ddm.c | 12 ++--- >>> drivers/net/ark/ark_ethdev.c| 77 +++-- >>> drivers/net/ark/ark_ethdev_rx.c | 46 ++-- >>> drivers/net/ark/ark_ethdev_tx.c | 10 ++--- >>> drivers/net/ark/ark_logs.h | 63 +++ >>> drivers/net/ark/ark_mpu.c | 32 -- >>> drivers/net/ark/ark_pktchkr.c | 36 +++ >>> drivers/net/ark/ark_pktdir.c| 2 +- >>> drivers/net/ark/ark_pktgen.c| 22 +- >>> drivers/net/ark/ark_rqp.c | 4 +- >>> drivers/net/ark/ark_udm.c | 18 >>> 12 files changed, 125 insertions(+), 210 deletions(-) >>> >>> diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst >>> index 06e8c3374..c3ffcbbc2 100644 >>> --- a/doc/guides/nics/ark.rst >>> +++ b/doc/guides/nics/ark.rst >>> @@ -132,19 +132,6 @@ Configuration Information >>> * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y): When enabled TX >>> packets are padded to 60 bytes to support downstream MACS. >>> >>> - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_RX** (default n): Enables or disables >>> debug >>> - logging and internal checking of RX ingress logic within the ARK PMD >>> driver. >>> - >>> - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TX** (default n): Enables or disables >>> debug >>> - logging and internal checking of TX egress logic within the ARK PMD >>> driver. >>> - >>> - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS** (default n): Enables or >>> disables debug >>> - logging of detailed packet and performance statistics gathered in >>> - the PMD and FPGA. >>> - >>> - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE** (default n): Enables or >>> disables debug >>> - logging of detailed PMD events and status. >>> - >> >> Can you please remove these config option from 'config/common_base'? >> > Given that the file is scheduled for deletion fairly soon, not sure if that > is worthwhile doing. > Since there is possible new version already because of comment in 2/2, I think better to update 'config/common_base' for the sake of completeness. But if there won't be a new version, this can be skipped pragmatically.
Re: [dpdk-dev] [PATCH v2 1/3] eal: add API for bus close
On Mon, 24 Aug 2020 13:54:12 +0530
rohit@nxp.com wrote:
> + if (vbus) {
> + if (vbus->close) {
Looks good, minor nit.
This could be:
if (vbus && vbus->close) {
Re: [dpdk-dev] Misuses of dev_info->if_index in embedded drivers.
On 8/24/2020 4:07 PM, Stephen Hemminger wrote:
> The use of if_index in some drivers is wrong.
> It does not match the user expectation in the documentation.
>
> This code:
> dpaa2/dpaa2_ethdev.c: dev_info->if_index = priv->hw_id;
> pfe/pfe_ethdev.c: dev_info->if_index = internals->id;
>
> Does match:
> struct rte_eth_dev_info {
> struct rte_device *device; /** Generic device information */
> const char *driver_name; /**< Device Driver name. */
> unsigned int if_index; /**< Index to bound host interface, or 0 if none.
> Use if_indextoname() to translate into an interface name. */
>
> Also, this code is unnecessary.
>
'if_index' is needed only for some PMDs interact with kernel, like af_packet,
pcap, tap, af_xdp, ...
Agree that it should not be needed for 'dpaa2' or 'pfe'.
Re: [dpdk-dev] Misuses of dev_info->if_index in embedded drivers.
> -Original Message-
> From: Ferruh Yigit
> Sent: Monday, August 24, 2020 8:49 PM
> To: Stephen Hemminger ; Hemant Agrawal
> ; Sachin Saxena
> Cc: dev@dpdk.org; Gagandeep Singh ; Akhil Goyal
>
> Subject: Re: [dpdk-dev] Misuses of dev_info->if_index in embedded drivers.
>
> On 8/24/2020 4:07 PM, Stephen Hemminger wrote:
> > The use of if_index in some drivers is wrong.
> > It does not match the user expectation in the documentation.
> >
> > This code:
> > dpaa2/dpaa2_ethdev.c: dev_info->if_index = priv->hw_id;
> > pfe/pfe_ethdev.c: dev_info->if_index = internals->id;
> >
> > Does match:
> > struct rte_eth_dev_info {
> > struct rte_device *device; /** Generic device information */
> > const char *driver_name; /**< Device Driver name. */
> > unsigned int if_index; /**< Index to bound host interface, or 0 if
> none.
> > Use if_indextoname() to translate into an interface name. */
> >
> > Also, this code is unnecessary.
> >
>
> 'if_index' is needed only for some PMDs interact with kernel, like af_packet,
> pcap, tap, af_xdp, ...
>
> Agree that it should not be needed for 'dpaa2' or 'pfe'.
[Hemant] ok. We will check and remove it.
[dpdk-dev] [PATCH 1/2] doc/linux_gsg: clarify instructions on running as non-root
The current instructions are slightly out of date when it comes to providing information about setting up the system for using DPDK as non-root, so update them. Cc: sta...@dpdk.org Signed-off-by: Anatoly Burakov --- doc/guides/linux_gsg/enable_func.rst | 54 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/doc/guides/linux_gsg/enable_func.rst b/doc/guides/linux_gsg/enable_func.rst index b2bda80bb7..78b0f7c012 100644 --- a/doc/guides/linux_gsg/enable_func.rst +++ b/doc/guides/linux_gsg/enable_func.rst @@ -58,22 +58,34 @@ The application can then determine what action to take, if any, if the HPET is n if any, and on what is available on the system at runtime. Running DPDK Applications Without Root Privileges - +- -.. note:: +In order to run DPDK as non-root, the following Linux filesystem objects' +permissions should be adjusted to ensure that the Linux account being used to +run the DPDK application has access to them: -The instructions below will allow running DPDK as non-root with older -Linux kernel versions. However, since version 4.0, the kernel does not allow -unprivileged processes to read the physical address information from -the pagemaps file, making it impossible for those processes to use HW -devices which require physical addresses +* All directories which serve as hugepage mount points, for example, ``/dev/hugepages`` -Although applications using the DPDK use network ports and other hardware resources directly, -with a number of small permission adjustments it is possible to run these applications as a user other than "root". -To do so, the ownership, or permissions, on the following Linux file system objects should be adjusted to ensure that -the Linux user account being used to run the DPDK application has access to them: +* If the HPET is to be used, ``/dev/hpet`` -* All directories which serve as hugepage mount points, for example, ``/mnt/huge`` +When running as non-root user, there may be some additional resource limits +that are imposed by the system. Specifically, the following resource limits may +need to be adjusted in order to ensure normal DPDK operation: + +* RLIMIT_LOCKS (number of file locks that can be held by a process) + +* RLIMIT_NOFILE (number of open file descriptors that can be held open by a process) + +* RLIMIT_MEMLOCK (amount of pinned pages the process is allowed to have) + +The above limits can usually be adjusted by editing +``/etc/security/limits.conf`` file, and rebooting. + +Additionally, depending on which kernel driver is in use, the relevant +resources also should be accessible by the user running the DPDK application. + +For ``igb_uio`` or ``uio_pci_generic`` kernel drivers, the following Linux file +system objects' permissions should be adjusted: * The userspace-io device files in ``/dev``, for example, ``/dev/uio0``, ``/dev/uio1``, and so on @@ -82,11 +94,23 @@ the Linux user account being used to run the DPDK application has access to them /sys/class/uio/uio0/device/config /sys/class/uio/uio0/device/resource* -* If the HPET is to be used, ``/dev/hpet`` - .. note:: -On some Linux installations, ``/dev/hugepages`` is also a hugepage mount point created by default. +The instructions above will allow running DPDK with ``igb_uio`` driver as +non-root with older Linux kernel versions. However, since version 4.0, the +kernel does not allow unprivileged processes to read the physical address +information from the pagemaps file, making it impossible for those +processes to be used by non-privileged users. In such cases, using the VFIO +driver is recommended. + +For ``vfio-pci`` kernel driver, the following Linux file system objects' +permissions should be adjusted: + +* The VFIO device file , ``/dev/vfio/vfio`` + +* The directories under ``/dev/vfio`` that correspond to IOMMU group numbers of + devices intended to be used by DPDK, for example, ``/dev/vfio/50`` + Power Management and Power Saving Functionality --- -- 2.17.1
[dpdk-dev] [PATCH 2/2] doc/linux_gsg: update information on using hugepages
Current information regarding hugepage usage is a little out of date. Update it to include information on in-memory mode, as well as on default mountpoints provided by systemd. Cc: sta...@dpdk.org Signed-off-by: Anatoly Burakov --- doc/guides/linux_gsg/sys_reqs.rst | 39 +++ 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst index a124656bcb..2ddd7ed667 100644 --- a/doc/guides/linux_gsg/sys_reqs.rst +++ b/doc/guides/linux_gsg/sys_reqs.rst @@ -155,8 +155,12 @@ Without hugepages, high TLB miss rates would occur with the standard 4k page siz Reserving Hugepages for DPDK Use -The allocation of hugepages should be done at boot time or as soon as possible after system boot -to prevent memory from being fragmented in physical memory. +The allocation of hugepages can be performed either at run time or at boot time. +In the general case, reserving hugepages at run time is perfectly fine, but in +use cases where having lots of physically contiguous memory is required, it is +preferable to reserve hugepages at boot time, as that will help in preventing +physical memory from becoming heavily fragmented. + To reserve hugepages at boot time, a parameter is passed to the Linux kernel on the kernel command line. For 2 MB pages, just pass the hugepages option to the kernel. For example, to reserve 1024 pages of 2 MB, use:: @@ -187,9 +191,9 @@ See the Documentation/admin-guide/kernel-parameters.txt file in your Linux sourc **Alternative:** -For 2 MB pages, there is also the option of allocating hugepages after the system has booted. +There is also the option of allocating hugepages after the system has booted. This is done by echoing the number of hugepages required to a nr_hugepages file in the ``/sys/devices/`` directory. -For a single-node system, the command to use is as follows (assuming that 1024 pages are required):: +For a single-node system, the command to use is as follows (assuming that 1024 of 2MB pages are required):: echo 1024 > /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages @@ -198,22 +202,27 @@ On a NUMA machine, pages should be allocated explicitly on separate nodes:: echo 1024 > /sys/devices/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages echo 1024 > /sys/devices/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages -.. note:: - -For 1G pages, it is not possible to reserve the hugepage memory after the system has booted. - Using Hugepages with the DPDK ^ -Once the hugepage memory is reserved, to make the memory available for DPDK use, perform the following steps:: +If secondary process support is not required, DPDK is able to use hugepages +without any configuration by using "in-memory" mode. Please see +:ref:`linux_eal_parameters` for more details. + +If secondary process support is required, mount points for hugepages need to be +created. On modern Linux distributions, a default mount point for hugepages is provided +by the system and is located at ``/dev/hugepages``. This mount point will use the +default hugepage size set by the kernel parameters as described above. + +However, in order to use multiple hugepage sizes, it is necessary to manually +create mount points for hugepage sizes that are not provided by the system +(e.g. 1GB pages). + +To make the hugepages of size 1GB available for DPDK use, perform the following steps:: mkdir /mnt/huge -mount -t hugetlbfs nodev /mnt/huge +mount -t hugetlbfs pagesize=1GB /mnt/huge The mount point can be made permanent across reboots, by adding the following line to the ``/etc/fstab`` file:: -nodev /mnt/huge hugetlbfs defaults 0 0 - -For 1GB pages, the page size must be specified as a mount option:: - -nodev /mnt/huge_1GB hugetlbfs pagesize=1GB 0 0 +nodev /mnt/huge hugetlbfs pagesize=1GB 0 0 -- 2.17.1
[dpdk-dev] [PATCH] doc: add stack mempool guide
This guide describes the two stack modes, their tradeoffs, and (via a reference to the mempool guide) how to enable them. Signed-off-by: Gage Eads --- v2: Added commit description doc/guides/mempool/index.rst | 1 + doc/guides/mempool/stack.rst | 38 +++ doc/guides/prog_guide/mempool_lib.rst | 2 ++ doc/guides/prog_guide/stack_lib.rst | 4 4 files changed, 45 insertions(+) create mode 100644 doc/guides/mempool/stack.rst diff --git a/doc/guides/mempool/index.rst b/doc/guides/mempool/index.rst index bbd02fd81..a0e55467e 100644 --- a/doc/guides/mempool/index.rst +++ b/doc/guides/mempool/index.rst @@ -14,3 +14,4 @@ application through the mempool API. octeontx octeontx2 ring +stack diff --git a/doc/guides/mempool/stack.rst b/doc/guides/mempool/stack.rst new file mode 100644 index 0..3baa774f3 --- /dev/null +++ b/doc/guides/mempool/stack.rst @@ -0,0 +1,38 @@ +.. SPDX-License-Identifier: BSD-3-Clause +Copyright(c) 2020 Intel Corporation. + +Stack Mempool Driver +=== + +**rte_mempool_stack** is a pure software mempool driver based on the +``rte_stack`` DPDK library. A stack-based mempool is often better suited to +packet-processing workloads than a ring-based mempool, since its LIFO behavior +results in better temporal locality and a minimal memory footprint even if the +mempool is over-provisioned. + +The following modes of operation are available for the stack mempool driver and +can be selected as described in :ref:`Mempool_Handlers`: + +- ``stack`` + + The underlying **rte_stack** operates in standard (lock-based) mode. + For more information please refer to :ref:`Stack_Library_Std_Stack`. + +- ``lf_stack`` + + The underlying **rte_stack** operates in lock-free mode. For more + information please refer to :ref:`Stack_Library_LF_Stack`. + +The standard stack outperforms the lock-free stack on average, however the +standard stack is non-preemptive: if a mempool user is preempted while holding +the stack lock, that thread will block all other mempool accesses until it +returns and releases the lock. As a result, an application using the standard +stack whose threads can be preempted can suffer from brief, infrequent +performance hiccups. + +The lock-free stack, by design, is not susceptible to this problem; one thread can +be preempted at any point during a push or pop operation and will not impede +the progress of any other thread. + +For a more detailed description of the stack implementations, please refer to +:doc:`../prog_guide/stack_lib`. diff --git a/doc/guides/prog_guide/mempool_lib.rst b/doc/guides/prog_guide/mempool_lib.rst index e3e1f940b..6f3c0067f 100644 --- a/doc/guides/prog_guide/mempool_lib.rst +++ b/doc/guides/prog_guide/mempool_lib.rst @@ -105,6 +105,8 @@ These user-owned caches can be explicitly passed to ``rte_mempool_generic_put()` The ``rte_mempool_default_cache()`` call returns the default internal cache if any. In contrast to the default caches, user-owned caches can be used by unregistered non-EAL threads too. +.. _Mempool_Handlers: + Mempool Handlers diff --git a/doc/guides/prog_guide/stack_lib.rst b/doc/guides/prog_guide/stack_lib.rst index 8fe8804e3..3097cab0c 100644 --- a/doc/guides/prog_guide/stack_lib.rst +++ b/doc/guides/prog_guide/stack_lib.rst @@ -28,6 +28,8 @@ Implementation The library supports two types of stacks: standard (lock-based) and lock-free. Both types use the same set of interfaces, but their implementations differ. +.. _Stack_Library_Std_Stack: + Lock-based Stack @@ -35,6 +37,8 @@ The lock-based stack consists of a contiguous array of pointers, a current index, and a spinlock. Accesses to the stack are made multi-thread safe by the spinlock. +.. _Stack_Library_LF_Stack: + Lock-free Stack -- -- 2.13.6
Re: [dpdk-dev] [PATCH v2] usertools/dpdk-devbind: add support for PCI wildcards
On Fri, Aug 21, 2020 at 10:17:14AM +0100, Burakov, Anatoly wrote:
> On 20-Aug-20 4:43 PM, Bruce Richardson wrote:
> > When binding or unbinding a range of devices, it can be useful to use
> > wildcards to specify the devices rather than repeating the same prefix
> > multiple times. We can use the python "glob" module to give us this
> > functionality - at least for PCI devices - by checking /sys for matching
> > files.
> >
> > Examples of use from my system:
> >
> > ./dpdk-devbind.py -b vfio-pci 80:04.*
> > ./dpdk-devbind.py -u 80:04.[2-7]
> >
> > The first example binds eight devices, 80:04.0..80:04.7, to vfio-pci. The
> > second then unbinds six of those devices, 80:04.2..80:04.7, from any
> > driver.
> >
> > Signed-off-by: Bruce Richardson
> > Tested-by: Ferruh Yigit
> > ---
> > V2: added help text additions
> > ---
> > usertools/dpdk-devbind.py | 16
> > 1 file changed, 16 insertions(+)
> >
> > diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py
> > index 86b6b53c40..d13defbe1a 100755
> > --- a/usertools/dpdk-devbind.py
> > +++ b/usertools/dpdk-devbind.py
> > @@ -8,6 +8,7 @@
> > import os
> > import getopt
> > import subprocess
> > +from glob import glob
> > from os.path import exists, abspath, dirname, basename
> > if sys.version_info.major < 3:
> > @@ -89,6 +90,8 @@ def usage():
> > where DEVICE1, DEVICE2 etc, are specified via PCI "domain:bus:slot.func"
> > syntax
> > or "bus:slot.func" syntax. For devices bound to Linux kernel drivers,
> > they may
> > also be referred to by Linux interface name e.g. eth0, eth1, em0, em1,
> > etc.
> > +If devices are specified using PCI bus:device:func format, then
> > +shell wildcards and ranges may be used, e.g. 80:04.*, 80:04.[0-3]
> > Options:
> > --help, --usage:
> > @@ -145,6 +148,9 @@ def usage():
> > To bind :02:00.0 and :02:00.1 to the ixgbe kernel driver
> > %(argv0)s -b ixgbe 02:00.0 02:00.1
> > +To bind all funcions on device :02:00 to ixgbe kernel driver
> > +%(argv0)s -b ixgbe 02:00.*
> > +
> > """ % locals()) # replace items from local variables
> > @@ -689,6 +695,16 @@ def parse_args():
> > else:
> > b_flag = arg
> > +# resolve any PCI globs in the args
> > +new_args = []
> > +sysfs_path = "/sys/bus/pci/devices/"
> > +for arg in args:
> > +globbed_arg = glob(sysfs_path + arg) + glob(sysfs_path + ":" +
> > arg)
>
> Also, could be
>
> glob_path = arg if arg.startswith(":") else ":" + arg
> globbed_arg = glob(os.path.join(sysfs_path, glob_path))
>
> No need to glob twice :)
>
Well, the two are not quite equivalent if one assumes that the domain part
can start with something other than . If the domain is e.g. :, you
don't want to prefix that with - only if no domain is specified.
Therefore it's safer to glob twice, especially since we are not
particularly concerned about performance here (or else we wouldn't be using
python!).
/Bruce
[dpdk-dev] [PATCH v4] usertools/dpdk-devbind: add support for PCI wildcards
When binding or unbinding a range of devices, it can be useful to use
wildcards to specify the devices rather than repeating the same prefix
multiple times. We can use the python "glob" module to give us this
functionality - at least for PCI devices - by checking /sys for matching
files.
Examples of use from my system:
./dpdk-devbind.py -b vfio-pci 80:04.*
./dpdk-devbind.py -u 80:04.[2-7]
The first example binds eight devices, 80:04.0..80:04.7, to vfio-pci. The
second then unbinds six of those devices, 80:04.2..80:04.7, from any
driver.
Signed-off-by: Bruce Richardson
---
V4: change path manipulation to use os.path.join and basename
separated pci_glob out into separate function with doc string
[dropped Ferruh's test-by due to scope of changes]
V3: fix typo in help text additions
V2: added help text additions
---
usertools/dpdk-devbind.py | 25 +
1 file changed, 25 insertions(+)
diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py
index 86b6b53c40..6c23d243fa 100755
--- a/usertools/dpdk-devbind.py
+++ b/usertools/dpdk-devbind.py
@@ -8,7 +8,9 @@
import os
import getopt
import subprocess
+from glob import glob
from os.path import exists, abspath, dirname, basename
+from os.path import join as path_join
if sys.version_info.major < 3:
print("WARNING: Python 2 is deprecated for use in DPDK, and will not work
in future releases.", file=sys.stderr)
@@ -89,6 +91,8 @@ def usage():
where DEVICE1, DEVICE2 etc, are specified via PCI "domain:bus:slot.func" syntax
or "bus:slot.func" syntax. For devices bound to Linux kernel drivers, they may
also be referred to by Linux interface name e.g. eth0, eth1, em0, em1, etc.
+If devices are specified using PCI bus:device:func format, then
+shell wildcards and ranges may be used, e.g. 80:04.*, 80:04.[0-3]
Options:
--help, --usage:
@@ -145,6 +149,9 @@ def usage():
To bind :02:00.0 and :02:00.1 to the ixgbe kernel driver
%(argv0)s -b ixgbe 02:00.0 02:00.1
+To bind all functions on device :02:00 to ixgbe kernel driver
+%(argv0)s -b ixgbe 02:00.*
+
""" % locals()) # replace items from local variables
@@ -648,6 +655,19 @@ def show_status():
if status_dev == "misc" or status_dev == "all":
show_device_status(misc_devices, "Misc (rawdev)")
+
+def pci_glob(arg):
+'''Returns a list containing either:
+* List of PCI B:D:F matching arg, using shell wildcards e.g. 80:04.*
+* Only the passed arg if matching list is empty'''
+sysfs_path = "/sys/bus/pci/devices"
+for _glob in [arg, ':' + arg]:
+paths = [basename(path) for path in glob(path_join(sysfs_path, _glob))]
+if paths:
+return paths
+return [arg]
+
+
def parse_args():
'''Parses the command-line arguments given by the user and takes the
appropriate action for each'''
@@ -689,6 +709,11 @@ def parse_args():
else:
b_flag = arg
+# resolve any PCI globs in the args
+new_args = []
+for arg in args:
+new_args.extend(pci_glob(arg))
+args = new_args
def do_arg_actions():
'''do the actual action requested by the user'''
--
2.25.1
Re: [dpdk-dev] [PATCH v2] usertools/dpdk-devbind: add support for PCI wildcards
On Fri, Aug 21, 2020 at 10:14:19AM +0100, Burakov, Anatoly wrote: > On 20-Aug-20 4:43 PM, Bruce Richardson wrote: > > When binding or unbinding a range of devices, it can be useful to use > > wildcards to specify the devices rather than repeating the same prefix > > multiple times. We can use the python "glob" module to give us this > > functionality - at least for PCI devices - by checking /sys for matching > > files. > > > > Examples of use from my system: > > > > ./dpdk-devbind.py -b vfio-pci 80:04.* > > ./dpdk-devbind.py -u 80:04.[2-7] > > > > The first example binds eight devices, 80:04.0..80:04.7, to vfio-pci. The > > second then unbinds six of those devices, 80:04.2..80:04.7, from any > > driver. > > > > Signed-off-by: Bruce Richardson > > Tested-by: Ferruh Yigit > > --- > > V2: added help text additions > > --- > > usertools/dpdk-devbind.py | 16 > > 1 file changed, 16 insertions(+) > > > > diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py > > index 86b6b53c40..d13defbe1a 100755 > > --- a/usertools/dpdk-devbind.py > > +++ b/usertools/dpdk-devbind.py > > @@ -8,6 +8,7 @@ > > import os > > import getopt > > import subprocess > > +from glob import glob > > from os.path import exists, abspath, dirname, basename > > if sys.version_info.major < 3: > > @@ -89,6 +90,8 @@ def usage(): > > where DEVICE1, DEVICE2 etc, are specified via PCI "domain:bus:slot.func" > > syntax > > or "bus:slot.func" syntax. For devices bound to Linux kernel drivers, > > they may > > also be referred to by Linux interface name e.g. eth0, eth1, em0, em1, > > etc. > > +If devices are specified using PCI bus:device:func format, then > > +shell wildcards and ranges may be used, e.g. 80:04.*, 80:04.[0-3] > > Options: > > --help, --usage: > > @@ -145,6 +148,9 @@ def usage(): > > To bind :02:00.0 and :02:00.1 to the ixgbe kernel driver > > %(argv0)s -b ixgbe 02:00.0 02:00.1 > > +To bind all funcions on device :02:00 to ixgbe kernel driver > > +%(argv0)s -b ixgbe 02:00.* > > + > > """ % locals()) # replace items from local variables > > @@ -689,6 +695,16 @@ def parse_args(): > > else: > > b_flag = arg > > +# resolve any PCI globs in the args > > +new_args = [] > > +sysfs_path = "/sys/bus/pci/devices/" > > +for arg in args: > > +globbed_arg = glob(sysfs_path + arg) + glob(sysfs_path + ":" + > > arg) > > os.path.join()? > > > +if globbed_arg: > > +new_args.extend([a[len(sysfs_path):] for a in globbed_arg]) > > os.path.basename()? > These are used in V4.
Re: [dpdk-dev] [PATCH 1/2] doc/linux_gsg: clarify instructions on running as non-root
On Mon, Aug 24, 2020 at 04:45:00PM +0100, Anatoly Burakov wrote: > The current instructions are slightly out of date when it comes to > providing information about setting up the system for using DPDK as > non-root, so update them. > > Cc: sta...@dpdk.org > > Signed-off-by: Anatoly Burakov > --- > doc/guides/linux_gsg/enable_func.rst | 54 > 1 file changed, 39 insertions(+), 15 deletions(-) > > diff --git a/doc/guides/linux_gsg/enable_func.rst > b/doc/guides/linux_gsg/enable_func.rst > index b2bda80bb7..78b0f7c012 100644 > --- a/doc/guides/linux_gsg/enable_func.rst > +++ b/doc/guides/linux_gsg/enable_func.rst > @@ -58,22 +58,34 @@ The application can then determine what action to take, > if any, if the HPET is n > if any, and on what is available on the system at runtime. > > Running DPDK Applications Without Root Privileges > - > +- > > -.. note:: > +In order to run DPDK as non-root, the following Linux filesystem objects' > +permissions should be adjusted to ensure that the Linux account being used to > +run the DPDK application has access to them: > > -The instructions below will allow running DPDK as non-root with older > -Linux kernel versions. However, since version 4.0, the kernel does not > allow > -unprivileged processes to read the physical address information from > -the pagemaps file, making it impossible for those processes to use HW > -devices which require physical addresses > +* All directories which serve as hugepage mount points, for example, > ``/dev/hugepages`` > > -Although applications using the DPDK use network ports and other hardware > resources directly, > -with a number of small permission adjustments it is possible to run these > applications as a user other than "root". > -To do so, the ownership, or permissions, on the following Linux file system > objects should be adjusted to ensure that > -the Linux user account being used to run the DPDK application has access to > them: > +* If the HPET is to be used, ``/dev/hpet`` > > -* All directories which serve as hugepage mount points, for example, > ``/mnt/huge`` > +When running as non-root user, there may be some additional resource limits > +that are imposed by the system. Specifically, the following resource limits > may > +need to be adjusted in order to ensure normal DPDK operation: > + > +* RLIMIT_LOCKS (number of file locks that can be held by a process) > + > +* RLIMIT_NOFILE (number of open file descriptors that can be held open by a > process) > + > +* RLIMIT_MEMLOCK (amount of pinned pages the process is allowed to have) > + > +The above limits can usually be adjusted by editing > +``/etc/security/limits.conf`` file, and rebooting. > + > +Additionally, depending on which kernel driver is in use, the relevant > +resources also should be accessible by the user running the DPDK application. > + > +For ``igb_uio`` or ``uio_pci_generic`` kernel drivers, the following Linux > file > +system objects' permissions should be adjusted: > > * The userspace-io device files in ``/dev``, for example, ``/dev/uio0``, > ``/dev/uio1``, and so on > > @@ -82,11 +94,23 @@ the Linux user account being used to run the DPDK > application has access to them > /sys/class/uio/uio0/device/config > /sys/class/uio/uio0/device/resource* > > -* If the HPET is to be used, ``/dev/hpet`` > - > .. note:: > > -On some Linux installations, ``/dev/hugepages`` is also a hugepage > mount point created by default. > +The instructions above will allow running DPDK with ``igb_uio`` driver as > +non-root with older Linux kernel versions. However, since version 4.0, > the > +kernel does not allow unprivileged processes to read the physical address > +information from the pagemaps file, making it impossible for those > +processes to be used by non-privileged users. In such cases, using the > VFIO > +driver is recommended. > + > +For ``vfio-pci`` kernel driver, the following Linux file system objects' > +permissions should be adjusted: > + > +* The VFIO device file , ``/dev/vfio/vfio`` > + > +* The directories under ``/dev/vfio`` that correspond to IOMMU group numbers > of > + devices intended to be used by DPDK, for example, ``/dev/vfio/50`` > + > Since we'd very much prefer in all cases people to use VFIO, I think the VFIO instructions should come first. Otherwise the text itself reads fine to me. /Bruce
Re: [dpdk-dev] [PATCH 2/2] doc/linux_gsg: update information on using hugepages
On Mon, Aug 24, 2020 at 04:45:01PM +0100, Anatoly Burakov wrote: > Current information regarding hugepage usage is a little out of date. > Update it to include information on in-memory mode, as well as on > default mountpoints provided by systemd. > > Cc: sta...@dpdk.org > > Signed-off-by: Anatoly Burakov > --- > doc/guides/linux_gsg/sys_reqs.rst | 39 +++ > 1 file changed, 24 insertions(+), 15 deletions(-) > > diff --git a/doc/guides/linux_gsg/sys_reqs.rst > b/doc/guides/linux_gsg/sys_reqs.rst > index a124656bcb..2ddd7ed667 100644 > --- a/doc/guides/linux_gsg/sys_reqs.rst > +++ b/doc/guides/linux_gsg/sys_reqs.rst > @@ -155,8 +155,12 @@ Without hugepages, high TLB miss rates would occur with > the standard 4k page siz > Reserving Hugepages for DPDK Use > > > -The allocation of hugepages should be done at boot time or as soon as > possible after system boot > -to prevent memory from being fragmented in physical memory. > +The allocation of hugepages can be performed either at run time or at boot > time. > +In the general case, reserving hugepages at run time is perfectly fine, but > in > +use cases where having lots of physically contiguous memory is required, it > is > +preferable to reserve hugepages at boot time, as that will help in preventing > +physical memory from becoming heavily fragmented. > + Although we are removing the note about 1G pages requiring to be reserved at boot time, I think we should still mention here that some older kernel versions do not allow 1G reservations post-boot. > To reserve hugepages at boot time, a parameter is passed to the Linux kernel > on the kernel command line. > > For 2 MB pages, just pass the hugepages option to the kernel. For example, > to reserve 1024 pages of 2 MB, use:: > @@ -187,9 +191,9 @@ See the Documentation/admin-guide/kernel-parameters.txt > file in your Linux sourc > > **Alternative:** > > -For 2 MB pages, there is also the option of allocating hugepages after the > system has booted. > +There is also the option of allocating hugepages after the system has booted. > This is done by echoing the number of hugepages required to a nr_hugepages > file in the ``/sys/devices/`` directory. > -For a single-node system, the command to use is as follows (assuming that > 1024 pages are required):: > +For a single-node system, the command to use is as follows (assuming that > 1024 of 2MB pages are required):: > > echo 1024 > /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages > > @@ -198,22 +202,27 @@ On a NUMA machine, pages should be allocated explicitly > on separate nodes:: > echo 1024 > > /sys/devices/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages > echo 1024 > > /sys/devices/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages > > -.. note:: > - > -For 1G pages, it is not possible to reserve the hugepage memory after > the system has booted. > - > Using Hugepages with the DPDK > ^ > > -Once the hugepage memory is reserved, to make the memory available for DPDK > use, perform the following steps:: > +If secondary process support is not required, DPDK is able to use hugepages > +without any configuration by using "in-memory" mode. Please see > +:ref:`linux_eal_parameters` for more details. > + > +If secondary process support is required, mount points for hugepages need to > be > +created. On modern Linux distributions, a default mount point for hugepages > is provided > +by the system and is located at ``/dev/hugepages``. This mount point will > use the > +default hugepage size set by the kernel parameters as described above. > + > +However, in order to use multiple hugepage sizes, it is necessary to manually Rather than multiple hugepage sizes, I'd suggest changing this to hugepage sizes other than the default. Do we also want to add a line somewhere explaining that the default size can be set a boot using a kernel parameter? > +create mount points for hugepage sizes that are not provided by the system > +(e.g. 1GB pages). > + > +To make the hugepages of size 1GB available for DPDK use, perform the > following steps:: > > mkdir /mnt/huge > -mount -t hugetlbfs nodev /mnt/huge > +mount -t hugetlbfs pagesize=1GB /mnt/huge > > The mount point can be made permanent across reboots, by adding the > following line to the ``/etc/fstab`` file:: > > -nodev /mnt/huge hugetlbfs defaults 0 0 > - > -For 1GB pages, the page size must be specified as a mount option:: > - > -nodev /mnt/huge_1GB hugetlbfs pagesize=1GB 0 0 > +nodev /mnt/huge hugetlbfs pagesize=1GB 0 0 > -- > 2.17.1
Re: [dpdk-dev] [PATCH 1/2] drivers: replace RTE CIO barriers with RTE IO barriers
Hi Phil,
Can you please add a statement in release notes indicating that these
APIs are removed.
Thank you,
Honnappa
> -Original Message-
> From: Phil Yang
> Sent: Monday, August 24, 2020 3:41 AM
> To: dev@dpdk.org
> Cc: jer...@marvell.com; d...@linux.vnet.ibm.com; Ajit Khaparde
> (ajit.khapa...@broadcom.com) ;
> konstantin.anan...@intel.com; Honnappa Nagarahalli
> ; Joyce Kong ; nd
> ; Matan Azrad ; Shahaf Shuler
> ; Viacheslav Ovsiienko
> ; Ankur Dwivedi ;
> Anoob Joseph ; Pavan Nikhilesh
> ; Somnath Kotur
> ; Wei Zhao ; Jeff
> Guo ; Beilei Xing ; Ruifeng Wang
> ; Harman Kalra ; Nithin
> Dabilpuram ; Kiran Kumar K
> ; Maxime Coquelin
> ; Chenbo Xia ;
> Zhihong Wang ; Mahipal Challa
> ; Ori Kam
> Subject: [PATCH 1/2] drivers: replace RTE CIO barriers with RTE IO barriers
>
> Replace the deprecated rte_cio_[rw]mb barriers with rte_io_[rw]mb barriers.
>
> Signed-off-by: Phil Yang
> Signed-off-by: Joyce Kong
> ---
> drivers/common/mlx5/mlx5_common.h | 2 +-
> drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 2 +-
> drivers/crypto/octeontx2/otx2_cryptodev_sec.c | 4 ++--
> drivers/event/octeontx/ssovf_worker.c | 6 +++---
> drivers/event/octeontx2/otx2_worker.h | 2 +-
> drivers/net/bnxt/bnxt_hwrm.c | 2 +-
> drivers/net/bnxt/bnxt_ring.h | 6 +++---
> drivers/net/e1000/em_rxtx.c | 2 +-
> drivers/net/i40e/i40e_rxtx.c | 2 +-
> drivers/net/i40e/i40e_rxtx_vec_neon.c | 4 ++--
> drivers/net/mlx5/mlx5_flow.c | 2 +-
> drivers/net/mlx5/mlx5_flow_dv.c | 2 +-
> drivers/net/mlx5/mlx5_rxq.c | 12 ++--
> drivers/net/mlx5/mlx5_rxtx.c | 16
> drivers/net/mlx5/mlx5_rxtx.h | 2 +-
> drivers/net/mlx5/mlx5_rxtx_vec.h | 2 +-
> drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 2 +-
> drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 4 ++--
> drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 2 +-
> drivers/net/mlx5/mlx5_txq.c | 4 ++--
> drivers/net/octeontx/octeontx_rxtx.h | 2 +-
> drivers/net/octeontx2/otx2_ethdev_sec.c | 2 +-
> drivers/net/octeontx2/otx2_ethdev_sec_tx.h| 2 +-
> drivers/net/octeontx2/otx2_rx.c | 2 +-
> drivers/net/octeontx2/otx2_tx.c | 6 +++---
> drivers/net/virtio/virtio_rxtx.c | 2 +-
> drivers/net/virtio/virtio_rxtx_simple_neon.c | 2 +-
> drivers/net/virtio/virtqueue.h| 26 +-
> drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c | 4 ++--
> drivers/regex/mlx5/mlx5_regex_fastpath.c | 4 ++--
> 30 files changed, 66 insertions(+), 66 deletions(-)
>
> diff --git a/drivers/common/mlx5/mlx5_common.h
> b/drivers/common/mlx5/mlx5_common.h
> index 2cdb226..ed44a45 100644
> --- a/drivers/common/mlx5/mlx5_common.h
> +++ b/drivers/common/mlx5/mlx5_common.h
> @@ -193,7 +193,7 @@ check_cqe(volatile struct mlx5_cqe *cqe, const
> uint16_t cqes_n,
>
> if (unlikely((op_owner != (!!(idx))) || (op_code ==
> MLX5_CQE_INVALID)))
> return MLX5_CQE_STATUS_HW_OWN;
> - rte_cio_rmb();
> + rte_io_rmb();
> if (unlikely(op_code == MLX5_CQE_RESP_ERR ||
>op_code == MLX5_CQE_REQ_ERR))
> return MLX5_CQE_STATUS_ERR;
> diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
> b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
> index 9d51b17..df39cde 100644
> --- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
> +++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
> @@ -469,7 +469,7 @@ otx2_cpt_enqueue_req(const struct otx2_cpt_qp *qp,
>* buffer immediately, a DMB is not required to push out
>* LMTSTs.
>*/
> - rte_cio_wmb();
> + rte_io_wmb();
> lmt_status = otx2_lmt_submit(qp->lf_nq_reg);
> } while (lmt_status == 0);
>
> diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_sec.c
> b/drivers/crypto/octeontx2/otx2_cryptodev_sec.c
> index 0741a59..72e6c41 100644
> --- a/drivers/crypto/octeontx2/otx2_cryptodev_sec.c
> +++ b/drivers/crypto/octeontx2/otx2_cryptodev_sec.c
> @@ -107,7 +107,7 @@ otx2_cpt_enq_sa_write(struct
> otx2_sec_session_ipsec_lp *lp,
> inst.u64[3] = 0;
> inst.res_addr = rte_mempool_virt2iova(res);
>
> - rte_cio_wmb();
> + rte_io_wmb();
>
> do {
> /* Copy CPT command to LMTLINE */
> @@ -124,7 +124,7 @@ otx2_cpt_enq_sa_write(struct
> otx2_sec_session_ipsec_lp *lp,
> otx2_err("Request timed out");
> return -ETIMEDOUT;
> }
> - rte_cio_rmb();
> + rte_io_rmb();
> }
>
> if (unlikely(res->compcode != CPT_9X_COMP_E_GOOD)) { diff --git
> a/drivers/event/octeontx/ssovf_worker.c
> b/drivers/event/octeontx/ssovf_worker.c
> index 18b7926..3dfe665 100644
> --- a/d
[dpdk-dev] [Bug 530] Lack of Support for Inner RSS Header Hashing (Feature 2.21)
https://bugs.dpdk.org/show_bug.cgi?id=530 Bug ID: 530 Summary: Lack of Support for Inner RSS Header Hashing (Feature 2.21) Product: DPDK Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: enhancement Priority: Normal Component: testpmd Assignee: dev@dpdk.org Reporter: ohily...@iol.unh.edu Target Milestone: --- As far as I can tell, testpmd doesn't report when inner rss header hashing occurs. There is currently a field in log output (I enabled it using "set log global 3") that shows the RSS hash when a packet is received, but there is no indication of an inner RSS hash. Similarly, there is an offload flag (PKT_RX_RSS_HASH) for rss hashing, but I was unable to find any flags relating to inner rss offload like IPv4/IPv6, UDP, TCP and SCTP have. This makes testing the feature difficult as there is no indication as to whether inner hashing was preformed. -- You are receiving this mail because: You are the assignee for the bug.
Re: [dpdk-dev] [PATCH v2] windows/netuio: add Windows NetUIO kernel driver
On Thu, 20 Aug 2020 15:23:55 -0700, Narcisa Ana Maria Vasile wrote:
> From: Narcisa Vasile
>
> The Windows NetUIO kernel driver allows the DPDK userspace
> application to directly access the hardware.
>
> Cc: Harini Ramakrishnan
> Cc: Omar Cardona
> Signed-off-by: Narcisa Vasile
> ---
Major questions:
1. Does NetUIO still need to allocate and map a contiguous memory segment
now, when DPDK has user-mode memory management?
2. IOCTLs require to specify PCI address on each call. This is very
inconvenient for DPDK consumers and also seems to serve no purpose.
3. There is a need to document driver's design, preferably in commit message,
specifically:
3.1) DMA remapping capability in INF (AFAIK, vendors are notified);
3.2) manual BAR probing instead of using resource lists;
3.3) reason to use EvtIoInCallerContext and IO queues;
3.4) IOCTL format.
Also, I agree with everything Ranjit has noted already.
General suggestions to cleanup the code a bit. We can do it later if you
wish. This also brings up the question, which code style should Windows
kernel code for DPDK follow (off-topic for now).
* Remove boilerplate code and comments generated by VS wizard.
* Place `_Use_decl_annotations` on definitions to make them simpler.
* Limit line length, try using shorted variable names (e.g.
"netuio_contextdata" may be "context" or "ctx" with no loss).
More specific comments inline.
> create mode 100644 .gitattributes
> create mode 100644 .gitignore
Both of these files should be in windows/ directory.
> create mode 100644 windows/netuio/kernel/windows/netuio/resource.h
This file is not needed.
> diff --git a/windows/netuio/kernel/README_NetUIO.rst
> b/windows/netuio/kernel/README_NetUIO.rst
> new file mode 100644
> index 0..a290fcf20
> --- /dev/null
> +++ b/windows/netuio/kernel/README_NetUIO.rst
> @@ -0,0 +1,64 @@
[snip]
> +Installing netuio.sys Driver for development
> +
> +.. note::
> +
> +In a development environment, NetUIO driver can be loaded by enabling
> test-signing.
> +Please implement adequate precautionary measures before installing a
> test-signed driver, replacing a signed-driver.
Paragraph under "note" must be indented for RST to peek it up as note
content. Like so:
.. note::
This line has 3 spaces in the beginning.
[snip]
> diff --git a/windows/netuio/kernel/windows/netuio/netuio.inf
> b/windows/netuio/kernel/windows/netuio/netuio.inf
> new file mode 100644
> index 0..88e90b365
> --- /dev/null
> +++ b/windows/netuio/kernel/windows/netuio/netuio.inf
> @@ -0,0 +1,78 @@
> +; SPDX-License-Identifier: BSD-3-Clause
> +; Copyright (c) Microsoft Corporation. All rights reserved
This copyright differs from the one in README.
"All rights reserved" is probably unnecessary.
[snip]
> +[Strings]
> +SPSVCINST_ASSOCSERVICE= 0x0002
> +Intel = "Intel"
> +Broadcom = "Broadcom Corporation"
IHVs are supposed to add this gradually.
> +ClassName = "Windows UIO"
> +DiskName = "DPDK netUIO Installation Disk"
> +netuio.DeviceDesc = "netuio Device"
> +netuio.SVCDESC = "netuio Service"
> +
> +[DMAr.reg]
> +HKR,Parameters,DmaRemappingCompatible,0x00010001,1
> diff --git a/windows/netuio/kernel/windows/netuio/netuio_dev.c
> b/windows/netuio/kernel/windows/netuio/netuio_dev.c
> new file mode 100644
> index 0..6394bb5d1
> --- /dev/null
> +++ b/windows/netuio/kernel/windows/netuio/netuio_dev.c
[snip]
> +NTSTATUS
> +netuio_create_device(_Inout_ PWDFDEVICE_INIT DeviceInit)
> +{
[snip]
> +
> +status = WdfDeviceCreate(&DeviceInit, &deviceAttributes, &device);
> +
> + if (NT_SUCCESS(status)) {
> + // Create a device interface so that applications can find and
> talk to us.
> + status = WdfDeviceCreateDeviceInterface(device,
> &GUID_DEVINTERFACE_netUIO, NULL);
> + }
Mixed tabs and spaces for indent.
[snip]
> +/*
> +Routine Description:
> +Free all the resources allocated in AdfEvtDeviceAdd.
Typo: Adf -> Wdf.
[snip]
> +static NTSTATUS
> +get_pci_device_info(_In_ WDFOBJECT device)
> +{
[snip]
> +// Also, retrieve the NUMA node of the device
> +USHORT numaNode;
> +status = IoGetDeviceNumaNode(pdo, &numaNode);
> +if (NT_SUCCESS(status)) {
> +netuio_contextdata->dev_numa_node = numaNode;
> +}
Why is this needed? Userspace has access to this info.
> +}
> +
> +return status;
> +}
> +
> +static NTSTATUS
> +create_device_specific_symbolic_link(_In_ WDFOBJECT device)
> +{
> +NTSTATUS status = STATUS_UNSUCCESSFUL;
> +UNICODE_STRING netuio_symbolic_link;
> +
> +PNETUIO_CONTEXT_DATA netuio_contextdata;
> +netuio_contextdata = netuio_get_context_data(device);
> +
> +if (!netuio_contextdata)
> +return status;
> +
> +// Build symbolic link name as _BDF
> (bus/device/func)
> +CHAR symbolic_link[64] = { 0 };
> +sprintf_s(symbolic_link, sizeof(symbolic_link), "%s_%04d%02d%02d",
> +
[dpdk-dev] [PATCH v2] pci/linux: copy new id for inserted device
When a device is inserted into an existing BDF slot
that has not been probed, we must overwrite the old
PCI ID with the ID of the new function. Otherwise
we may not probe the function with the correct driver,
if at all.
Signed-off-by: Jim Harris
---
drivers/bus/pci/linux/pci.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index a2198abf4..d8fd973b2 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -352,6 +352,7 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr
*addr)
if (!rte_dev_is_probed(&dev2->device)) {
dev2->kdrv = dev->kdrv;
dev2->max_vfs = dev->max_vfs;
+ memcpy(&dev2->id, &dev->id,
sizeof(dev2->id));
pci_name_set(dev2);
memmove(dev2->mem_resource,
dev->mem_resource,
@@ -365,7 +366,8 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr
*addr)
* need to do anything here unless...
**/
if (dev2->kdrv != dev->kdrv ||
- dev2->max_vfs != dev->max_vfs)
+ dev2->max_vfs != dev->max_vfs ||
+ memcmp(&dev2->id, &dev->id,
sizeof(dev2->id)))
/*
* This should not happens.
* But it is still possible if
--
2.20.1
Re: [dpdk-dev] [PATCH 1/2] net/ark: remove compile time log macros in favor of run time log control
On Mon, Aug 24, 2020 at 11:09 AM Ferruh Yigit wrote: > > On 8/24/2020 3:40 PM, Bruce Richardson wrote: > > On Mon, Aug 24, 2020 at 03:37:53PM +0100, Ferruh Yigit wrote: > >> On 8/24/2020 2:36 PM, Ed Czeck wrote: > >>> Use ARK_PMD_LOG in place of PMD_DRV_LOG, PMD_DEBUG_LOG, PMD_FUNC_LOG, > >>> PMD_STATS_LOG, PMD_RX_LOG, and PMD_TX_LOG. > >>> Review and adjust log levels and messages as needed. > >>> > >>> Signed-off-by: Ed Czeck > >>> --- > >>> doc/guides/nics/ark.rst | 13 -- > >>> drivers/net/ark/ark_ddm.c | 12 ++--- > >>> drivers/net/ark/ark_ethdev.c| 77 +++-- > >>> drivers/net/ark/ark_ethdev_rx.c | 46 ++-- > >>> drivers/net/ark/ark_ethdev_tx.c | 10 ++--- > >>> drivers/net/ark/ark_logs.h | 63 +++ > >>> drivers/net/ark/ark_mpu.c | 32 -- > >>> drivers/net/ark/ark_pktchkr.c | 36 +++ > >>> drivers/net/ark/ark_pktdir.c| 2 +- > >>> drivers/net/ark/ark_pktgen.c| 22 +- > >>> drivers/net/ark/ark_rqp.c | 4 +- > >>> drivers/net/ark/ark_udm.c | 18 > >>> 12 files changed, 125 insertions(+), 210 deletions(-) > >>> > >>> diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst > >>> index 06e8c3374..c3ffcbbc2 100644 > >>> --- a/doc/guides/nics/ark.rst > >>> +++ b/doc/guides/nics/ark.rst > >>> @@ -132,19 +132,6 @@ Configuration Information > >>> * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y): When enabled TX > >>> packets are padded to 60 bytes to support downstream MACS. > >>> > >>> - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_RX** (default n): Enables or disables > >>> debug > >>> - logging and internal checking of RX ingress logic within the ARK > >>> PMD driver. > >>> - > >>> - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TX** (default n): Enables or disables > >>> debug > >>> - logging and internal checking of TX egress logic within the ARK PMD > >>> driver. > >>> - > >>> - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS** (default n): Enables or > >>> disables debug > >>> - logging of detailed packet and performance statistics gathered in > >>> - the PMD and FPGA. > >>> - > >>> - * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE** (default n): Enables or > >>> disables debug > >>> - logging of detailed PMD events and status. > >>> - > >> > >> Can you please remove these config option from 'config/common_base'? > >> > > Given that the file is scheduled for deletion fairly soon, not sure if that > > is worthwhile doing. > > > > Since there is possible new version already because of comment in 2/2, I think > better to update 'config/common_base' for the sake of completeness. > > But if there won't be a new version, this can be skipped pragmatically. I will avoid the update of config/common_base as changes there will cause merge conflict.
Re: [dpdk-dev] [PATCH 2/2] net/ark: remove RTE_LIBRTE_ARK_PAD_TX configuration macro
On Mon, Aug 24, 2020 at 10:55 AM Ferruh Yigit wrote: > > On 8/24/2020 2:36 PM, Ed Czeck wrote: > > Replace behavior with RTE_LIBRTE_ARK_MIN_TX_PKTLEN > > with a default value of 0. > > Update documentation as needed. > > > > Signed-off-by: Ed Czeck > > --- > > doc/guides/nics/ark.rst | 13 -- > > drivers/net/ark/ark_ethdev_tx.c | 44 +++-- > > drivers/net/ark/ark_logs.h | 8 -- > > 3 files changed, 36 insertions(+), 29 deletions(-) > > > > diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst > > index c3ffcbbc2..f4d4539e5 100644 > > --- a/doc/guides/nics/ark.rst > > +++ b/doc/guides/nics/ark.rst > > @@ -129,8 +129,10 @@ Configuration Information > > * **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables > > inclusion > > of the ARK PMD driver in the DPDK compilation. > > > > - * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y): When enabled TX > > - packets are padded to 60 bytes to support downstream MACS. > > + * **CONFIG_RTE_LIBRTE_ARK_MIN_TX_PKTLEN** (default 0): Sets the minimum > > +packet length for tx packets to the FPGA. Packets less than this > > +length are padded to meet the requirement. This allows padding to > > +be offloaded or remain in host software. > > > > There is no 'CONFIG_RTE_LIBRTE_ARK_MIN_TX_PKTLEN' option, I think it is > confusing to add it to documentation. There is already some documentation in > below for 'RTE_LIBRTE_ARK_MIN_TX_PKTLEN', what do you think removing this > part? > Should I remove the all references to the CONFIG_RTE_LIBRTE_ARK from the net/ark section of the guide? It appears that CONFIG_.* will be removed along with the makefile build system. > And can you please remove 'CONFIG_RTE_LIBRTE_ARK_PAD_TX' form > 'config/common_base'? > I am hesitant to modify config/common_base, since it is slated for removal and edits will cause merge conflicts. Are you OK with this? > Another option is, do you think does it help your users to keep the config > name > same, like keep the 'CONFIG_RTE_LIBRTE_ARK_PAD_TX' as 'RTE_LIBRTE_ARK_PAD_TX' > for the meson CFLAGs, instead of renaming it to > 'RTE_LIBRTE_ARK_MIN_TX_PKTLEN'? I will drop the CONFIG names and leave the compiler marco documented in my next patch. Thx,
[dpdk-dev] question regarding rx checksum offload flags
I was looking for some clarification regarding how rx checksum flags should be set for tunnel packets having both inner and outer IP/L4 headers. Based on comments in rte_mbuf_core.h, it seems to me. that the inner (encapsulated) IP header checksum status should determine which of these goes into ol_flags: PKT_RX_IP_CKSUM_UNKNOWN PKT_RX_IP_CKSUM_BAD PKT_RX_IP_CKSUM_GOOD PKT_RX_IP_CKSUM_NONE Similarly, the L4 checksum status should determine which of these goes into ol_flags: PKT_RX_L4_CKSUM_UNKNOWN PKT_RX_L4_CKSUM_BAD PKT_RX_L4_CKSUM_GOOD PKT_RX_L4_CKSUM_NONE The IP header checksum status for the outer IP header should determine whether this flag is set in ol_flags: PKT_RX_EIP_CKSUM_BAD And for UDP-based tunnel encapsulations, the outer L4 checksum status should determine which of these goes into ol_flags: PKT_RX_OUTER_L4_CKSUM_UNKNOWN PKT_RX_OUTER_L4_CKSUM_BAD PKT_RX_OUTER_L4_CKSUM_GOOD PKT_RX_OUTER_L4_CKSUM_INVALID Finally, the checksum status of inner headers should have no influence on PKT_RX_EIP_CKSUM_BAD or PKT_RX_OUTER_L4_CKSUM_*, and likewise the checksum status of outer headers should have no influence on PKT_RX_L4_CKSUM_* or PKT_RX_IP_CKSUM_*. Is this correct? Apologies for such a basic question, but I'm having trouble correlating the above with implementations. Thanks and regards, Lance
[dpdk-dev] [PATCH] net/iavf: fix default mac set fail issue
rte_is_valid_assigned_ether_addr retrun true if the given ethernet address is valid. Signed-off-by: Li Han --- drivers/net/iavf/iavf_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index c3aa4cd..18ce809 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -973,7 +973,7 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev, return 0; /* If the MAC address is configured by host, skip the setting */ - if (rte_is_valid_assigned_ether_addr(perm_addr)) + if (!rte_is_valid_assigned_ether_addr(perm_addr)) return -EPERM; ret = iavf_add_del_eth_addr(adapter, old_addr, false); -- 1.8.3.1
