[PATCH] net/hns3: support power monitor
From: Chengwen Feng
This commit supports power monitor on the Rx queue descriptor of the
next poll.
Note: Although rte_power_monitor() on the ARM platform does not support
callback, this commit still implements the callback so that it does not
need to be adjusted after the ARM platform supports callback.
Signed-off-by: Chengwen Feng
Signed-off-by: Jie Hai
---
drivers/net/hns3/hns3_ethdev.c| 1 +
drivers/net/hns3/hns3_ethdev_vf.c | 1 +
drivers/net/hns3/hns3_rxtx.c | 21 +
drivers/net/hns3/hns3_rxtx.h | 1 +
4 files changed, 24 insertions(+)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index eafcf2c6f644..b10d1216d2d1 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -6501,6 +6501,7 @@ static const struct eth_dev_ops hns3_eth_dev_ops = {
.eth_dev_priv_dump = hns3_eth_dev_priv_dump,
.eth_rx_descriptor_dump = hns3_rx_descriptor_dump,
.eth_tx_descriptor_dump = hns3_tx_descriptor_dump,
+ .get_monitor_addr = hns3_get_monitor_addr,
};
static const struct hns3_reset_ops hns3_reset_ops = {
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c
b/drivers/net/hns3/hns3_ethdev_vf.c
index 83d3d660056d..4eeb46a34448 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -2209,6 +2209,7 @@ static const struct eth_dev_ops hns3vf_eth_dev_ops = {
.eth_dev_priv_dump = hns3_eth_dev_priv_dump,
.eth_rx_descriptor_dump = hns3_rx_descriptor_dump,
.eth_tx_descriptor_dump = hns3_tx_descriptor_dump,
+ .get_monitor_addr = hns3_get_monitor_addr,
};
static const struct hns3_reset_ops hns3vf_reset_ops = {
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index 228490eb6e01..7e636a0a2e99 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -4884,3 +4884,24 @@ hns3_start_rxtx_datapath(struct rte_eth_dev *dev)
hns3_mp_req_start_rxtx(dev);
}
+
+static int
+hns3_monitor_callback(const uint64_t value,
+ const uint64_t arg[RTE_POWER_MONITOR_OPAQUE_SZ] __rte_unused)
+{
+ const uint64_t vld = rte_le_to_cpu_32(BIT(HNS3_RXD_VLD_B));
+ return (value & vld) == vld ? -1 : 0;
+}
+
+int
+hns3_get_monitor_addr(void *rx_queue, struct rte_power_monitor_cond *pmc)
+{
+ struct hns3_rx_queue *rxq = rx_queue;
+ struct hns3_desc *rxdp = &rxq->rx_ring[rxq->next_to_use];
+
+ pmc->addr = &rxdp->rx.bd_base_info;
+ pmc->fn = hns3_monitor_callback;
+ pmc->size = sizeof(uint32_t);
+
+ return 0;
+}
diff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h
index c1c8bd29d8ea..e2ad42bb8e30 100644
--- a/drivers/net/hns3/hns3_rxtx.h
+++ b/drivers/net/hns3/hns3_rxtx.h
@@ -815,5 +815,6 @@ void hns3_stop_tx_datapath(struct rte_eth_dev *dev);
void hns3_start_tx_datapath(struct rte_eth_dev *dev);
void hns3_stop_rxtx_datapath(struct rte_eth_dev *dev);
void hns3_start_rxtx_datapath(struct rte_eth_dev *dev);
+int hns3_get_monitor_addr(void *rx_queue, struct rte_power_monitor_cond *pmc);
#endif /* HNS3_RXTX_H */
--
2.30.0
Re: [PATCH v1 1/1] baseband/acc: remove acc101
On 1/12/24 21:36, Hernan Vargas wrote: The ACC101 HW variant is not productized, the relevant code is removed as obsolete. Signed-off-by: Hernan Vargas --- doc/guides/bbdevs/acc100.rst | 18 +- doc/guides/rel_notes/release_24_03.rst | 1 + drivers/baseband/acc/acc100_pmd.h | 5 +- drivers/baseband/acc/acc101_pmd.h | 40 --- drivers/baseband/acc/rte_acc100_pmd.c | 425 - 5 files changed, 6 insertions(+), 483 deletions(-) delete mode 100644 drivers/baseband/acc/acc101_pmd.h Reviewed-by: Maxime Coquelin Thanks, Maxime
Re: [PATCH v2] vhost: fix deadlock during software live migration of VDPA in a nested virtualization environment
Hi Hao,
On 1/22/24 04:27, Hao Chen wrote:
In a nested virtualization environment, running dpdk-vdpa in QEMU-L1 for
software live migration will result in a deadlock between dpdke-vdpa and
QEMU-L2 processes.
'rte_vdpa_relay_vring_used'->
'__vhost_iova_to_vva'->
'vhost_user_iotlb_rd_unlock(vq)'->
'vhost_user_iotlb_miss'-> send vhost message 'VHOST_USER_SLAVE_IOTLB_MSG'
to QEMU-L2's vdpa socket,
then call 'vhost_user_iotlb_rd_lock(vq)' to hold the read lock `iotlb_lock`.
But there is no place to release this read lock.
QEMU-L2 get the 'VHOST_USER_SLAVE_IOTLB_MSG',
then call 'vhost_user_send_device_iotlb_msg' to send 'VHOST_USER_IOTLB_MSG'
messages to dpdk-vdpa.
Dpdk-vdpa will call vhost_user_iotlb_msg->
vhost_user_iotlb_cache_insert, here, will obtain the write lock
`iotlb_lock`, but the read lock `iotlb_lock` has not been released and
will block here.
This patch add lock and unlock function to fix the deadlock.
Fixes: b13ad2decc83 ("vhost: provide helpers for virtio ring relay")
Cc: sta...@dpdk.org
Signed-off-by: Hao Chen
---
Changes v1 ... v2:
- protect the vhost_alloc_copy_ind_table() call too.
lib/vhost/vdpa.c | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/vhost/vdpa.c b/lib/vhost/vdpa.c
index 9776fc07a9..a1dd5a753b 100644
--- a/lib/vhost/vdpa.c
+++ b/lib/vhost/vdpa.c
@@ -19,6 +19,7 @@
#include "rte_vdpa.h"
#include "vdpa_driver.h"
#include "vhost.h"
+#include "iotlb.h"
/** Double linked list of vDPA devices. */
TAILQ_HEAD(vdpa_device_list, rte_vdpa_device);
@@ -147,7 +148,6 @@ rte_vdpa_unregister_device(struct rte_vdpa_device *dev)
int
rte_vdpa_relay_vring_used(int vid, uint16_t qid, void *vring_m)
- __rte_no_thread_safety_analysis /* FIXME: requires iotlb_lock? */
{
struct virtio_net *dev = get_device(vid);
uint16_t idx, idx_m, desc_id;
@@ -193,17 +193,21 @@ rte_vdpa_relay_vring_used(int vid, uint16_t qid, void
*vring_m)
if (unlikely(nr_descs > vq->size))
return -1;
+ vhost_user_iotlb_rd_lock(vq);
desc_ring = (struct vring_desc *)(uintptr_t)
vhost_iova_to_vva(dev, vq,
vq->desc[desc_id].addr, &dlen,
VHOST_ACCESS_RO);
+ vhost_user_iotlb_rd_unlock(vq);
if (unlikely(!desc_ring))
return -1;
if (unlikely(dlen < vq->desc[desc_id].len)) {
+ vhost_user_iotlb_rd_lock(vq);
idesc = vhost_alloc_copy_ind_table(dev, vq,
vq->desc[desc_id].addr,
vq->desc[desc_id].len);
+ vhost_user_iotlb_rd_unlock(vq);
if (unlikely(!idesc))
return -1;
@@ -220,9 +224,12 @@ rte_vdpa_relay_vring_used(int vid, uint16_t qid, void *vring_m)
if (unlikely(nr_descs-- == 0))
goto fail;
desc = desc_ring[desc_id];
- if (desc.flags & VRING_DESC_F_WRITE)
+ if (desc.flags & VRING_DESC_F_WRITE) {
+ vhost_user_iotlb_rd_lock(vq);
vhost_log_write_iova(dev, vq, desc.addr,
desc.len);
+ vhost_user_iotlb_rd_unlock(vq);
+ }
desc_id = desc.next;
} while (desc.flags & VRING_DESC_F_NEXT);
Thanks for the fix, looks good to me.
There's one minor checkpatch issue I'll fix while applying.
Reviewed-by: Maxime Coquelin
Thanks,
Maxime
Re: [PATCH v2 1/2] net/virtio-user: improve kick performance with notification area mapping
On 1/23/24 11:55, Srujana Challa wrote: This patch introduces new virtio-user callbacks to map the vq notification area and implements it for the vhost-vDPA backend. This is simply done by using mmap()/munmap() for the vhost-vDPA fd. And also adds code to write to queue notify address in notify callback. This will help in increasing the kick performance. Signed-off-by: Srujana Challa --- drivers/net/virtio/virtio_user/vhost.h| 2 + drivers/net/virtio/virtio_user/vhost_vdpa.c | 68 +++ .../net/virtio/virtio_user/virtio_user_dev.c | 43 ++-- .../net/virtio/virtio_user/virtio_user_dev.h | 2 + drivers/net/virtio/virtio_user_ethdev.c | 37 -- 5 files changed, 143 insertions(+), 9 deletions(-) For next time, please add a changelog either in a cover letter, or in the patch just before the stats. Reviewed-by: Maxime Coquelin Thanks, Maxime
Re: [PATCH v2 2/2] net/virtio-user: add VIRTIO_NET_F_RSS to supported features
On 1/23/24 11:55, Srujana Challa wrote: This patch introduces new function to get rss device config and adds code to forward the RSS control command to backend through hw control queue if RSS feature is negotiated. This patch will help to negotiate VIRTIO_NET_F_RSS feature if vhost-vdpa backend supports RSS in HW. Signed-off-by: Srujana Challa --- .../net/virtio/virtio_user/virtio_user_dev.c | 31 ++- .../net/virtio/virtio_user/virtio_user_dev.h | 2 ++ drivers/net/virtio/virtio_user_ethdev.c | 3 ++ 3 files changed, 35 insertions(+), 1 deletion(-) Reporting the R-by I gave on V1. Please next time apply R-By and A-by from previous revision when the patch did not change. Reviewed-by: Maxime Coquelin Thanks, Maxime
RE: [PATCH v8 0/3] test/dma: add vchan reconfig and SG tests
Hi, Could this series be merged as the patches are acked. Thanks, Gowrishankar
RE: [PATCH v8 0/4] PCI Dev and SG copy support
Hi, Could this series be merged as the patches are acked. Thanks, Gowrishankar
[PATCH v2 0/7] support dump reigser names and filter them
The registers can be dumped through the API rte_eth_dev_get_reg_info. However, only register values are exported, which is inconvenient for users to interpret. Therefore, an extension of the structure "rte_dev_reg_info" and a new API rte_eth_dev_get_reg_info_ext is added to support the capability of exporting the name of the corresponding register and filtering by names. The hns3 driver and telemetry are examples for that. -- v2: 1. fix compile error. 2. add new API to support it instead of the old one. 3. split patches on hns3 driver. Jie Hai (7): ethdev: support report register names and filter ethdev: add telemetry cmd for registers net/hns3: fix dump counter of registers net/hns3: remove dump format of registers net/hns3: add names for registers net/hns3: support filter directly accessed registers net/hns3: support filter dump of registers doc/guides/rel_notes/release_24_03.rst |8 + drivers/net/hns3/hns3_regs.c | 1342 +--- lib/ethdev/rte_dev_info.h | 11 + lib/ethdev/rte_ethdev.c| 36 + lib/ethdev/rte_ethdev.h| 22 + lib/ethdev/rte_ethdev_telemetry.c | 126 +++ 6 files changed, 1373 insertions(+), 172 deletions(-) -- 2.30.0
[PATCH v2 2/7] ethdev: add telemetry cmd for registers
This patch adds a telemetry command for registers dump,
and supports get registers with specified names.
The length of the string exported by telemetry is limited
by MAX_OUTPUT_LEN. Therefore, the filter should be more
precise.
An example usage is shown below:
--> /ethdev/regs,0,INTR
{
"/ethdev/regs": {
"registers_length": 318,
"registers_width": 4,
"register_offset": "0x0",
"version": "0x1140011",
"group_0": {
"HNS3_CMDQ_INTR_STS_REG": "0x0",
"HNS3_CMDQ_INTR_EN_REG": "0x2",
"HNS3_CMDQ_INTR_GEN_REG": "0x0",
"queue_0_HNS3_TQP_INTR_CTRL_REG": "0x0",
"queue_0_HNS3_TQP_INTR_GL0_REG": "0xa",
"queue_0_HNS3_TQP_INTR_GL1_REG": "0xa",
"queue_0_HNS3_TQP_INTR_GL2_REG": "0x0",
...
},
"group_1": {
...
},
...
}
or as below if the number of registers not exceed the
RTE_TEL_MAX_DICT_ENTRIES:
--> /ethdev/regs,0,ppp
{
"/ethdev/regs": {
"registers_length": 156,
"registers_width": 4,
"register_offset": "0x0",
"version": "0x1140011",
"ppp_key_drop_num": "0x0",
"ppp_rlt_drop_num": "0x0",
"ssu_ppp_mac_key_num_l": "0x1",
"ssu_ppp_mac_key_num_h": "0x0",
"ssu_ppp_host_key_num_l": "0x1",
"ssu_ppp_host_key_num_h": "0x0",
"ppp_ssu_mac_rlt_num_l": "0x1",
...
}
}
Signed-off-by: Jie Hai
---
lib/ethdev/rte_ethdev_telemetry.c | 126 ++
1 file changed, 126 insertions(+)
diff --git a/lib/ethdev/rte_ethdev_telemetry.c
b/lib/ethdev/rte_ethdev_telemetry.c
index 6b873e7abe68..f1ebb2fae632 100644
--- a/lib/ethdev/rte_ethdev_telemetry.c
+++ b/lib/ethdev/rte_ethdev_telemetry.c
@@ -5,6 +5,7 @@
#include
#include
+#include
#include
#include
@@ -1395,6 +1396,129 @@ eth_dev_handle_port_tm_node_caps(const char *cmd
__rte_unused,
return ret;
}
+static int
+eth_dev_store_regs(struct rte_tel_data *d, struct rte_dev_reg_info *reg_info)
+{
+ struct rte_tel_data *groups[RTE_TEL_MAX_DICT_ENTRIES] = {NULL};
+ char group_name[RTE_TEL_MAX_STRING_LEN] = {0};
+ struct rte_tel_data *group = NULL;
+ uint32_t grp_num = 0;
+ uint32_t *data;
+ int ret = 0;
+ uint32_t i;
+
+ rte_tel_data_start_dict(d);
+ rte_tel_data_add_dict_uint(d, "register_length", reg_info->length);
+ rte_tel_data_add_dict_uint(d, "register_width", reg_info->width);
+ rte_tel_data_add_dict_uint_hex(d, "register_offset", reg_info->offset,
0);
+ rte_tel_data_add_dict_uint_hex(d, "version", reg_info->version, 0);
+
+ data = reg_info->data;
+ if (reg_info->length <= RTE_TEL_MAX_DICT_ENTRIES) {
+ for (i = 0; i < reg_info->length; i++, data++)
+ rte_tel_data_add_dict_uint_hex(d,
+ reg_info->names[i].name, *data, 0);
+ return 0;
+ }
+
+ for (i = 0; i < reg_info->length; i++, data++) {
+ if (i % RTE_TEL_MAX_DICT_ENTRIES == 0) {
+ if (i != 0)
+ rte_tel_data_add_dict_container(d, group_name,
+ group, 0);
+
+ group = rte_tel_data_alloc();
+ if (group == NULL) {
+ ret = -ENOMEM;
+ goto out;
+ }
+ rte_tel_data_start_dict(group);
+ snprintf(group_name, RTE_TEL_MAX_STRING_LEN,
+ "group_%u", grp_num);
+ if (grp_num >= RTE_TEL_MAX_DICT_ENTRIES) {
+ RTE_ETHDEV_LOG_LINE(NOTICE,
+ "Too many regs, please filter");
+ return 0;
+ }
+ groups[grp_num++] = group;
+ }
+ rte_tel_data_add_dict_uint_hex(group, reg_info->names[i].name,
+ *data, 0);
+ }
+ if (i % RTE_TEL_MAX_DICT_ENTRIES != 0)
+ rte_tel_data_add_dict_container(d, group_name, group, 0);
+
+ return 0;
+out:
+ for (i = 0; i < grp_num; i++)
+ rte_tel_data_free(groups[i]);
+
+ return ret;
+}
+
+static int
+eth_dev_get_port_regs(int port_id, struct rte_tel_data *d, char *filter)
+{
+ struct rte_dev_reg_info reg_info;
+ int ret;
+
+ memset(®_info, 0, sizeof(reg_info));
+ reg_info.filter = filter;
+
+ ret = rte_eth_dev_get_reg_info_ext(port_id, ®_info);
+ if (ret != 0) {
+ RTE_ETHDEV_LOG_LINE(ERR,
+ "Error getting device reg info: %d", ret);
+ return ret;
+ }
+
+ reg_info.data = calloc(reg_info.length, reg_info.width);
+ if (!reg_info.data)
+ return -ENOMEM;
+
+ reg_info.names = calloc(reg_info.length, sizeof(struct
rte_eth_reg_name));
+ if (
[PATCH v2 1/7] ethdev: support report register names and filter
This patch adds "filter" and "names" fields to "rte_dev_reg_info"
structure. Names of registers in data fields can be reported and
the registers can be filtered by their names.
For compatibility, the original API rte_eth_dev_get_reg_info()
does not use the name and filter fields. The new API
rte_eth_dev_get_reg_info_ext() is added to support reporting
names and filtering by names. If the drivers does not report
the names, set them to "offset_XXX".
Signed-off-by: Jie Hai
---
doc/guides/rel_notes/release_24_03.rst | 8 ++
lib/ethdev/rte_dev_info.h | 11
lib/ethdev/rte_ethdev.c| 36 ++
lib/ethdev/rte_ethdev.h| 22
4 files changed, 77 insertions(+)
diff --git a/doc/guides/rel_notes/release_24_03.rst
b/doc/guides/rel_notes/release_24_03.rst
index 84d3144215c6..5d402341223a 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -75,6 +75,11 @@ New Features
* Added support for Atomic Rules' TK242 packet-capture family of devices
with PCI IDs: ``0x1024, 0x1025, 0x1026``.
+* **Added support for dumping regiters with names and filter.**
+
+ * Added new API functions ``rte_eth_dev_get_reg_info_ext()`` to and filter
+ * the registers by their names and get the information of registers(names,
+ * values and other attributes).
Removed Items
-
@@ -124,6 +129,9 @@ ABI Changes
* No ABI change that would break compatibility with 23.11.
+* ethdev: Added ``filter`` and ``names`` fields to ``rte_dev_reg_info``
+ structure for reporting names of regiters and filtering them by names.
+
Known Issues
diff --git a/lib/ethdev/rte_dev_info.h b/lib/ethdev/rte_dev_info.h
index 67cf0ae52668..2f4541bd46c8 100644
--- a/lib/ethdev/rte_dev_info.h
+++ b/lib/ethdev/rte_dev_info.h
@@ -11,6 +11,11 @@ extern "C" {
#include
+#define RTE_ETH_REG_NAME_SIZE 128
+struct rte_eth_reg_name {
+ char name[RTE_ETH_REG_NAME_SIZE];
+};
+
/*
* Placeholder for accessing device registers
*/
@@ -20,6 +25,12 @@ struct rte_dev_reg_info {
uint32_t length; /**< Number of registers to fetch */
uint32_t width; /**< Size of device register */
uint32_t version; /**< Device version */
+ /**
+* Filter for target subset of registers.
+* This field could affects register selection for data/length/names.
+*/
+ char *filter;
+ struct rte_eth_reg_name *names; /**< Registers name saver */
};
/*
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index f1c658f49e80..3e0294e49092 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -6388,8 +6388,39 @@ rte_eth_read_clock(uint16_t port_id, uint64_t *clock)
int
rte_eth_dev_get_reg_info(uint16_t port_id, struct rte_dev_reg_info *info)
+{
+ struct rte_dev_reg_info reg_info;
+ int ret;
+
+ if (info == NULL) {
+ RTE_ETHDEV_LOG_LINE(ERR,
+ "Cannot get ethdev port %u register info to NULL",
+ port_id);
+ return -EINVAL;
+ }
+
+ reg_info.length = info->length;
+ reg_info.data = info->data;
+ reg_info.names = NULL;
+ reg_info.filter = NULL;
+
+ ret = rte_eth_dev_get_reg_info_ext(port_id, ®_info);
+ if (ret != 0)
+ return ret;
+
+ info->length = reg_info.length;
+ info->width = reg_info.width;
+ info->version = reg_info.version;
+ info->offset = reg_info.offset;
+
+ return 0;
+}
+
+int
+rte_eth_dev_get_reg_info_ext(uint16_t port_id, struct rte_dev_reg_info *info)
{
struct rte_eth_dev *dev;
+ uint32_t i;
int ret;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
@@ -6408,6 +6439,11 @@ rte_eth_dev_get_reg_info(uint16_t port_id, struct
rte_dev_reg_info *info)
rte_ethdev_trace_get_reg_info(port_id, info, ret);
+ /* Report the default names if drivers not report. */
+ if (info->names != NULL && strlen(info->names[0].name) == 0)
+ for (i = 0; i < info->length; i++)
+ sprintf(info->names[i].name, "offset_%x",
+ info->offset + i * info->width);
return ret;
}
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index 2687c23fa6fb..3abc2ad3f865 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -5053,6 +5053,28 @@ __rte_experimental
int rte_eth_get_monitor_addr(uint16_t port_id, uint16_t queue_id,
struct rte_power_monitor_cond *pmc);
+/**
+ * Retrieve the filtered device registers (values and names) and
+ * register attributes (number of registers and register size)
+ *
+ * @param port_id
+ * The port identifier of the Ethernet device.
+ * @param info
+ * Pointer to rte_dev_reg_info structure to fill in. If info->data is
+ * NULL, the function fills in the width and length fie
[PATCH v2 3/7] net/hns3: fix dump counter of registers
Since the driver dumps the queue interrupt registers according
to the intr_tqps_num, the counter should be the same.
Fixes: acb3260fac5c ("net/hns3: fix dump register out of range")
Fixes: 936eda25e8da ("net/hns3: support dump register")
Signed-off-by: Jie Hai
Cc: sta...@dpdk.org
---
drivers/net/hns3/hns3_regs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index be1be6a89c94..d77170481a3d 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -135,7 +135,7 @@ hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length)
tqp_intr_lines = sizeof(tqp_intr_reg_addrs) / REG_LEN_PER_LINE + 1;
len = (cmdq_lines + common_lines + ring_lines * hw->tqps_num +
- tqp_intr_lines * hw->num_msi) * REG_NUM_PER_LINE;
+ tqp_intr_lines * hw->intr_tqps_num) * REG_NUM_PER_LINE;
if (!hns->is_vf) {
ret = hns3_get_regs_num(hw, ®s_num_32_bit, ®s_num_64_bit);
--
2.30.0
[PATCH v2 4/7] net/hns3: remove dump format of registers
Since the driver is going to support reporting names of
all registers, remove the counter and insert of separators
between diffent register modules.
Signed-off-by: Jie Hai
---
drivers/net/hns3/hns3_regs.c | 67 ++--
1 file changed, 18 insertions(+), 49 deletions(-)
diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index d77170481a3d..b1c0d538a3c8 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -10,12 +10,9 @@
#include "hns3_rxtx.h"
#include "hns3_regs.h"
-#define MAX_SEPARATE_NUM 4
-#define SEPARATOR_VALUE0x
-#define REG_NUM_PER_LINE 4
-#define REG_LEN_PER_LINE (REG_NUM_PER_LINE * sizeof(uint32_t))
+#define HNS3_64_BIT_REG_SIZE (sizeof(uint64_t) / sizeof(uint32_t))
-static int hns3_get_dfx_reg_line(struct hns3_hw *hw, uint32_t *lines);
+static int hns3_get_dfx_reg_cnt(struct hns3_hw *hw, uint32_t *count);
static const uint32_t cmdq_reg_addrs[] = {HNS3_CMDQ_TX_ADDR_L_REG,
HNS3_CMDQ_TX_ADDR_H_REG,
@@ -119,23 +116,22 @@ static int
hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length)
{
struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
- uint32_t cmdq_lines, common_lines, ring_lines, tqp_intr_lines;
+ uint32_t cmdq_cnt, common_cnt, ring_cnt, tqp_intr_cnt;
uint32_t regs_num_32_bit, regs_num_64_bit;
- uint32_t dfx_reg_lines;
+ uint32_t dfx_reg_cnt;
uint32_t len;
int ret;
- cmdq_lines = sizeof(cmdq_reg_addrs) / REG_LEN_PER_LINE + 1;
+ cmdq_cnt = sizeof(cmdq_reg_addrs);
if (hns->is_vf)
- common_lines =
- sizeof(common_vf_reg_addrs) / REG_LEN_PER_LINE + 1;
+ common_cnt = sizeof(common_vf_reg_addrs);
else
- common_lines = sizeof(common_reg_addrs) / REG_LEN_PER_LINE + 1;
- ring_lines = sizeof(ring_reg_addrs) / REG_LEN_PER_LINE + 1;
- tqp_intr_lines = sizeof(tqp_intr_reg_addrs) / REG_LEN_PER_LINE + 1;
+ common_cnt = sizeof(common_reg_addrs);
+ ring_cnt = sizeof(ring_reg_addrs);
+ tqp_intr_cnt = sizeof(tqp_intr_reg_addrs);
- len = (cmdq_lines + common_lines + ring_lines * hw->tqps_num +
- tqp_intr_lines * hw->intr_tqps_num) * REG_NUM_PER_LINE;
+ len = cmdq_cnt + common_cnt + ring_cnt * hw->tqps_num +
+ tqp_intr_cnt * hw->intr_tqps_num;
if (!hns->is_vf) {
ret = hns3_get_regs_num(hw, ®s_num_32_bit, ®s_num_64_bit);
@@ -144,18 +140,16 @@ hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length)
"ret = %d.", ret);
return ret;
}
- dfx_reg_lines = regs_num_32_bit * sizeof(uint32_t) /
- REG_LEN_PER_LINE + 1;
- dfx_reg_lines += regs_num_64_bit * sizeof(uint64_t) /
- REG_LEN_PER_LINE + 1;
+ dfx_reg_cnt = regs_num_32_bit +
+ regs_num_64_bit * HNS3_64_BIT_REG_SIZE;
- ret = hns3_get_dfx_reg_line(hw, &dfx_reg_lines);
+ ret = hns3_get_dfx_reg_cnt(hw, &dfx_reg_cnt);
if (ret) {
hns3_err(hw, "fail to get the number of dfx registers, "
"ret = %d.", ret);
return ret;
}
- len += dfx_reg_lines * REG_NUM_PER_LINE;
+ len += dfx_reg_cnt;
}
*length = len;
@@ -276,18 +270,6 @@ hns3_get_64_bit_regs(struct hns3_hw *hw, uint32_t
regs_num, void *data)
return 0;
}
-static int
-hns3_insert_reg_separator(int reg_num, uint32_t *data)
-{
- int separator_num;
- int i;
-
- separator_num = MAX_SEPARATE_NUM - reg_num % REG_NUM_PER_LINE;
- for (i = 0; i < separator_num; i++)
- *data++ = SEPARATOR_VALUE;
- return separator_num;
-}
-
static int
hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *data)
{
@@ -302,7 +284,6 @@ hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *data)
reg_num = sizeof(cmdq_reg_addrs) / sizeof(uint32_t);
for (i = 0; i < reg_num; i++)
*data++ = hns3_read_dev(hw, cmdq_reg_addrs[i]);
- data += hns3_insert_reg_separator(reg_num, data);
if (hns->is_vf)
reg_num = sizeof(common_vf_reg_addrs) / sizeof(uint32_t);
@@ -313,7 +294,6 @@ hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *data)
*data++ = hns3_read_dev(hw, common_vf_reg_addrs[i]);
else
*data++ = hns3_read_dev(hw, common_reg_addrs[i]);
- data += hns3_insert_reg_separator(reg_num, data);
reg_num = sizeof(ring_reg_addrs) / sizeof(uint32_t);
for (j = 0; j < hw->tqps_num; j++) {
@@ -321,7 +301,6 @@ hns3_direct_access_regs(struct hns3
[PATCH v2 5/7] net/hns3: add names for registers
This patch adds names for all registers to be dumped.
For those who can be directly accessed by their addresses,
a new structure containing both name and address is added
and the related arrays is refactored and renamed.
For the remaining modules, there may be different meanings
on different platforms for the same field. Therefore, two
name fields are provided.
There are some 64-bit registers, dump them as two 32-bit
registers.
Signed-off-by: Jie Hai
---
drivers/net/hns3/hns3_regs.c | 877 ---
1 file changed, 801 insertions(+), 76 deletions(-)
diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index b1c0d538a3c8..b7e4f78eecde 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -14,67 +14,84 @@
static int hns3_get_dfx_reg_cnt(struct hns3_hw *hw, uint32_t *count);
-static const uint32_t cmdq_reg_addrs[] = {HNS3_CMDQ_TX_ADDR_L_REG,
- HNS3_CMDQ_TX_ADDR_H_REG,
- HNS3_CMDQ_TX_DEPTH_REG,
- HNS3_CMDQ_TX_TAIL_REG,
- HNS3_CMDQ_TX_HEAD_REG,
- HNS3_CMDQ_RX_ADDR_L_REG,
- HNS3_CMDQ_RX_ADDR_H_REG,
- HNS3_CMDQ_RX_DEPTH_REG,
- HNS3_CMDQ_RX_TAIL_REG,
- HNS3_CMDQ_RX_HEAD_REG,
- HNS3_VECTOR0_CMDQ_SRC_REG,
- HNS3_CMDQ_INTR_STS_REG,
- HNS3_CMDQ_INTR_EN_REG,
- HNS3_CMDQ_INTR_GEN_REG};
-
-static const uint32_t common_reg_addrs[] = {HNS3_MISC_VECTOR_REG_BASE,
- HNS3_VECTOR0_OTER_EN_REG,
- HNS3_MISC_RESET_STS_REG,
- HNS3_VECTOR0_OTHER_INT_STS_REG,
- HNS3_GLOBAL_RESET_REG,
- HNS3_FUN_RST_ING,
- HNS3_GRO_EN_REG};
-
-static const uint32_t common_vf_reg_addrs[] = {HNS3_MISC_VECTOR_REG_BASE,
- HNS3_FUN_RST_ING,
- HNS3_GRO_EN_REG};
-
-static const uint32_t ring_reg_addrs[] = {HNS3_RING_RX_BASEADDR_L_REG,
- HNS3_RING_RX_BASEADDR_H_REG,
- HNS3_RING_RX_BD_NUM_REG,
- HNS3_RING_RX_BD_LEN_REG,
- HNS3_RING_RX_EN_REG,
- HNS3_RING_RX_MERGE_EN_REG,
- HNS3_RING_RX_TAIL_REG,
- HNS3_RING_RX_HEAD_REG,
- HNS3_RING_RX_FBDNUM_REG,
- HNS3_RING_RX_OFFSET_REG,
- HNS3_RING_RX_FBD_OFFSET_REG,
- HNS3_RING_RX_STASH_REG,
- HNS3_RING_RX_BD_ERR_REG,
- HNS3_RING_TX_BASEADDR_L_REG,
- HNS3_RING_TX_BASEADDR_H_REG,
- HNS3_RING_TX_BD_NUM_REG,
- HNS3_RING_TX_EN_REG,
- HNS3_RING_TX_PRIORITY_REG,
- HNS3_RING_TX_TC_REG,
- HNS3_RING_TX_MERGE_EN_REG,
- HNS3_RING_TX_TAIL_REG,
- HNS3_RING_TX_HEAD_REG,
- HNS3_RING_TX_FBDNUM_REG,
- HNS3_RING_TX_OFFSET_REG,
- HNS3_RING_TX_EBD_NUM_REG,
- HNS3_RING_TX_EBD_OFFSET_REG,
- HNS3_RING_TX_BD_ERR_REG,
- HNS3_RING_EN_REG};
-
-static const uint32_t tqp_intr_reg_addrs[] = {HNS3_TQP_INTR_CTRL_REG,
- HNS3_TQP_INTR_GL0_REG,
- HNS3_TQP_INTR_GL1_REG,
- HNS3_TQP_INTR_GL2_REG,
- HNS3_TQP_INTR_RL_REG};
+struct direct_reg_list {
+ const char *name;
+ uint32_t addr;
+};
+
+#define STR(s) #s
+
+static const struct direct_reg_list cmdq_reg_list[] = {
+ {STR(HNS3_CMDQ_TX_ADDR_L_REG), HNS3_CMDQ_TX_ADDR_L_REG},
+ {STR(HNS3_CMDQ_TX_ADDR_H_REG), HNS3_
[PATCH v2 6/7] net/hns3: support filter directly accessed registers
This patch supports reporting names of registers which
can be directly accessed by addresses and filtering
them by names.
Signed-off-by: Jie Hai
---
drivers/net/hns3/hns3_regs.c | 185 +--
1 file changed, 156 insertions(+), 29 deletions(-)
diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index b7e4f78eecde..ac07563ebaec 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -837,8 +837,24 @@ hns3_get_regs_num(struct hns3_hw *hw, uint32_t
*regs_num_32_bit,
return 0;
}
+static uint32_t
+hns3_get_direct_regs_cnt(const struct direct_reg_list *list,
+uint32_t len, char *filter)
+{
+ uint32_t i;
+ uint32_t count = 0;
+
+ for (i = 0 ; i < len; i++) {
+ if (filter != NULL && !strstr(list[i].name, filter))
+ continue;
+ count++;
+ }
+
+ return count;
+}
+
static int
-hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length)
+hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length, char *filter)
{
struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
uint32_t cmdq_cnt, common_cnt, ring_cnt, tqp_intr_cnt;
@@ -847,13 +863,18 @@ hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length)
uint32_t len;
int ret;
- cmdq_cnt = RTE_DIM(cmdq_reg_list);
+ cmdq_cnt = hns3_get_direct_regs_cnt(cmdq_reg_list,
+ RTE_DIM(cmdq_reg_list), filter);
if (hns->is_vf)
- common_cnt = sizeof(common_vf_reg_list);
+ common_cnt = hns3_get_direct_regs_cnt(common_vf_reg_list,
+ RTE_DIM(common_vf_reg_list), filter);
else
- common_cnt = RTE_DIM(common_reg_list);
- ring_cnt = RTE_DIM(ring_reg_list);
- tqp_intr_cnt = RTE_DIM(tqp_intr_reg_list);
+ common_cnt = hns3_get_direct_regs_cnt(common_reg_list,
+ RTE_DIM(common_reg_list), filter);
+ ring_cnt = hns3_get_direct_regs_cnt(ring_reg_list,
+ RTE_DIM(ring_reg_list), filter);
+ tqp_intr_cnt = hns3_get_direct_regs_cnt(tqp_intr_reg_list,
+ RTE_DIM(tqp_intr_reg_list), filter);
len = cmdq_cnt + common_cnt + ring_cnt * hw->tqps_num +
tqp_intr_cnt * hw->intr_tqps_num;
@@ -995,47 +1016,151 @@ hns3_get_64_bit_regs(struct hns3_hw *hw, uint32_t
regs_num, void *data)
return 0;
}
-static int
-hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *data)
+
+static uint32_t
+hns3_direct_access_cmdq_reg(struct hns3_hw *hw,
+ struct rte_dev_reg_info *regs,
+ uint32_t count)
{
- struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
- uint32_t *origin_data_ptr = data;
- uint32_t reg_offset;
+ uint32_t *data = regs->data;
size_t reg_num;
- uint16_t j;
+ data += count;
size_t i;
- /* fetching per-PF registers values from PF PCIe register space */
reg_num = RTE_DIM(cmdq_reg_list);
- for (i = 0; i < reg_num; i++)
+ for (i = 0; i < reg_num; i++) {
+ if (regs->filter != NULL &&
+ !strstr(cmdq_reg_list[i].name, regs->filter))
+ continue;
*data++ = hns3_read_dev(hw, cmdq_reg_list[i].addr);
+ snprintf(regs->names[count++].name, RTE_ETH_REG_NAME_SIZE,
+"%s", cmdq_reg_list[i].name);
+ }
- if (hns->is_vf)
- reg_num = RTE_DIM(common_vf_reg_list);
- else
- reg_num = RTE_DIM(common_reg_list);
- for (i = 0; i < reg_num; i++)
- if (hns->is_vf)
- *data++ = hns3_read_dev(hw, common_vf_reg_list[i].addr);
- else
- *data++ = hns3_read_dev(hw, common_reg_list[i].addr);
+ return count;
+}
+static uint32_t
+hns3_direct_access_common_reg(struct hns3_hw *hw,
+ struct rte_dev_reg_info *regs,
+ uint32_t count)
+{
+ uint32_t *data = regs->data;
+ size_t reg_num;
+ data += count;
+ size_t i;
+
+ reg_num = RTE_DIM(common_reg_list);
+ for (i = 0; i < reg_num; i++) {
+ if (regs->filter != NULL &&
+ !strstr(common_reg_list[i].name, regs->filter))
+ continue;
+ *data++ = hns3_read_dev(hw, common_reg_list[i].addr);
+ snprintf(regs->names[count++].name, RTE_ETH_REG_NAME_SIZE,
+"%s", common_reg_list[i].name);
+ }
+
+ return count;
+}
+
+static uint32_t
+hns3_direct_access_vf_common_reg(struct hns3_hw *hw,
+struct rte_dev_reg_info *regs,
+uint32_t
[PATCH v2 7/7] net/hns3: support filter dump of registers
This patch supports reporting names of the dfx registers
which filtering them by names.
Signed-off-by: Jie Hai
---
drivers/net/hns3/hns3_regs.c | 271 +--
1 file changed, 224 insertions(+), 47 deletions(-)
diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index ac07563ebaec..53b5a2dbe15f 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -12,7 +12,8 @@
#define HNS3_64_BIT_REG_SIZE (sizeof(uint64_t) / sizeof(uint32_t))
-static int hns3_get_dfx_reg_cnt(struct hns3_hw *hw, uint32_t *count);
+static int hns3_get_dfx_reg_cnt(struct hns3_hw *hw,
+ uint32_t *count, char *filter);
struct direct_reg_list {
const char *name;
@@ -853,12 +854,41 @@ hns3_get_direct_regs_cnt(const struct direct_reg_list
*list,
return count;
}
+static uint32_t
+hns3_get_32_64_regs_cnt(struct hns3_hw *hw, char *filter)
+{
+ uint32_t regs_num_32_bit, regs_num_64_bit;
+ int ret;
+ uint32_t i;
+ uint32_t count = 0;
+
+ ret = hns3_get_regs_num(hw, ®s_num_32_bit, ®s_num_64_bit);
+ if (ret) {
+ hns3_err(hw, "fail to get the number of registers, "
+"ret = %d.", ret);
+ return ret;
+ }
+
+ for (i = 0 ; i < regs_num_32_bit; i++) {
+ if (filter != NULL &&
+ !strstr(regs_32_bit_list[i].new_name, filter))
+ continue;
+ count++;
+ }
+ for (i = 0 ; i < regs_num_64_bit * HNS3_64_BIT_REG_SIZE; i++) {
+ if (filter != NULL &&
+ !strstr(regs_64_bit_list[i].new_name, filter))
+ continue;
+ count++;
+ }
+ return count;
+}
+
static int
hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length, char *filter)
{
struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
uint32_t cmdq_cnt, common_cnt, ring_cnt, tqp_intr_cnt;
- uint32_t regs_num_32_bit, regs_num_64_bit;
uint32_t dfx_reg_cnt;
uint32_t len;
int ret;
@@ -880,16 +910,9 @@ hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length,
char *filter)
tqp_intr_cnt * hw->intr_tqps_num;
if (!hns->is_vf) {
- ret = hns3_get_regs_num(hw, ®s_num_32_bit, ®s_num_64_bit);
- if (ret) {
- hns3_err(hw, "fail to get the number of registers, "
-"ret = %d.", ret);
- return ret;
- }
- dfx_reg_cnt = regs_num_32_bit +
- regs_num_64_bit * HNS3_64_BIT_REG_SIZE;
+ dfx_reg_cnt = hns3_get_32_64_regs_cnt(hw, filter);
- ret = hns3_get_dfx_reg_cnt(hw, &dfx_reg_cnt);
+ ret = hns3_get_dfx_reg_cnt(hw, &dfx_reg_cnt, filter);
if (ret) {
hns3_err(hw, "fail to get the number of dfx registers, "
"ret = %d.", ret);
@@ -903,19 +926,19 @@ hns3_get_regs_length(struct hns3_hw *hw, uint32_t
*length, char *filter)
}
static int
-hns3_get_32_bit_regs(struct hns3_hw *hw, uint32_t regs_num, void *data)
+hns3_get_32_bit_regs(struct hns3_hw *hw, void *data)
{
#define HNS3_32_BIT_REG_RTN_DATANUM 8
#define HNS3_32_BIT_DESC_NODATA_LEN 2
struct hns3_cmd_desc *desc;
uint32_t *reg_val = data;
uint32_t *desc_data;
+ uint32_t regs_num;
int cmd_num;
int i, k, n;
int ret;
- if (regs_num == 0)
- return 0;
+ regs_num = RTE_DIM(regs_32_bit_list);
cmd_num = DIV_ROUND_UP(regs_num + HNS3_32_BIT_DESC_NODATA_LEN,
HNS3_32_BIT_REG_RTN_DATANUM);
@@ -959,20 +982,66 @@ hns3_get_32_bit_regs(struct hns3_hw *hw, uint32_t
regs_num, void *data)
return 0;
}
+static void
+hns3_filter_32_bit_regs(struct rte_dev_reg_info *regs,
+ uint32_t *count, uint32_t *data)
+{
+ uint32_t *regs_data;
+ regs_data = regs->data;
+ regs_data += *count;
+ uint32_t i;
+
+ for (i = 0; i < RTE_DIM(regs_32_bit_list); i++) {
+ if (regs->filter != NULL &&
+ !strstr(regs_32_bit_list[i].new_name, regs->filter)) {
+ data++;
+ continue;
+ }
+ *regs_data++ = *data++;
+ snprintf(regs->names[(*count)++].name, RTE_ETH_REG_NAME_SIZE,
+"%s", regs_32_bit_list[i].new_name);
+ }
+}
+
static int
-hns3_get_64_bit_regs(struct hns3_hw *hw, uint32_t regs_num, void *data)
+hns3_get_32_bit_regs_filtered(struct hns3_hw *hw,
+ struct rte_dev_reg_info *regs, uint32_t *count)
+{
+ uint32_t *data;
+ int ret;
+
+ if (count == NULL)
+ return -EINVAL;
+
+ data = rte_zmalloc(NULL, sizeof(uint3
Re: [PATCH v2] ethdev: fast path async flow API
31/01/2024 10:35, Dariusz Sosnowski:
> This patch reworks the async flow API functions called in data path,
> to reduce the overhead during flow operations at the library level.
> Main source of the overhead was indirection and checks done while
> ethdev library was fetching rte_flow_ops from a given driver.
>
> This patch introduces rte_flow_fp_ops struct which holds callbacks
> to driver's implementation of fast path async flow API functions.
> Each driver implementing these functions must populate flow_fp_ops
> field inside rte_eth_dev structure with a reference to
> its own implementation.
> By default, ethdev library provides dummy callbacks with
> implementations returning ENOSYS.
> Such design provides a few assumptions:
>
> - rte_flow_fp_ops struct for given port is always available.
> - Each callback is either:
> - Default provided by library.
> - Set up by driver.
It looks similar to what was done in the commit
c87d435a4d79 ("ethdev: copy fast-path API into separate structure")
right?
Maybe worth to mention in the commit log.
> As a result, no checks for availability of the implementation
> are needed at library level in data path.
> Any library-level validation checks in async flow API are compiled
> if and only if RTE_FLOW_DEBUG macro is defined.
How are we supposed to enable RTE_FLOW_DEBUG?
May it be enabled automatically if other debug option is globally enabled?
One comment on the code style: please compare pointers explicitly with NULL
instead of considering them as boolean.
Re: [PATCH v6 1/3] ethdev: rename action modify field data structure
02/02/2024 01:42, Suanming Mou:
> --- a/doc/guides/rel_notes/release_24_03.rst
> +++ b/doc/guides/rel_notes/release_24_03.rst
> @@ -124,6 +124,8 @@ ABI Changes
>
> * No ABI change that would break compatibility with 23.11.
>
> +* ethdev: Rename the experimental ``struct rte_flow_action_modify_data`` to
> be ``struct rte_flow_field_data``
It should be in API change section.
Please us past tense as recommened in comments in the file.
> --- a/lib/ethdev/rte_flow.h
> +++ b/lib/ethdev/rte_flow.h
> @@ -3894,6 +3894,7 @@ struct rte_flow_action_ethdev {
>
> /**
> * Field IDs for MODIFY_FIELD action.
> + * e.g. the packet field IDs used in RTE_FLOW_ACTION_TYPE_MODIFY_FIELD.
Better to give the full name in the first line,
so no need to add a second line of comment.
[...]
> - * Field description for MODIFY_FIELD action.
> + * Field description for packet field.
> + * e.g. the packet fields used in RTE_FLOW_ACTION_TYPE_MODIFY_FIELD.
Same here, can be one simple line with full name.
RE: [PATCH v6 1/3] ethdev: rename action modify field data structure
Hi Thomas,
> -Original Message-
> From: Thomas Monjalon
> Sent: Monday, February 5, 2024 7:23 PM
> To: Suanming Mou
> Cc: ferruh.yi...@amd.com; Ori Kam ; Aman Singh
> ; Yuying Zhang ; Dariusz
> Sosnowski ; Slava Ovsiienko
> ; Matan Azrad ; Andrew
> Rybchenko ; dev@dpdk.org
> Subject: Re: [PATCH v6 1/3] ethdev: rename action modify field data structure
>
> 02/02/2024 01:42, Suanming Mou:
> > --- a/doc/guides/rel_notes/release_24_03.rst
> > +++ b/doc/guides/rel_notes/release_24_03.rst
> > @@ -124,6 +124,8 @@ ABI Changes
> >
> > * No ABI change that would break compatibility with 23.11.
> >
> > +* ethdev: Rename the experimental ``struct
> > +rte_flow_action_modify_data`` to be ``struct rte_flow_field_data``
>
> It should be in API change section.
> Please us past tense as recommened in comments in the file.
OK.
>
> > --- a/lib/ethdev/rte_flow.h
> > +++ b/lib/ethdev/rte_flow.h
> > @@ -3894,6 +3894,7 @@ struct rte_flow_action_ethdev {
> >
> > /**
> > * Field IDs for MODIFY_FIELD action.
> > + * e.g. the packet field IDs used in RTE_FLOW_ACTION_TYPE_MODIFY_FIELD.
>
> Better to give the full name in the first line, so no need to add a second
> line of
> comment.
So maybe " Field IDs for packet field, used by
RTE_FLOW_ACTION_TYPE_MODIFY_FIELD."?
But when COMPARE item to be added. It will be " Field IDs for packet field,
used by RTE_FLOW_ACTION_TYPE_MODIFY_FIELD and RTE_FLOW_ITEM_TYPE_COMPARE." And
I assume that will still need a second line since it is too long.
>
> [...]
> > - * Field description for MODIFY_FIELD action.
> > + * Field description for packet field.
> > + * e.g. the packet fields used in RTE_FLOW_ACTION_TYPE_MODIFY_FIELD.
>
> Same here, can be one simple line with full name.
>
>
Re: [PATCH v6 1/3] ethdev: rename action modify field data structure
> > > --- a/lib/ethdev/rte_flow.h
> > > +++ b/lib/ethdev/rte_flow.h
> > > @@ -3894,6 +3894,7 @@ struct rte_flow_action_ethdev {
> > >
> > > /**
> > > * Field IDs for MODIFY_FIELD action.
> > > + * e.g. the packet field IDs used in RTE_FLOW_ACTION_TYPE_MODIFY_FIELD.
> >
> > Better to give the full name in the first line, so no need to add a second
> > line of
> > comment.
>
> So maybe " Field IDs for packet field, used by
> RTE_FLOW_ACTION_TYPE_MODIFY_FIELD."?
Yes, or just
"Packet header field IDs, used by RTE_FLOW_ACTION_TYPE_MODIFY_FIELD."
> But when COMPARE item to be added. It will be " Field IDs for packet field,
> used by RTE_FLOW_ACTION_TYPE_MODIFY_FIELD and RTE_FLOW_ITEM_TYPE_COMPARE."
> And I assume that will still need a second line since it is too long.
Yes no problem, I'm just trying to have something concise while being explicit
and easy to read.
Re: [PATCH 01/13] net/ionic: add stat for completion queue entries processed
> On Feb 2, 2024, at 11:24 PM, Stephen Hemminger > wrote: > > Caution: This message originated from an External Source. Use proper caution > when opening attachments, clicking links, or responding. > > > On Fri, 2 Feb 2024 11:32:26 -0800 > Andrew Boyer wrote: > >> When completion coalescing is turned on in the FW, there will be >> fewer CQE than Tx packets. Expose the stat through debug logging. >> >> Signed-off-by: Andrew Boyer > > If you care about the stat it should be in xstats. Thanks for looking. Moving all of our per-queue stats to xstats is on the todo list. -Andrew
RE: [PATCH v6 1/3] ethdev: rename action modify field data structure
Hi,
> -Original Message-
> From: Thomas Monjalon
> Sent: Monday, February 5, 2024 8:39 PM
> To: Suanming Mou
> Cc: dev@dpdk.org; ferruh.yi...@amd.com; Ori Kam ; Aman
> Singh ; Yuying Zhang ;
> Dariusz Sosnowski ; Slava Ovsiienko
> ; Matan Azrad ; Andrew
> Rybchenko ; dev@dpdk.org
> Subject: Re: [PATCH v6 1/3] ethdev: rename action modify field data structure
>
> > > > --- a/lib/ethdev/rte_flow.h
> > > > +++ b/lib/ethdev/rte_flow.h
> > > > @@ -3894,6 +3894,7 @@ struct rte_flow_action_ethdev {
> > > >
> > > > /**
> > > > * Field IDs for MODIFY_FIELD action.
> > > > + * e.g. the packet field IDs used in
> RTE_FLOW_ACTION_TYPE_MODIFY_FIELD.
> > >
> > > Better to give the full name in the first line, so no need to add a
> > > second line of comment.
> >
> > So maybe " Field IDs for packet field, used by
> RTE_FLOW_ACTION_TYPE_MODIFY_FIELD."?
>
> Yes, or just
> "Packet header field IDs, used by RTE_FLOW_ACTION_TYPE_MODIFY_FIELD."
>
> > But when COMPARE item to be added. It will be " Field IDs for packet field,
> > used
> by RTE_FLOW_ACTION_TYPE_MODIFY_FIELD and
> RTE_FLOW_ITEM_TYPE_COMPARE." And I assume that will still need a second
> line since it is too long.
>
> Yes no problem, I'm just trying to have something concise while being
> explicit and
> easy to read.
Got it, thanks. Will update.
>
>
Re: [PATCH v6 2/3] ethdev: add compare item
02/02/2024 01:42, Suanming Mou:
> --- a/doc/guides/rel_notes/release_24_03.rst
> +++ b/doc/guides/rel_notes/release_24_03.rst
> +* **Added compare flow matching criteria.**
Suggestion:
"Added flow matching with various comparisons."
Not sure how to illustrate the idea.
> + Added ``RTE_FLOW_ITEM_TYPE_COMPARE`` to allow matching on compare
s/compare/comparison/
> + result between the packet fields or value.
remove "the"
> --- a/lib/ethdev/rte_flow.h
> +++ b/lib/ethdev/rte_flow.h
> + /**
> + * Matches the packet with compare result.
Match packet with various comparison types.
> + *
> + * See struct rte_flow_item_compare.
> + */
> + RTE_FLOW_ITEM_TYPE_COMPARE,
> };
>
> /**
> @@ -2365,6 +2372,182 @@ static const struct rte_flow_item_ptype
> rte_flow_item_ptype_mask = {
> };
> #endif
>
> +/**
> + * Field IDs for packet field.
> + * e.g. the packet field IDs used in RTE_FLOW_ACTION_TYPE_MODIFY_FIELD
> + * and RTE_FLOW_ITEM_TYPE_COMPARE.
> + */
> +enum rte_flow_field_id {
> + RTE_FLOW_FIELD_START = 0, /**< Start of a packet. */
> + RTE_FLOW_FIELD_MAC_DST, /**< Destination MAC Address. */
> + RTE_FLOW_FIELD_MAC_SRC, /**< Source MAC Address. */
> + RTE_FLOW_FIELD_VLAN_TYPE, /**< VLAN Tag Identifier. */
> + RTE_FLOW_FIELD_VLAN_ID, /**< VLAN Identifier. */
> + RTE_FLOW_FIELD_MAC_TYPE,/**< EtherType. */
> + RTE_FLOW_FIELD_IPV4_DSCP, /**< IPv4 DSCP. */
> + RTE_FLOW_FIELD_IPV4_TTL,/**< IPv4 Time To Live. */
> + RTE_FLOW_FIELD_IPV4_SRC,/**< IPv4 Source Address. */
> + RTE_FLOW_FIELD_IPV4_DST,/**< IPv4 Destination Address. */
> + RTE_FLOW_FIELD_IPV6_DSCP, /**< IPv6 DSCP. */
> + RTE_FLOW_FIELD_IPV6_HOPLIMIT, /**< IPv6 Hop Limit. */
> + RTE_FLOW_FIELD_IPV6_SRC,/**< IPv6 Source Address. */
> + RTE_FLOW_FIELD_IPV6_DST,/**< IPv6 Destination Address. */
> + RTE_FLOW_FIELD_TCP_PORT_SRC,/**< TCP Source Port Number. */
> + RTE_FLOW_FIELD_TCP_PORT_DST,/**< TCP Destination Port Number. */
> + RTE_FLOW_FIELD_TCP_SEQ_NUM, /**< TCP Sequence Number. */
> + RTE_FLOW_FIELD_TCP_ACK_NUM, /**< TCP Acknowledgment Number. */
> + RTE_FLOW_FIELD_TCP_FLAGS, /**< TCP Flags. */
> + RTE_FLOW_FIELD_UDP_PORT_SRC,/**< UDP Source Port Number. */
> + RTE_FLOW_FIELD_UDP_PORT_DST,/**< UDP Destination Port Number. */
> + RTE_FLOW_FIELD_VXLAN_VNI, /**< VXLAN Network Identifier. */
> + RTE_FLOW_FIELD_GENEVE_VNI, /**< GENEVE Network Identifier. */
> + RTE_FLOW_FIELD_GTP_TEID,/**< GTP Tunnel Endpoint Identifier. */
> + RTE_FLOW_FIELD_TAG, /**< Tag value. */
> + RTE_FLOW_FIELD_MARK,/**< Mark value. */
> + RTE_FLOW_FIELD_META,/**< Metadata value. */
> + RTE_FLOW_FIELD_POINTER, /**< Memory pointer. */
> + RTE_FLOW_FIELD_VALUE, /**< Immediate value. */
> + RTE_FLOW_FIELD_IPV4_ECN,/**< IPv4 ECN. */
> + RTE_FLOW_FIELD_IPV6_ECN,/**< IPv6 ECN. */
> + RTE_FLOW_FIELD_GTP_PSC_QFI, /**< GTP QFI. */
> + RTE_FLOW_FIELD_METER_COLOR, /**< Meter color marker. */
> + RTE_FLOW_FIELD_IPV6_PROTO, /**< IPv6 next header. */
> + RTE_FLOW_FIELD_FLEX_ITEM, /**< Flex item. */
> + RTE_FLOW_FIELD_HASH_RESULT, /**< Hash result. */
> + RTE_FLOW_FIELD_GENEVE_OPT_TYPE, /**< GENEVE option type. */
> + RTE_FLOW_FIELD_GENEVE_OPT_CLASS,/**< GENEVE option class. */
> + RTE_FLOW_FIELD_GENEVE_OPT_DATA, /**< GENEVE option data. */
> + RTE_FLOW_FIELD_MPLS,/**< MPLS header. */
> + RTE_FLOW_FIELD_TCP_DATA_OFFSET, /**< TCP data offset. */
> + RTE_FLOW_FIELD_IPV4_IHL,/**< IPv4 IHL. */
> + RTE_FLOW_FIELD_IPV4_TOTAL_LEN, /**< IPv4 total length. */
> + RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN,/**< IPv6 payload length. */
> + RTE_FLOW_FIELD_RANDOM /**< Random value. */
> +};
You should use spaces for aligmnent of the comments.
[...]
> +struct rte_flow_field_data {
> + enum rte_flow_field_id field; /**< Field or memory type ID. */
> + union {
> + struct {
> + /** Encapsulation level and tag index or flex item
> handle. */
> + union {
> + struct {
> + /**
> + * Packet encapsulation level containing
> + * the field to modify.
> + *
> + * - @p 0 requests the default behavior.
> + * Depending on the packet type, it
> + * can mean outermost, innermost or
> + * anything in between.
> + *
> +
RE: [PATCH v2] ethdev: fast path async flow API
> -Original Message-
> From: Thomas Monjalon
> Sent: Monday, February 5, 2024 12:08
> To: Dariusz Sosnowski
> Cc: Slava Ovsiienko ; Ori Kam ;
> Suanming Mou ; Matan Azrad
> ; Ferruh Yigit ; Andrew
> Rybchenko ; dev@dpdk.org
> Subject: Re: [PATCH v2] ethdev: fast path async flow API
>
> 31/01/2024 10:35, Dariusz Sosnowski:
> > This patch reworks the async flow API functions called in data path,
> > to reduce the overhead during flow operations at the library level.
> > Main source of the overhead was indirection and checks done while
> > ethdev library was fetching rte_flow_ops from a given driver.
> >
> > This patch introduces rte_flow_fp_ops struct which holds callbacks to
> > driver's implementation of fast path async flow API functions.
> > Each driver implementing these functions must populate flow_fp_ops
> > field inside rte_eth_dev structure with a reference to its own
> > implementation.
> > By default, ethdev library provides dummy callbacks with
> > implementations returning ENOSYS.
> > Such design provides a few assumptions:
> >
> > - rte_flow_fp_ops struct for given port is always available.
> > - Each callback is either:
> > - Default provided by library.
> > - Set up by driver.
>
> It looks similar to what was done in the commit
> c87d435a4d79 ("ethdev: copy fast-path API into separate structure") right?
> Maybe worth to mention in the commit log.
Right, proposed design is based on what happens in Rx/Tx datapath.
I think it's worth mentioning the commit. I'll add a reference in v3.
> > As a result, no checks for availability of the implementation are
> > needed at library level in data path.
> > Any library-level validation checks in async flow API are compiled if
> > and only if RTE_FLOW_DEBUG macro is defined.
>
> How are we supposed to enable RTE_FLOW_DEBUG?
I should document it, but the idea was that it must be explicitly enabled
during build,
by adding -c_args=-DRTE_FLOW_DEBUG to meson options.
Do you think doc/guides/nics/build_and_test.rst is a good place to document
this option?
It would be documented alongside RTE_ETHDEV_DEBUG_RX and RTE_ETHDEV_DEBUG_TX.
> May it be enabled automatically if other debug option is globally enabled?
Do you mean that if buildtype is defined as debug, then RTE_FLOW_DEBUG is
defined automatically?
I think that's a good idea.
> One comment on the code style: please compare pointers explicitly with NULL
> instead of considering them as boolean.
Ok. I'll fix it and I'll send v3.
Best regards,
Dariusz Sosnowski
Re: [PATCH 13/13] net/ionic: optimize device start operation
> On Feb 2, 2024, at 11:28 PM, Stephen Hemminger > wrote: > > Caution: This message originated from an External Source. Use proper caution > when opening attachments, clicking links, or responding. > > > On Fri, 2 Feb 2024 11:32:38 -0800 > Andrew Boyer wrote: > >> + memset(ctx, 0, sizeof(*ctx)); >> + ctx->pending_work = true; >> + ctx->cmd.q_init.opcode = IONIC_CMD_Q_INIT; >> + ctx->cmd.q_init.type = q->type; >> + ctx->cmd.q_init.ver = lif->qtype_info[q->type].version; >> + ctx->cmd.q_init.index = rte_cpu_to_le_32(q->index); >> + ctx->cmd.q_init.flags = rte_cpu_to_le_16(IONIC_QINIT_F_ENA); >> + ctx->cmd.q_init.intr_index = rte_cpu_to_le_16(IONIC_INTR_NONE); >> + ctx->cmd.q_init.ring_size = rte_log2_u32(q->num_descs); >> + ctx->cmd.q_init.cq_ring_base = rte_cpu_to_le_64(cq->base_pa); >> + ctx->cmd.q_init.sg_ring_base = rte_cpu_to_le_64(q->sg_base_pa); >> + > > memset followed by assignment is technically slower than structure > initialization because it requires two writes to the data. > But the optimizer may in some cases figure that out. Thanks for looking. Since DPDK requires C11 now, and I see other users of compound literals in lib/, I'll respin this to use that instead. (The internet says unset fields are implicitly initialized to zero, hopefully that's correct.) It makes the diff a lot cleaner, too. Thanks, Andrew
RE: [PATCH v6 2/3] ethdev: add compare item
Hi Thomas,
> -Original Message-
> From: Thomas Monjalon
> Sent: Monday, February 5, 2024 9:01 PM
> To: Suanming Mou
> Cc: ferruh.yi...@amd.com; Ori Kam ; Aman Singh
> ; Yuying Zhang ;
> Andrew Rybchenko ; dev@dpdk.org
> Subject: Re: [PATCH v6 2/3] ethdev: add compare item
>
> 02/02/2024 01:42, Suanming Mou:
> > --- a/doc/guides/rel_notes/release_24_03.rst
> > +++ b/doc/guides/rel_notes/release_24_03.rst
> > +* **Added compare flow matching criteria.**
>
> Suggestion:
> "Added flow matching with various comparisons."
> Not sure how to illustrate the idea.
What about " Added flow matching with various comparison results." ?
>
> > + Added ``RTE_FLOW_ITEM_TYPE_COMPARE`` to allow matching on compare
>
> s/compare/comparison/
>
> > + result between the packet fields or value.
>
> remove "the"
>
>
> > --- a/lib/ethdev/rte_flow.h
> > +++ b/lib/ethdev/rte_flow.h
> > + /**
> > +* Matches the packet with compare result.
>
> Match packet with various comparison types.
>
> > +*
> > +* See struct rte_flow_item_compare.
> > +*/
> > + RTE_FLOW_ITEM_TYPE_COMPARE,
> > };
> >
> > /**
> > @@ -2365,6 +2372,182 @@ static const struct rte_flow_item_ptype
> > rte_flow_item_ptype_mask = { }; #endif
> >
> > +/**
> > + * Field IDs for packet field.
> > + * e.g. the packet field IDs used in
> > +RTE_FLOW_ACTION_TYPE_MODIFY_FIELD
> > + * and RTE_FLOW_ITEM_TYPE_COMPARE.
> > + */
> > +enum rte_flow_field_id {
> > + RTE_FLOW_FIELD_START = 0, /**< Start of a packet. */
> > + RTE_FLOW_FIELD_MAC_DST, /**< Destination MAC Address.
> */
> > + RTE_FLOW_FIELD_MAC_SRC, /**< Source MAC Address. */
> > + RTE_FLOW_FIELD_VLAN_TYPE, /**< VLAN Tag Identifier. */
> > + RTE_FLOW_FIELD_VLAN_ID, /**< VLAN Identifier. */
> > + RTE_FLOW_FIELD_MAC_TYPE,/**< EtherType. */
> > + RTE_FLOW_FIELD_IPV4_DSCP, /**< IPv4 DSCP. */
> > + RTE_FLOW_FIELD_IPV4_TTL,/**< IPv4 Time To Live. */
> > + RTE_FLOW_FIELD_IPV4_SRC,/**< IPv4 Source Address. */
> > + RTE_FLOW_FIELD_IPV4_DST,/**< IPv4 Destination Address. */
> > + RTE_FLOW_FIELD_IPV6_DSCP, /**< IPv6 DSCP. */
> > + RTE_FLOW_FIELD_IPV6_HOPLIMIT, /**< IPv6 Hop Limit. */
> > + RTE_FLOW_FIELD_IPV6_SRC,/**< IPv6 Source Address. */
> > + RTE_FLOW_FIELD_IPV6_DST,/**< IPv6 Destination Address. */
> > + RTE_FLOW_FIELD_TCP_PORT_SRC,/**< TCP Source Port Number.
> */
> > + RTE_FLOW_FIELD_TCP_PORT_DST,/**< TCP Destination Port
> Number. */
> > + RTE_FLOW_FIELD_TCP_SEQ_NUM, /**< TCP Sequence Number. */
> > + RTE_FLOW_FIELD_TCP_ACK_NUM, /**< TCP Acknowledgment
> Number. */
> > + RTE_FLOW_FIELD_TCP_FLAGS, /**< TCP Flags. */
> > + RTE_FLOW_FIELD_UDP_PORT_SRC,/**< UDP Source Port Number.
> */
> > + RTE_FLOW_FIELD_UDP_PORT_DST,/**< UDP Destination Port
> Number. */
> > + RTE_FLOW_FIELD_VXLAN_VNI, /**< VXLAN Network Identifier. */
> > + RTE_FLOW_FIELD_GENEVE_VNI, /**< GENEVE Network
> Identifier. */
> > + RTE_FLOW_FIELD_GTP_TEID,/**< GTP Tunnel Endpoint Identifier. */
> > + RTE_FLOW_FIELD_TAG, /**< Tag value. */
> > + RTE_FLOW_FIELD_MARK,/**< Mark value. */
> > + RTE_FLOW_FIELD_META,/**< Metadata value. */
> > + RTE_FLOW_FIELD_POINTER, /**< Memory pointer. */
> > + RTE_FLOW_FIELD_VALUE, /**< Immediate value. */
> > + RTE_FLOW_FIELD_IPV4_ECN,/**< IPv4 ECN. */
> > + RTE_FLOW_FIELD_IPV6_ECN,/**< IPv6 ECN. */
> > + RTE_FLOW_FIELD_GTP_PSC_QFI, /**< GTP QFI. */
> > + RTE_FLOW_FIELD_METER_COLOR, /**< Meter color marker. */
> > + RTE_FLOW_FIELD_IPV6_PROTO, /**< IPv6 next header. */
> > + RTE_FLOW_FIELD_FLEX_ITEM, /**< Flex item. */
> > + RTE_FLOW_FIELD_HASH_RESULT, /**< Hash result. */
> > + RTE_FLOW_FIELD_GENEVE_OPT_TYPE, /**< GENEVE option type. */
> > + RTE_FLOW_FIELD_GENEVE_OPT_CLASS,/**< GENEVE option class. */
> > + RTE_FLOW_FIELD_GENEVE_OPT_DATA, /**< GENEVE option data. */
> > + RTE_FLOW_FIELD_MPLS,/**< MPLS header. */
> > + RTE_FLOW_FIELD_TCP_DATA_OFFSET, /**< TCP data offset. */
> > + RTE_FLOW_FIELD_IPV4_IHL,/**< IPv4 IHL. */
> > + RTE_FLOW_FIELD_IPV4_TOTAL_LEN, /**< IPv4 total length. */
> > + RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN,/**< IPv6 payload length. */
> > + RTE_FLOW_FIELD_RANDOM /**< Random value. */
> > +};
>
> You should use spaces for aligmnent of the comments.
Sorry, the original code is not using spaces.
Anyway, never mind, since I touched that, let me format them with spaces.
>
> [...]
> > +struct rte_flow_field_data {
> > + enum rte_flow_field_id field; /**< Field or memory type ID. */
> > + union {
> > + struct {
> > + /** Encapsulation level and tag index or flex item
> handle. */
> > + union {
> > + struct {
> > +
Re: [PATCH 04/13] net/ionic: fix missing volatile type for cqe pointers
> On Feb 2, 2024, at 11:26 PM, Stephen Hemminger
> wrote:
>
> Caution: This message originated from an External Source. Use proper caution
> when opening attachments, clicking links, or responding.
>
>
> On Fri, 2 Feb 2024 11:32:29 -0800
> Andrew Boyer wrote:
>
>> From: Neel Patel
>>
>> This memory may be changed by the hardware, so the volatile
>> keyword is required for correctness.
>>
>> Fixes: e86a6fcc7cf3 ("net/ionic: add optimized non-scattered Rx/Tx")
>> cc: sta...@dpdk.org
>>
>> Signed-off-by: Andrew Boyer
>> Signed-off-by: Neel Patel
>
> In general barriers are better than volatile.
> Volatile is a compiler not hardware construct really.
>
> https://www.kernel.org/doc/html/latest/process/volatile-considered-harmful.html
Thanks for looking. The goal here is to prevent inappropriate compiler
optimization.
>From the link you posted:
> Pointers to data structures in coherent memory which might be modified by I/O
> devices can, sometimes, legitimately be volatile. A ring buffer used by a
> network adapter, where that adapter changes pointers to indicate which
> descriptors have been processed, is an example of this type of situation.
Doesn't that sound like what we are doing?
Thanks,
Andrew
Re: [PATCH] telemetry: correct json empty dictionaries
David,
It was just a minor oversight in following commit:
commit c933bb5177cac5fbf4533e357d466cff1f3e6c97
Author: Ciara Power
Date: Wed Sep 23 12:12:26 2020 +0100
telemetry: support array values in data object
Arrays of type uint64_t/int/string can now be included within an array
or dict. One level of embedded containers is supported. This is
necessary to allow for instances such as the ethdev queue stats to be
reported as a list of uint64_t values, rather than having multiple dict
entries with one uint64_t value for each queue stat.
The memory management APIs provided by telemetry simplify the memory
allocation/free aspect of the embedded container. The
rte_tel_data_alloc
function is called in the library/app callback to return a pointer to a
container that has been allocated memory. When adding this container
to an array/dict, a parameter is passed to indicate if the memory
should be freed by telemetry after use. This will allow reuse of the
allocated memory if the library/app wishes to do so.
Signed-off-by: Ciara Power
Acked-by: Bruce Richardson
On 2/1/24 06:57, David Marchand wrote:
On Fri, Jan 19, 2024 at 8:48 AM Jonathan Erb wrote:
Fix to allow telemetry to handle empty dictionaries correctly.
This patch resolves an issue where empty dictionaries are reported
by telemetry as '[]' rather than '{}'. Initializing the output
buffer based on the container type resolves the issue.
Signed-off-by: Jonathan Erb
Thanks for the fix.
Could you point at the change that introduced this issue?
I will add the Fixes: tag when applying.
--
Re: Regarding https://mails.dpdk.org/archives/dev/2023-June/270558.html dpdk patch
Hi Kaiwenx, There are no specific parameters except "-m 1024 -l 1,2". Just that the guest has 2 SR IOV X710 interfaces. Just for an additional update - ESX version: 8.0 U1 i40e PF driver version: 1.11.3.5 Firmware version:7.10 0x800075da 19.5.12 I tried updating the firmware version to 9.00 0x8000cadc 21.5.9 based on the compatibility matrix https://www.vmware.com/resources/compatibility/detail.php?deviceCategory=io&productid=37976 But It still did not help. I'm not sure if we need to upgrade the driver version as well. Please let me know if you have any breakthroughs. Thanks in advance. Regards, Amiya On Thu, Jan 25, 2024 at 11:40 AM Deng, KaiwenX wrote: > Hi Amiya > > > > Can you provide me with the DPDK startup parameters? > > > > Thanks > > *From:* Amiya Ranjan Mohakud > *Sent:* Tuesday, January 23, 2024 4:54 PM > *To:* Deng, KaiwenX ; dev@dpdk.org > *Cc:* Amiya Ranjan Mohakud ; Amiya > Ranjan Mohakud > *Subject:* Regarding > https://mails.dpdk.org/archives/dev/2023-June/270558.html dpdk patch > > > > Hi Kaiwenx > > > > I came across the below DPDK iavf error message during the initialization > of X710 NICs in ESX. It seems the functionality works fine, but with below > error messages. > > DPDK Version: 22.11.2 > > > > 2023-12-08T09:58:00.901 |9322| MSG [NET] dpdk_port_configure:1717 > Configure port eth3/1. lsc_intr=1, rxq/txq=1/1, (rss_enabled=1) > rss_hf=0x0c30 tx_ol=0x06 rx_ol=0x080007 > > 2023-12-08T09:58:00.906 |9322| MSG [NET] dpdk_log_write:107 > iavf_execute_vf_cmd(): Return failure -4 for cmd 27 > > 2023-12-08T09:58:00.906 |9322| MSG [NET] dpdk_log_write:107 > iavf_enable_vlan_strip(): Failed to execute command of > OP_ENABLE_VLAN_STRIPPING > > 2023-12-08T09:58:00.906 |9322| MSG [NET] dpdk_log_write:107 > iavf_dev_init_vlan(): Failed to update vlan offload > > 2023-12-08T09:58:00.906 |9322| MSG [NET] dpdk_log_write:107 > iavf_dev_configure(): configure VLAN failed: -5 > > 2023-12-08T09:58:01.156 |9322| MSG [NET] dpdk_log_write:107 > iavf_execute_vf_cmd(): Return failure -5 for cmd 14 > > > > On search, I came across your above patch. I am not able to make out > properly from the description. Could you please help elaborate the root > cause/fix for my understanding and kindly confirm if this patch would fix > the above issue. Thanks in advance. > > > > Regards, > > Amiya > > > This electronic communication and the information and any files > transmitted with it, or attached to it, are confidential and are intended > solely for the use of the individual or entity to whom it is addressed and > may contain information that is confidential, legally privileged, protected > by privacy laws, or otherwise restricted from disclosure to anyone else. If > you are not the intended recipient or the person responsible for delivering > the e-mail to the intended recipient, you are hereby notified that any use, > copying, distributing, dissemination, forwarding, printing, or copying of > this e-mail is strictly prohibited. If you received this e-mail in error, > please return the e-mail to the sender, delete it from your computer, and > destroy any printed copy of it. > -- This electronic communication and the information and any files transmitted with it, or attached to it, are confidential and are intended solely for the use of the individual or entity to whom it is addressed and may contain information that is confidential, legally privileged, protected by privacy laws, or otherwise restricted from disclosure to anyone else. If you are not the intended recipient or the person responsible for delivering the e-mail to the intended recipient, you are hereby notified that any use, copying, distributing, dissemination, forwarding, printing, or copying of this e-mail is strictly prohibited. If you received this e-mail in error, please return the e-mail to the sender, delete it from your computer, and destroy any printed copy of it.
Re: [PATCH v2] ethdev: fast path async flow API
05/02/2024 14:14, Dariusz Sosnowski: > From: Thomas Monjalon > > 31/01/2024 10:35, Dariusz Sosnowski: > > > As a result, no checks for availability of the implementation are > > > needed at library level in data path. > > > Any library-level validation checks in async flow API are compiled if > > > and only if RTE_FLOW_DEBUG macro is defined. > > > > How are we supposed to enable RTE_FLOW_DEBUG? > > I should document it, but the idea was that it must be explicitly enabled > during build, > by adding -c_args=-DRTE_FLOW_DEBUG to meson options. > > Do you think doc/guides/nics/build_and_test.rst is a good place to document > this option? Yes > It would be documented alongside RTE_ETHDEV_DEBUG_RX and RTE_ETHDEV_DEBUG_TX. > > > May it be enabled automatically if other debug option is globally enabled? > > Do you mean that if buildtype is defined as debug, then RTE_FLOW_DEBUG is > defined automatically? Yes > I think that's a good idea. Another way of enabling it is to check #if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
Re: [PATCH v6 2/3] ethdev: add compare item
05/02/2024 14:28, Suanming Mou: > From: Thomas Monjalon > > 02/02/2024 01:42, Suanming Mou: > > > --- a/doc/guides/rel_notes/release_24_03.rst > > > +++ b/doc/guides/rel_notes/release_24_03.rst > > > +* **Added compare flow matching criteria.** > > > > Suggestion: > > "Added flow matching with various comparisons." > > Not sure how to illustrate the idea. > > What about " Added flow matching with various comparison results." ? I am thinking we are comparing packet fields, and you say we match comparison results, which at the end is the same :) I feel not talking about results is clearer but I may be wrong. You choose.
Adding helper function for ARM "dsb st"
I see that cnxk has added inline assembly for the ARM "dsb st" barrier. We,
too, would like to add a use of this instruction. Can a helper function be
added to the atomics headers?
> drivers/ml/cnxk/cn10k_ml_dev.h:#define dsb_st ({ asm volatile("dsb st" : : :
> "memory"); })
What would the helper be named, rte_wsb()? I suppose it would be a NOP on all
other platforms.
Maybe we could add something for "dmb st" at the same time and get rid of that
assembly, too.
Thanks,
Andrew
DPDK Release Status Meeting 2024-02-01
Release status meeting minutes 2024-02-01 = Agenda: * Release Dates * Subtrees * Roadmaps * LTS * Defects * Opens Participants: * AMD * ARM [No] * Debian/Microsoft [No] * Intel * Marvell * Nvidia * Red Hat Release Dates - The following are the current working dates for 24.03: * V1: 29 December 2023 * RC1: 12 February 2024 * RC2: 27 February 2024 * RC3: 6 March2024 * Release: 14 March2024 https://core.dpdk.org/roadmap/#dates Subtrees * next-net * Ethdev patches reviewed and some merged. * next-net-intel * Merged to main. * next-net-mlx * No update. * next-net-mvl * Port representor for cnxk work in progress. * next-eventdev * New feature MLdev Event Adaptor library. - Needs unit test * next-baseband * Preparing pull request for end of week. * next-virtio * Preparing pull request for end of week. * next-crypto * Ready for pull. * TLS support in cnxk driver. * New Nitrox PMD for compressdev. * QAT patches require acks. * main * Cleanups in progress. - Log cleanup. * Windows patches in progress. * New bus driver from Huawei. * Looking at argument parsing. * Proposed 24.03 dates: * RC1: 12 February 2024 * RC2: 27 February 2024 * RC3: 6 March2024 * Release: 14 March2024 LTS --- * 22.11.4 - Released. * 21.11.6 - Released. * 20.11.10 - Released. * 19.11.15 - Will only be updated with CVE and critical fixes. * Distros * Debian 12 contains DPDK v22.11 * Ubuntu 22.04-LTS contains DPDK v21.11 * Ubuntu 23.04 contains DPDK v22.11 Defects --- * Bugzilla links, 'Bugs', added for hosted projects * https://www.dpdk.org/hosted-projects/ DPDK Release Status Meetings The DPDK Release Status Meeting is intended for DPDK Committers to discuss the status of the master tree and sub-trees, and for project managers to track progress or milestone dates. The meeting occurs on every Thursday at 9:30 UTC over Jitsi on https://meet.jit.si/DPDK You don't need an invite to join the meeting but if you want a calendar reminder just send an email to "John McNamara john.mcnam...@intel.com" for the invite.
Re: [PATCH 1/1] eal: add C++ include guard in generic/rte_vect.h
On Fri, Feb 02, 2024 at 09:40:59AM +, Bruce Richardson wrote:
> On Fri, Feb 02, 2024 at 10:18:23AM +0100, Thomas Monjalon wrote:
> > 02/02/2024 06:13, Ashish Sadanandan:
> > > The header was missing the extern "C" directive which causes name
> > > mangling of functions by C++ compilers, leading to linker errors
> > > complaining of undefined references to these functions.
> > >
> > > Fixes: 86c743cf9140 ("eal: define generic vector types")
> > > Cc: nelio.laranje...@6wind.com
> > > Cc: sta...@dpdk.org
> > >
> > > Signed-off-by: Ashish Sadanandan
> >
> > Thank you for improving C++ compatibility.
> >
> > I'm not sure what is best to fix it.
> > You are adding extern "C" in a file which is not directly included
> > by the user app. The same was done for rte_rwlock.h.
> > The other way is to make sure this include is in an extern "C" block
> > in lib/eal/*/include/rte_vect.h (instead of being before the block).
> >
> > I would like we use the same approach for all files.
> > Opinions?
> >
> I think just having the extern "C" guard in all files is the safest choice,
> because it's immediately obvious in each and every file that it is correct.
> Taking the other option, to check any indirect include file you need to go
> finding what other files include it and check there that a) they have
> include guards and b) the include for the indirect header is contained
> within it.
>
> Adopting the policy of putting the guard in each and every header is also a
> lot easier to do basic automated sanity checks on. If the file ends in .h,
> we just use grep to quickly verify it's not missing the guards. [Naturally,
> we can do more complete checks than that if we want, but 99% percent of
> misses can be picked up by a grep for the 'extern "C"' bit]
so first, i agree with what you say here. but one downside i've seen
is that non-public symbols may end up as extern "C".
i've also been unsatisfied with the inconsistency of either having
includes in or outside of the guards.
a lot of dpdk headers follow this pattern.
// foo.h
#ifdef __cplusplus
extern "C" {
#endif
#include
...
but some dpdk headers follow this pattern.
// foo.h
#include
#ifdef __cplusplus
extern "C"
#endif
...
standard C headers include the guards so don't need to be inside the
extern "C" block. one minor annoyance with always including inside the
block is we can't reliably provide a offer a C++-only header without
doing extern "C++".
please bear in mind i do not mean to suggest implementing any dpdk in
C++ with this comment, merely that there are advantages to occasionally
offering C++-only header content to applications should we wever want
to.
in some cases for harmony between C and C++ it may be easier to
interoperate by supplying some basic C++-only headers, this may become
more important as it there appears to be increasing divergance between
the C and C++ standards and interoperability.
for full disclosure i do anticipate having to provide some small bits of
header only C++ for msvc which is why this is top of my mind.
finally, i'll also note that we could again be explicit in our intent to
declare what is extern "C" / exported by instead marking the declared names
(functions and variables) themselves in a more precise manner.
i.e.
__rte__export // extern "C" or __declspec(dllexport) extern "C"
void some_public_symbol(void);
you'll recall we had a related discussion about symbol visibility here
which is somewhat a similar problem to being solved to symbol naming. if
we were defaulting visibility to hidden and using a single mechanism to
guarantee extern "C" linkage and public visibility exposure we could
catch all "missed" symbols for C++ without having to build as C++ and
reference the symbols.
https://mails.dpdk.org/archives/dev/2024-January/285109.html
i still intend to put forward an RFC for the discussion resulting from
that thread (just haven't had time yet).
>
> /Bruce
[PATCH v9 00/23] Use inclusive naming in DPDK
This is a collection of patches around fixing many of the uses of non-inclusive naming in DPDK. The current tree is in pretty good shape. The overall reduction of problematic words is significant. Before After app17 0 drivers379 331 (except base) examples 16 0 lib25 7 The remaining problem area is around use of the term bus master which still is present upstream in kernel. The standards bodies have already addressed this for PCI and SPI but the kernel has not caught up.
[PATCH v9 01/23] devtools: add script to check for non inclusive naming
Add a new script to find words that should not be used.
It is a wrapper around git grep command.
By default it prints matches but can also display counts.
Uses the word lists from Inclusive Naming Initiative
see https://inclusivenaming.org/word-lists/
Note: the JSON list has extra comma at end of list of elements which is not
valid in basic JSON but is allowed in user-friendly JSON5 (https://json5.org/)
To handle this the tool uses the PyPi package for parsing json5 format.
Examples:
$ ./devtools/check-inclusive-naming.py -c | head -5
app/test/test_common.c:1
app/test/test_eal_flags.c:8
app/test/test_hash.c:1
app/test/test_hash_readwrite_lf_perf.c:1
app/test/test_link_bonding_mode4.c:1
$ ./devtools/check-inclusive-naming.py lib/pcapng
lib/pcapng/rte_pcapng.c:/* sanity check that is really a pcapng
mbuf */
$ ./devtools/check-inclusive-naming.py -l lib/eal
lib/eal/common/eal_common_memory.c
lib/eal/common/eal_common_proc.c
lib/eal/common/eal_common_trace.c
lib/eal/common/eal_memcfg.h
lib/eal/common/rte_malloc.c
lib/eal/freebsd/eal.c
lib/eal/linux/eal.c
lib/eal/windows/eal.c
Signed-off-by: Stephen Hemminger
---
MAINTAINERS| 1 +
devtools/check-inclusive-naming.py | 135 +
2 files changed, 136 insertions(+)
create mode 100755 devtools/check-inclusive-naming.py
diff --git a/MAINTAINERS b/MAINTAINERS
index 5fb3a73f840e..dbf7ea2d916d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -88,6 +88,7 @@ F: devtools/check-doc-vs-code.sh
F: devtools/check-dup-includes.sh
F: devtools/check-maintainers.sh
F: devtools/check-forbidden-tokens.awk
+F: devtools/check-inclusive-naming.py
F: devtools/check-git-log.sh
F: devtools/check-spdx-tag.sh
F: devtools/check-symbol-change.sh
diff --git a/devtools/check-inclusive-naming.py
b/devtools/check-inclusive-naming.py
new file mode 100755
index ..e8989c3c9b79
--- /dev/null
+++ b/devtools/check-inclusive-naming.py
@@ -0,0 +1,135 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright 2023 Stephen Hemminger
+#
+# This script scans the source tree and creates list of files
+# containing words that are recommended to be avoided by the
+# Inclusive Naming Initiative.
+# See: https://inclusivenaming.org/word-lists/
+
+import argparse
+import subprocess
+from urllib.request import urlopen
+
+# Need JSON5 to be able to handle extra comma
+import json5
+
+DEFAULT_URL = 'https://inclusivenaming.org/word-lists/index.json'
+
+# These give false positives
+skip_files = [
+'doc/guides/rel_notes/', 'doc/guides/contributing/coding_style.rst',
+'doc/guides/prog_guide/glossary.rst'
+]
+
+# These are allowed for now
+allow_words = ['abort']
+
+
+def args_parse():
+"parse arguments and return the argument object back to main"
+
+parser = argparse.ArgumentParser(
+description="Identify word usage not aligned with inclusive naming")
+parser.add_argument('-c',
+'--count',
+help="Show the number of lines that match",
+action='store_true')
+parser.add_argument('-d',
+'--debug',
+default=False,
+help="Debug this script",
+action='store_true')
+parser.add_argument('-l',
+'--files-with-matches',
+help="Show only names of files with hits",
+action='store_true')
+# note: tier 0 is "ok to use"
+parser.add_argument('-t',
+'--tier',
+type=int,
+choices=range(0, 4),
+action='append',
+help="Show non-conforming words of particular tier")
+parser.add_argument('-x',
+'--exclude',
+default=skip_files,
+action='append',
+help="Exclude path from scan")
+parser.add_argument('-a',
+'--allow',
+default=allow_words,
+action='append',
+help="Ignore these words")
+parser.add_argument('--url',
+default=DEFAULT_URL,
+help="URL for the non-inclusive naming word list")
+parser.add_argument('paths', nargs='*', help='files and directory to scan')
+
+return parser.parse_args()
+
+
+def fetch_wordlist(url, tiers):
+"Read list of words from inclusivenaming.org"
+
+# The wordlist is returned as JSON like:
+# {
+# "data" :
+# [
+# {
+# "term": "abort",
+# "tier" : "1",
+# "recommendation": "Replace when possible.",
+# ...
+with urlopen(url) as response:
+entries = json5.loads(response.read())['data']
+
+wordlist = []
+for item in entries:
+
[PATCH v9 02/23] test: replace use of term segregate
Change comment based on inclusive naming recommendations.
https://inclusivenaming.org/word-lists/tier-3/
Signed-off-by: Stephen Hemminger
Acked-by: Tyler Retzlaff
---
app/test/test_hash_readwrite_lf_perf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/test/test_hash_readwrite_lf_perf.c
b/app/test/test_hash_readwrite_lf_perf.c
index 5d18850e199a..817754e9889f 100644
--- a/app/test/test_hash_readwrite_lf_perf.c
+++ b/app/test/test_hash_readwrite_lf_perf.c
@@ -397,7 +397,7 @@ generate_keys(void)
for (i = 2; i < TOTAL_INSERT; i++)
keys[i] = keys[i-1] + keys[i-2];
- /* Segregate keys into keys_no_ks and keys_ks */
+ /* Separate keys into keys_no_ks and keys_ks */
for (i = 0; i < TOTAL_INSERT; i++) {
/* Check if primary bucket has space.*/
sig = rte_hash_hash(tbl_rwc_test_param.h,
--
2.43.0
[PATCH v9 03/23] examples/ptp: replace terms master and slave
The IEEE 1588 standard has been updated to remove the use of master-slave terminolgy. Use the terms recommended by IEEE 1588g-2022 amendment: In place of the term “master”, use the term “timeTransmitter”. In place of the term “slave”, use the term “timeReceiver”. Signed-off-by: Stephen Hemminger Reviewed-by: Somnath Kotur --- doc/guides/nics/bnxt.rst | 8 ++-- doc/guides/sample_app_ug/img/ptpclient.svg | 4 +- doc/guides/sample_app_ug/intro.rst | 4 +- doc/guides/sample_app_ug/ptpclient.rst | 29 ++-- examples/ptpclient/ptpclient.c | 54 +++--- 5 files changed, 51 insertions(+), 48 deletions(-) diff --git a/doc/guides/nics/bnxt.rst b/doc/guides/nics/bnxt.rst index 6db880d632f8..8b9fcd25583d 100644 --- a/doc/guides/nics/bnxt.rst +++ b/doc/guides/nics/bnxt.rst @@ -538,10 +538,12 @@ Time Synchronization System operators may run a PTP (Precision Time Protocol) client application to -synchronize the time on the NIC (and optionally, on the system) to a PTP master. +synchronize the time on the NIC (and optionally, on the system) to a +PTP timeTransmitter. -The BNXT PMD supports a PTP client application to communicate with a PTP master -clock using DPDK IEEE1588 APIs. Note that the PTP client application needs to +The BNXT PMD supports a PTP client application to communicate with a +PTP timeTransmitter using DPDK IEEE1588 APIs. +Note that the PTP client application needs to run on PF and vector mode needs to be disabled. .. code-block:: console diff --git a/doc/guides/sample_app_ug/img/ptpclient.svg b/doc/guides/sample_app_ug/img/ptpclient.svg index fd78ef839b91..41869bc4c959 100644 --- a/doc/guides/sample_app_ug/img/ptpclient.svg +++ b/doc/guides/sample_app_ug/img/ptpclient.svg @@ -488,7 +488,7 @@ sodipodi:role="line" id="tspan7096" x="38.764343" - y="590.47479">master + y="590.47479">timeTransmitter slave + y="593.71478">timeReceiver `: The PTP client is another minimal implementation of a real world application. In this case the application is a PTP client that communicates with a PTP - master clock to synchronize time on a Network Interface Card (NIC) using the - IEEE1588 protocol. + timeTransmitter to synchronize time on a Network Interface Card (NIC) + using the IEEE1588 protocol. * :doc:`Quality of Service (QoS) Scheduler`: The QoS Scheduler application demonstrates the use of DPDK to provide QoS scheduling. diff --git a/doc/guides/sample_app_ug/ptpclient.rst b/doc/guides/sample_app_ug/ptpclient.rst index d47e942738d0..242c9628eaff 100644 --- a/doc/guides/sample_app_ug/ptpclient.rst +++ b/doc/guides/sample_app_ug/ptpclient.rst @@ -5,8 +5,9 @@ PTP Client Sample Application = The PTP (Precision Time Protocol) client sample application is a simple -example of using the DPDK IEEE1588 API to communicate with a PTP master clock -to synchronize the time on the NIC and, optionally, on the Linux system. +example of using the DPDK IEEE1588 API to communicate with a PTP +timeTransmitter to synchronize the time on the NIC and, optionally, +on the Linux system. Note, PTP is a time syncing protocol and cannot be used within DPDK as a time-stamping mechanism. See the following for an explanation of the protocol: @@ -21,10 +22,10 @@ The PTP sample application is intended as a simple reference implementation of a PTP client using the DPDK IEEE1588 API. In order to keep the application simple the following assumptions are made: -* The first discovered master is the main for the session. +* The first discovered timeTransmitter is the main for the session. * Only L2 PTP packets are supported. * Only the PTP v2 protocol is supported. -* Only the slave clock is implemented. +* Only the timeReceiver clock is implemented. How the Application Works @@ -38,12 +39,12 @@ How the Application Works The PTP synchronization in the sample application works as follows: -* Master sends *Sync* message - the slave saves it as T2. -* Master sends *Follow Up* message and sends time of T1. -* Slave sends *Delay Request* frame to PTP Master and stores T3. -* Master sends *Delay Response* T4 time which is time of received T3. +* TimeTransmitter sends *Sync* message - the TimeReceiver saves it as T2. +* TimeTransmitter sends *Follow Up* message and sends time of T1. +* TimeReceiver sends *Delay Request* frame to PTP TimeTransmitter and stores T3. +* TimeTransmitter sends *Delay Response* T4 time which is time of received T3. -The adjustment for slave can be represented as: +The adjustment for timeReceiver can be represented as: adj = -[(T2-T1)-(T4 - T3)]/2 @@ -71,8 +72,8 @@ Refer to *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. * ``-p portmask``: Hexadecimal portmask. -* ``-T 0``: Update only the PTP slave clo
[PATCH v9 04/23] test: remove use of word master in test_red
No need to use term master here.
Signed-off-by: Stephen Hemminger
Acked-by: Tyler Retzlaff
---
app/test/test_red.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/test/test_red.c b/app/test/test_red.c
index aa7538d51a35..6bf58ad4dd9a 100644
--- a/app/test/test_red.c
+++ b/app/test/test_red.c
@@ -85,7 +85,7 @@ struct test_var { /**< Test variables used
for testing RTE_RED
uint32_t *enqueued; /**< Test operations enqueued */
};
-struct test_config {/**< Master test structure for RTE_RED */
+struct test_config {/**< Test structure for RTE_RED */
const char *ifname; /**< Interface name */
const char *msg;/**< Test message for display */
const char *htxt; /**< Header txt display for result
output */
--
2.43.0
[PATCH v9 05/23] mbuf: replace term sanity check
Replace rte_mbuf_sanity_check() with rte_mbuf_verify()
to match the similar macro RTE_VERIFY() in rte_debug.h
Good wording from discussion english.stackexchange.com:
The phrase "sanity check" is ableist language as it implies that
there is something wrong with people who have mental illnesses
and the word "sanity" has been used to discriminate against such people.
Therefore, it should should be avoided.
Signed-off-by: Stephen Hemminger
Acked-by: Andrew Rybchenko
Acked-by: Morten Brørup
---
app/test/test_mbuf.c | 28 +--
doc/guides/prog_guide/mbuf_lib.rst | 4 +-
doc/guides/rel_notes/deprecation.rst | 3 ++
drivers/net/avp/avp_ethdev.c | 18 +++
drivers/net/sfc/sfc_ef100_rx.c | 6 +--
drivers/net/sfc/sfc_ef10_essb_rx.c | 4 +-
drivers/net/sfc/sfc_ef10_rx.c| 4 +-
drivers/net/sfc/sfc_rx.c | 2 +-
examples/ipv4_multicast/main.c | 2 +-
lib/mbuf/rte_mbuf.c | 23 +
lib/mbuf/rte_mbuf.h | 71 +++-
lib/mbuf/version.map | 1 +
12 files changed, 90 insertions(+), 76 deletions(-)
diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index d7393df7eb5d..261c6e5d71e9 100644
--- a/app/test/test_mbuf.c
+++ b/app/test/test_mbuf.c
@@ -261,8 +261,8 @@ test_one_pktmbuf(struct rte_mempool *pktmbuf_pool)
GOTO_FAIL("Buffer should be continuous");
memset(hdr, 0x55, MBUF_TEST_HDR2_LEN);
- rte_mbuf_sanity_check(m, 1);
- rte_mbuf_sanity_check(m, 0);
+ rte_mbuf_verify(m, 1);
+ rte_mbuf_verify(m, 0);
rte_pktmbuf_dump(stdout, m, 0);
/* this prepend should fail */
@@ -1161,7 +1161,7 @@ test_refcnt_mbuf(void)
#ifdef RTE_EXEC_ENV_WINDOWS
static int
-test_failing_mbuf_sanity_check(struct rte_mempool *pktmbuf_pool)
+test_failing_mbuf_verify(struct rte_mempool *pktmbuf_pool)
{
RTE_SET_USED(pktmbuf_pool);
return TEST_SKIPPED;
@@ -1180,12 +1180,12 @@ mbuf_check_pass(struct rte_mbuf *buf)
}
static int
-test_failing_mbuf_sanity_check(struct rte_mempool *pktmbuf_pool)
+test_failing_mbuf_verify(struct rte_mempool *pktmbuf_pool)
{
struct rte_mbuf *buf;
struct rte_mbuf badbuf;
- printf("Checking rte_mbuf_sanity_check for failure conditions\n");
+ printf("Checking rte_mbuf_verify for failure conditions\n");
/* get a good mbuf to use to make copies */
buf = rte_pktmbuf_alloc(pktmbuf_pool);
@@ -1707,7 +1707,7 @@ test_mbuf_validate_tx_offload(const char *test_name,
GOTO_FAIL("%s: mbuf allocation failed!\n", __func__);
if (rte_pktmbuf_pkt_len(m) != 0)
GOTO_FAIL("%s: Bad packet length\n", __func__);
- rte_mbuf_sanity_check(m, 0);
+ rte_mbuf_verify(m, 0);
m->ol_flags = ol_flags;
m->tso_segsz = segsize;
ret = rte_validate_tx_offload(m);
@@ -1914,7 +1914,7 @@ test_pktmbuf_read(struct rte_mempool *pktmbuf_pool)
GOTO_FAIL("%s: mbuf allocation failed!\n", __func__);
if (rte_pktmbuf_pkt_len(m) != 0)
GOTO_FAIL("%s: Bad packet length\n", __func__);
- rte_mbuf_sanity_check(m, 0);
+ rte_mbuf_verify(m, 0);
data = rte_pktmbuf_append(m, MBUF_TEST_DATA_LEN2);
if (data == NULL)
@@ -1963,7 +1963,7 @@ test_pktmbuf_read_from_offset(struct rte_mempool
*pktmbuf_pool)
if (rte_pktmbuf_pkt_len(m) != 0)
GOTO_FAIL("%s: Bad packet length\n", __func__);
- rte_mbuf_sanity_check(m, 0);
+ rte_mbuf_verify(m, 0);
/* prepend an ethernet header */
hdr = (struct ether_hdr *)rte_pktmbuf_prepend(m, hdr_len);
@@ -2108,7 +2108,7 @@ create_packet(struct rte_mempool *pktmbuf_pool,
GOTO_FAIL("%s: mbuf allocation failed!\n", __func__);
if (rte_pktmbuf_pkt_len(pkt_seg) != 0)
GOTO_FAIL("%s: Bad packet length\n", __func__);
- rte_mbuf_sanity_check(pkt_seg, 0);
+ rte_mbuf_verify(pkt_seg, 0);
/* Add header only for the first segment */
if (test_data->flags == MBUF_HEADER && seg == 0) {
hdr_len = sizeof(struct rte_ether_hdr);
@@ -2320,7 +2320,7 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool
*pktmbuf_pool)
GOTO_FAIL("%s: mbuf allocation failed!\n", __func__);
if (rte_pktmbuf_pkt_len(m) != 0)
GOTO_FAIL("%s: Bad packet length\n", __func__);
- rte_mbuf_sanity_check(m, 0);
+ rte_mbuf_verify(m, 0);
ext_buf_addr = rte_malloc("External buffer", buf_len,
RTE_CACHE_LINE_SIZE);
@@ -2484,8 +2484,8 @@ test_pktmbuf_ext_pinned_buffer(struct rte_mempool
*std_pool)
GOTO_FAIL("%s: test_pktmbuf_copy(pinned) failed\n",
__func__);
- if (test_failing_mbuf_sanity_check(pinned_pool) < 0)
- GOTO_FAIL("%s: te
[PATCH v9 06/23] eal: replace use of sanity check in comments and messages
Sanity check is on the Tier 2 non-inclusive list.
Replace or remove it.
Signed-off-by: Stephen Hemminger
Acked-by: Anatoly Burakov
---
lib/eal/common/eal_common_memory.c | 2 +-
lib/eal/common/eal_common_proc.c | 3 ++-
lib/eal/common/eal_common_trace.c | 2 +-
lib/eal/common/eal_memcfg.h| 2 +-
lib/eal/common/rte_malloc.c| 2 +-
lib/eal/freebsd/eal.c | 2 +-
lib/eal/linux/eal.c| 2 +-
lib/eal/windows/eal.c | 2 +-
8 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/lib/eal/common/eal_common_memory.c
b/lib/eal/common/eal_common_memory.c
index 60ddc30580a7..9f4a8676f18f 100644
--- a/lib/eal/common/eal_common_memory.c
+++ b/lib/eal/common/eal_common_memory.c
@@ -562,7 +562,7 @@ check_dma_mask(uint8_t maskbits, bool thread_unsafe)
uint64_t mask;
int ret;
- /* Sanity check. We only check width can be managed with 64 bits
+ /* We only check width can be managed with 64 bits
* variables. Indeed any higher value is likely wrong. */
if (maskbits > MAX_DMA_MASK_BITS) {
EAL_LOG(ERR, "wrong dma mask size %u (Max: %u)",
diff --git a/lib/eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c
index d24093937c1d..838602edef08 100644
--- a/lib/eal/common/eal_common_proc.c
+++ b/lib/eal/common/eal_common_proc.c
@@ -309,7 +309,8 @@ read_msg(int fd, struct mp_msg_internal *m, struct
sockaddr_un *s)
break;
}
}
- /* sanity-check the response */
+
+ /* Check that the response is valid */
if (m->msg.num_fds < 0 || m->msg.num_fds > RTE_MP_MAX_FD_NUM) {
EAL_LOG(ERR, "invalid number of fd's received");
return -1;
diff --git a/lib/eal/common/eal_common_trace.c
b/lib/eal/common/eal_common_trace.c
index 6ad87fc0df5d..b2bab5c45f1e 100644
--- a/lib/eal/common/eal_common_trace.c
+++ b/lib/eal/common/eal_common_trace.c
@@ -468,7 +468,7 @@ __rte_trace_point_register(rte_trace_point_t *handle, const
char *name,
struct trace_point *tp;
uint16_t sz;
- /* Sanity checks of arguments */
+ /* Check arguments */
if (name == NULL || register_fn == NULL || handle == NULL) {
trace_err("invalid arguments");
rte_errno = EINVAL;
diff --git a/lib/eal/common/eal_memcfg.h b/lib/eal/common/eal_memcfg.h
index 60e2089797a2..e8a85df35585 100644
--- a/lib/eal/common/eal_memcfg.h
+++ b/lib/eal/common/eal_memcfg.h
@@ -18,7 +18,7 @@
* Memory configuration shared across multiple processes.
*/
struct rte_mem_config {
- volatile uint32_t magic; /**< Magic number - sanity check. */
+ volatile uint32_t magic; /**< Magic number check. */
uint32_t version;
/**< Prevent secondary processes using different DPDK versions. */
diff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c
index 6d3c301a2368..dac077bc8e09 100644
--- a/lib/eal/common/rte_malloc.c
+++ b/lib/eal/common/rte_malloc.c
@@ -654,7 +654,7 @@ rte_malloc_heap_destroy(const char *heap_name)
ret = -1;
goto unlock;
}
- /* sanity checks done, now we can destroy the heap */
+ /* checks done, now we can destroy the heap */
rte_spinlock_lock(&heap->lock);
ret = malloc_heap_destroy(heap);
rte_spinlock_unlock(&heap->lock);
diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
index bab77118e967..1500778b4f06 100644
--- a/lib/eal/freebsd/eal.c
+++ b/lib/eal/freebsd/eal.c
@@ -501,7 +501,7 @@ eal_parse_args(int argc, char **argv)
goto out;
}
- /* sanity checks */
+ /* options checks */
if (eal_check_common_options(internal_conf) != 0) {
eal_usage(prgname);
ret = -1;
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index fd422f1f6236..50cebdbbd481 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -803,7 +803,7 @@ eal_parse_args(int argc, char **argv)
goto out;
}
- /* sanity checks */
+ /* options checks */
if (eal_check_common_options(internal_conf) != 0) {
eal_usage(prgname);
ret = -1;
diff --git a/lib/eal/windows/eal.c b/lib/eal/windows/eal.c
index 52f0e7462dd8..915c8e569a5d 100644
--- a/lib/eal/windows/eal.c
+++ b/lib/eal/windows/eal.c
@@ -194,7 +194,7 @@ eal_parse_args(int argc, char **argv)
if (eal_adjust_config(internal_conf) != 0)
return -1;
- /* sanity checks */
+ /* options checks */
if (eal_check_common_options(internal_conf) != 0) {
eal_usage(prgname);
return -1;
--
2.43.0
[PATCH v9 07/23] test: replace use word sanity
The word "sanity" is on the not-allowed inclusive naming
list. Replace the unnecessary usage in tests.
Signed-off-by: Stephen Hemminger
---
app/test/test_bitmap.c | 4 +--
app/test/test_bpf.c| 6 ++--
app/test/test_common.c | 2 +-
app/test/test_distributor.c| 46 +++---
app/test/test_dmadev.c | 2 +-
app/test/test_eal_flags.c | 20 ++---
app/test/test_hash.c | 2 +-
app/test/test_interrupts.c | 9 +++---
app/test/test_link_bonding_mode4.c | 2 +-
app/test/test_mbuf.c | 2 +-
app/test/test_rawdev.c | 2 +-
app/test/test_timer.c | 10 +++
12 files changed, 54 insertions(+), 53 deletions(-)
diff --git a/app/test/test_bitmap.c b/app/test/test_bitmap.c
index bab11812c767..a074b64f2e98 100644
--- a/app/test/test_bitmap.c
+++ b/app/test/test_bitmap.c
@@ -33,7 +33,7 @@ test_bitmap_scan_operations(struct rte_bitmap *bmp)
}
if (slab1_magic != out_slab) {
- printf("Scan operation sanity failed.\n");
+ printf("Scan operation magic number check failed.\n");
return TEST_FAILED;
}
@@ -43,7 +43,7 @@ test_bitmap_scan_operations(struct rte_bitmap *bmp)
}
if (slab2_magic != out_slab) {
- printf("Scan operation sanity failed.\n");
+ printf("Scan operation magic number check failed.\n");
return TEST_FAILED;
}
diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c
index f83e72a9adfd..ffadcece2212 100644
--- a/app/test/test_bpf.c
+++ b/app/test/test_bpf.c
@@ -3329,9 +3329,9 @@ test_bpf_match(pcap_t *pcap, const char *str,
return ret;
}
-/* Basic sanity test can we match a IP packet */
+/* Basic test can we match a IP packet */
static int
-test_bpf_filter_sanity(pcap_t *pcap)
+test_bpf_filter_match(pcap_t *pcap)
{
const uint32_t plen = 100;
struct rte_mbuf mb, *m;
@@ -3463,7 +3463,7 @@ test_bpf_convert(void)
return -1;
}
- rc = test_bpf_filter_sanity(pcap);
+ rc = test_bpf_filter_match(pcap);
for (i = 0; i < RTE_DIM(sample_filters); i++)
rc |= test_bpf_filter(pcap, sample_filters[i]);
diff --git a/app/test/test_common.c b/app/test/test_common.c
index 21eb2285e1b2..784cdaf3d640 100644
--- a/app/test/test_common.c
+++ b/app/test/test_common.c
@@ -19,7 +19,7 @@
{printf(x "() test failed!\n");\
return -1;}
-/* this is really a sanity check */
+/* this is really a consistency check */
static int
test_macros(int __rte_unused unused_parm)
{
diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c
index 6cb27f4de111..915de3027bd0 100644
--- a/app/test/test_distributor.c
+++ b/app/test/test_distributor.c
@@ -80,7 +80,7 @@ clear_packet_count(void)
__ATOMIC_RELAXED);
}
-/* this is the basic worker function for sanity test
+/* this is the basic worker function
* it does nothing but return packets and count them.
*/
static int
@@ -105,7 +105,7 @@ handle_work(void *arg)
return 0;
}
-/* do basic sanity testing of the distributor. This test tests the following:
+/* do basic testing of the distributor. This test tests the following:
* - send 32 packets through distributor with the same tag and ensure they
* all go to the one worker
* - send 32 packets through the distributor with two different tags and
@@ -117,7 +117,7 @@ handle_work(void *arg)
* not necessarily in the same order (as different flows).
*/
static int
-sanity_test(struct worker_params *wp, struct rte_mempool *p)
+basic_test(struct worker_params *wp, struct rte_mempool *p)
{
struct rte_distributor *db = wp->dist;
struct rte_mbuf *bufs[BURST];
@@ -126,7 +126,7 @@ sanity_test(struct worker_params *wp, struct rte_mempool *p)
unsigned int retries;
unsigned int processed;
- printf("=== Basic distributor sanity tests ===\n");
+ printf("=== Basic distributor tests ===\n");
clear_packet_count();
if (rte_mempool_get_bulk(p, (void *)bufs, BURST) != 0) {
printf("line %d: Error getting mbufs from pool\n", __LINE__);
@@ -163,7 +163,7 @@ sanity_test(struct worker_params *wp, struct rte_mempool *p)
printf("Worker %u handled %u packets\n", i,
__atomic_load_n(&worker_stats[i].handled_packets,
__ATOMIC_RELAXED));
- printf("Sanity test with all zero hashes done.\n");
+ printf("Test with all zero hashes done.\n");
/* pick two flows and check they go correctly */
if (rte_lcore_count() >= 3) {
@@ -191,7 +191,7 @@ sanity_test(struct worker_params *wp, struct rte_mempool *p)
__atomic_load_n(
&worker_stats[i].handled_packets,
[PATCH v9 08/23] examples: remove term sanity
Do not use non-inclusive terms.
Signed-off-by: Stephen Hemminger
---
examples/ipsec-secgw/event_helper.c | 2 +-
examples/qos_sched/args.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/ipsec-secgw/event_helper.c
b/examples/ipsec-secgw/event_helper.c
index 89fb7e62a5a3..f595b4fe01dc 100644
--- a/examples/ipsec-secgw/event_helper.c
+++ b/examples/ipsec-secgw/event_helper.c
@@ -2100,7 +2100,7 @@ eh_launch_worker(struct eh_conf *conf, struct
eh_app_worker_params *app_wrkr,
goto clean_and_exit;
}
- /* Verify sanity of the matched worker */
+ /* Verify validity of the matched worker */
if (eh_verify_match_worker(match_wrkr) != 1) {
EH_LOG_ERR("Failed to validate the matched worker");
goto clean_and_exit;
diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c
index e97273152aa7..1d8ba9522586 100644
--- a/examples/qos_sched/args.c
+++ b/examples/qos_sched/args.c
@@ -384,7 +384,7 @@ app_parse_args(int argc, char **argv)
return -1;
}
- /* sanity check for cores assignment */
+ /* check for cores assignment */
for(i = 0; i < nb_pfc; i++) {
if (qos_conf[i].rx_core >= RTE_MAX_LCORE) {
RTE_LOG(ERR, APP, "pfc %u: invalid RX lcore index
%u\n", i + 1,
--
2.43.0
[PATCH v9 09/23] lib: replace use of sanity check in comments and messages
Sanity check is on the Tier 2 non-inclusive list.
Replace or remove it.
Signed-off-by: Stephen Hemminger
---
lib/graph/graph.c | 2 +-
lib/graph/graph_stats.c | 2 +-
lib/graph/node.c| 2 +-
lib/jobstats/rte_jobstats.c | 6 +++---
lib/metrics/rte_metrics.c | 2 +-
lib/pcapng/rte_pcapng.c | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index 26f0968a978d..e51dcc30568e 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -344,7 +344,7 @@ rte_graph_create(const char *name, struct rte_graph_param
*prm)
graph_spinlock_lock();
- /* Check arguments sanity */
+ /* Check argument validity */
if (prm == NULL)
SET_ERR_JMP(EINVAL, fail, "Param should not be NULL");
diff --git a/lib/graph/graph_stats.c b/lib/graph/graph_stats.c
index cc32245c0593..cfb30ae07497 100644
--- a/lib/graph/graph_stats.c
+++ b/lib/graph/graph_stats.c
@@ -317,7 +317,7 @@ rte_graph_cluster_stats_create(const struct
rte_graph_cluster_stats_param *prm)
const char *pattern;
rte_graph_t i;
- /* Sanity checks */
+ /* Validate arguments */
if (!rte_graph_has_stats_feature())
SET_ERR_JMP(EINVAL, fail, "Stats feature is not enabled");
diff --git a/lib/graph/node.c b/lib/graph/node.c
index 99a962277964..c238d140ed31 100644
--- a/lib/graph/node.c
+++ b/lib/graph/node.c
@@ -68,7 +68,7 @@ __rte_node_register(const struct rte_node_register *reg)
graph_spinlock_lock();
- /* Check sanity */
+ /* Check argument validity */
if (reg == NULL || reg->process == NULL) {
rte_errno = EINVAL;
goto fail;
diff --git a/lib/jobstats/rte_jobstats.c b/lib/jobstats/rte_jobstats.c
index af565a14eaf3..1c4b280c952a 100644
--- a/lib/jobstats/rte_jobstats.c
+++ b/lib/jobstats/rte_jobstats.c
@@ -124,7 +124,7 @@ rte_jobstats_start(struct rte_jobstats_context *ctx, struct
rte_jobstats *job)
{
uint64_t now;
- /* Some sanity check. */
+ /* Check validity of arguments. */
if (unlikely(ctx == NULL || job == NULL || job->context != NULL))
return -EINVAL;
@@ -144,7 +144,7 @@ rte_jobstats_abort(struct rte_jobstats *job)
struct rte_jobstats_context *ctx;
uint64_t now, exec_time;
- /* Some sanity check. */
+ /* Check that arguments are valid */
if (unlikely(job == NULL || job->context == NULL))
return -EINVAL;
@@ -165,7 +165,7 @@ rte_jobstats_finish(struct rte_jobstats *job, int64_t
job_value)
uint64_t now, exec_time;
int need_update;
- /* Some sanity check. */
+ /* Check arguments */
if (unlikely(job == NULL || job->context == NULL))
return -EINVAL;
diff --git a/lib/metrics/rte_metrics.c b/lib/metrics/rte_metrics.c
index 0ccdbabc04eb..f60d4f3f6e25 100644
--- a/lib/metrics/rte_metrics.c
+++ b/lib/metrics/rte_metrics.c
@@ -120,7 +120,7 @@ rte_metrics_reg_names(const char * const *names, uint16_t
cnt_names)
uint16_t idx_name;
uint16_t idx_base;
- /* Some sanity checks */
+ /* Some consistency checks */
if (cnt_names < 1 || names == NULL)
return -EINVAL;
for (idx_name = 0; idx_name < cnt_names; idx_name++)
diff --git a/lib/pcapng/rte_pcapng.c b/lib/pcapng/rte_pcapng.c
index f74ec939a9f8..0de0a231693e 100644
--- a/lib/pcapng/rte_pcapng.c
+++ b/lib/pcapng/rte_pcapng.c
@@ -619,7 +619,7 @@ rte_pcapng_write_packets(rte_pcapng_t *self,
struct pcapng_enhance_packet_block *epb;
uint64_t cycles, timestamp;
- /* sanity check that is really a pcapng mbuf */
+ /* Check that is really a pcapng mbuf */
epb = rte_pktmbuf_mtod(m, struct pcapng_enhance_packet_block *);
if (unlikely(epb->block_type != PCAPNG_ENHANCED_PACKET_BLOCK ||
epb->block_length != rte_pktmbuf_data_len(m))) {
--
2.43.0
[PATCH v9 10/23] doc/eventdev_pipeline: remove sanity
The word sanity check is unnecessary here. Signed-off-by: Stephen Hemminger --- doc/guides/gpus/cuda.rst | 2 +- doc/guides/sample_app_ug/eventdev_pipeline.rst | 2 +- doc/guides/tools/testbbdev.rst | 8 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/guides/gpus/cuda.rst b/doc/guides/gpus/cuda.rst index 6520c17c3ea4..c523da1f3e9d 100644 --- a/doc/guides/gpus/cuda.rst +++ b/doc/guides/gpus/cuda.rst @@ -80,7 +80,7 @@ Similarly to CUDA shared library, if the **libgdrapi.so** shared library is not installed in default locations (e.g. /usr/local/lib), you can use the variable ``GDRCOPY_PATH_L``. -As an example, to enable the CPU map feature sanity check, +As an example, to enable the CPU map feature check, run the ``app/test-gpudev`` application with: .. code-block:: console diff --git a/doc/guides/sample_app_ug/eventdev_pipeline.rst b/doc/guides/sample_app_ug/eventdev_pipeline.rst index 19ff53803ede..e7787fb26609 100644 --- a/doc/guides/sample_app_ug/eventdev_pipeline.rst +++ b/doc/guides/sample_app_ug/eventdev_pipeline.rst @@ -50,7 +50,7 @@ these settings is shown below: .//examples/dpdk-eventdev_pipeline -l 0,2,8-15 --vdev event_sw0 \ -- -r1 -t1 -e4 -w FF00 -s4 -n0 -c32 -W1000 -D -The application has some sanity checking built-in, so if there is a function +The application has some internal validation, so if there is a function (e.g.; the RX core) which doesn't have a cpu core mask assigned, the application will print an error message: diff --git a/doc/guides/tools/testbbdev.rst b/doc/guides/tools/testbbdev.rst index ddb8d787be6f..baaf9d115dda 100644 --- a/doc/guides/tools/testbbdev.rst +++ b/doc/guides/tools/testbbdev.rst @@ -9,7 +9,7 @@ dpdk-test-bbdev Application The ``dpdk-test-bbdev`` tool is a Data Plane Development Kit (DPDK) utility that allows measuring performance parameters of PMDs available in the bbdev framework. Tests available for execution are: latency, throughput, validation, -bler and sanity tests. Execution of tests can be customized using various +bler and basic functionality. Execution of tests can be customized using various parameters passed to a python running script. @@ -97,8 +97,8 @@ Test Cases There are 7 main test cases that can be executed using testbbdev tool: -* Sanity checks [-c unittest] -- Performs sanity checks on BBDEV interface, validating basic functionality +* Functional checks [-c unittest] +- Performs checks on BBDEV interface, validating basic functionality * Validation tests [-c validation] - Performs full operation of enqueue and dequeue @@ -232,7 +232,7 @@ vector name refer more explicitly processing specificity such as is purely read/written for external DDR, lbrm when limited buffer rate matching is expected, or crc_fail when a CRC failure is expected. They are chosen to have a good coverage across sizes and processing -parameters while still keeping their number limited as part of sanity +parameters while still keeping their number limited as part of functional regression. Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled and output -- 2.43.0
[PATCH v9 11/23] net/ring: replace use of sanity
Don't use term sanity check
Signed-off-by: Stephen Hemminger
---
drivers/net/ring/rte_eth_ring.c | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index 48953dd7a059..710fd9ebe526 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -34,7 +34,7 @@ struct ring_internal_args {
struct rte_ring * const *tx_queues;
const unsigned int nb_tx_queues;
const unsigned int numa_node;
- void *addr; /* self addr for sanity check */
+ void *addr; /* self addr for verification */
};
enum dev_action {
@@ -606,10 +606,7 @@ static int parse_kvlist(const char *key __rte_unused,
*action = '\0';
action++;
- /*
-* Need to do some sanity checking here
-*/
-
+ /* Check the command argument is valid action */
if (strcmp(action, ETH_RING_ACTION_ATTACH) == 0)
info->list[info->count].action = DEV_ATTACH;
else if (strcmp(action, ETH_RING_ACTION_CREATE) == 0)
--
2.43.0
[PATCH v9 12/23] net/fm10k, net/ixgbe: remove word sanity
Remove non-inclusive term sanity from these Intel drivers.
Signed-off-by: Stephen Hemminger
---
drivers/net/fm10k/fm10k_ethdev.c | 2 +-
drivers/net/fm10k/fm10k_rxtx.c | 2 +-
drivers/net/ixgbe/ixgbe_fdir.c | 2 +-
drivers/net/ixgbe/ixgbe_ipsec.c | 2 +-
drivers/net/ixgbe/ixgbe_rxtx.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index 4d3c4c10cfa4..894cf8c8a6b5 100644
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -1757,7 +1757,7 @@ mempool_element_size_valid(struct rte_mempool *mp)
/* account for up to 512B of alignment */
min_size -= FM10K_RX_DATABUF_ALIGN;
- /* sanity check for overflow */
+ /* check for overflow */
if (min_size > mp->elt_size)
return 0;
diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c
index c0841ab8cb34..94345299b22a 100644
--- a/drivers/net/fm10k/fm10k_rxtx.c
+++ b/drivers/net/fm10k/fm10k_rxtx.c
@@ -647,7 +647,7 @@ fm10k_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
if (q->nb_free < mb->nb_segs)
break;
- /* sanity check to make sure the mbuf is valid */
+ /* check to make sure the mbuf is valid */
if ((mb->nb_segs == 0) ||
((mb->nb_segs > 1) && (mb->next == NULL)))
break;
diff --git a/drivers/net/ixgbe/ixgbe_fdir.c b/drivers/net/ixgbe/ixgbe_fdir.c
index 06d6e2126de5..51bbf577e3fe 100644
--- a/drivers/net/ixgbe/ixgbe_fdir.c
+++ b/drivers/net/ixgbe/ixgbe_fdir.c
@@ -1130,7 +1130,7 @@ ixgbe_fdir_filter_program(struct rte_eth_dev *dev,
return -ENOTSUP;
/*
-* Sanity check for x550.
+* Check for x550.
* When adding a new filter with flow type set to IPv4,
* the flow director mask should be configed before,
* and the L4 protocol and ports are masked.
diff --git a/drivers/net/ixgbe/ixgbe_ipsec.c b/drivers/net/ixgbe/ixgbe_ipsec.c
index d3313085560d..d4aa3e9ede8e 100644
--- a/drivers/net/ixgbe/ixgbe_ipsec.c
+++ b/drivers/net/ixgbe/ixgbe_ipsec.c
@@ -615,7 +615,7 @@ ixgbe_crypto_enable_ipsec(struct rte_eth_dev *dev)
rx_offloads = dev->data->dev_conf.rxmode.offloads;
tx_offloads = dev->data->dev_conf.txmode.offloads;
- /* sanity checks */
+ /* input validation */
if (rx_offloads & RTE_ETH_RX_OFFLOAD_TCP_LRO) {
PMD_DRV_LOG(ERR, "RSC and IPsec not supported");
return -1;
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 90b0a7004f50..0e53b8a73a18 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -4983,7 +4983,7 @@ ixgbe_set_rsc(struct rte_eth_dev *dev)
uint32_t rdrxctl;
uint32_t rfctl;
- /* Sanity check */
+ /* Offload check */
dev->dev_ops->dev_infos_get(dev, &dev_info);
if (dev_info.rx_offload_capa & RTE_ETH_RX_OFFLOAD_TCP_LRO)
rsc_capable = true;
--
2.43.0
[PATCH v9 13/23] net/mlx[45]: remove word sanity
The term "sanity" is on non-inclusive naming list.
Remove it from the Nvidia drivers.
Signed-off-by: Stephen Hemminger
---
drivers/common/mlx5/linux/mlx5_common_os.c | 2 +-
drivers/net/mlx4/mlx4.c| 2 +-
drivers/net/mlx4/mlx4_flow.c | 6 +++---
drivers/net/mlx5/mlx5_flow_dv.c| 2 +-
drivers/net/mlx5/mlx5_flow_hw.c| 6 ++
drivers/net/mlx5/mlx5_rxq.c| 2 +-
drivers/net/mlx5/mlx5_rxtx_vec.h | 2 +-
7 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c
b/drivers/common/mlx5/linux/mlx5_common_os.c
index 41345e1597a4..2caa1a1da0b6 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.c
+++ b/drivers/common/mlx5/linux/mlx5_common_os.c
@@ -235,7 +235,7 @@ mlx5_get_ifname_sysfs(const char *ibdev_path, char *ifname)
/**
* Suffix RTE_EAL_PMD_PATH with "-glue".
*
- * This function performs a sanity check on RTE_EAL_PMD_PATH before
+ * This function performs a check on RTE_EAL_PMD_PATH before
* suffixing its last component.
*
* @param buf[out]
diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index a1a7e9328848..c167d7f90f97 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -1216,7 +1216,7 @@ static struct rte_pci_driver mlx4_driver = {
/**
* Suffix RTE_EAL_PMD_PATH with "-glue".
*
- * This function performs a sanity check on RTE_EAL_PMD_PATH before
+ * This function performs a check on RTE_EAL_PMD_PATH before
* suffixing its last component.
*
* @param buf[out]
diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c
index 8ef9fd2db44e..25b185d8710c 100644
--- a/drivers/net/mlx4/mlx4_flow.c
+++ b/drivers/net/mlx4/mlx4_flow.c
@@ -514,7 +514,7 @@ mlx4_flow_merge_tcp(struct rte_flow *flow,
}
/**
- * Perform basic sanity checks on a pattern item.
+ * Perform basic checks on a pattern item.
*
* @param[in] item
* Item specification.
@@ -730,7 +730,7 @@ mlx4_flow_prepare(struct mlx4_priv *priv,
goto exit_item_not_supported;
proc = next;
/*
-* Perform basic sanity checks only once, while handle is
+* Perform basic checks only once, while handle is
* not allocated.
*/
if (flow == &temp) {
@@ -799,7 +799,7 @@ mlx4_flow_prepare(struct mlx4_priv *priv,
rss_key = mlx4_rss_hash_key_default;
rss_key_len = MLX4_RSS_HASH_KEY_SIZE;
}
- /* Sanity checks. */
+ /* Input checks. */
for (i = 0; i < rss->queue_num; ++i)
if (rss->queue[i] >=
ETH_DEV(priv)->data->nb_rx_queues)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 115d7303172d..254dc521c78e 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -8820,7 +8820,7 @@ flow_dv_prepare(struct rte_eth_dev *dev,
#ifdef RTE_LIBRTE_MLX5_DEBUG
/**
- * Sanity check for match mask and value. Similar to check_valid_spec() in
+ * Check for match mask and value. Similar to check_valid_spec() in
* kernel driver. If unmasked bit is present in value, it returns failure.
*
* @param match_mask
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index da873ae2e243..69bf3c51f886 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -7453,11 +7453,10 @@ flow_hw_tx_tag_regc_mask(struct rte_eth_dev *dev)
struct mlx5_priv *priv = dev->data->dev_private;
uint32_t mask = priv->sh->dv_regc0_mask;
- /* Mask is verified during device initialization. Sanity checking here.
*/
+ /* Mask is verified during device initialization. */
MLX5_ASSERT(mask != 0);
/*
* Availability of sufficient number of bits in REG_C_0 is verified on
initialization.
-* Sanity checking here.
*/
MLX5_ASSERT(rte_popcount32(mask) >=
rte_popcount32(priv->vport_meta_mask));
return mask;
@@ -7469,12 +7468,11 @@ flow_hw_tx_tag_regc_value(struct rte_eth_dev *dev)
struct mlx5_priv *priv = dev->data->dev_private;
uint32_t tag;
- /* Mask is verified during device initialization. Sanity checking here.
*/
+ /* Mask is verified during device initialization. */
MLX5_ASSERT(priv->vport_meta_mask != 0);
tag = priv->vport_meta_tag >> (rte_bsf32(priv->vport_meta_mask));
/*
* Availability of sufficient number of bits in REG_C_0 is verified on
initialization.
-* Sanity checking here.
*/
MLX5_ASSERT((tag & priv->sh->dv_regc0_mask) == tag);
return tag;
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 1bb036afebb3..fbe5cfd30201 100644
--- a/
[PATCH v9 14/23] net/sfc: remove term "sanity check"
Remove term sanity check in comment.
Signed-off-by: Stephen Hemminger
Acked-by: Andrew Rybchenko
---
drivers/net/sfc/sfc_dp_rx.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/sfc/sfc_dp_rx.h b/drivers/net/sfc/sfc_dp_rx.h
index 9f9bf2898881..dfb4fb98844b 100644
--- a/drivers/net/sfc/sfc_dp_rx.h
+++ b/drivers/net/sfc/sfc_dp_rx.h
@@ -59,7 +59,7 @@ struct sfc_dp_rx_qcreate_info {
/**
* Maximum number of Rx descriptors completed in one Rx event.
-* Just for sanity checks if datapath would like to do.
+* Checks if datapath would like to do.
*/
unsigned intbatch_max;
--
2.43.0
[PATCH v9 15/23] net/ark: replace use of term sanity
Do not use non inclusive terms.
Signed-off-by: Stephen Hemminger
---
drivers/net/ark/ark_ethdev.c| 8
drivers/net/ark/ark_ethdev_rx.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
index 0ffd4b9e9e4a..68edb542db43 100644
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -346,10 +346,10 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
ARK_PMD_LOG(NOTICE, "Arkville HW Commit_ID: %08x\n",
rte_be_to_cpu_32(ark->sysctrl.t32[0x20 / 4]));
- /* If HW sanity test fails, return an error */
+ /* If HW test fails, return an error */
if (ark->sysctrl.t32[4] != 0xcafef00d) {
ARK_PMD_LOG(ERR,
- "HW Sanity test has failed, expected constant"
+ "HW test has failed, expected constant"
" 0x%x, read 0x%x (%s)\n",
0xcafef00d,
ark->sysctrl.t32[4], __func__);
@@ -357,7 +357,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
}
ARK_PMD_LOG(DEBUG,
- "HW Sanity test has PASSED, expected constant"
+ "HW test has PASSED, expected constant"
" 0x%x, read 0x%x (%s)\n",
0xcafef00d, ark->sysctrl.t32[4], __func__);
@@ -587,7 +587,7 @@ eth_ark_dev_start(struct rte_eth_dev *dev)
rte_thread_t thread;
/* Delay packet generator start allow the hardware to be ready
-* This is only used for sanity checking with internal generator
+* This is only used for checking with internal generator
*/
char tname[RTE_THREAD_INTERNAL_NAME_SIZE];
snprintf(tname, sizeof(tname), "ark-pg%d", dev->data->port_id);
diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c
index 24f1c65690eb..8ac9d904e795 100644
--- a/drivers/net/ark/ark_ethdev_rx.c
+++ b/drivers/net/ark/ark_ethdev_rx.c
@@ -283,7 +283,7 @@ eth_ark_recv_pkts(void *rx_queue,
mbuf->pkt_len = meta->pkt_len;
mbuf->data_len = meta->pkt_len;
- if (ARK_DEBUG_CORE) { /* debug sanity checks */
+ if (ARK_DEBUG_CORE) { /* debug checks */
if ((meta->pkt_len > (1024 * 16)) ||
(meta->pkt_len == 0)) {
--
2.43.0
[PATCH v9 16/23] net/bnxt: replace use of term sanity
Do not use non-inclusive terms.
Signed-off-by: Stephen Hemminger
---
drivers/net/bnxt/bnxt_hwrm.c | 2 +-
drivers/net/bnxt/hsi_struct_def_dpdk.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 06f196760fa8..e1254375b650 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -262,7 +262,7 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void
*msg,
done = bnxt_check_cq_hwrm_done(cpr, is_tx, is_rx,
i == timeout - 1);
- /* Sanity check on the resp->resp_len */
+ /* Input check on the resp->resp_len */
rte_io_rmb();
if (resp->resp_len && resp->resp_len <= bp->max_resp_len) {
/* Last byte of resp contains the valid key */
diff --git a/drivers/net/bnxt/hsi_struct_def_dpdk.h
b/drivers/net/bnxt/hsi_struct_def_dpdk.h
index 9afdd056ce7a..a8076a6fc223 100644
--- a/drivers/net/bnxt/hsi_struct_def_dpdk.h
+++ b/drivers/net/bnxt/hsi_struct_def_dpdk.h
@@ -55482,7 +55482,7 @@ struct hwrm_tfc_ident_alloc_output {
* Requests the firmware to free a TFC resource identifier.
* A resource subtype and session id are passed in.
* An identifier (previously allocated) corresponding to all these is
- * freed, only after various sanity checks are completed.
+ * freed, only after various checks are completed.
*/
/* hwrm_tfc_ident_free_input (size:192b/24B) */
struct hwrm_tfc_ident_free_input {
--
2.43.0
[PATCH v9 17/23] net/bnx2x: remove reference to sanity
Replace "sanity check"
Signed-off-by: Stephen Hemminger
---
drivers/net/bnx2x/bnx2x.c | 2 +-
drivers/net/bnx2x/bnx2x_stats.c | 8
drivers/net/bnx2x/ecore_sp.c| 2 +-
drivers/net/bnx2x/elink.c | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index c3283c94f38f..e345f293f25c 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -7820,7 +7820,7 @@ static int bnx2x_check_valid_mf_cfg(struct bnx2x_softc
*sc)
uint32_t ovlan2;
uint8_t i, j;
- /* various MF mode sanity checks... */
+ /* various MF mode checks... */
if (mf_info->mf_config[SC_VN(sc)] & FUNC_MF_CFG_FUNC_HIDE) {
PMD_DRV_LOG(NOTICE, sc,
diff --git a/drivers/net/bnx2x/bnx2x_stats.c b/drivers/net/bnx2x/bnx2x_stats.c
index c07b01510a06..86d90679ac0a 100644
--- a/drivers/net/bnx2x/bnx2x_stats.c
+++ b/drivers/net/bnx2x/bnx2x_stats.c
@@ -187,7 +187,7 @@ bnx2x_stats_pmf_update(struct bnx2x_softc *sc)
*/
return;
}
- /* sanity */
+ /* input valid? */
if (!sc->port.pmf || !sc->port.port_stx) {
PMD_DRV_LOG(ERR, sc, "BUG!");
return;
@@ -237,7 +237,7 @@ bnx2x_port_stats_init(struct bnx2x_softc *sc)
uint32_t mac_addr;
uint32_t *stats_comp = BNX2X_SP(sc, stats_comp);
-/* sanity */
+/* input valid? */
if (!sc->link_vars.link_up || !sc->port.pmf) {
PMD_DRV_LOG(ERR, sc, "BUG!");
return;
@@ -461,7 +461,7 @@ bnx2x_func_stats_init(struct bnx2x_softc *sc)
struct dmae_command *dmae = &sc->stats_dmae;
uint32_t *stats_comp = BNX2X_SP(sc, stats_comp);
-/* sanity */
+/* input valid? */
if (!sc->func_stx) {
PMD_DRV_LOG(ERR, sc, "BUG!");
return;
@@ -1301,7 +1301,7 @@ bnx2x_port_stats_base_init(struct bnx2x_softc *sc)
struct dmae_command *dmae;
uint32_t *stats_comp = BNX2X_SP(sc, stats_comp);
-/* sanity */
+/* input valid? */
if (!sc->port.pmf || !sc->port.port_stx) {
PMD_DRV_LOG(ERR, sc, "BUG!");
return;
diff --git a/drivers/net/bnx2x/ecore_sp.c b/drivers/net/bnx2x/ecore_sp.c
index c6c3857778f7..158205266f62 100644
--- a/drivers/net/bnx2x/ecore_sp.c
+++ b/drivers/net/bnx2x/ecore_sp.c
@@ -207,7 +207,7 @@ static int ecore_exe_queue_step(struct bnx2x_softc *sc,
break;
}
- /* Sanity check */
+ /* Argument check */
if (!cur_len)
return ECORE_SUCCESS;
diff --git a/drivers/net/bnx2x/elink.c b/drivers/net/bnx2x/elink.c
index 2c81f85b9605..6ebd47d927f8 100644
--- a/drivers/net/bnx2x/elink.c
+++ b/drivers/net/bnx2x/elink.c
@@ -1088,7 +1088,7 @@ static void elink_get_epio(struct bnx2x_softc *sc,
uint32_t epio_pin,
{
uint32_t epio_mask, gp_oenable;
*en = 0;
- /* Sanity check */
+ /* Input check */
if (epio_pin > 31) {
ELINK_DEBUG_P1(sc, "Invalid EPIO pin %d to get", epio_pin);
return;
@@ -1105,7 +1105,7 @@ static void elink_set_epio(struct bnx2x_softc *sc,
uint32_t epio_pin, uint32_t e
{
uint32_t epio_mask, gp_output, gp_oenable;
- /* Sanity check */
+ /* Input check */
if (epio_pin > 31) {
ELINK_DEBUG_P1(sc, "Invalid EPIO pin %d to set", epio_pin);
return;
--
2.43.0
[PATCH v9 18/23] cnxk: replace term sanity
Do not use non-inclusive naming.
Signed-off-by: Stephen Hemminger
---
drivers/common/cnxk/roc_nix_tm_ops.c | 2 +-
drivers/common/cnxk/roc_npa.c| 4 ++--
drivers/net/cnxk/cnxk_ethdev.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/common/cnxk/roc_nix_tm_ops.c
b/drivers/common/cnxk/roc_nix_tm_ops.c
index e1cef7a670b6..6060dba0d799 100644
--- a/drivers/common/cnxk/roc_nix_tm_ops.c
+++ b/drivers/common/cnxk/roc_nix_tm_ops.c
@@ -527,7 +527,7 @@ roc_nix_tm_hierarchy_disable(struct roc_nix *roc_nix)
node->flags &= ~NIX_TM_NODE_ENABLED;
}
- /* Verify sanity of all tx queues */
+ /* Verify all tx queues */
for (i = 0; i < sq_cnt; i++) {
sq = nix->sqs[i];
if (!sq)
diff --git a/drivers/common/cnxk/roc_npa.c b/drivers/common/cnxk/roc_npa.c
index 6c14c499019a..5e38ecf0414e 100644
--- a/drivers/common/cnxk/roc_npa.c
+++ b/drivers/common/cnxk/roc_npa.c
@@ -458,7 +458,7 @@ npa_aura_pool_pair_alloc(struct npa_lf *lf, const uint32_t
block_size,
char name[PLT_MEMZONE_NAMESIZE];
const struct plt_memzone *mz;
- /* Sanity check */
+ /* argument checks */
if (!lf || !block_size || !block_count || !pool || !aura ||
!aura_handle)
return NPA_ERR_PARAM;
@@ -1096,7 +1096,7 @@ npa_dev_init(struct npa_lf *lf, uintptr_t base, struct
mbox *mbox)
uint8_t aura_sz;
int rc;
- /* Sanity checks */
+ /* Input checks */
if (!lf || !base || !mbox)
return NPA_ERR_PARAM;
diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c
index 5e11bbb017ea..798567592efe 100644
--- a/drivers/net/cnxk/cnxk_ethdev.c
+++ b/drivers/net/cnxk/cnxk_ethdev.c
@@ -636,7 +636,7 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t qid,
struct rte_mempool *lpb_pool = mp;
struct rte_mempool *spb_pool = NULL;
- /* Sanity checks */
+ /* input checks */
if (rx_conf->rx_deferred_start == 1) {
plt_err("Deferred Rx start is not supported");
goto fail;
@@ -1205,7 +1205,7 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev)
rc = -EINVAL;
- /* Sanity checks */
+ /* baseline checks */
if (rte_eal_has_hugepages() == 0) {
plt_err("Huge page is not configured");
goto fail_configure;
--
2.43.0
[PATCH v9 19/23] event/opdl: remove term sanity
Don't use non-inclusive term.
Signed-off-by: Stephen Hemminger
---
drivers/event/opdl/opdl_evdev.c | 2 +-
drivers/event/opdl/opdl_evdev_init.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/event/opdl/opdl_evdev.c b/drivers/event/opdl/opdl_evdev.c
index 0cccaf7e9731..39cd87b8f944 100644
--- a/drivers/event/opdl/opdl_evdev.c
+++ b/drivers/event/opdl/opdl_evdev.c
@@ -241,7 +241,7 @@ opdl_queue_setup(struct rte_eventdev *dev,
struct opdl_evdev *device = opdl_pmd_priv(dev);
- /* Extra sanity check, probably not needed */
+ /* Extra check, probably not needed */
if (queue_id == OPDL_INVALID_QID) {
PMD_DRV_LOG(ERR, "DEV_ID:[%02d] : "
"Invalid queue id %u requested\n",
diff --git a/drivers/event/opdl/opdl_evdev_init.c
b/drivers/event/opdl/opdl_evdev_init.c
index be3437fc2f40..12eb2695f5de 100644
--- a/drivers/event/opdl/opdl_evdev_init.c
+++ b/drivers/event/opdl/opdl_evdev_init.c
@@ -300,7 +300,7 @@ static int opdl_add_deps(struct opdl_evdev *device,
struct opdl_queue *queue_deps = &device->queue[deps_q_id];
struct opdl_stage *dep_stages[OPDL_PORTS_MAX];
- /* sanity check that all stages are for same opdl ring */
+ /* check that all stages are for same opdl ring */
for (i = 0; i < queue->nb_ports; i++) {
struct opdl_ring *r =
opdl_stage_get_opdl_ring(stage_for_port(queue, i));
--
2.43.0
[PATCH v9 20/23] net/txgbe: replace term sanity
Don't use term sanity.
Signed-off-by: Stephen Hemminger
---
drivers/net/txgbe/txgbe_ipsec.c | 2 +-
drivers/net/txgbe/txgbe_rxtx.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/txgbe/txgbe_ipsec.c b/drivers/net/txgbe/txgbe_ipsec.c
index f9f8108fb894..cadb0943c82d 100644
--- a/drivers/net/txgbe/txgbe_ipsec.c
+++ b/drivers/net/txgbe/txgbe_ipsec.c
@@ -595,7 +595,7 @@ txgbe_crypto_enable_ipsec(struct rte_eth_dev *dev)
rx_offloads = dev->data->dev_conf.rxmode.offloads;
tx_offloads = dev->data->dev_conf.txmode.offloads;
- /* sanity checks */
+ /* offload checks */
if (rx_offloads & RTE_ETH_RX_OFFLOAD_TCP_LRO) {
PMD_DRV_LOG(ERR, "RSC and IPsec not supported");
return -1;
diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c
index 1cd4b25965b5..5d45d8763dc9 100644
--- a/drivers/net/txgbe/txgbe_rxtx.c
+++ b/drivers/net/txgbe/txgbe_rxtx.c
@@ -4115,7 +4115,7 @@ txgbe_set_rsc(struct rte_eth_dev *dev)
uint32_t rdrxctl;
uint32_t rfctl;
- /* Sanity check */
+ /* Offload check */
dev->dev_ops->dev_infos_get(dev, &dev_info);
if (dev_info.rx_offload_capa & RTE_ETH_RX_OFFLOAD_TCP_LRO)
rsc_capable = true;
--
2.43.0
[PATCH v9 21/23] net/cxgbe: remove use of term sanity
Remove non-inclusive terminolgy.
Signed-off-by: Stephen Hemminger
---
drivers/net/cxgbe/cxgbe_ethdev.c | 10 ++
drivers/net/cxgbe/cxgbevf_main.c | 4 ++--
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c
index 8cc3d9f257a0..c7c745fee495 100644
--- a/drivers/net/cxgbe/cxgbe_ethdev.c
+++ b/drivers/net/cxgbe/cxgbe_ethdev.c
@@ -524,10 +524,7 @@ int cxgbe_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,
eth_dev->data->tx_queues[queue_idx] = (void *)txq;
- /* Sanity Checking
-*
-* nb_desc should be > 1023 and <= CXGBE_MAX_RING_DESC_SIZE
-*/
+ /* nb_desc should be > 1023 and <= CXGBE_MAX_RING_DESC_SIZE */
temp_nb_desc = nb_desc;
if (nb_desc < CXGBE_MIN_RING_DESC_SIZE) {
dev_warn(adapter, "%s: number of descriptors must be >= %d.
Using default [%d]\n",
@@ -648,10 +645,7 @@ int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
eth_dev->data->rx_queues[queue_idx] = (void *)rxq;
- /* Sanity Checking
-*
-* nb_desc should be > 0 and <= CXGBE_MAX_RING_DESC_SIZE
-*/
+ /* nb_desc should be > 0 and <= CXGBE_MAX_RING_DESC_SIZE */
temp_nb_desc = nb_desc;
if (nb_desc < CXGBE_MIN_RING_DESC_SIZE) {
dev_warn(adapter, "%s: number of descriptors must be >= %d.
Using default [%d]\n",
diff --git a/drivers/net/cxgbe/cxgbevf_main.c b/drivers/net/cxgbe/cxgbevf_main.c
index d0c93f8ac3a5..dfb12b4ed5c9 100644
--- a/drivers/net/cxgbe/cxgbevf_main.c
+++ b/drivers/net/cxgbe/cxgbevf_main.c
@@ -137,7 +137,7 @@ static int adap_init0vf(struct adapter *adapter)
/*
* Grab our Virtual Interface resource allocation, extract the
-* features that we're interested in and do a bit of sanity testing on
+* features that we're interested in and do a bit of testing on
* what we discover.
*/
err = t4vf_get_vfres(adapter);
@@ -148,7 +148,7 @@ static int adap_init0vf(struct adapter *adapter)
}
/*
-* Check for various parameter sanity issues.
+* Check for various parameter issues.
*/
if (adapter->params.vfres.pmask == 0) {
dev_err(adapter->pdev_dev, "no port access configured\n"
--
2.43.0
[PATCH v9 22/23] crypto/bcmfs: replace term sanity check
Do not use non-inclusive naming here.
Signed-off-by: Stephen Hemminger
---
drivers/crypto/bcmfs/hw/bcmfs4_rm.c | 6 +++---
drivers/crypto/bcmfs/hw/bcmfs5_rm.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/crypto/bcmfs/hw/bcmfs4_rm.c
b/drivers/crypto/bcmfs/hw/bcmfs4_rm.c
index 9a30c654dab8..051bbea9cc81 100644
--- a/drivers/crypto/bcmfs/hw/bcmfs4_rm.c
+++ b/drivers/crypto/bcmfs/hw/bcmfs4_rm.c
@@ -317,7 +317,7 @@ bcmfs4_mdst_desc(uint64_t addr, unsigned int length_div_16)
}
static bool
-bcmfs4_sanity_check(struct bcmfs_qp_message *msg)
+bcmfs4_message_check(struct bcmfs_qp_message *msg)
{
unsigned int i = 0;
@@ -458,8 +458,8 @@ bcmfs4_enqueue_single_request_qp(struct bcmfs_qp *qp, void
*op)
struct bcmfs_queue *txq = &qp->tx_q;
struct bcmfs_qp_message *msg = (struct bcmfs_qp_message *)op;
- /* Do sanity check on message */
- if (!bcmfs4_sanity_check(msg)) {
+ /* Do check on message */
+ if (!bcmfs4_message_check(msg)) {
BCMFS_DP_LOG(ERR, "Invalid msg on queue %d", qp->qpair_id);
return -EIO;
}
diff --git a/drivers/crypto/bcmfs/hw/bcmfs5_rm.c
b/drivers/crypto/bcmfs/hw/bcmfs5_rm.c
index cbfe42cb4713..2df10a302841 100644
--- a/drivers/crypto/bcmfs/hw/bcmfs5_rm.c
+++ b/drivers/crypto/bcmfs/hw/bcmfs5_rm.c
@@ -293,7 +293,7 @@ bcmfs5_mdst_desc(uint64_t addr, unsigned int len_div_16)
}
static bool
-bcmfs5_sanity_check(struct bcmfs_qp_message *msg)
+bcmfs5_message_check(struct bcmfs_qp_message *msg)
{
unsigned int i = 0;
@@ -389,8 +389,8 @@ bcmfs5_enqueue_single_request_qp(struct bcmfs_qp *qp, void
*op)
struct bcmfs_queue *txq = &qp->tx_q;
struct bcmfs_qp_message *msg = (struct bcmfs_qp_message *)op;
- /* Do sanity check on message */
- if (!bcmfs5_sanity_check(msg)) {
+ /* Do check on message */
+ if (!bcmfs5_message_check(msg)) {
BCMFS_DP_LOG(ERR, "Invalid msg on queue %d", qp->qpair_id);
return -EIO;
}
--
2.43.0
[PATCH v9 23/23] drivers: remove use of term sanity check
Replace non-inclusive language with better comments.
Covers multiple drivers
Signed-off-by: Stephen Hemminger
Acked-by: Hemant Agrawal
---
drivers/bus/fslmc/qbman/qbman_sys_decl.h | 2 +-
drivers/common/cnxk/roc_npa.c | 2 +-
drivers/common/dpaax/caamflib/desc.h | 2 +-
drivers/common/sfc_efx/base/ef10_nvram.c | 4 ++--
drivers/common/sfc_efx/base/efx_rx.c | 2 +-
drivers/dma/idxd/idxd_pci.c | 2 +-
drivers/net/bonding/rte_eth_bond_8023ad.c | 2 +-
drivers/net/mvpp2/mrvl_qos.c | 2 +-
drivers/net/nfp/nfp_flow.c| 2 +-
drivers/net/qede/qede_rxtx.c | 6 +++---
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/bus/fslmc/qbman/qbman_sys_decl.h
b/drivers/bus/fslmc/qbman/qbman_sys_decl.h
index caaae417773c..2b6162d0ceaf 100644
--- a/drivers/bus/fslmc/qbman/qbman_sys_decl.h
+++ b/drivers/bus/fslmc/qbman/qbman_sys_decl.h
@@ -9,7 +9,7 @@
#include
#include
-/* Sanity check */
+/* Byte order check */
#if (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__) && \
(__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)
#error "Unknown endianness!"
diff --git a/drivers/common/cnxk/roc_npa.c b/drivers/common/cnxk/roc_npa.c
index 5e38ecf0414e..bd8ab1b39584 100644
--- a/drivers/common/cnxk/roc_npa.c
+++ b/drivers/common/cnxk/roc_npa.c
@@ -622,7 +622,7 @@ npa_aura_alloc(struct npa_lf *lf, const uint32_t
block_count, int pool_id,
{
int rc, aura_id;
- /* Sanity check */
+ /* parameter check */
if (!lf || !aura || !aura_handle)
return NPA_ERR_PARAM;
diff --git a/drivers/common/dpaax/caamflib/desc.h
b/drivers/common/dpaax/caamflib/desc.h
index 4a1285c4d488..37c87eebd5b4 100644
--- a/drivers/common/dpaax/caamflib/desc.h
+++ b/drivers/common/dpaax/caamflib/desc.h
@@ -107,7 +107,7 @@ extern enum rta_sec_era rta_sec_era;
/*
* ONE - should always be set. Combination of ONE (always
- * set) and ZRO (always clear) forms an endianness sanity check
+ * set) and ZRO (always clear) forms an endianness check
*/
#define HDR_ONEBIT(23)
#define HDR_ZROBIT(15)
diff --git a/drivers/common/sfc_efx/base/ef10_nvram.c
b/drivers/common/sfc_efx/base/ef10_nvram.c
index ce8357fa94ce..fad9f0f507f3 100644
--- a/drivers/common/sfc_efx/base/ef10_nvram.c
+++ b/drivers/common/sfc_efx/base/ef10_nvram.c
@@ -595,13 +595,13 @@ tlv_update_partition_len_and_cks(
/*
* We just modified the partition, so the total length may not be
-* valid. Don't use tlv_find(), which performs some sanity checks
+* valid. Don't use tlv_find(), which performs some checks
* that may fail here.
*/
partition.data = cursor->block;
memcpy(&partition.tlv_cursor, cursor, sizeof (*cursor));
header = (struct tlv_partition_header *)partition.data;
- /* Sanity check. */
+ /* Header check */
if (__LE_TO_CPU_32(header->tag) != TLV_TAG_PARTITION_HEADER) {
rc = EFAULT;
goto fail1;
diff --git a/drivers/common/sfc_efx/base/efx_rx.c
b/drivers/common/sfc_efx/base/efx_rx.c
index dce9ada55d28..28676c5a5b99 100644
--- a/drivers/common/sfc_efx/base/efx_rx.c
+++ b/drivers/common/sfc_efx/base/efx_rx.c
@@ -930,7 +930,7 @@ efx_rx_qcreate_internal(
ndescs, id, flags, eep, erp)) != 0)
goto fail4;
- /* Sanity check queue creation result */
+ /* Check queue creation result */
if (flags & EFX_RXQ_FLAG_RSS_HASH) {
const efx_rx_prefix_layout_t *erplp = &erp->er_prefix_layout;
const efx_rx_prefix_field_info_t *rss_hash_field;
diff --git a/drivers/dma/idxd/idxd_pci.c b/drivers/dma/idxd/idxd_pci.c
index a78889a7efa0..ba36a96f085d 100644
--- a/drivers/dma/idxd/idxd_pci.c
+++ b/drivers/dma/idxd/idxd_pci.c
@@ -204,7 +204,7 @@ init_pci_device(struct rte_pci_device *dev, struct
idxd_dmadev *idxd,
goto err;
}
- /* sanity check device status */
+ /* check device status */
if (pci->regs->gensts & GENSTS_DEV_STATE_MASK) {
/* need function-level-reset (FLR) or is enabled */
IDXD_PMD_ERR("Device status is not disabled, cannot init");
diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c
b/drivers/net/bonding/rte_eth_bond_8023ad.c
index 79f1b3f1a0f2..57a67bd029ed 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -1476,7 +1476,7 @@ bond_8023ad_setup_validate(uint16_t port_id,
return -EINVAL;
if (conf != NULL) {
- /* Basic sanity check */
+ /* Basic input check */
if (conf->slow_periodic_ms == 0 ||
conf->fast_periodic_ms >=
conf->slow_periodic_ms ||
conf->long_timeout_ms == 0 ||
diff --git a/drivers/net/mvpp2/mrvl_qos.c b/drivers/net/mvpp2/mrvl_qos.c
ind
Re: [PATCH] drivers: Convert uses of RTE_LOG_DP to use RTE_LOG_DP_LINE
Recheck-request: iol-intel-Functional I saw this failed in CI testing for the DTS mtu_update test but suspect it was an infra failure as it happened across 3 distinct patches in a short span of time. So, triggering a retest.
Re: [PATCH 00/13] net/ionic: miscellaneous fixes and improvements
Recheck-request: iol-intel-Functional I saw this failed in CI testing for the DTS MTU_Update test but suspect it was an infra failure as it happened across 3 distinct patches in a short span of time. So, triggering a retest.
Re: [PATCH v7 00/19] Replace uses of RTE_LOGTYPE_PMD
Recheck-request: iol-intel-Functional I saw this failed in CI testing for the DTS MTU_Update test but suspect it was an infra failure as it happened across 3 distinct patches in a short span of time. So, triggering a retest.
RE: [PATCH v7 16/19] event/dlb2: use dedicated logtype
>+ DLB2_LOG_INFO("Ignoring unsupported parameters when
>creating device '%s'",
name);
Hi Stephen can you modify above like this:
DLB2_LOG_INFO(": Ignoring unsupported parameters when creating device '%s'\n",
name);
It looks better this way the output will be like this after this modification:
dlb2_parse_params: Ignoring unsupported parameters when creating device
'ea:00.0'
RE: [PATCH v2] app/testpmd: support updating flow rule actions
> -Original Message-
> From: Thomas Monjalon
> Sent: Friday, February 2, 2024 10:55
> To: mko-...@napatech.com; c...@napatech.com; Oleksandr Kolomeiets
>
> Cc: aman.deep.si...@intel.com; yuying.zh...@intel.com; dev@dpdk.org;
> Ori Kam ; Dariusz Sosnowski
> Subject: Re: [PATCH v2] app/testpmd: support updating flow rule actions
>
> 01/02/2024 10:59, Oleksandr Kolomeiets:
> > "flow actions_update" updates a flow rule specified by a rule ID with
> > a new action list by making a call to "rte_flow_actions_update()":
> >
> > flow actions_update {port_id} {rule_id}
> > actions {action} [/ {action} [...]] / end [user_id]
> >
> > Creating, updating and destroying a flow rule:
> >
> > testpmd> flow create 0 group 1 pattern eth / end actions drop / end
> > Flow rule #0 created
> > testpmd> flow actions_update 0 0 actions queue index 1 / end
> > Flow rule #0 updated with new actions
> > testpmd> flow destroy 0 rule 0
> > Flow rule #0 destroyed
>
> Why not a simple "flow update" command name?
+1. This would also make it consistent with async version of this command -
"flow queue {port_id} update ...".
RE: [PATCH v9 13/23] net/mlx[45]: remove word sanity
> -Original Message- > From: Stephen Hemminger > Sent: Monday, February 5, 2024 18:44 > To: dev@dpdk.org > Cc: Stephen Hemminger ; Dariusz Sosnowski > ; Slava Ovsiienko ; Ori > Kam ; Suanming Mou ; Matan > Azrad > Subject: [PATCH v9 13/23] net/mlx[45]: remove word sanity > > The term "sanity" is on non-inclusive naming list. > Remove it from the Nvidia drivers. > > Signed-off-by: Stephen Hemminger Acked-by: Dariusz Sosnowski Best regards, Dariusz Sosnowski
Re: [PATCH 00/13] net/ionic: miscellaneous fixes and improvements
On Feb 5, 2024, at 1:44 PM, Patrick Robb wrote: Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding. Recheck-request: iol-intel-Functional I saw this failed in CI testing for the DTS MTU_Update test but suspect it was an infra failure as it happened across 3 distinct patches in a short span of time. So, triggering a retest. I thought I saw another patchset hit the same failure that day. -Andrew
RE: [PATCH 1/1] eal: add C++ include guard in generic/rte_vect.h
> From: Tyler Retzlaff [mailto:roret...@linux.microsoft.com]
> Sent: Monday, 5 February 2024 18.37
>
> On Fri, Feb 02, 2024 at 09:40:59AM +, Bruce Richardson wrote:
> > On Fri, Feb 02, 2024 at 10:18:23AM +0100, Thomas Monjalon wrote:
> > > 02/02/2024 06:13, Ashish Sadanandan:
> > > > The header was missing the extern "C" directive which causes name
> > > > mangling of functions by C++ compilers, leading to linker errors
> > > > complaining of undefined references to these functions.
> > > >
> > > > Fixes: 86c743cf9140 ("eal: define generic vector types")
> > > > Cc: nelio.laranje...@6wind.com
> > > > Cc: sta...@dpdk.org
> > > >
> > > > Signed-off-by: Ashish Sadanandan
> > >
> > > Thank you for improving C++ compatibility.
> > >
> > > I'm not sure what is best to fix it.
> > > You are adding extern "C" in a file which is not directly included
> > > by the user app. The same was done for rte_rwlock.h.
> > > The other way is to make sure this include is in an extern "C"
> block
> > > in lib/eal/*/include/rte_vect.h (instead of being before the
> block).
> > >
> > > I would like we use the same approach for all files.
> > > Opinions?
> > >
> > I think just having the extern "C" guard in all files is the safest
> choice,
> > because it's immediately obvious in each and every file that it is
> correct.
> > Taking the other option, to check any indirect include file you need
> to go
> > finding what other files include it and check there that a) they have
> > include guards and b) the include for the indirect header is
> contained
> > within it.
> >
> > Adopting the policy of putting the guard in each and every header is
> also a
> > lot easier to do basic automated sanity checks on. If the file ends
> in .h,
> > we just use grep to quickly verify it's not missing the guards.
> [Naturally,
> > we can do more complete checks than that if we want, but 99% percent
> of
> > misses can be picked up by a grep for the 'extern "C"' bit]
>
> so first, i agree with what you say here. but one downside i've seen
> is that non-public symbols may end up as extern "C".
>
> i've also been unsatisfied with the inconsistency of either having
> includes in or outside of the guards.
>
> a lot of dpdk headers follow this pattern.
>
> // foo.h
> #ifdef __cplusplus
> extern "C" {
> #endif
>
> #include
>
> ...
>
> but some dpdk headers follow this pattern.
>
> // foo.h
> #include
>
> #ifdef __cplusplus
> extern "C"
> #endif
>
> ...
>
> standard C headers include the guards so don't need to be inside the
> extern "C" block. one minor annoyance with always including inside the
> block is we can't reliably provide a offer a C++-only header without
> doing extern "C++".
I would say that the first of the two above patterns is not only annoying, it
is incorrect.
A DPDK header file should not change the meaning of any other header files it
includes.
And although the incorrectness currently only screws up any C++ in those header
files, I still consider it a bug.
>
> please bear in mind i do not mean to suggest implementing any dpdk in
> C++ with this comment, merely that there are advantages to occasionally
> offering C++-only header content to applications should we wever want
> to.
>
> in some cases for harmony between C and C++ it may be easier to
> interoperate by supplying some basic C++-only headers, this may become
> more important as it there appears to be increasing divergance between
> the C and C++ standards and interoperability.
>
> for full disclosure i do anticipate having to provide some small bits
> of
> header only C++ for msvc which is why this is top of my mind.
>
> finally, i'll also note that we could again be explicit in our intent
> to
> declare what is extern "C" / exported by instead marking the declared
> names
> (functions and variables) themselves in a more precise manner.
>
> i.e.
> __rte__export // extern "C" or __declspec(dllexport) extern "C"
> void some_public_symbol(void);
>
> you'll recall we had a related discussion about symbol visibility here
> which is somewhat a similar problem to being solved to symbol naming.
> if
> we were defaulting visibility to hidden and using a single mechanism to
> guarantee extern "C" linkage and public visibility exposure we could
> catch all "missed" symbols for C++ without having to build as C++ and
> reference the symbols.
>
> https://mails.dpdk.org/archives/dev/2024-January/285109.html
>
> i still intend to put forward an RFC for the discussion resulting from
> that thread (just haven't had time yet).
With that RFC, please also mention if function pointers need any
special/additional considerations. No need to think about it yet. :-)
>
> >
> > /Bruce
Re: [PATCH v9 15/23] net/ark: replace use of term sanity
On Mon, Feb 5, 2024 at 1:03 PM Stephen Hemminger
wrote:
>
> Do not use non inclusive terms.
>
> Signed-off-by: Stephen Hemminger
> ---
> drivers/net/ark/ark_ethdev.c| 8
> drivers/net/ark/ark_ethdev_rx.c | 2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
> index 0ffd4b9e9e4a..68edb542db43 100644
> --- a/drivers/net/ark/ark_ethdev.c
> +++ b/drivers/net/ark/ark_ethdev.c
> @@ -346,10 +346,10 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
> ARK_PMD_LOG(NOTICE, "Arkville HW Commit_ID: %08x\n",
> rte_be_to_cpu_32(ark->sysctrl.t32[0x20 / 4]));
>
> - /* If HW sanity test fails, return an error */
> + /* If HW test fails, return an error */
> if (ark->sysctrl.t32[4] != 0xcafef00d) {
> ARK_PMD_LOG(ERR,
> - "HW Sanity test has failed, expected constant"
> + "HW test has failed, expected constant"
> " 0x%x, read 0x%x (%s)\n",
> 0xcafef00d,
> ark->sysctrl.t32[4], __func__);
> @@ -357,7 +357,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
> }
>
> ARK_PMD_LOG(DEBUG,
> - "HW Sanity test has PASSED, expected constant"
> + "HW test has PASSED, expected constant"
> " 0x%x, read 0x%x (%s)\n",
> 0xcafef00d, ark->sysctrl.t32[4], __func__);
>
> @@ -587,7 +587,7 @@ eth_ark_dev_start(struct rte_eth_dev *dev)
> rte_thread_t thread;
>
> /* Delay packet generator start allow the hardware to be
ready
> -* This is only used for sanity checking with internal
generator
> +* This is only used for checking with internal generator
> */
> char tname[RTE_THREAD_INTERNAL_NAME_SIZE];
> snprintf(tname, sizeof(tname), "ark-pg%d",
dev->data->port_id);
> diff --git a/drivers/net/ark/ark_ethdev_rx.c
b/drivers/net/ark/ark_ethdev_rx.c
> index 24f1c65690eb..8ac9d904e795 100644
> --- a/drivers/net/ark/ark_ethdev_rx.c
> +++ b/drivers/net/ark/ark_ethdev_rx.c
> @@ -283,7 +283,7 @@ eth_ark_recv_pkts(void *rx_queue,
> mbuf->pkt_len = meta->pkt_len;
> mbuf->data_len = meta->pkt_len;
>
> - if (ARK_DEBUG_CORE) { /* debug sanity checks */
> + if (ARK_DEBUG_CORE) { /* debug checks */
>
> if ((meta->pkt_len > (1024 * 16)) ||
> (meta->pkt_len == 0)) {
> --
> 2.43.0
>
Acked-by: Ed Czeck
Re: [PATCH v7 16/19] event/dlb2: use dedicated logtype
On Mon, 5 Feb 2024 19:16:15 +
"Sevincer, Abdullah" wrote:
> >+DLB2_LOG_INFO("Ignoring unsupported parameters when
> >creating device '%s'",
> name);
>
> Hi Stephen can you modify above like this:
>
> DLB2_LOG_INFO(": Ignoring unsupported parameters when creating device '%s'\n",
> name);
>
> It looks better this way the output will be like this after this modification:
>
> dlb2_parse_params: Ignoring unsupported parameters when creating device
> 'ea:00.0'
I don't understand why you would say that.
The message already will get a single newline and your change would add a
second one.
Log messages are not supposed to be double spaced, it confuses syslog.
If you want to change the overall format of log messages and how it displays the
function name, that is a different change. And would be done in the macro,
DLB2_LOG_IMPL.
The focus of this patch set is using existing format, if you want to change that
please address it in another patch later.
RE: [PATCH v7 16/19] event/dlb2: use dedicated logtype
>+I don't understand why you would say that.
>+The message already will get a single newline and your change would add a
>second one.
>+Log messages are not supposed to be double spaced, it confuses syslog.
>+If you want to change the overall format of log messages and how it displays
>the function name, that is a different change. And would be done in the macro,
>DLB2_LOG_IMPL.
>+The focus of this patch set is using existing format, if you want to change
>that please address it in another patch later.
No need for new line, I copied wrong debug message, apologies it would be like
this
DLB2_LOG_INFO(": Ignoring unsupported parameters when creating device '%s'",
name);
Note: Gage and Timothy is not with Intel now. So, not including them in the CC.
[PATCH] net/hns3: fix Rx packet truncation when KEEP CRC enabled
From: Dengdui Huang
When KEEP_CRC offload is enabled, some packets will be truncated and
the CRC is still be stripped in following cases:
1. For HIP08 hardware, the packet type is TCP and the length
is less than or equal to 60B.
2. For other hardwares, the packet type is IP and the length
is less than or equal to 60B.
So driver has to recaculate positively the CRC of these packets
on above cases.
In addition, to avoid impacting performance, KEEP_CRC is not
supported when NEON or SVE algorithm is used.
Fixes: 8973d7c4ca12 ("net/hns3: support keeping CRC")
Cc: sta...@dpdk.org
Signed-off-by: Dengdui Huang
Signed-off-by: Jie Hai
---
drivers/net/hns3/hns3_rxtx.c | 116 --
drivers/net/hns3/hns3_rxtx.h | 9 ++
drivers/net/hns3/hns3_rxtx_vec.c | 3 +-
drivers/net/hns3/hns3_rxtx_vec_neon.h | 19 -
drivers/net/hns3/hns3_rxtx_vec_sve.c | 3 +-
5 files changed, 103 insertions(+), 47 deletions(-)
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index 7e636a0a2e99..6e9b6db843f9 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#if defined(RTE_ARCH_ARM64)
#include
#include
@@ -1732,8 +1733,9 @@ hns3_rx_buf_len_calc(struct rte_mempool *mp, uint16_t
*rx_buf_len)
}
static int
-hns3_rxq_conf_runtime_check(struct hns3_hw *hw, uint16_t buf_size,
- uint16_t nb_desc)
+hns3_rxq_conf_runtime_check(struct hns3_hw *hw,
+ const struct rte_eth_rxconf *conf,
+ uint16_t buf_size, uint16_t nb_desc)
{
struct rte_eth_dev *dev = &rte_eth_devices[hw->data->port_id];
eth_rx_burst_t pkt_burst = dev->rx_pkt_burst;
@@ -1766,6 +1768,14 @@ hns3_rxq_conf_runtime_check(struct hns3_hw *hw, uint16_t
buf_size,
return -EINVAL;
}
}
+
+ if ((conf->offloads & RTE_ETH_RX_OFFLOAD_KEEP_CRC) &&
+ pkt_burst != hns3_recv_pkts_simple &&
+ pkt_burst != hns3_recv_scattered_pkts) {
+ hns3_err(hw, "KEEP_CRC offload is not supported in the current
rx function.");
+ return -EINVAL;
+ }
+
return 0;
}
@@ -1802,7 +1812,7 @@ hns3_rx_queue_conf_check(struct hns3_hw *hw, const struct
rte_eth_rxconf *conf,
}
if (hw->data->dev_started) {
- ret = hns3_rxq_conf_runtime_check(hw, *buf_size, nb_desc);
+ ret = hns3_rxq_conf_runtime_check(hw, conf, *buf_size, nb_desc);
if (ret) {
hns3_err(hw, "Rx queue runtime setup fail.");
return ret;
@@ -1917,6 +1927,8 @@ hns3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t
idx, uint16_t nb_desc,
memset(&rxq->err_stats, 0, sizeof(struct hns3_rx_bd_errors_stats));
memset(&rxq->dfx_stats, 0, sizeof(struct hns3_rx_dfx_stats));
+ if (hw->revision < PCI_REVISION_ID_HIP09_A)
+ rxq->keep_crc_fail_only_tcp = true;
/* CRC len set here is used for amending packet length */
if (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_KEEP_CRC)
rxq->crc_len = RTE_ETHER_CRC_LEN;
@@ -2400,6 +2412,47 @@ hns3_rx_ptp_timestamp_handle(struct hns3_rx_queue *rxq,
struct rte_mbuf *mbuf,
pf->rx_timestamp = timestamp;
}
+static inline bool
+hns3_need_recalculate_crc(struct hns3_rx_queue *rxq, struct rte_mbuf *m)
+{
+ uint32_t ptype = m->packet_type;
+
+ if (m->pkt_len > HNS3_KEEP_CRC_OK_MIN_PKT_LEN)
+ return false;
+
+ if (!(RTE_ETH_IS_IPV4_HDR(ptype) || RTE_ETH_IS_IPV6_HDR(ptype)))
+ return false;
+
+ if (rxq->keep_crc_fail_only_tcp)
+ return (ptype & RTE_PTYPE_L4_MASK) == RTE_PTYPE_L4_TCP;
+
+ return true;
+}
+
+static inline void
+hns3_recalculate_crc(struct hns3_rx_queue *rxq, struct rte_mbuf *m)
+{
+ char *append_data;
+ uint32_t crc;
+
+ crc = rte_net_crc_calc(rte_pktmbuf_mtod(m, void *),
+ m->data_len, RTE_NET_CRC32_ETH);
+
+ /*
+* The hns3 driver requires that mbuf size must be at least 512B.
+* When CRC is stripped by hardware, the pkt_len must be less than
+* or equal to 60B. Therefore, the space of the mbuf is enough
+* to insert the CRC.
+*
+* In addition, after CRC is stripped by hardware, pkt_len and data_len
+* do not contain the CRC length. Therefore, after CRC data is appended
+* by PMD again, both pkt_len and data_len add the CRC length.
+*/
+ append_data = rte_pktmbuf_append(m, rxq->crc_len);
+ /* The CRC data is binary data and does not care about the byte order.
*/
+ rte_memcpy(append_data, (void *)&crc, rxq->crc_len);
+}
+
uint16_t
hns3_recv_pkts_simple(void *rx_queue,
struct rte_mbuf **rx_pkts,
@@ -2470,8 +252
RE: [PATCH v6 2/3] ethdev: add compare item
> -Original Message- > From: Thomas Monjalon > Sent: Monday, February 5, 2024 10:09 PM > To: Suanming Mou > Cc: ferruh.yi...@amd.com; Ori Kam ; Aman Singh > ; Yuying Zhang ; > Andrew Rybchenko ; dev@dpdk.org > Subject: Re: [PATCH v6 2/3] ethdev: add compare item > > 05/02/2024 14:28, Suanming Mou: > > From: Thomas Monjalon > > > 02/02/2024 01:42, Suanming Mou: > > > > --- a/doc/guides/rel_notes/release_24_03.rst > > > > +++ b/doc/guides/rel_notes/release_24_03.rst > > > > +* **Added compare flow matching criteria.** > > > > > > Suggestion: > > > "Added flow matching with various comparisons." > > > Not sure how to illustrate the idea. > > > > What about " Added flow matching with various comparison results." ? > > I am thinking we are comparing packet fields, and you say we match comparison > results, which at the end is the same :) > > I feel not talking about results is clearer but I may be wrong. > You choose. OK, thanks, I prefer to keep results since user will be able to specify the comparison result. >
RE: [PATCH 0/2] Wangxun support vector Rx/Tx
Hi, > -Original Message- > From: Jiawen Wu > Sent: Thursday, February 1, 2024 11:00 AM > To: dev@dpdk.org > Cc: Jiawen Wu > Subject: [PATCH 0/2] Wangxun support vector Rx/Tx > > Add SSE/NEON vector instructions for TXGBE and NGBE driver to process > packets. > > Jiawen Wu (2): > net/txgbe: add vectorized functions for Rx/Tx > net/ngbe: add vectorized functions for Rx/Tx > > drivers/net/ngbe/meson.build | 6 + > drivers/net/ngbe/ngbe_ethdev.c| 6 + > drivers/net/ngbe/ngbe_ethdev.h| 1 + > drivers/net/ngbe/ngbe_rxtx.c | 161 - > drivers/net/ngbe/ngbe_rxtx.h | 32 +- > drivers/net/ngbe/ngbe_rxtx_vec_common.h | 296 + > drivers/net/ngbe/ngbe_rxtx_vec_neon.c | 604 ++ > drivers/net/ngbe/ngbe_rxtx_vec_sse.c | 692 > drivers/net/txgbe/meson.build | 6 + > drivers/net/txgbe/txgbe_ethdev.c | 6 + > drivers/net/txgbe/txgbe_ethdev.h | 1 + > drivers/net/txgbe/txgbe_ethdev_vf.c | 1 + > drivers/net/txgbe/txgbe_rxtx.c| 150 - > drivers/net/txgbe/txgbe_rxtx.h| 18 + > drivers/net/txgbe/txgbe_rxtx_vec_common.h | 301 + > drivers/net/txgbe/txgbe_rxtx_vec_neon.c | 604 ++ > drivers/net/txgbe/txgbe_rxtx_vec_sse.c| 736 ++ > 17 files changed, 3611 insertions(+), 10 deletions(-) > create mode 100644 drivers/net/ngbe/ngbe_rxtx_vec_common.h > create mode 100644 drivers/net/ngbe/ngbe_rxtx_vec_neon.c > create mode 100644 drivers/net/ngbe/ngbe_rxtx_vec_sse.c > create mode 100644 drivers/net/txgbe/txgbe_rxtx_vec_common.h > create mode 100644 drivers/net/txgbe/txgbe_rxtx_vec_neon.c > create mode 100644 drivers/net/txgbe/txgbe_rxtx_vec_sse.c > > -- > 2.27.0 >
[PATCH v7 0/4] ethdev: add RTE_FLOW_ITEM_TYPE_COMPARE
The new item type is added for the case user wants to match traffic based on packet field compare result with other fields or immediate value. e.g. take advantage the compare item user will be able to accumulate a IPv4/TCP packet's TCP data_offset and IPv4 IHL field to a tag register, then compare the tag register with IPv4 header total length to understand the packet has payload or not. The supported operations can be as below: - RTE_FLOW_ITEM_COMPARE_EQ (equal) - RTE_FLOW_ITEM_COMPARE_NE (not equal) - RTE_FLOW_ITEM_COMPARE_LT (less than) - RTE_FLOW_ITEM_COMPARE_LE (less than or equal) - RTE_FLOW_ITEM_COMPARE_GT (great than) - RTE_FLOW_ITEM_COMPARE_GE (great than or equal) V7: - Moved release notes to API. - Optimize comment descriptions. V6: - fix typo and style issue. - adjust flow_field description. V5: - rebase on top of next-net - add sample detail for rte_flow_field. V4: - rebase on top of the latest version. - move ACTION_MODIFY_PATTERN_SIZE and modify_field_ids rename to first patch. - add comparison flow create sample in testpmd_funcs.rst. V3: - fix code style missing empty line in rte_flow.rst. - fix missing the ABI change release notes. V2: - Since modify field data struct is experiment, rename modify field data directly instead of adding new flow field struct. Suanming Mou (4): ethdev: rename action modify field data structure ethdev: move flow field data structures ethdev: add compare item net/mlx5: add compare item support app/test-pmd/cmdline_flow.c | 416 +++- doc/guides/nics/features/default.ini| 1 + doc/guides/nics/features/mlx5.ini | 1 + doc/guides/nics/mlx5.rst| 7 + doc/guides/prog_guide/rte_flow.rst | 9 +- doc/guides/rel_notes/release_24_03.rst | 10 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 24 ++ drivers/net/mlx5/mlx5_flow.c| 4 +- drivers/net/mlx5/mlx5_flow.h| 9 +- drivers/net/mlx5/mlx5_flow_dv.c | 10 +- drivers/net/mlx5/mlx5_flow_hw.c | 73 lib/ethdev/rte_flow.c | 1 + lib/ethdev/rte_flow.h | 330 +--- 13 files changed, 726 insertions(+), 169 deletions(-) -- 2.34.1
[PATCH v7 1/4] ethdev: rename action modify field data structure
Current rte_flow_action_modify_data struct describes the pkt
field perfectly and is used only in action.
It is planned to be used for item as well. This commit renames
it to "rte_flow_field_data" making it compatible to be used by item.
Signed-off-by: Suanming Mou
Acked-by: Ori Kam
Acked-by: Andrew Rybchenko
---
app/test-pmd/cmdline_flow.c| 22 +++---
doc/guides/prog_guide/rte_flow.rst | 2 +-
doc/guides/rel_notes/release_24_03.rst | 3 +++
drivers/net/mlx5/mlx5_flow.c | 4 ++--
drivers/net/mlx5/mlx5_flow.h | 6 +++---
drivers/net/mlx5/mlx5_flow_dv.c| 10 +-
lib/ethdev/rte_flow.h | 10 +-
7 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 4d26e81d26..35030b5c47 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -744,13 +744,13 @@ enum index {
#define ITEM_RAW_SIZE \
(sizeof(struct rte_flow_item_raw) + ITEM_RAW_PATTERN_SIZE)
-/** Maximum size for external pattern in struct rte_flow_action_modify_data. */
-#define ACTION_MODIFY_PATTERN_SIZE 32
+/** Maximum size for external pattern in struct rte_flow_field_data. */
+#define FLOW_FIELD_PATTERN_SIZE 32
/** Storage size for struct rte_flow_action_modify_field including pattern. */
#define ACTION_MODIFY_SIZE \
(sizeof(struct rte_flow_action_modify_field) + \
- ACTION_MODIFY_PATTERN_SIZE)
+ FLOW_FIELD_PATTERN_SIZE)
/** Maximum number of queue indices in struct rte_flow_action_rss. */
#define ACTION_RSS_QUEUE_NUM 128
@@ -944,7 +944,7 @@ static const char *const modify_field_ops[] = {
"set", "add", "sub", NULL
};
-static const char *const modify_field_ids[] = {
+static const char *const flow_field_ids[] = {
"start", "mac_dst", "mac_src",
"vlan_type", "vlan_id", "mac_type",
"ipv4_dscp", "ipv4_ttl", "ipv4_src", "ipv4_dst",
@@ -6995,7 +6995,7 @@ static const struct token token_list[] = {
ARGS_ENTRY_ARB(0, 0),
ARGS_ENTRY_ARB
(sizeof(struct rte_flow_action_modify_field),
-ACTION_MODIFY_PATTERN_SIZE)),
+FLOW_FIELD_PATTERN_SIZE)),
.call = parse_vc_conf,
},
[ACTION_MODIFY_FIELD_WIDTH] = {
@@ -9821,10 +9821,10 @@ parse_vc_modify_field_id(struct context *ctx, const
struct token *token,
if (ctx->curr != ACTION_MODIFY_FIELD_DST_TYPE_VALUE &&
ctx->curr != ACTION_MODIFY_FIELD_SRC_TYPE_VALUE)
return -1;
- for (i = 0; modify_field_ids[i]; ++i)
- if (!strcmp_partial(modify_field_ids[i], str, len))
+ for (i = 0; flow_field_ids[i]; ++i)
+ if (!strcmp_partial(flow_field_ids[i], str, len))
break;
- if (!modify_field_ids[i])
+ if (!flow_field_ids[i])
return -1;
if (!ctx->object)
return len;
@@ -12051,10 +12051,10 @@ comp_set_modify_field_id(struct context *ctx, const
struct token *token,
RTE_SET_USED(token);
if (!buf)
- return RTE_DIM(modify_field_ids);
- if (ent >= RTE_DIM(modify_field_ids) - 1)
+ return RTE_DIM(flow_field_ids);
+ if (ent >= RTE_DIM(flow_field_ids) - 1)
return -1;
- name = modify_field_ids[ent];
+ name = flow_field_ids[ent];
if (ctx->curr == ACTION_MODIFY_FIELD_SRC_TYPE ||
(strcmp(name, "pointer") && strcmp(name, "value")))
return strlcpy(buf, name, size);
diff --git a/doc/guides/prog_guide/rte_flow.rst
b/doc/guides/prog_guide/rte_flow.rst
index 7af329bd93..9192d6ab01 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -3185,7 +3185,7 @@ destination offset as ``48``, and provide immediate value
``0x85XX``.
| ``width`` | number of bits to use |
+---+-+
-.. _table_rte_flow_action_modify_data:
+.. _table_rte_flow_field_data:
.. table:: destination/source field definition
diff --git a/doc/guides/rel_notes/release_24_03.rst
b/doc/guides/rel_notes/release_24_03.rst
index 84d3144215..222a091e8b 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -106,6 +106,9 @@ API Changes
* gso: ``rte_gso_segment`` now returns -ENOTSUP for unknown protocols.
+* ethdev: Renamed structure ``rte_flow_action_modify_data`` to be
+ ``rte_flow_field_data`` for more generic usage.
+
ABI Changes
---
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 85e8c77c81..5788a7fb57 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -2493,7 +2493,7 @@ mlx5_validate_action_ct(struct rte_eth_dev *dev,
* Validate the level value for modify field action.
[PATCH v7 2/4] ethdev: move flow field data structures
As flow field relevant data structures will be used by both actions and
items, this commit moves the relevant data structures up to item parts.
Signed-off-by: Suanming Mou
---
lib/ethdev/rte_flow.h | 290 +-
1 file changed, 145 insertions(+), 145 deletions(-)
diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
index eb46cfe09e..958eb01a80 100644
--- a/lib/ethdev/rte_flow.h
+++ b/lib/ethdev/rte_flow.h
@@ -2365,6 +2365,151 @@ static const struct rte_flow_item_ptype
rte_flow_item_ptype_mask = {
};
#endif
+/**
+ * Packet header field IDs, used by RTE_FLOW_ACTION_TYPE_MODIFY_FIELD.
+ */
+enum rte_flow_field_id {
+ RTE_FLOW_FIELD_START = 0, /**< Start of a packet. */
+ RTE_FLOW_FIELD_MAC_DST, /**< Destination MAC Address. */
+ RTE_FLOW_FIELD_MAC_SRC, /**< Source MAC Address. */
+ RTE_FLOW_FIELD_VLAN_TYPE, /**< VLAN Tag Identifier. */
+ RTE_FLOW_FIELD_VLAN_ID, /**< VLAN Identifier. */
+ RTE_FLOW_FIELD_MAC_TYPE,/**< EtherType. */
+ RTE_FLOW_FIELD_IPV4_DSCP, /**< IPv4 DSCP. */
+ RTE_FLOW_FIELD_IPV4_TTL,/**< IPv4 Time To Live. */
+ RTE_FLOW_FIELD_IPV4_SRC,/**< IPv4 Source Address. */
+ RTE_FLOW_FIELD_IPV4_DST,/**< IPv4 Destination Address. */
+ RTE_FLOW_FIELD_IPV6_DSCP, /**< IPv6 DSCP. */
+ RTE_FLOW_FIELD_IPV6_HOPLIMIT, /**< IPv6 Hop Limit. */
+ RTE_FLOW_FIELD_IPV6_SRC,/**< IPv6 Source Address. */
+ RTE_FLOW_FIELD_IPV6_DST,/**< IPv6 Destination Address. */
+ RTE_FLOW_FIELD_TCP_PORT_SRC,/**< TCP Source Port Number. */
+ RTE_FLOW_FIELD_TCP_PORT_DST,/**< TCP Destination Port Number. */
+ RTE_FLOW_FIELD_TCP_SEQ_NUM, /**< TCP Sequence Number. */
+ RTE_FLOW_FIELD_TCP_ACK_NUM, /**< TCP Acknowledgment Number. */
+ RTE_FLOW_FIELD_TCP_FLAGS, /**< TCP Flags. */
+ RTE_FLOW_FIELD_UDP_PORT_SRC,/**< UDP Source Port Number. */
+ RTE_FLOW_FIELD_UDP_PORT_DST,/**< UDP Destination Port Number. */
+ RTE_FLOW_FIELD_VXLAN_VNI, /**< VXLAN Network Identifier. */
+ RTE_FLOW_FIELD_GENEVE_VNI, /**< GENEVE Network Identifier. */
+ RTE_FLOW_FIELD_GTP_TEID,/**< GTP Tunnel Endpoint Identifier. */
+ RTE_FLOW_FIELD_TAG, /**< Tag value. */
+ RTE_FLOW_FIELD_MARK,/**< Mark value. */
+ RTE_FLOW_FIELD_META,/**< Metadata value. */
+ RTE_FLOW_FIELD_POINTER, /**< Memory pointer. */
+ RTE_FLOW_FIELD_VALUE, /**< Immediate value. */
+ RTE_FLOW_FIELD_IPV4_ECN,/**< IPv4 ECN. */
+ RTE_FLOW_FIELD_IPV6_ECN,/**< IPv6 ECN. */
+ RTE_FLOW_FIELD_GTP_PSC_QFI, /**< GTP QFI. */
+ RTE_FLOW_FIELD_METER_COLOR, /**< Meter color marker. */
+ RTE_FLOW_FIELD_IPV6_PROTO, /**< IPv6 next header. */
+ RTE_FLOW_FIELD_FLEX_ITEM, /**< Flex item. */
+ RTE_FLOW_FIELD_HASH_RESULT, /**< Hash result. */
+ RTE_FLOW_FIELD_GENEVE_OPT_TYPE, /**< GENEVE option type. */
+ RTE_FLOW_FIELD_GENEVE_OPT_CLASS,/**< GENEVE option class. */
+ RTE_FLOW_FIELD_GENEVE_OPT_DATA, /**< GENEVE option data. */
+ RTE_FLOW_FIELD_MPLS,/**< MPLS header. */
+ RTE_FLOW_FIELD_TCP_DATA_OFFSET, /**< TCP data offset. */
+ RTE_FLOW_FIELD_IPV4_IHL,/**< IPv4 IHL. */
+ RTE_FLOW_FIELD_IPV4_TOTAL_LEN, /**< IPv4 total length. */
+ RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN,/**< IPv6 payload length. */
+ RTE_FLOW_FIELD_RANDOM /**< Random value. */
+};
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this structure may change without prior notice
+ *
+ * Packet header field descriptions, used by RTE_FLOW_ACTION_TYPE_MODIFY_FIELD.
+ */
+struct rte_flow_field_data {
+ enum rte_flow_field_id field; /**< Field or memory type ID. */
+ union {
+ struct {
+ /** Encapsulation level and tag index or flex item
handle. */
+ union {
+ struct {
+ /**
+* Packet encapsulation level containing
+* the field to modify.
+*
+* - @p 0 requests the default behavior.
+* Depending on the packet type, it
+* can mean outermost, innermost or
+* anything in between.
+*
+* It basically stands for the
+* innermost encapsulation level.
+* Modification can be performed
+* accor
[PATCH v7 3/4] ethdev: add compare item
The new item type is added for the case user wants to match traffic
based on packet field compare result with other fields or immediate
value.
e.g. take advantage the compare item user will be able to accumulate
a IPv4/TCP packet's TCP data_offset and IPv4 IHL field to a tag
register, then compare the tag register with IPv4 header total length
to understand the packet has payload or not.
The supported operations can be as below:
- RTE_FLOW_ITEM_COMPARE_EQ (equal)
- RTE_FLOW_ITEM_COMPARE_NE (not equal)
- RTE_FLOW_ITEM_COMPARE_LT (less than)
- RTE_FLOW_ITEM_COMPARE_LE (less than or equal)
- RTE_FLOW_ITEM_COMPARE_GT (great than)
- RTE_FLOW_ITEM_COMPARE_GE (great than or equal)
A sample for create the comparison flow:
flow pattern_template 0 create ingress pattern_template_id 1 template \
compare op mask le a_type mask tag a_tag_index mask 1 b_type \
mask tag b_tag_index mask 2 width mask 0x / end
flow actions_template 0 create ingress actions_template_id 1 template \
count / drop / end mask count / drop / end
flow template_table 0 create table_id 1 group 2 priority 1 ingress \
rules_number 1 pattern_template 1 actions_template 1
flow queue 0 create 0 template_table 1 pattern_template 0 \
actions_template 0 postpone no pattern compare op is le \
a_type is tag a_tag_index is 1 b_type is tag b_tag_index is 2 \
width is 32 / end actions count / drop / end
Signed-off-by: Suanming Mou
Acked-by: Ori Kam
Acked-by: Andrew Rybchenko
---
app/test-pmd/cmdline_flow.c | 394
doc/guides/nics/features/default.ini| 1 +
doc/guides/prog_guide/rte_flow.rst | 7 +
doc/guides/rel_notes/release_24_03.rst | 5 +
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 24 ++
lib/ethdev/rte_flow.c | 1 +
lib/ethdev/rte_flow.h | 40 +-
7 files changed, 470 insertions(+), 2 deletions(-)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 35030b5c47..06f8c82342 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -545,6 +545,28 @@ enum index {
ITEM_PTYPE,
ITEM_PTYPE_VALUE,
ITEM_NSH,
+ ITEM_COMPARE,
+ ITEM_COMPARE_OP,
+ ITEM_COMPARE_OP_VALUE,
+ ITEM_COMPARE_FIELD_A_TYPE,
+ ITEM_COMPARE_FIELD_A_TYPE_VALUE,
+ ITEM_COMPARE_FIELD_A_LEVEL,
+ ITEM_COMPARE_FIELD_A_LEVEL_VALUE,
+ ITEM_COMPARE_FIELD_A_TAG_INDEX,
+ ITEM_COMPARE_FIELD_A_TYPE_ID,
+ ITEM_COMPARE_FIELD_A_CLASS_ID,
+ ITEM_COMPARE_FIELD_A_OFFSET,
+ ITEM_COMPARE_FIELD_B_TYPE,
+ ITEM_COMPARE_FIELD_B_TYPE_VALUE,
+ ITEM_COMPARE_FIELD_B_LEVEL,
+ ITEM_COMPARE_FIELD_B_LEVEL_VALUE,
+ ITEM_COMPARE_FIELD_B_TAG_INDEX,
+ ITEM_COMPARE_FIELD_B_TYPE_ID,
+ ITEM_COMPARE_FIELD_B_CLASS_ID,
+ ITEM_COMPARE_FIELD_B_OFFSET,
+ ITEM_COMPARE_FIELD_B_VALUE,
+ ITEM_COMPARE_FIELD_B_POINTER,
+ ITEM_COMPARE_FIELD_WIDTH,
/* Validate/create actions. */
ACTIONS,
@@ -744,6 +766,10 @@ enum index {
#define ITEM_RAW_SIZE \
(sizeof(struct rte_flow_item_raw) + ITEM_RAW_PATTERN_SIZE)
+static const char *const compare_ops[] = {
+ "eq", "ne", "lt", "le", "gt", "ge", NULL
+};
+
/** Maximum size for external pattern in struct rte_flow_field_data. */
#define FLOW_FIELD_PATTERN_SIZE 32
@@ -1596,6 +1622,7 @@ static const enum index next_item[] = {
ITEM_IB_BTH,
ITEM_PTYPE,
ITEM_NSH,
+ ITEM_COMPARE,
END_SET,
ZERO,
};
@@ -2133,6 +2160,38 @@ static const enum index item_nsh[] = {
ZERO,
};
+static const enum index item_compare_field[] = {
+ ITEM_COMPARE_OP,
+ ITEM_COMPARE_FIELD_A_TYPE,
+ ITEM_COMPARE_FIELD_B_TYPE,
+ ITEM_NEXT,
+ ZERO,
+};
+
+static const enum index compare_field_a[] = {
+ ITEM_COMPARE_FIELD_A_TYPE,
+ ITEM_COMPARE_FIELD_A_LEVEL,
+ ITEM_COMPARE_FIELD_A_TAG_INDEX,
+ ITEM_COMPARE_FIELD_A_TYPE_ID,
+ ITEM_COMPARE_FIELD_A_CLASS_ID,
+ ITEM_COMPARE_FIELD_A_OFFSET,
+ ITEM_COMPARE_FIELD_B_TYPE,
+ ZERO,
+};
+
+static const enum index compare_field_b[] = {
+ ITEM_COMPARE_FIELD_B_TYPE,
+ ITEM_COMPARE_FIELD_B_LEVEL,
+ ITEM_COMPARE_FIELD_B_TAG_INDEX,
+ ITEM_COMPARE_FIELD_B_TYPE_ID,
+ ITEM_COMPARE_FIELD_B_CLASS_ID,
+ ITEM_COMPARE_FIELD_B_OFFSET,
+ ITEM_COMPARE_FIELD_B_VALUE,
+ ITEM_COMPARE_FIELD_B_POINTER,
+ ITEM_COMPARE_FIELD_WIDTH,
+ ZERO,
+};
+
static const enum index next_action[] = {
ACTION_END,
ACTION_VOID,
@@ -2882,6 +2941,24 @@ comp_quota_update_name(struct context *ctx, const struct
token *token,
static int
comp_qu_mode_name(struct context *ctx, const struct token *token,
unsigned int ent, char *buf, unsigned int size);
+static int
+comp_set_compare_field_id(struct context *ctx,
[PATCH v7 4/4] net/mlx5: add compare item support
The compare item allows adding flow match with comparison
result. This commit adds compare item support to the PMD
code.
Due to HW limitation:
- Only HWS supported.
- Only 32-bit comparison is supported.
- Only single compare flow is supported in the flow table.
- Only match with compare result between packet fields is
supported.
Signed-off-by: Suanming Mou
Acked-by: Ori Kam
---
doc/guides/nics/features/mlx5.ini | 1 +
doc/guides/nics/mlx5.rst | 7 +++
doc/guides/rel_notes/release_24_03.rst | 2 +
drivers/net/mlx5/mlx5_flow.h | 3 ++
drivers/net/mlx5/mlx5_flow_hw.c| 73 ++
5 files changed, 86 insertions(+)
diff --git a/doc/guides/nics/features/mlx5.ini
b/doc/guides/nics/features/mlx5.ini
index 0739fe9d63..00e9348fc6 100644
--- a/doc/guides/nics/features/mlx5.ini
+++ b/doc/guides/nics/features/mlx5.ini
@@ -56,6 +56,7 @@ Usage doc= Y
[rte_flow items]
aggr_affinity= Y
+compare = Y
conntrack= Y
ecpri= Y
esp = Y
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 6b52fb93c5..18b40bc22d 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -778,6 +778,13 @@ Limitations
The flow engine of a process cannot move from active to standby mode
if preceding active application rules are still present and vice versa.
+- Match with compare result item (``RTE_FLOW_ITEM_TYPE_COMPARE``):
+
+ - Only supported in HW steering(``dv_flow_en`` = 2) mode.
+ - Only single flow is supported to the flow table.
+ - Only 32-bit comparison is supported.
+ - Only match with compare result between packet fields is supported.
+
Statistics
--
diff --git a/doc/guides/rel_notes/release_24_03.rst
b/doc/guides/rel_notes/release_24_03.rst
index 59eda27606..01d2d6d043 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -80,6 +80,8 @@ New Features
* Added support for Atomic Rules' TK242 packet-capture family of devices
with PCI IDs: ``0x1024, 0x1025, 0x1026``.
+ * Added support for comparing result between packet fields or value.
+
Removed Items
-
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index ecfb04ead2..f0a11949e6 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -277,6 +277,9 @@ enum mlx5_feature_name {
/* NSH ITEM */
#define MLX5_FLOW_ITEM_NSH (1ull << 53)
+/* COMPARE ITEM */
+#define MLX5_FLOW_ITEM_COMPARE (1ull << 54)
+
/* Outer Masks. */
#define MLX5_FLOW_LAYER_OUTER_L3 \
(MLX5_FLOW_LAYER_OUTER_L3_IPV4 | MLX5_FLOW_LAYER_OUTER_L3_IPV6)
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index da873ae2e2..f21c22131c 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -426,6 +426,9 @@ flow_hw_matching_item_flags_get(const struct rte_flow_item
items[])
case RTE_FLOW_ITEM_TYPE_GTP:
last_item = MLX5_FLOW_LAYER_GTP;
break;
+ case RTE_FLOW_ITEM_TYPE_COMPARE:
+ last_item = MLX5_FLOW_ITEM_COMPARE;
+ break;
default:
break;
}
@@ -4386,6 +4389,8 @@ flow_hw_table_create(struct rte_eth_dev *dev,
rte_errno = EINVAL;
goto it_error;
}
+ if (item_templates[i]->item_flags & MLX5_FLOW_ITEM_COMPARE)
+ matcher_attr.mode = MLX5DR_MATCHER_RESOURCE_MODE_HTABLE;
ret = __atomic_fetch_add(&item_templates[i]->refcnt, 1,
__ATOMIC_RELAXED) + 1;
if (ret <= 1) {
@@ -6634,6 +6639,66 @@ flow_hw_prepend_item(const struct rte_flow_item *items,
return copied_items;
}
+static inline bool
+flow_hw_item_compare_field_supported(enum rte_flow_field_id field)
+{
+ switch (field) {
+ case RTE_FLOW_FIELD_TAG:
+ case RTE_FLOW_FIELD_META:
+ case RTE_FLOW_FIELD_VALUE:
+ return true;
+ default:
+ break;
+ }
+ return false;
+}
+
+static int
+flow_hw_validate_item_compare(const struct rte_flow_item *item,
+ struct rte_flow_error *error)
+{
+ const struct rte_flow_item_compare *comp_m = item->mask;
+ const struct rte_flow_item_compare *comp_v = item->spec;
+
+ if (unlikely(!comp_m))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "compare item mask is missing");
+ if (comp_m->width != UINT32_MAX)
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+
RE: DPDK testpmd with E823 link status is down
Hi JackyCT.Chen:
We are tracking this issue, it is a firmware issue that has been reported to
the hardware team and the fix will take some time.
There is a workaround in ICE PMD, change the "no wait" to "wait_to_complete"
mode when ice_interrupt_handler() updates the link status in
drivers/net/ice/ice_ethdev.c:
#ifdef ICE_LSE_SPT
if (int_fw_ctl & PFINT_FW_CTL_INTEVENT_M) {
PMD_DRV_LOG(INFO, "FW_CTL: link state change
event");
ice_handle_aq_msg(dev);
}
#else
if (oicr & PFINT_OICR_LINK_STAT_CHANGE_M) {
PMD_DRV_LOG(INFO, "OICR: link state change
event");
-ret = ice_link_update(dev, 0);
+ ret = ice_link_update(dev, 1);
if (!ret)
rte_eth_dev_callback_process
(dev,
RTE_ETH_EVENT_INTR_LSC, NULL);
}
#endif
Best Regards
Zhichao
From: JackyCT.Chen
Sent: Wednesday, January 31, 2024 6:53 PM
To: Yang, Qiming ; dev@dpdk.org
Cc: Shih, Amy ; Hsu, Jason
; Wang, Leo
Subject: RE: DPDK testpmd with E823 link status is down
Hi Qiming & dpdk dev team:
This is JackyCT.Chen from Advantech, we have a question about E823 DPDK
loopback testpmd ,
Could you please give us some advice?
We bind the E823 and X710 devices with vfio-pci driver and execute the DPDK
testpmd . (detail see attached files please)
However, both E823 "link status : down and link speed : None" , we expected
that "link status : up and link speed : 10 Gbps" .
Do you have any suggestions?
Testing procedure & result:
Platform : Moro City Reference Planform ICX-D ~ CRB
l On-Board : E823
l Ext-PCIE CARD : PCIE-2230NP-00A1E ( Intel X710 )
OS/Kernel : Debian 12 / kernel 6.1.0-16-amd64 x86_64
DPDK : DPDK 24.03.0-rc0 (from trunk build)
NIC_BDF_INFO :
CRB EXT-PCIE CARD : X710
Port : 10G * 4
firmware-version: 7.10 0x80007b33 255.65535.255
CRB On-BOARD : E823
Port Option : 4x10-4x2.5
firmware-version: 3.26 0x8001b733 1.3429.0
BDF = 91:00.0
---
BDF = 89:00.0
BDF = 91:00.1
---
BDF = 89:00.1
Prepare and config :
root@5-efi:~# modprobe uio
root@5-efi:~# modprobe vfio-pci
root@5-efi:~# echo 2048 >
/sys/devices/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages
root@5-efi:~# mkdir -p /mnt/huge
root@5-efi:~# mount -t hugetlbfs nodev /mnt/huge
root@5-efi:~# dpdk-devbind.py -b vfio-pci 91:00.0
root@5-efi:~# dpdk-devbind.py -b vfio-pci 91:00.1
root@5-efi:~# dpdk-devbind.py -b vfio-pci 89:00.0
root@5-efi:~# dpdk-devbind.py -b vfio-pci 89:00.1
LOG :
root@5-efi:~# dpdk-testpmd -c 0xff -n 4 -a 89:00.0 -a 89:00.1 --socket-mem=256
-- -i --mbcache=512 --socket-num=0 --coremask=0xc --nb-cores=2 --rxq=1 --txq=1
--portmask=0xf --rxd=4096 --rxfreet=128 --rxpt=128 --rxht=8 --rxwt=0 --txd=4096
--txfreet=128 --txpt=128 --txht=0 --txwt=0 --burst=64 --txrst=64 --rss-ip -a
EAL: Detected CPU lcores: 24
EAL: Detected NUMA nodes: 1
EAL: Detected static linkage of DPDK
EAL: Multi-process socket /var/run/dpdk/rte/mp_socket
EAL: Selected IOVA mode 'VA'
EAL: VFIO support initialized
EAL: Using IOMMU type 1 (Type 1)
EAL: Ignore mapping IO port bar(1)
EAL: Ignore mapping IO port bar(4)
EAL: Probe PCI driver: net_ice (8086:188a) device: :89:00.0 (socket 0)
ice_dev_init(): Failed to read device serial number
ice_load_pkg_type(): Active package is: 1.3.35.0, ICE OS Default Package
(double VLAN mode)
EAL: Ignore mapping IO port bar(1)
EAL: Ignore mapping IO port bar(4)
EAL: Probe PCI driver: net_ice (8086:188a) device: :89:00.1 (socket 0)
ice_dev_init(): Failed to read device serial number
ice_load_pkg_type(): Active package is: 1.3.35.0, ICE OS Default Package
(double VLAN mode)
TMTY: TELEMETRY: No legacy callbacks, legacy socket not created
Interactive-mode selected
previous number of forwarding cores 1 - changed to number of configured cores 2
Auto-start selected
testpmd: create a new mbuf pool : n=262144, size=2176, socket=0
testpmd: preferred mempool ops selected: ring_mp_mc
Configuring Port 0 (socket 0)
ice_set_rx_function(): Using AVX2 Vector Rx (port 0).
Port 0: 00:00:00:00:01:00
Configuring Port 1 (socket 0)
ice_set_rx_function(): Using AVX2 Vector Rx (port 1).
Port 1: 00:00:00:00:01:01
Checking link statuses...
Done
Start automatic packet forwarding
io packet forwarding - ports=2 - cores=2 - streams=2 - NUMA support enabled, MP
allocation mode: native
Logical Core 2 (socket 0) forwards packets on 1 streams:
RX P=0/Q=0 (socket 0) -> TX P=1/Q=0 (socket 0) peer=02:00:00:00:00:01
Logical Core 3 (socket 0) forwards packets on 1 streams:
RX P=1/Q=0 (socket 0) -> TX P=0/Q=0 (socket 0) peer=02:00:00:00:00:00
io packet forwarding packets/burst=64
nb forwarding cores=2 - nb forwarding ports=2
port 0: RX queue number: 1 Tx queue number: 1
Rx offloads=0x0 Tx offloads=0x1
RX queue: 0
RE: [PATCH v3 1/3] config/arm: avoid mcpu and march conflicts
Hi Pavan,
> The compiler options march and mtune are a subset of mcpu and will lead to
> conflicts if improper march is chosen for a given mcpu.
> To avoid conflicts, force part number march when mcpu is available and is
> supported by the compiler.
Why would one force the march specified in the part number when mcpu for
that part number is also available and supported by the compiler?
>
> Example:
> march = armv9-a
> mcpu = neoverse-n2
>
> mcpu supported, march supported
> machine_args = ['-mcpu=neoverse-n2', '-march=armv9-a']
-march restricts the compiler to baseline architecture of the -mcpu.
For instance, Neoverse-n1's baseline architecture is armv8.2-a,
but it has some extensions from armv8.3-a, armv8.4-a, and armv8.5-a.
By setting -march to armv8.2-a the compiler will strictly omit extensions
from 8.3, 8.4 and 8.5 resulting in a suboptimal outcome.
>
> mcpu supported, march not supported
> machine_args = ['-mcpu=neoverse-n2']
This will result in the best outcome.
>
> mcpu not supported, march supported
> machine_args = ['-march=armv9-a']
This too may result in a suboptimal outcome as optimization space
is limited to the given march (not using extensions from later
architectures when available).
>
> mcpu not supported, march not supported
> machine_args = ['-march=armv8.6-a']
Compiler knows nothing about the target CPU or the architecture.
I think it's better to exit the build process with an error.
>
> Signed-off-by: Pavan Nikhilesh
> ---
> v2 Changes:
> - Cleanup march inconsistencies. (Juraj Linkes)
> - Unify fallback march selection. (Juraj Linkes)
> - Tag along ARM WFE patch.
> v3 Changes:
> - Fix missing 'fallback_march' key check.
>
> config/arm/meson.build | 108 +---
> -
> 1 file changed, 66 insertions(+), 42 deletions(-)
>
> diff --git a/config/arm/meson.build b/config/arm/meson.build index
> 36f21d22599a..ba859bd060b5 100644
> --- a/config/arm/meson.build
> +++ b/config/arm/meson.build
> @@ -58,18 +58,18 @@ implementer_generic = { }
>
> part_number_config_arm = {
> -'0xd03': {'compiler_options': ['-mcpu=cortex-a53']},
> -'0xd04': {'compiler_options': ['-mcpu=cortex-a35']},
> -'0xd05': {'compiler_options': ['-mcpu=cortex-a55']},
> -'0xd07': {'compiler_options': ['-mcpu=cortex-a57']},
> -'0xd08': {'compiler_options': ['-mcpu=cortex-a72']},
> -'0xd09': {'compiler_options': ['-mcpu=cortex-a73']},
> -'0xd0a': {'compiler_options': ['-mcpu=cortex-a75']},
> -'0xd0b': {'compiler_options': ['-mcpu=cortex-a76']},
> +'0xd03': {'mcpu': 'cortex-a53'},
> +'0xd04': {'mcpu': 'cortex-a35'},
> +'0xd05': {'mcpu': 'cortex-a55'},
> +'0xd07': {'mcpu': 'cortex-a57'},
> +'0xd08': {'mcpu': 'cortex-a72'},
> +'0xd09': {'mcpu': 'cortex-a73'},
> +'0xd0a': {'mcpu': 'cortex-a75'},
> +'0xd0b': {'mcpu': 'cortex-a76'},
> '0xd0c': {
> 'march': 'armv8.2-a',
> 'march_features': ['crypto', 'rcpc'],
> -'compiler_options': ['-mcpu=neoverse-n1'],
> +'mcpu': 'neoverse-n1',
> 'flags': [
> ['RTE_MACHINE', '"neoverse-n1"'],
> ['RTE_ARM_FEATURE_ATOMICS', true], @@ -81,7 +81,7 @@
> part_number_config_arm = {
> '0xd40': {
> 'march': 'armv8.4-a',
> 'march_features': ['sve'],
> -'compiler_options': ['-mcpu=neoverse-v1'],
> +'mcpu': 'neoverse-v1',
> 'flags': [
> ['RTE_MACHINE', '"neoverse-v1"'],
> ['RTE_ARM_FEATURE_ATOMICS', true], @@ -92,8 +92,9 @@
> part_number_config_arm = {
> 'march': 'armv8.4-a',
> },
> '0xd49': {
> +'march': 'armv9-a',
> 'march_features': ['sve2'],
> -'compiler_options': ['-mcpu=neoverse-n2'],
> +'mcpu': 'neoverse-n2',
> 'flags': [
> ['RTE_MACHINE', '"neoverse-n2"'],
> ['RTE_ARM_FEATURE_ATOMICS', true], @@ -127,21 +128,23 @@
> implementer_cavium = {
> ],
> 'part_number_config': {
> '0xa1': {
> -'compiler_options': ['-mcpu=thunderxt88'],
> +'mcpu': 'thunderxt88',
> 'flags': flags_part_number_thunderx
> },
> '0xa2': {
> -'compiler_options': ['-mcpu=thunderxt81'],
> +'mcpu': 'thunderxt81',
> 'flags': flags_part_number_thunderx
> },
> '0xa3': {
> -'compiler_options': ['-march=armv8-a+crc', '-mcpu=thunderxt83'],
> +'march': 'armv8-a',
> +'march_features': ['crc'],
> +'mcpu': 'thunderxt83',
> 'flags': flags_part_number_thunderx
> },
> '0xaf': {
> 'march': 'armv8.1-a',
> 'march_features': ['crc', 'crypto'],
> -'compiler_options': ['-mcpu=thunderx2t99'],
> +'mcpu': 'thunderx2t99',
> 'flags': [
> ['RTE_MACHINE', '"thunde
Re: [PATCH v3 1/3] config/arm: avoid mcpu and march conflicts
> On Feb 5, 2024, at 10:10 PM, Wathsala Wathawana Vithanage
> wrote:
>
> Hi Pavan,
>
>> The compiler options march and mtune are a subset of mcpu and will lead to
>> conflicts if improper march is chosen for a given mcpu.
>> To avoid conflicts, force part number march when mcpu is available and is
>> supported by the compiler.
>
> Why would one force the march specified in the part number when mcpu for
> that part number is also available and supported by the compiler?
>
It would be good to explain the use case or the problem being faced.
>>
>> Example:
>> march = armv9-a
>> mcpu = neoverse-n2
>>
>> mcpu supported, march supported
>> machine_args = ['-mcpu=neoverse-n2', '-march=armv9-a']
>
> -march restricts the compiler to baseline architecture of the -mcpu.
> For instance, Neoverse-n1's baseline architecture is armv8.2-a,
> but it has some extensions from armv8.3-a, armv8.4-a, and armv8.5-a.
> By setting -march to armv8.2-a the compiler will strictly omit extensions
> from 8.3, 8.4 and 8.5 resulting in a suboptimal outcome.
>
>>
>> mcpu supported, march not supported
>> machine_args = ['-mcpu=neoverse-n2']
>
> This will result in the best outcome.
>
>>
>> mcpu not supported, march supported
>> machine_args = ['-march=armv9-a']
>
> This too may result in a suboptimal outcome as optimization space
> is limited to the given march (not using extensions from later
> architectures when available).
>
>>
>> mcpu not supported, march not supported
>> machine_args = ['-march=armv8.6-a']
>
> Compiler knows nothing about the target CPU or the architecture.
> I think it's better to exit the build process with an error.
>
>>
>> Signed-off-by: Pavan Nikhilesh
>> ---
>> v2 Changes:
>> - Cleanup march inconsistencies. (Juraj Linkes)
>> - Unify fallback march selection. (Juraj Linkes)
>> - Tag along ARM WFE patch.
>> v3 Changes:
>> - Fix missing 'fallback_march' key check.
>>
>> config/arm/meson.build | 108 +---
>> -
>> 1 file changed, 66 insertions(+), 42 deletions(-)
>>
>> diff --git a/config/arm/meson.build b/config/arm/meson.build index
>> 36f21d22599a..ba859bd060b5 100644
>> --- a/config/arm/meson.build
>> +++ b/config/arm/meson.build
>> @@ -58,18 +58,18 @@ implementer_generic = { }
>>
>> part_number_config_arm = {
>> -'0xd03': {'compiler_options': ['-mcpu=cortex-a53']},
>> -'0xd04': {'compiler_options': ['-mcpu=cortex-a35']},
>> -'0xd05': {'compiler_options': ['-mcpu=cortex-a55']},
>> -'0xd07': {'compiler_options': ['-mcpu=cortex-a57']},
>> -'0xd08': {'compiler_options': ['-mcpu=cortex-a72']},
>> -'0xd09': {'compiler_options': ['-mcpu=cortex-a73']},
>> -'0xd0a': {'compiler_options': ['-mcpu=cortex-a75']},
>> -'0xd0b': {'compiler_options': ['-mcpu=cortex-a76']},
>> +'0xd03': {'mcpu': 'cortex-a53'},
>> +'0xd04': {'mcpu': 'cortex-a35'},
>> +'0xd05': {'mcpu': 'cortex-a55'},
>> +'0xd07': {'mcpu': 'cortex-a57'},
>> +'0xd08': {'mcpu': 'cortex-a72'},
>> +'0xd09': {'mcpu': 'cortex-a73'},
>> +'0xd0a': {'mcpu': 'cortex-a75'},
>> +'0xd0b': {'mcpu': 'cortex-a76'},
>> '0xd0c': {
>> 'march': 'armv8.2-a',
>> 'march_features': ['crypto', 'rcpc'],
>> -'compiler_options': ['-mcpu=neoverse-n1'],
>> +'mcpu': 'neoverse-n1',
>> 'flags': [
>> ['RTE_MACHINE', '"neoverse-n1"'],
>> ['RTE_ARM_FEATURE_ATOMICS', true], @@ -81,7 +81,7 @@
>> part_number_config_arm = {
>> '0xd40': {
>> 'march': 'armv8.4-a',
>> 'march_features': ['sve'],
>> -'compiler_options': ['-mcpu=neoverse-v1'],
>> +'mcpu': 'neoverse-v1',
>> 'flags': [
>> ['RTE_MACHINE', '"neoverse-v1"'],
>> ['RTE_ARM_FEATURE_ATOMICS', true], @@ -92,8 +92,9 @@
>> part_number_config_arm = {
>> 'march': 'armv8.4-a',
>> },
>> '0xd49': {
>> +'march': 'armv9-a',
>> 'march_features': ['sve2'],
>> -'compiler_options': ['-mcpu=neoverse-n2'],
>> +'mcpu': 'neoverse-n2',
>> 'flags': [
>> ['RTE_MACHINE', '"neoverse-n2"'],
>> ['RTE_ARM_FEATURE_ATOMICS', true], @@ -127,21 +128,23 @@
>> implementer_cavium = {
>> ],
>> 'part_number_config': {
>> '0xa1': {
>> -'compiler_options': ['-mcpu=thunderxt88'],
>> +'mcpu': 'thunderxt88',
>> 'flags': flags_part_number_thunderx
>> },
>> '0xa2': {
>> -'compiler_options': ['-mcpu=thunderxt81'],
>> +'mcpu': 'thunderxt81',
>> 'flags': flags_part_number_thunderx
>> },
>> '0xa3': {
>> -'compiler_options': ['-march=armv8-a+crc', '-mcpu=thunderxt83'],
>> +'march': 'armv8-a',
>> +'march_features': ['crc'],
>> +'mcpu': 'thunderxt83',
>> 'flags': flags_part_number_thunderx
>> },
>> '0xaf': {
>> 'march': 'armv8.1-a',
>>
RE: [PATCH v2] lib/dmadev: get DMA device using device ID
Hi Thomas, Gentle ping. Could you please consider merging this patch. The driver series https://patches.dpdk.org/project/dpdk/patch/20231208082835.2817601-3-amitpraka...@marvell.com/ is dependent on this patch. Thanks, Amit Shukla > -Original Message- > From: Anoob Joseph > Sent: Monday, January 8, 2024 8:17 PM > To: Amit Prakash Shukla ; Chengwen Feng > ; Kevin Laatz ; Bruce > Richardson > Cc: dev@dpdk.org; Jerin Jacob Kollanukkaran ; Vamsi > Krishna Attunuru ; Nithin Kumar Dabilpuram > ; m...@smartsharesystems.com; Amit Prakash > Shukla > Subject: RE: [PATCH v2] lib/dmadev: get DMA device using device ID > > > > > DMA library has a function to get DMA device based on device name but > > there is no function to get DMA device using device id. > > > > Added a function that lookup for the dma device using device id and > > returns the pointer to the same. > > > > Signed-off-by: Amit Prakash Shukla > > Acked-by: Chengwen Feng > > Acked-by: Anoob Joseph >
