[dpdk-dev] [PATCH v8] ethdev: add sanity checks in control APIs
This patch adds more sanity checks in control path APIs.
Fixes: 214ed1acd125 ("ethdev: add iterator to match devargs input")
Fixes: 3d98f921fbe9 ("ethdev: unify prefix for static functions and variables")
Fixes: 0366137722a0 ("ethdev: check for invalid device name")
Fixes: d948f596fee2 ("ethdev: fix port data mismatched in multiple process
model")
Fixes: 5b7ba31148a8 ("ethdev: add port ownership")
Fixes: f8244c6399d9 ("ethdev: increase port id range")
Cc: sta...@dpdk.org
Signed-off-by: Min Hu (Connor)
Reviewed-by: Andrew Rybchenko
Acked-by: Kevin Traynor
---
v8:
* Change logging style.
v7:
* Use a natural sounding names instead of argument name.
v6:
* Change logging grammar.
* "Failed to" change to "Cannot".
* Break the message part to next line.
* Delete param check for internal function.
v5:
* Keep "RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV)"
and "dev = &rte_eth_devices[port_id]" together.
v4:
* add error logging.
* delete check in control path API.
v3:
* set port_id checked first.
* add error logging.
v2:
* Removed unnecessary checks.
* Deleted checks in internal API.
* Added documentation in the header file.
---
lib/librte_ethdev/rte_ethdev.c | 365 +
lib/librte_ethdev/rte_ethdev.h | 20 ++-
2 files changed, 349 insertions(+), 36 deletions(-)
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 6b5cfd6..60f9ab3 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -199,6 +199,16 @@ rte_eth_iterator_init(struct rte_dev_iterator *iter, const
char *devargs_str)
char *cls_str = NULL;
int str_size;
+ if (iter == NULL) {
+ RTE_ETHDEV_LOG(ERR, "Cannot init NULL iterator\n");
+ return -EINVAL;
+ }
+
+ if (devargs_str == NULL) {
+ RTE_ETHDEV_LOG(ERR, "Cannot init iterator for NULL devargs\n");
+ return -EINVAL;
+ }
+
memset(iter, 0, sizeof(*iter));
/*
@@ -293,6 +303,11 @@ rte_eth_iterator_init(struct rte_dev_iterator *iter, const
char *devargs_str)
uint16_t
rte_eth_iterator_next(struct rte_dev_iterator *iter)
{
+ if (iter == NULL) {
+ RTE_ETHDEV_LOG(ERR, "Cannot iterate next NULL iter\n");
+ return RTE_MAX_ETHPORTS;
+ }
+
if (iter->cls == NULL) /* invalid ethdev iterator */
return RTE_MAX_ETHPORTS;
@@ -322,6 +337,11 @@ rte_eth_iterator_next(struct rte_dev_iterator *iter)
void
rte_eth_iterator_cleanup(struct rte_dev_iterator *iter)
{
+ if (iter == NULL) {
+ RTE_ETHDEV_LOG(ERR, "Cannot clean up NULL iterator\n");
+ return;
+ }
+
if (iter->bus_str == NULL)
return; /* nothing to free in pure class filter */
free(RTE_CAST_FIELD(iter, bus_str, char *)); /* workaround const */
@@ -622,6 +642,11 @@ rte_eth_find_next_owned_by(uint16_t port_id, const
uint64_t owner_id)
int
rte_eth_dev_owner_new(uint64_t *owner_id)
{
+ if (owner_id == NULL) {
+ RTE_ETHDEV_LOG(ERR, "Cannot return owner id\n");
+ return -EINVAL;
+ }
+
eth_dev_shared_data_prepare();
rte_spinlock_lock(ð_dev_shared_data->ownership_lock);
@@ -645,6 +670,13 @@ eth_dev_owner_set(const uint16_t port_id, const uint64_t
old_owner_id,
return -ENODEV;
}
+ if (new_owner == NULL) {
+ RTE_ETHDEV_LOG(ERR,
+ "Cannot set ethdev port %u owner to NULL new_owner\n",
+ port_id);
+ return -EINVAL;
+ }
+
if (!eth_is_valid_owner_id(new_owner->id) &&
!eth_is_valid_owner_id(old_owner_id)) {
RTE_ETHDEV_LOG(ERR,
@@ -738,23 +770,30 @@ rte_eth_dev_owner_delete(const uint64_t owner_id)
int
rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner)
{
- int ret = 0;
- struct rte_eth_dev *ethdev = &rte_eth_devices[port_id];
-
- eth_dev_shared_data_prepare();
-
- rte_spinlock_lock(ð_dev_shared_data->ownership_lock);
+ struct rte_eth_dev *ethdev;
- if (port_id >= RTE_MAX_ETHPORTS || !eth_dev_is_allocated(ethdev)) {
+ RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+ ethdev = &rte_eth_devices[port_id];
+ if (!eth_dev_is_allocated(ethdev)) {
RTE_ETHDEV_LOG(ERR, "Port id %"PRIu16" is not allocated\n",
port_id);
- ret = -ENODEV;
- } else {
- rte_memcpy(owner, ðdev->data->owner, sizeof(*owner));
+ return -ENODEV;
}
+ if (owner == NULL) {
+ RTE_ETHDEV_LOG(ERR,
+ "Cannot get ethdev port %"PRIu16" owner for NULL
param\n",
+ port_id);
+ return -EINVAL;
+ }
+
+ eth_dev_shared_data_prepare();
+
+ rte_spinlock_lock(ð_dev_shared_data->ownership_lock)
Re: [dpdk-dev] [PATCH v7] ethdev: add sanity checks in control APIs
在 2021/4/16 20:02, Thomas Monjalon 写道:
16/04/2021 13:00, Min Hu (Connor):
+ if (iter == NULL) {
+ RTE_ETHDEV_LOG(ERR, "Cannot init iterator for NULL iterator\n");
Don't you think it would be better as
"Cannot init NULL iterator"?
rte_eth_iterator_cleanup(struct rte_dev_iterator *iter)
{
+ if (iter == NULL) {
+ RTE_ETHDEV_LOG(ERR, "Cannot iterator clear up for NULL iter\n");
Cannot clean up NULL iterator.
rte_eth_dev_owner_new(uint64_t *owner_id)
{
+ if (owner_id == NULL) {
+ RTE_ETHDEV_LOG(ERR, "Cannot get owner id for NULL param\n");
Cannot return owner id.
@@ -825,6 +864,11 @@ rte_eth_dev_get_port_by_name(const char *name, uint16_t
*port_id)
+ if (port_id == NULL) {
+ RTE_ETHDEV_LOG(ERR, "Cannot get port id for NULL param\n");
Cannot return port ID
etc for all other messages
Do you agree with the idea?
Hi， Thomos, fixed in v10, thanks.
.
Re: [dpdk-dev] [PATCH v6] ethdev: add sanity checks in control APIs
在 2021/4/17 0:28, Stephen Hemminger 写道:
On Fri, 16 Apr 2021 11:22:02 +0100
Kevin Traynor wrote:
+ if (dev_conf == NULL) {
+ RTE_ETHDEV_LOG(ERR,
+ "Cannot configure ethdev port %u to NULL dev_conf\n",
The others use a natural sounding names instead of argument name. If you
wanted to match that it could be "..to NULL conf"
I would prefer that error messages don't try to be English sentences.
The wording ends up awkward. and overly wordy.
If function name is automatically included by RTE_ETHDEV_LOG() then
Just:
RTE_ETHDEV_LOG(ERR, "NULL ethdev")
should be enough for programmer to find/fix the problem
.
Hi, Stephen, thanks your for comment.
But I am on side with Andrew Rybchenko.
"- log messages should be human readable (i.e. I'd avoid
usage of function name)"
[dpdk-dev] [PATCH v2 3/7] vdpa/ifc: support set notify and vring relay thread name
From: Chengwen Feng
This patch supports set notify and vring relay thread name which is
helpful for debugging.
Signed-off-by: Chengwen Feng
Signed-off-by: Min Hu (Connor)
---
drivers/vdpa/ifc/ifcvf_vdpa.c | 20 ++--
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
index 7a06f97..1dc813d 100644
--- a/drivers/vdpa/ifc/ifcvf_vdpa.c
+++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
@@ -37,6 +37,8 @@ RTE_LOG_REGISTER(ifcvf_vdpa_logtype, pmd.vdpa.ifcvf, NOTICE);
#define IFCVF_VDPA_MODE"vdpa"
#define IFCVF_SW_FALLBACK_LM "sw-live-migration"
+#define THREAD_NAME_LEN16
+
static const char * const ifcvf_valid_arguments[] = {
IFCVF_VDPA_MODE,
IFCVF_SW_FALLBACK_LM,
@@ -494,14 +496,17 @@ notify_relay(void *arg)
static int
setup_notify_relay(struct ifcvf_internal *internal)
{
+ char name[THREAD_NAME_LEN];
int ret;
- ret = pthread_create(&internal->tid, NULL, notify_relay,
- (void *)internal);
- if (ret) {
+ snprintf(name, sizeof(name), "ifc-notify-%d", internal->vid);
+ ret = rte_ctrl_thread_create(&internal->tid, name, NULL, notify_relay,
+(void *)internal);
+ if (ret != 0) {
DRV_LOG(ERR, "failed to create notify relay pthread.");
return -1;
}
+
return 0;
}
@@ -797,14 +802,17 @@ vring_relay(void *arg)
static int
setup_vring_relay(struct ifcvf_internal *internal)
{
+ char name[THREAD_NAME_LEN];
int ret;
- ret = pthread_create(&internal->tid, NULL, vring_relay,
- (void *)internal);
- if (ret) {
+ snprintf(name, sizeof(name), "ifc-vring-%d", internal->vid);
+ ret = rte_ctrl_thread_create(&internal->tid, name, NULL, vring_relay,
+(void *)internal);
+ if (ret != 0) {
DRV_LOG(ERR, "failed to create ring relay pthread.");
return -1;
}
+
return 0;
}
--
2.7.4
[dpdk-dev] [PATCH v2 5/7] examples/performance-thread: support set thread name
From: Chengwen Feng This patch supports set helloworld thread name which is helpful for debugging. Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) --- examples/performance-thread/pthread_shim/main.c | 5 + 1 file changed, 5 insertions(+) diff --git a/examples/performance-thread/pthread_shim/main.c b/examples/performance-thread/pthread_shim/main.c index 23e3b5e..4ce3622 100644 --- a/examples/performance-thread/pthread_shim/main.c +++ b/examples/performance-thread/pthread_shim/main.c @@ -27,6 +27,7 @@ #define DEBUG_APP 0 #define HELLOW_WORLD_MAX_LTHREADS 10 +#define THREAD_NAME_LEN16 #ifndef __GLIBC__ /* sched_getcpu() is glibc-specific */ #define sched_getcpu() rte_lcore_id() @@ -149,6 +150,7 @@ static void *initial_lthread(void *args __rte_unused) */ pthread_attr_t attr; rte_cpuset_t cpuset; + char name[THREAD_NAME_LEN]; CPU_ZERO(&cpuset); CPU_SET(lcore, &cpuset); @@ -160,6 +162,9 @@ static void *initial_lthread(void *args __rte_unused) helloworld_pthread, (void *) i); if (ret != 0) rte_exit(EXIT_FAILURE, "Cannot create helloworld thread\n"); + + snprintf(name, sizeof(name), "helloworld-%u", (uint32_t)i); + rte_thread_setname(tid[i], name); } /* wait for 1s to allow threads -- 2.7.4
[dpdk-dev] [PATCH v2 0/7] support set thread name
This set of patches support set thread name for debugging. Chengwen Feng (7): net/ark: support set thread name net/ice: support set VSI reset thread name vdpa/ifc: support set notify and vring relay thread name raw/ifpga: support set monitor thread name examples/performance-thread: support set thread name telemetry: support set init threads name examples/vhost_blk: support set ctrl worker thread name --- v2: * change 'pthread_create' to 'rte_ctrl_thread_create' except two: 'examples/performance-thread', because special CPU affinity needs to be set, the ctrl interface cannot be used to set the affinity. 'telemetry', telemetry is an independent lib and does not depend on EAL. drivers/net/ark/ark_ethdev.c| 4 ++-- drivers/net/ice/ice_dcf_parent.c| 9 ++--- drivers/raw/ifpga/ifpga_rawdev.c| 8 drivers/vdpa/ifc/ifcvf_vdpa.c | 20 ++-- examples/performance-thread/pthread_shim/main.c | 5 + examples/vhost_blk/vhost_blk.c | 3 ++- lib/librte_telemetry/telemetry.c| 3 ++- 7 files changed, 35 insertions(+), 17 deletions(-) -- 2.7.4
[dpdk-dev] [PATCH v2 7/7] examples/vhost_blk: support set ctrl worker thread name
From: Chengwen Feng
This patch supports set ctrl worker thread name which is helpful for
debugging.
Signed-off-by: Chengwen Feng
Signed-off-by: Min Hu (Connor)
---
examples/vhost_blk/vhost_blk.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/examples/vhost_blk/vhost_blk.c b/examples/vhost_blk/vhost_blk.c
index 5c64071..54f81b3 100644
--- a/examples/vhost_blk/vhost_blk.c
+++ b/examples/vhost_blk/vhost_blk.c
@@ -685,7 +685,8 @@ new_device(int vid)
/* start polling vring */
worker_thread_status = WORKER_STATE_START;
fprintf(stdout, "New Device %s, Device ID %d\n", path, vid);
- if (pthread_create(&tid, NULL, &ctrlr_worker, ctrlr) < 0) {
+ if (rte_ctrl_thread_create(&tid, "vhostblk-ctrlr", NULL,
+ &ctrlr_worker, ctrlr) != 0) {
fprintf(stderr, "Worker Thread Started Failed\n");
return -1;
}
--
2.7.4
[dpdk-dev] [PATCH v2 6/7] telemetry: support set init threads name
From: Chengwen Feng This patch supports set init threads name which is helpful for debugging. Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) --- lib/librte_telemetry/telemetry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/librte_telemetry/telemetry.c b/lib/librte_telemetry/telemetry.c index 7e08afd..8f48337 100644 --- a/lib/librte_telemetry/telemetry.c +++ b/lib/librte_telemetry/telemetry.c @@ -442,7 +442,7 @@ telemetry_legacy_init(void) return -1; pthread_create(&t_old, NULL, socket_listener, &v1_socket); pthread_setaffinity_np(t_old, sizeof(*thread_cpuset), thread_cpuset); - + pthread_setname_np(t_old, "telemetry-v1"); TMTY_LOG(DEBUG, "Legacy telemetry socket initialized ok\n"); return 0; } @@ -471,6 +471,7 @@ telemetry_v2_init(void) return -1; pthread_create(&t_new, NULL, socket_listener, &v2_socket); pthread_setaffinity_np(t_new, sizeof(*thread_cpuset), thread_cpuset); + pthread_setname_np(t_new, "telemetry-v2"); atexit(unlink_sockets); return 0; -- 2.7.4
[dpdk-dev] [PATCH v2 1/7] net/ark: support set thread name
From: Chengwen Feng
This patch supports set delay packet generator start thread name which
is helpful for debugging.
Signed-off-by: Chengwen Feng
Signed-off-by: Min Hu (Connor)
---
drivers/net/ark/ark_ethdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
index 9dea5fa..6372cf7 100644
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -568,8 +568,8 @@ eth_ark_dev_start(struct rte_eth_dev *dev)
/* Delay packet generatpr start allow the hardware to be ready
* This is only used for sanity checking with internal generator
*/
- if (pthread_create(&thread, NULL,
- ark_pktgen_delay_start, ark->pg)) {
+ if (rte_ctrl_thread_create(&thread, "ark-delay-pg", NULL,
+ ark_pktgen_delay_start, ark) != 0) {
ARK_PMD_LOG(ERR, "Could not create pktgen "
"starter thread\n");
return -1;
--
2.7.4
[dpdk-dev] [PATCH v2 4/7] raw/ifpga: support set monitor thread name
From: Chengwen Feng
This patch supports set monitor thread name which is helpful for
debugging.
Signed-off-by: Chengwen Feng
Signed-off-by: Min Hu (Connor)
---
drivers/raw/ifpga/ifpga_rawdev.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index d9a46ef..f2551be 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -526,10 +526,10 @@ ifpga_monitor_start_func(void)
int ret;
if (ifpga_monitor_start == 0) {
- ret = pthread_create(&ifpga_monitor_start_thread,
- NULL,
- ifpga_rawdev_gsd_handle, NULL);
- if (ret) {
+ ret = rte_ctrl_thread_create(&ifpga_monitor_start_thread,
+"ifpga-monitor", NULL,
+ifpga_rawdev_gsd_handle, NULL);
+ if (ret != 0) {
IFPGA_RAWDEV_PMD_ERR(
"Fail to create ifpga nonitor thread");
return -1;
--
2.7.4
[dpdk-dev] [PATCH v2 2/7] net/ice: support set VSI reset thread name
From: Chengwen Feng
This patch supports set VSI reset thread name which is helpful for
debugging.
Signed-off-by: Chengwen Feng
Signed-off-by: Min Hu (Connor)
---
drivers/net/ice/ice_dcf_parent.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ice/ice_dcf_parent.c b/drivers/net/ice/ice_dcf_parent.c
index a8571b3..c8e4332 100644
--- a/drivers/net/ice/ice_dcf_parent.c
+++ b/drivers/net/ice/ice_dcf_parent.c
@@ -151,7 +151,9 @@ ice_dcf_vsi_update_service_handler(void *param)
static void
start_vsi_reset_thread(struct ice_dcf_hw *dcf_hw, bool vfr, uint16_t vf_id)
{
+#define THREAD_NAME_LEN16
struct ice_dcf_reset_event_param *param;
+ char name[THREAD_NAME_LEN];
pthread_t thread;
int ret;
@@ -165,9 +167,10 @@ start_vsi_reset_thread(struct ice_dcf_hw *dcf_hw, bool
vfr, uint16_t vf_id)
param->vfr = vfr;
param->vf_id = vf_id;
- ret = pthread_create(&thread, NULL,
-ice_dcf_vsi_update_service_handler, param);
- if (ret) {
+ snprintf(name, sizeof(name), "ice-reset-%u", vf_id);
+ ret = rte_ctrl_thread_create(&thread, name, NULL,
+ice_dcf_vsi_update_service_handler, param);
+ if (ret != 0) {
PMD_DRV_LOG(ERR, "Failed to start the thread for reset
handling");
free(param);
}
--
2.7.4
[dpdk-dev] [PATCH 0/7] features and bugfix for hns3 PMD
This patchset contains 2 features and 5 bugfixes. Chengwen Feng (3): net/hns3: check max SIMD bitwidth net/hns3: Rx vector add compile-time verify net/hns3: fix FDIR lock bug Huisong Li (4): net/hns3: remove redundant code about mbx net/hns3: fix the check for DCB mode net/hns3: fix the check for VMDq mode net/hns3: move the link speeds check to dev configure drivers/net/hns3/hns3_ethdev.c| 89 +--- drivers/net/hns3/hns3_ethdev.h| 4 ++ drivers/net/hns3/hns3_ethdev_vf.c | 9 ++-- drivers/net/hns3/hns3_fdir.c | 28 +- drivers/net/hns3/hns3_fdir.h | 3 +- drivers/net/hns3/hns3_flow.c | 96 --- drivers/net/hns3/hns3_rxtx.c | 5 ++ drivers/net/hns3/hns3_rxtx_vec.c | 22 drivers/net/hns3/hns3_rxtx_vec_neon.h | 8 +++ drivers/net/hns3/hns3_rxtx_vec_sve.c | 6 +++ 10 files changed, 211 insertions(+), 59 deletions(-) -- 2.7.4
[dpdk-dev] [PATCH 3/7] net/hns3: remove redundant code about mbx
From: Huisong Li
Some mbx messages do not need to reply with data. In this case,
it is no need to set the response data address and the response
length.
This patch removes these redundant codes from mbx messages that do
not need be replied.
Fixes: a5475d61fa34 ("net/hns3: support VF")
Signed-off-by: Huisong Li
Signed-off-by: Min Hu (Connor)
---
drivers/net/hns3/hns3_ethdev_vf.c | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c
b/drivers/net/hns3/hns3_ethdev_vf.c
index 5770c47..58809fb 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1511,7 +1511,6 @@ static void
hns3vf_request_link_info(struct hns3_hw *hw)
{
struct hns3_vf *vf = HNS3_DEV_HW_TO_VF(hw);
- uint8_t resp_msg;
bool send_req;
int ret;
@@ -1524,7 +1523,7 @@ hns3vf_request_link_info(struct hns3_hw *hw)
return;
ret = hns3_send_mbx_msg(hw, HNS3_MBX_GET_LINK_STATUS, 0, NULL, 0, false,
- &resp_msg, sizeof(resp_msg));
+ NULL, 0);
if (ret) {
hns3_err(hw, "failed to fetch link status, ret = %d", ret);
return;
@@ -1756,11 +1755,10 @@ hns3vf_keep_alive_handler(void *param)
struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)param;
struct hns3_adapter *hns = eth_dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
- uint8_t respmsg;
int ret;
ret = hns3_send_mbx_msg(hw, HNS3_MBX_KEEP_ALIVE, 0, NULL, 0,
- false, &respmsg, sizeof(uint8_t));
+ false, NULL, 0);
if (ret)
hns3_err(hw, "VF sends keeping alive cmd failed(=%d)",
ret);
--
2.7.4
[dpdk-dev] [PATCH 7/7] net/hns3: move the link speeds check to dev configure
From: Huisong Li
This patch moves the check for "link_speeds" in dev_conf to dev_configure,
so that users know whether "link_speeds" is valid in advance.
Fixes: 0d90a6b8e59f ("net/hns3: support link speed autoneg for PF")
Fixes: 30b08275cb87 ("net/hns3: support fixed link speed")
Signed-off-by: Huisong Li
Signed-off-by: Min Hu (Connor)
---
drivers/net/hns3/hns3_ethdev.c | 57 +-
1 file changed, 45 insertions(+), 12 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index bcbebd0..a3ea513 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -105,6 +105,7 @@ static int hns3_remove_mc_addr(struct hns3_hw *hw,
static int hns3_restore_fec(struct hns3_hw *hw);
static int hns3_query_dev_fec_info(struct hns3_hw *hw);
static int hns3_do_stop(struct hns3_adapter *hns);
+static int hns3_check_port_speed(struct hns3_hw *hw, uint32_t link_speeds);
void hns3_ether_format_addr(char *buf, uint16_t size,
const struct rte_ether_addr *ether_addr)
@@ -2431,6 +2432,46 @@ hns3_refresh_mtu(struct rte_eth_dev *dev, struct
rte_eth_conf *conf)
}
static int
+hns3_check_link_speed(struct hns3_hw *hw, uint32_t link_speeds)
+{
+ int ret;
+
+ /*
+* Some hardware doesn't support auto-negotiation, but users may not
+* configure link_speeds (default 0), which means auto-negotiation.
+* In this case, a warning message need to be printed, instead of
+* an error.
+*/
+ if (link_speeds == ETH_LINK_SPEED_AUTONEG &&
+ hw->mac.support_autoneg == 0) {
+ hns3_warn(hw, "auto-negotiation is not supported, use default
fixed speed!");
+ return 0;
+ }
+
+ if (link_speeds != ETH_LINK_SPEED_AUTONEG) {
+ ret = hns3_check_port_speed(hw, link_speeds);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
+static int
+hns3_check_dev_conf(struct rte_eth_dev *dev)
+{
+ struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct rte_eth_conf *conf = &dev->data->dev_conf;
+ int ret;
+
+ ret = hns3_check_mq_mode(dev);
+ if (ret)
+ return ret;
+
+ return hns3_check_link_speed(hw, conf->link_speeds);
+}
+
+static int
hns3_dev_configure(struct rte_eth_dev *dev)
{
struct hns3_adapter *hns = dev->data->dev_private;
@@ -2465,7 +2506,7 @@ hns3_dev_configure(struct rte_eth_dev *dev)
}
hw->adapter_state = HNS3_NIC_CONFIGURING;
- ret = hns3_check_mq_mode(dev);
+ ret = hns3_check_dev_conf(dev);
if (ret)
goto cfg_err;
@@ -5466,14 +5507,11 @@ hns3_set_fiber_port_link_speed(struct hns3_hw *hw,
/*
* Some hardware doesn't support auto-negotiation, but users may not
-* configure link_speeds (default 0), which means auto-negotiation
-* In this case, a warning message need to be printed, instead of
-* an error.
+* configure link_speeds (default 0), which means auto-negotiation.
+* In this case, it should return success.
*/
- if (cfg->autoneg) {
- hns3_warn(hw, "auto-negotiation is not supported.");
+ if (cfg->autoneg)
return 0;
- }
return hns3_cfg_mac_speed_dup(hw, cfg->speed, cfg->duplex);
}
@@ -5514,16 +5552,11 @@ hns3_apply_link_speed(struct hns3_hw *hw)
{
struct rte_eth_conf *conf = &hw->data->dev_conf;
struct hns3_set_link_speed_cfg cfg;
- int ret;
memset(&cfg, 0, sizeof(struct hns3_set_link_speed_cfg));
cfg.autoneg = (conf->link_speeds == ETH_LINK_SPEED_AUTONEG) ?
ETH_LINK_AUTONEG : ETH_LINK_FIXED;
if (cfg.autoneg != ETH_LINK_AUTONEG) {
- ret = hns3_check_port_speed(hw, conf->link_speeds);
- if (ret)
- return ret;
-
cfg.speed = hns3_get_link_speed(conf->link_speeds);
cfg.duplex = hns3_get_link_duplex(conf->link_speeds);
}
--
2.7.4
[dpdk-dev] [PATCH 2/7] net/hns3: Rx vector add compile-time verify
From: Chengwen Feng
According the Rx vector implement, it depends on the MBUF's fields
(such as rearm_data/rx_descriptor_fields1) layout, this patch adds
compile-time verifies with this.
Signed-off-by: Chengwen Feng
Signed-off-by: Min Hu (Connor)
---
drivers/net/hns3/hns3_rxtx_vec.c | 22 ++
drivers/net/hns3/hns3_rxtx_vec_neon.h | 8
drivers/net/hns3/hns3_rxtx_vec_sve.c | 6 ++
3 files changed, 36 insertions(+)
diff --git a/drivers/net/hns3/hns3_rxtx_vec.c b/drivers/net/hns3/hns3_rxtx_vec.c
index 08a86e0..dc1e1ae 100644
--- a/drivers/net/hns3/hns3_rxtx_vec.c
+++ b/drivers/net/hns3/hns3_rxtx_vec.c
@@ -147,6 +147,28 @@ hns3_rxq_vec_setup_rearm_data(struct hns3_rx_queue *rxq)
mb_def.port = rxq->port_id;
rte_mbuf_refcnt_set(&mb_def, 1);
+ /* compile-time verifies the rearm_data first 8bytes */
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_off) <
+offsetof(struct rte_mbuf, rearm_data));
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, refcnt) <
+offsetof(struct rte_mbuf, rearm_data));
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, refcnt) <
+offsetof(struct rte_mbuf, rearm_data));
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, nb_segs) <
+offsetof(struct rte_mbuf, rearm_data));
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, port) <
+offsetof(struct rte_mbuf, rearm_data));
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_off) -
+offsetof(struct rte_mbuf, rearm_data) > 6);
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, refcnt) -
+offsetof(struct rte_mbuf, rearm_data) > 6);
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, refcnt) -
+offsetof(struct rte_mbuf, rearm_data) > 6);
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, nb_segs) -
+offsetof(struct rte_mbuf, rearm_data) > 6);
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, port) -
+offsetof(struct rte_mbuf, rearm_data) > 6);
+
/* prevent compiler reordering: rearm_data covers previous fields */
rte_compiler_barrier();
p = (uintptr_t)&mb_def.rearm_data;
diff --git a/drivers/net/hns3/hns3_rxtx_vec_neon.h
b/drivers/net/hns3/hns3_rxtx_vec_neon.h
index 14d6fb0..69af7b3 100644
--- a/drivers/net/hns3/hns3_rxtx_vec_neon.h
+++ b/drivers/net/hns3/hns3_rxtx_vec_neon.h
@@ -161,6 +161,14 @@ hns3_recv_burst_vec(struct hns3_rx_queue *__restrict rxq,
0, 0, 0, /* ignore non-length fields */
};
+ /* compile-time verifies the shuffle mask */
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, pkt_len) !=
+offsetof(struct rte_mbuf, rx_descriptor_fields1) + 4);
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_len) !=
+offsetof(struct rte_mbuf, rx_descriptor_fields1) + 8);
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, hash.rss) !=
+offsetof(struct rte_mbuf, rx_descriptor_fields1) + 12);
+
for (pos = 0; pos < nb_pkts; pos += HNS3_DEFAULT_DESCS_PER_LOOP,
rxdp += HNS3_DEFAULT_DESCS_PER_LOOP) {
uint64x2x2_t descs[HNS3_DEFAULT_DESCS_PER_LOOP];
diff --git a/drivers/net/hns3/hns3_rxtx_vec_sve.c
b/drivers/net/hns3/hns3_rxtx_vec_sve.c
index 2eaf692..1fd87ca 100644
--- a/drivers/net/hns3/hns3_rxtx_vec_sve.c
+++ b/drivers/net/hns3/hns3_rxtx_vec_sve.c
@@ -122,6 +122,12 @@ hns3_recv_burst_vec_sve(struct hns3_rx_queue *__restrict
rxq,
svuint32_t rss_tbl1 = svld1_u32(PG32_256BIT, rss_adjust);
svuint32_t rss_tbl2 = svld1_u32(PG32_256BIT, &rss_adjust[8]);
+ /* compile-time verifies the xlen_adjust mask */
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_len) !=
+offsetof(struct rte_mbuf, pkt_len) + 4);
+ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, vlan_tci) !=
+offsetof(struct rte_mbuf, data_len) + 2);
+
for (pos = 0; pos < nb_pkts; pos += HNS3_SVE_DEFAULT_DESCS_PER_LOOP,
rxdp += HNS3_SVE_DEFAULT_DESCS_PER_LOOP) {
svuint64_t vld_clz, mbp1st, mbp2st, mbuf_init;
--
2.7.4
[dpdk-dev] [PATCH 1/7] net/hns3: check max SIMD bitwidth
From: Chengwen Feng
This patch supports check max SIMD bitwidth when choosing NEON and SVE
vector path.
Signed-off-by: Chengwen Feng
Signed-off-by: Min Hu (Connor)
---
drivers/net/hns3/hns3_rxtx.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index 9bb30fc..f2022a5 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -13,6 +13,7 @@
#include
#if defined(RTE_ARCH_ARM64)
#include
+#include
#endif
#include "hns3_ethdev.h"
@@ -2800,6 +2801,8 @@ static bool
hns3_get_default_vec_support(void)
{
#if defined(RTE_ARCH_ARM64)
+ if (rte_vect_get_max_simd_bitwidth() < RTE_VECT_SIMD_128)
+ return false;
if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_NEON))
return true;
#endif
@@ -2810,6 +2813,8 @@ static bool
hns3_get_sve_support(void)
{
#if defined(RTE_ARCH_ARM64) && defined(__ARM_FEATURE_SVE)
+ if (rte_vect_get_max_simd_bitwidth() < RTE_VECT_SIMD_256)
+ return false;
if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_SVE))
return true;
#endif
--
2.7.4
[dpdk-dev] [PATCH 5/7] net/hns3: fix the check for VMDq mode
From: Huisong Li
HNS3 PF driver only supports RSS, DCB or NONE multiple queues mode.
Currently, driver doesn't verify the VMDq multi-queue mode completely.
This patch fixes the verification for VMDq mode.
Fixes: 62e3ccc2b94c ("net/hns3: support flow control")
Cc: sta...@dpdk.org
Signed-off-by: Huisong Li
Signed-off-by: Min Hu (Connor)
---
drivers/net/hns3/hns3_ethdev.c | 28
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index b705a72..c276c6b 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2224,23 +2224,16 @@ hns3_check_mq_mode(struct rte_eth_dev *dev)
int max_tc = 0;
int i;
- dcb_rx_conf = &dev->data->dev_conf.rx_adv_conf.dcb_rx_conf;
- dcb_tx_conf = &dev->data->dev_conf.tx_adv_conf.dcb_tx_conf;
-
- if (rx_mq_mode == ETH_MQ_RX_VMDQ_DCB_RSS) {
- hns3_err(hw, "ETH_MQ_RX_VMDQ_DCB_RSS is not supported. "
-"rx_mq_mode = %d", rx_mq_mode);
- return -EINVAL;
- }
-
- if (rx_mq_mode == ETH_MQ_RX_VMDQ_DCB ||
- tx_mq_mode == ETH_MQ_TX_VMDQ_DCB) {
- hns3_err(hw, "ETH_MQ_RX_VMDQ_DCB and ETH_MQ_TX_VMDQ_DCB "
-"is not supported. rx_mq_mode = %d, tx_mq_mode = %d",
+ if ((rx_mq_mode & ETH_MQ_RX_VMDQ_FLAG) ||
+ (tx_mq_mode == ETH_MQ_TX_VMDQ_DCB ||
+tx_mq_mode == ETH_MQ_TX_VMDQ_ONLY)) {
+ hns3_err(hw, "VMDQ is not supported, rx_mq_mode = %d,
tx_mq_mode = %d.",
rx_mq_mode, tx_mq_mode);
- return -EINVAL;
+ return -EOPNOTSUPP;
}
+ dcb_rx_conf = &dev->data->dev_conf.rx_adv_conf.dcb_rx_conf;
+ dcb_tx_conf = &dev->data->dev_conf.tx_adv_conf.dcb_tx_conf;
if (rx_mq_mode & ETH_MQ_RX_DCB_FLAG) {
if (dcb_rx_conf->nb_tcs > pf->tc_max) {
hns3_err(hw, "nb_tcs(%u) > max_tc(%u) driver
supported.",
@@ -2299,8 +2292,7 @@ hns3_check_dcb_cfg(struct rte_eth_dev *dev)
return -EOPNOTSUPP;
}
- /* Check multiple queue mode */
- return hns3_check_mq_mode(dev);
+ return 0;
}
static int
@@ -2473,6 +2465,10 @@ hns3_dev_configure(struct rte_eth_dev *dev)
}
hw->adapter_state = HNS3_NIC_CONFIGURING;
+ ret = hns3_check_mq_mode(dev);
+ if (ret)
+ goto cfg_err;
+
if ((uint32_t)mq_mode & ETH_MQ_RX_DCB_FLAG) {
ret = hns3_check_dcb_cfg(dev);
if (ret)
--
2.7.4
[dpdk-dev] [PATCH 6/7] net/hns3: fix FDIR lock bug
From: Chengwen Feng
Currently, the fdir lock was used to protect concurrent access in
multiple processes, it has the following problems:
1) Lack of protection for fdir reset recover.
2) Only part data is protected, eg. the filterlist is not protected.
We use the following scheme:
1) Del the fdir lock.
2) Add a flow lock and provides rte flow driver ops API-level
protection.
3) Declare support RTE_ETH_DEV_FLOW_OPS_THREAD_SAFE.
Fixes: fcba820d9b9e ("net/hns3: support flow director")
Cc: sta...@dpdk.org
Signed-off-by: Chengwen Feng
Signed-off-by: Min Hu (Connor)
---
drivers/net/hns3/hns3_ethdev.c| 4 +-
drivers/net/hns3/hns3_ethdev.h| 4 ++
drivers/net/hns3/hns3_ethdev_vf.c | 3 +-
drivers/net/hns3/hns3_fdir.c | 28 ++--
drivers/net/hns3/hns3_fdir.h | 3 +-
drivers/net/hns3/hns3_flow.c | 96 ---
6 files changed, 111 insertions(+), 27 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index c276c6b..bcbebd0 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -7334,8 +7334,8 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)
PMD_INIT_LOG(ERR, "Failed to alloc memory for process private");
return -ENOMEM;
}
- /* initialize flow filter lists */
- hns3_filterlist_init(eth_dev);
+
+ hns3_flow_init(eth_dev);
hns3_set_rxtx_function(eth_dev);
eth_dev->dev_ops = &hns3_eth_dev_ops;
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 7b7d359..b1360cb 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -5,6 +5,7 @@
#ifndef _HNS3_ETHDEV_H_
#define _HNS3_ETHDEV_H_
+#include
#include
#include
#include
@@ -613,6 +614,9 @@ struct hns3_hw {
uint8_t udp_cksum_mode;
struct hns3_port_base_vlan_config port_base_vlan_cfg;
+
+ pthread_mutex_t flows_lock; /* rte_flow ops lock */
+
/*
* PMD setup and configuration is not thread safe. Since it is not
* performance sensitive, it is better to guarantee thread-safety
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c
b/drivers/net/hns3/hns3_ethdev_vf.c
index 58809fb..cf2b74e 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -2910,8 +2910,7 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev)
return -ENOMEM;
}
- /* initialize flow filter lists */
- hns3_filterlist_init(eth_dev);
+ hns3_flow_init(eth_dev);
hns3_set_rxtx_function(eth_dev);
eth_dev->dev_ops = &hns3vf_eth_dev_ops;
diff --git a/drivers/net/hns3/hns3_fdir.c b/drivers/net/hns3/hns3_fdir.c
index 603cc82..87c1aef 100644
--- a/drivers/net/hns3/hns3_fdir.c
+++ b/drivers/net/hns3/hns3_fdir.c
@@ -830,7 +830,6 @@ int hns3_fdir_filter_init(struct hns3_adapter *hns)
fdir_hash_params.socket_id = rte_socket_id();
TAILQ_INIT(&fdir_info->fdir_list);
- rte_spinlock_init(&fdir_info->flows_lock);
snprintf(fdir_hash_name, RTE_HASH_NAMESIZE, "%s", hns->hw.data->name);
fdir_info->hash_handle = rte_hash_create(&fdir_hash_params);
if (fdir_info->hash_handle == NULL) {
@@ -856,7 +855,6 @@ void hns3_fdir_filter_uninit(struct hns3_adapter *hns)
struct hns3_fdir_info *fdir_info = &pf->fdir;
struct hns3_fdir_rule_ele *fdir_filter;
- rte_spinlock_lock(&fdir_info->flows_lock);
if (fdir_info->hash_map) {
rte_free(fdir_info->hash_map);
fdir_info->hash_map = NULL;
@@ -865,7 +863,6 @@ void hns3_fdir_filter_uninit(struct hns3_adapter *hns)
rte_hash_free(fdir_info->hash_handle);
fdir_info->hash_handle = NULL;
}
- rte_spinlock_unlock(&fdir_info->flows_lock);
fdir_filter = TAILQ_FIRST(&fdir_info->fdir_list);
while (fdir_filter) {
@@ -891,10 +888,8 @@ static int hns3_fdir_filter_lookup(struct hns3_fdir_info
*fdir_info,
hash_sig_t sig;
int ret;
- rte_spinlock_lock(&fdir_info->flows_lock);
sig = rte_hash_crc(key, sizeof(*key), 0);
ret = rte_hash_lookup_with_hash(fdir_info->hash_handle, key, sig);
- rte_spinlock_unlock(&fdir_info->flows_lock);
return ret;
}
@@ -908,11 +903,9 @@ static int hns3_insert_fdir_filter(struct hns3_hw *hw,
int ret;
key = &fdir_filter->fdir_conf.key_conf;
- rte_spinlock_lock(&fdir_info->flows_lock);
sig = rte_hash_crc(key, sizeof(*key), 0);
ret = rte_hash_add_key_with_hash(fdir_info->hash_handle, key, sig);
if (ret < 0) {
- rte_spinlock_unlock(&fdir_info->flows_lock);
hns3_err(hw, "Hash table full? err:%d(%s)!", ret,
strerror(-ret));
return ret;
@@ -920,7 +913,6 @@ static int hns3_insert_fdir_filter(struct hns3_hw *hw,
fdir_info->hash_map[ret] = fdir_filter;
[dpdk-dev] [PATCH 4/7] net/hns3: fix the check for DCB mode
From: Huisong Li
Currently, "ONLY DCB" and "DCB+RSS" mode are both supported by HNS3
PF driver. But the driver verifies only the "DCB+RSS" multiple queues
mode.
Fixes: 62e3ccc2b94c ("net/hns3: support flow control")
Cc: sta...@dpdk.org
Signed-off-by: Huisong Li
Signed-off-by: Min Hu (Connor)
---
drivers/net/hns3/hns3_ethdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 1832d26..b705a72 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2241,7 +2241,7 @@ hns3_check_mq_mode(struct rte_eth_dev *dev)
return -EINVAL;
}
- if (rx_mq_mode == ETH_MQ_RX_DCB_RSS) {
+ if (rx_mq_mode & ETH_MQ_RX_DCB_FLAG) {
if (dcb_rx_conf->nb_tcs > pf->tc_max) {
hns3_err(hw, "nb_tcs(%u) > max_tc(%u) driver
supported.",
dcb_rx_conf->nb_tcs, pf->tc_max);
--
2.7.4
Re: [dpdk-dev] [PATCH] doc: add links for preconditions for meson
24/02/2021 09:53, as...@nvidia.com: > From: Asaf Penso > > To compile with meson some dependencies should be installed. > Section "Getting the Tools" describes what needed, but per > OS there are additional steps to do. > > Add links to Linux, FreeBSD, and Windows guide for more info. > > Signed-off-by: Asaf Penso Applied, thanks
Re: [dpdk-dev] [PATCH v2] buildtools: fix all drivers disabled on Windows
16/04/2021 22:48, Dmitry Kozlyuk:
> buildtools/list-dir-globs.py printed paths with OS directory separator,
> which is "/" on Unices and "\" on Windows, while Meson code always
> expected "/". This resulted in all drivers being disabled on Windows.
>
> Replace "\" with "/" in script output. Forward slash is a valid,
> although non-default, separator on Windows, so no paths can be broken
> by this substitution.
>
> Fixes: ab9407c3addd ("build: allow using wildcards to disable drivers")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Dmitry Kozlyuk
> Acked-by: Bruce Richardson
> ---
> v2: Change fixes line, correct a typo (Juraj, Bruce).
>
> Not sure if it's worth backporting: it wasn't an issue in 20.11
> and the patch won't apply as-is.
The commit you mention was introduced in 21.02.
No matter which release it is, it is good to suggest backporting
for those who need to maintain an old release even if not upstream.
Applied, thanks
Re: [dpdk-dev] Bug with commit 64051bb1 (devargs: unify scratch buffer storage)
Hi Jim,
> From: Harris, James R
> Sent: Saturday, April 17, 2021 6:05 AM
> To: dev@dpdk.org; Xueming(Steven) Li
> Subject: Bug with commit 64051bb1 (devargs: unify scratch buffer storage)
>
> Hi,
>
> SPDK has identified a regression with commit 64051bb1 (devargs: unify scratch
> buffer storage). The issue seems to be with this part of the patch:
>
> @@ -276,15 +287,8 @@ rte_devargs_insert(struct rte_devargs **da)
> if (strcmp(listed_da->bus->name, (*da)->bus->name) == 0 &&
> strcmp(listed_da->name, (*da)->name) == 0) {
> /* device already in devargs list, must be updated */
> - listed_da->type = (*da)->type;
> - listed_da->policy = (*da)->policy;
> - free(listed_da->args);
> - listed_da->args = (*da)->args;
> - listed_da->bus = (*da)->bus;
> - listed_da->cls = (*da)->cls;
> - listed_da->bus_str = (*da)->bus_str;
> - listed_da->cls_str = (*da)->cls_str;
> - listed_da->data = (*da)->data;
> + rte_devargs_reset(listed_da);
> + *listed_da = **da;
> /* replace provided devargs with found one */
> free(*da);
> *da = listed_da;
>
>
> Previously the data members were copied one-by-one, preserving the pointers
> in the listed_da’s TAILQ_ENTRY. But after this patch, rte_devargs_reset()
> zeroes the entire rte_devargs structure, including the pointers in the
> TAILQ_ENTRY. If we do a subsequent rte_devargs_remove() on this same entry,
> we segfault since the TAILQ_ENTRY’s pointers are invalid. There could be
> similar segfaults with any subsequent rte_devargs_insert() calls that require
> iterating the global list of devargs entries.
>
> rte_devargs_insert() could manually copy the TAILQ_ENTRY pointers to *da
> before calling rte_devargs_reset() – that at least fixes the SPDK regression.
> But it’s not clear to me how many of the other rte_devargs_reset() callsites
> added by this patch also need to be changed in some way.
Thanks for reporting this issue, your fix should work. Rte_devargs_reset()
simply free and clear da->data field, not all of da.
I will send a patch to fix this, thanks again for pointing this out.
>
> Thanks,
>
> -Jim
>
[dpdk-dev] [PATCH] devargs: backup entry when inserting duplicated item
When insert devargs that already in list, existing one was reset and
replaced completely by new once, the entry info was lost during copy.
This patch backups entry info before copy.
Fixes: 64051bb1f144 ("devargs: unify scratch buffer storage")
Signed-off-by: Xueming Li
---
lib/librte_eal/common/eal_common_devargs.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/librte_eal/common/eal_common_devargs.c
b/lib/librte_eal/common/eal_common_devargs.c
index e40b91ea66..96e0456d20 100644
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -295,6 +295,7 @@ rte_devargs_insert(struct rte_devargs **da)
if (strcmp(listed_da->bus->name, (*da)->bus->name) == 0 &&
strcmp(listed_da->name, (*da)->name) == 0) {
/* device already in devargs list, must be updated */
+ (*da)->next = listed_da->next;
rte_devargs_reset(listed_da);
*listed_da = **da;
/* replace provided devargs with found one */
--
2.25.1
Re: [dpdk-dev] [PATCH v11 1/3] eventdev: introduce crypto adapter enqueue API
On Thu, Apr 15, 2021 at 2:44 PM wrote:
>
> From: Akhil Goyal
>
> In case an event from a previous stage is required to be forwarded
> to a crypto adapter and PMD supports internal event port in crypto
> adapter, exposed via capability
> RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD, we do not have
> a way to check in the API rte_event_enqueue_burst(), whether it is
> for crypto adapter or for eth tx adapter.
>
> Hence we need a new API similar to rte_event_eth_tx_adapter_enqueue(),
> which can send to a crypto adapter.
>
> Note that RTE_EVENT_TYPE_* cannot be used to make that decision,
> as it is meant for event source and not event destination.
> And event port designated for crypto adapter is designed to be used
> for OP_NEW mode.
>
> Hence, in order to support an event PMD which has an internal event port
> in crypto adapter (RTE_EVENT_CRYPTO_ADAPTER_OP_FORWARD mode), exposed
> via capability RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD,
> application should use rte_event_crypto_adapter_enqueue() API to enqueue
> events.
>
> When internal port is not available(RTE_EVENT_CRYPTO_ADAPTER_OP_NEW mode),
> application can use API rte_event_enqueue_burst() as it was doing earlier,
> i.e. retrieve event port used by crypto adapter and bind its event queues
> to that port and enqueue events using the API rte_event_enqueue_burst().
>
> Signed-off-by: Akhil Goyal
> Acked-by: Abhinandan Gujjar
Acked-by: Jerin Jacob
Series applied to dpdk-next-net-eventdev/for-main. Thanks
> ---
> devtools/libabigail.abignore | 7 +-
> .../prog_guide/event_crypto_adapter.rst | 69 ---
> doc/guides/rel_notes/release_21_05.rst| 6 ++
> lib/librte_eventdev/eventdev_trace_points.c | 3 +
> .../rte_event_crypto_adapter.h| 63 +
> lib/librte_eventdev/rte_eventdev.c| 10 +++
> lib/librte_eventdev/rte_eventdev.h| 9 ++-
> lib/librte_eventdev/rte_eventdev_trace_fp.h | 10 +++
> lib/librte_eventdev/version.map | 1 +
> 9 files changed, 150 insertions(+), 28 deletions(-)
>
> diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
> index 6c0b38984..46a5a6af5 100644
> --- a/devtools/libabigail.abignore
> +++ b/devtools/libabigail.abignore
> @@ -19,4 +19,9 @@
> ; Ignore fields inserted in cacheline boundary of rte_cryptodev
> [suppress_type]
> name = rte_cryptodev
> -has_data_member_inserted_between = {offset_after(attached), end}
> \ No newline at end of file
> +has_data_member_inserted_between = {offset_after(attached), end}
> +
> +; Ignore fields inserted in place of reserved fields of rte_eventdev
> +[suppress_type]
> + name = rte_eventdev
> + has_data_member_inserted_between = {offset_after(attached), end}
> diff --git a/doc/guides/prog_guide/event_crypto_adapter.rst
> b/doc/guides/prog_guide/event_crypto_adapter.rst
> index 1e3eb7139..4fb5c688e 100644
> --- a/doc/guides/prog_guide/event_crypto_adapter.rst
> +++ b/doc/guides/prog_guide/event_crypto_adapter.rst
> @@ -55,21 +55,22 @@ which is needed to enqueue an event after the crypto
> operation is completed.
> RTE_EVENT_CRYPTO_ADAPTER_OP_FORWARD mode
>
>
> -In the RTE_EVENT_CRYPTO_ADAPTER_OP_FORWARD mode, if HW supports
> -RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD capability the application
> -can directly submit the crypto operations to the cryptodev.
> -If not, application retrieves crypto adapter's event port using
> -rte_event_crypto_adapter_event_port_get() API. Then, links its event
> -queue to this port and starts enqueuing crypto operations as events
> -to the eventdev. The adapter then dequeues the events and submits the
> -crypto operations to the cryptodev. After the crypto completions, the
> -adapter enqueues events to the event device.
> -Application can use this mode, when ingress packet ordering is needed.
> -In this mode, events dequeued from the adapter will be treated as
> -forwarded events. The application needs to specify the cryptodev ID
> -and queue pair ID (request information) needed to enqueue a crypto
> -operation in addition to the event information (response information)
> -needed to enqueue an event after the crypto operation has completed.
> +In the ``RTE_EVENT_CRYPTO_ADAPTER_OP_FORWARD`` mode, if the event PMD and
> crypto
> +PMD supports internal event port
> +(``RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD``), the application
> should
> +use ``rte_event_crypto_adapter_enqueue()`` API to enqueue crypto operations
> as
> +events to crypto adapter. If not, application retrieves crypto adapter's
> event
> +port using ``rte_event_crypto_adapter_event_port_get()`` API, links its event
> +queue to this port and starts enqueuing crypto operations as events to
> eventdev
> +using ``rte_event_enqueue_burst()``. The adapter then dequeues the events and
> +submits the crypto operations to the cryptodev. Afte
[dpdk-dev] [PATCH] net/mlx4: fix buffer leakage on device close
The mlx4 PMD tracks the buffers (mbufs) for the packets being
transmitted in the dedicated array named as "elts". The tx_burst
routine frees the mbufs from this array once it needs to rearm
the hardware descriptor and store the new mbuf, so it looks
like as replacement mbuf pointer in the elts array.
On the device stop mlx4 PMD freed only the part of elts according
tail and head pointers, leaking the rest of buffers, remained in
the elts array.
Fixes: a2ce2121c01c ("net/mlx4: separate Tx configuration functions")
Cc: sta...@dpdk.org
Signed-off-by: Viacheslav Ovsiienko
---
drivers/net/mlx4/mlx4_rxtx.c | 4
drivers/net/mlx4/mlx4_txq.c | 19 +--
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/drivers/net/mlx4/mlx4_rxtx.c b/drivers/net/mlx4/mlx4_rxtx.c
index adc1c9bf81..ecf08f53cf 100644
--- a/drivers/net/mlx4/mlx4_rxtx.c
+++ b/drivers/net/mlx4/mlx4_rxtx.c
@@ -921,10 +921,6 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts,
uint16_t pkts_n)
if (likely(elt->buf != NULL)) {
struct rte_mbuf *tmp = elt->buf;
-#ifdef RTE_LIBRTE_MLX4_DEBUG
- /* Poisoning. */
- memset(&elt->buf, 0x66, sizeof(struct rte_mbuf *));
-#endif
/* Faster than rte_pktmbuf_free(). */
do {
struct rte_mbuf *next = tmp->next;
diff --git a/drivers/net/mlx4/mlx4_txq.c b/drivers/net/mlx4/mlx4_txq.c
index 31ab308050..2df26842fb 100644
--- a/drivers/net/mlx4/mlx4_txq.c
+++ b/drivers/net/mlx4/mlx4_txq.c
@@ -206,19 +206,18 @@ mlx4_tx_uar_uninit_secondary(struct rte_eth_dev *dev
__rte_unused)
static void
mlx4_txq_free_elts(struct txq *txq)
{
- unsigned int elts_head = txq->elts_head;
- unsigned int elts_tail = txq->elts_tail;
struct txq_elt (*elts)[txq->elts_n] = txq->elts;
- unsigned int elts_m = txq->elts_n - 1;
+ unsigned int n = txq->elts_n;
- DEBUG("%p: freeing WRs", (void *)txq);
- while (elts_tail != elts_head) {
- struct txq_elt *elt = &(*elts)[elts_tail++ & elts_m];
+ DEBUG("%p: freeing WRs, %u", (void *)txq, n);
+ while (n--) {
+ struct txq_elt *elt = &(*elts)[n];
- MLX4_ASSERT(elt->buf != NULL);
- rte_pktmbuf_free(elt->buf);
- elt->buf = NULL;
- elt->wqe = NULL;
+ if (elt->buf) {
+ rte_pktmbuf_free(elt->buf);
+ elt->buf = NULL;
+ elt->wqe = NULL;
+ }
}
txq->elts_tail = txq->elts_head;
}
--
2.18.1
Re: [dpdk-dev] [PATCH v2] eventdev: fix case to initiate crypto adapter service
On Wed, Apr 14, 2021 at 12:36 PM Gujjar, Abhinandan S wrote: > > > > > -Original Message- > > From: Shijith Thotton > > Sent: Tuesday, April 13, 2021 1:21 PM > > To: Gujjar, Abhinandan S > > Cc: Shijith Thotton ; dev@dpdk.org; Jerin Jacob > > ; Akhil Goyal ; Anoob Joseph > > > > Subject: Re: [dpdk-dev] [PATCH v2] eventdev: fix case to initiate crypto > > adapter service > > > > As per comments above, below checks are used to initiate SW service if: > > 1. PMDs supports OP_NEW, but not OP_FWD, in FWD mode. > > 2. Does not support OP_NEW and OP_FWD. > > > > I have fixed the first point where only support for OP_NEW is checked in > > forward mode, by adding a check for no OP_FWD capability. > Sounds good. > > Acked-by: abhinandan.guj...@intel.com Applied to dpdk-next-eventdev/for-main. Thanks. > > > > > > >adapter->mode == > > > > RTE_EVENT_CRYPTO_ADAPTER_OP_FORWARD) || > > > >(!(cap & > > > > RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NEW) && > > > > !(cap & > > > > RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) && > > > > -- > > > > 2.25.1 > > >
[dpdk-dev] [pull-request] next-eventdev 21.05-rc1
The following changes since commit 74299cc7591192cbc72e8f411dff0c7f3cfdf309:
buildtools: fix all drivers disabled on Windows (2021-04-17 12:49:23 +0200)
are available in the Git repository at:
http://dpdk.org/git/next/dpdk-next-eventdev
for you to fetch changes up to 6e5aa8854846c884885391ddc84b2629de198e68:
eventdev: fix case to initiate crypto adapter service (2021-04-17 22:52:41
+0530)
Akhil Goyal (1):
eventdev: introduce crypto adapter enqueue API
Shijith Thotton (3):
event/octeontx2: support crypto adapter forward mode
test/event_crypto: use crypto adapter enqueue API
eventdev: fix case to initiate crypto adapter service
app/test/test_event_crypto_adapter.c | 33 +
devtools/libabigail.abignore | 5 ++
doc/guides/prog_guide/event_crypto_adapter.rst | 69 +++---
doc/guides/rel_notes/release_21_05.rst | 7 ++
drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 49 +
drivers/event/octeontx2/otx2_evdev.c | 5 +-
drivers/event/octeontx2/otx2_evdev_crypto_adptr.c | 3 +-
...pto_adptr_dp.h => otx2_evdev_crypto_adptr_rx.h} | 6 +-
.../event/octeontx2/otx2_evdev_crypto_adptr_tx.h | 83 ++
drivers/event/octeontx2/otx2_worker.h | 2 +-
drivers/event/octeontx2/otx2_worker_dual.h | 2 +-
lib/librte_eventdev/eventdev_trace_points.c| 3 +
lib/librte_eventdev/rte_event_crypto_adapter.c | 1 +
lib/librte_eventdev/rte_event_crypto_adapter.h | 63
lib/librte_eventdev/rte_eventdev.c | 10 +++
lib/librte_eventdev/rte_eventdev.h | 9 ++-
lib/librte_eventdev/rte_eventdev_trace_fp.h| 10 +++
lib/librte_eventdev/version.map| 1 +
18 files changed, 301 insertions(+), 60 deletions(-)
rename drivers/event/octeontx2/{otx2_evdev_crypto_adptr_dp.h =>
otx2_evdev_crypto_adptr_rx.h} (93%)
create mode 100644 drivers/event/octeontx2/otx2_evdev_crypto_adptr_tx.h
Re: [dpdk-dev] [PATCH v2 1/2] ethdev: introduce conntrack flow action and item
On Fri, Apr 16, 2021 at 11:10 PM Bing Zhao wrote:
>
> Hi Ajit,
>
> > -Original Message-
> > From: Ajit Khaparde
> > Sent: Saturday, April 17, 2021 5:47 AM
> > To: Bing Zhao
> > Cc: Ori Kam ; NBU-Contact-Thomas Monjalon
> > ; ferruh.yi...@intel.com;
> > andrew.rybche...@oktetlabs.ru; dev@dpdk.org
> > Subject: Re: [PATCH v2 1/2] ethdev: introduce conntrack flow action
> > and item
> >
> > > > > +
> > > > > +/**
> > > > > + * @warning
> > > > > + * @b EXPERIMENTAL: this structure may change without prior
> > > > notice
> > > > > + *
> > > > > + * Configuration parameters for each direction of a TCP
> > > > connection.
> > > > > + */
> > > > > +struct rte_flow_tcp_dir_param {
> > > > > + uint32_t scale:4; /**< TCP window scaling factor, 0xF to
> > > > disable. */
> > > > > + uint32_t close_initiated:1; /**< The FIN was sent by this
> > > > direction. */
> > > > > + /**< An ACK packet has been received by this side. */
> > > > > + uint32_t last_ack_seen:1;
> > > > > + /**< If set, indicates that there is unacked data of the
> > > > connection. */
> > > > > + uint32_t data_unacked:1;
> > > > > + /**< Maximal value of sequence + payload length over sent
> > > > > +* packets (next ACK from the opposite direction).
> > > > > +*/
> > > > > + uint32_t sent_end;
> > > > > + /**< Maximal value of (ACK + window size) over received
> > packet
> > > > +
> > > > > length
> > > > > +* over sent packet (maximal sequence could be sent).
> > > > > +*/
> > > > > + uint32_t reply_end;
> > > >
> > > > This comment is for all members that are part of the packet, Do
> > you
> > > > think it should be in network order?
> > >
> > > Almost none of the fields are part of the packet. Indeed, most of
> > them are calculated from the packets information. So I prefer to
> > keep the host order easy for using and
> > > keep all the fields of the whole structure the same endianness
> > format.
> > > What do you think?
> >
> > Can you mention it in the documentation and comments?
> > That all the values are in host byte order and need to be converted
> > to
> > network byte order if the HW needs it that way
>
> Sure, I think it would be better to add it in the documentation.
> What do you think?
Documentation - yes.
In the comments of the structure in the header file - if possible.
>
> BR. Bing
Re: [dpdk-dev] [PATCH v6] ethdev: add sanity checks in control APIs
17/04/2021 02:28, Min Hu (Connor):
>
> 在 2021/4/17 0:28, Stephen Hemminger 写道:
> > On Fri, 16 Apr 2021 11:22:02 +0100
> > Kevin Traynor wrote:
> >
> >>> + if (dev_conf == NULL) {
> >>> + RTE_ETHDEV_LOG(ERR,
> >>> + "Cannot configure ethdev port %u to NULL dev_conf\n",
> >>
> >> The others use a natural sounding names instead of argument name. If you
> >> wanted to match that it could be "..to NULL conf"
> >
> > I would prefer that error messages don't try to be English sentences.
> > The wording ends up awkward. and overly wordy.
> > If function name is automatically included by RTE_ETHDEV_LOG() then
> > Just:
> > RTE_ETHDEV_LOG(ERR, "NULL ethdev")
> > should be enough for programmer to find/fix the problem
> > .
> Hi, Stephen,
> Your opinion is quit different from that of Andrew Rybchenko.
> Andrew does not support show function name in the log:
> "- log messages should be human readable (i.e. I'd avoid
> usage of function name)"
>
> @Andrew ,@Thoms, @Ferruh, @Kevin, so, what's your opinion ?
I prefer human readable messages which are unique enough to be "grepped".
Re: [dpdk-dev] [PATCH V5] ethdev: add queue state when retrieve queue information
On 4/17/2021 4:09 AM, Lijun Ou wrote: Currently, upper-layer application could get queue state only through pointers such as dev->data->tx_queue_state[queue_id], this is not the recommended way to access it. So this patch add get queue state when call rte_eth_rx_queue_info_get and rte_eth_tx_queue_info_get API. Note: After add queue_state field, the 'struct rte_eth_rxq_info' size remains 128B, and the 'struct rte_eth_txq_info' size remains 64B, so it could be ABI compatible. Signed-off-by: Chengwen Feng Signed-off-by: Lijun Ou Acked-by: Konstantin Ananyev --- V4->V5: - Add acked-by - add a note to the "New features" section to annouce the new feature. V3->V4: - update libabigail.abignore for removing the CI warnings V2->V3: - rewrite the commit log and delete the part Note - rewrite tht comments for queue state - move the queue_state definition locations V1->V2: - move queue state defines to public file --- doc/guides/rel_notes/release_21_05.rst | 6 ++ lib/librte_ethdev/ethdev_driver.h | 7 --- lib/librte_ethdev/rte_ethdev.c | 3 +++ lib/librte_ethdev/rte_ethdev.h | 9 + 4 files changed, 18 insertions(+), 7 deletions(-) missing 'libabigail.abignore' that was in v4?
[dpdk-dev] [PATCH] doc: announce support of Alpine Linux
After many patches in several releases to make DPDK buildable with musl, and few adjustments for busybox, it is time to show the support of DPDK built in Alpine Linux. Signed-off-by: Thomas Monjalon --- doc/guides/linux_gsg/sys_reqs.rst | 8 +++- doc/guides/rel_notes/release_21_05.rst | 5 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst index dfe8f4ef3b..6994038d45 100644 --- a/doc/guides/linux_gsg/sys_reqs.rst +++ b/doc/guides/linux_gsg/sys_reqs.rst @@ -40,31 +40,29 @@ Compilation of the DPDK * General development tools including a supported C compiler such as gcc (version 4.9+) or clang (version 3.4+). * For RHEL/Fedora systems these can be installed using ``dnf groupinstall "Development Tools"`` - * For Ubuntu/Debian systems these can be installed using ``apt install build-essential`` +* For Alpine Linux, ``apk add gcc libc-dev bsd-compat-headers libexecinfo-dev`` * Python 3.5 or later. * Meson (version 0.49.2+) and ninja * ``meson`` & ``ninja-build`` packages in most Linux distributions - * If the packaged version is below the minimum version, the latest versions can be installed from Python's "pip" repository: ``pip3 install meson ninja`` * ``pyelftools`` (version 0.22+) * For Fedora systems it can be installed using ``dnf install python-pyelftools`` - * For RHEL/CentOS systems it can be installed using ``pip3 install pyelftools`` - * For Ubuntu/Debian it can be installed using ``apt install python3-pyelftools`` +* For Alpine Linux, ``apk add py3-elftools`` * Library for handling NUMA (Non Uniform Memory Access). * ``numactl-devel`` in RHEL/Fedora; - * ``libnuma-dev`` in Debian/Ubuntu; +* ``numactl-dev`` in Alpine Linux .. note:: diff --git a/doc/guides/rel_notes/release_21_05.rst b/doc/guides/rel_notes/release_21_05.rst index 83f06392af..12215effc6 100644 --- a/doc/guides/rel_notes/release_21_05.rst +++ b/doc/guides/rel_notes/release_21_05.rst @@ -55,6 +55,11 @@ New Features Also, make sure to start the actual text at the margin. === +* **Added Alpine Linux with musl libc support** + + The distribution Alpine Linux, using musl libc and busybox, + got initial support starting with building DPDK without modification. + * **Added phase-fair lock.** Phase-fair lock provides fairness guarantees. -- 2.31.1
Re: [dpdk-dev] [PATCH v10] app/testpmd: support multi-process
On 4/17/2021 7:12 AM, Min Hu (Connor) wrote:
This patch adds multi-process support for testpmd.
The test cmd example as follows:
the primary cmd:
./dpdk-testpmd -a xxx --proc-type=auto -l 0-1 -- -i \
--rxq=4 --txq=4 --num-procs=2 --proc-id=0
the secondary cmd:
./dpdk-testpmd -a xxx --proc-type=auto -l 2-3 -- -i \
--rxq=4 --txq=4 --num-procs=2 --proc-id=1
Signed-off-by: Min Hu (Connor)
Signed-off-by: Lijun Ou
Acked-by: Xiaoyun Li
Acked-by: Ajit Khaparde
Hi Connor,
I put some minor syntax comments, when they are fixed,
Reviewed-by: Ferruh Yigit
<...>
if (diag != 0) {
- if (rte_atomic16_cmpset(&(port->port_status),
- RTE_PORT_HANDLING, RTE_PORT_STOPPED) == 0)
- printf("Port %d can not be set back "
- "to stopped\n", pi);
- printf("Fail to configure port %d\n", pi);
+ if (rte_atomic16_cmpset(
+ &(port->port_status),
+ RTE_PORT_HANDLING,
+ RTE_PORT_STOPPED) == 0)
+ printf("Port %d can not be set "
+ "back to stopped\n", pi);
It is OK to have long line for the strings, so it can be like
printf("Port %d can not be set back to stopped\n",
pi);
+ printf("Fail to configure port %d\n",
+ pi);
No need to update this line.
<...>
/* Fail to setup rx queue, return */
if (rte_atomic16_cmpset(&(port->port_status),
- RTE_PORT_HANDLING, RTE_PORT_STOPPED) == 0)
+ RTE_PORT_HANDLING, RTE_PORT_STOPPED) == 0)
printf("Port %d can not be set back to "
- "stopped\n", pi);
+ "stopped\n",
+ pi);
These are syntax changes, I think can keep these lines as it is.
Re: [dpdk-dev] [PATCH v5 1/4] ethdev: add packet mode in meter profile structure
13/04/2021 17:59, Li Zhang: > Currently meter algorithms only supports rate is bytes per second(BPS). > Add packet_mode flag in meter profile parameters data structure. > So that it can meter traffic by packet per second. > > When packet_mode is 0, the profile rates and bucket sizes are > specified in bytes per second and bytes > when packet_mode is not 0, the profile rates and bucket sizes are > specified in packets and packets per second. > > The below structure will be extended: > rte_mtr_meter_profile > rte_mtr_capabilities > > Signed-off-by: Li Zhang > Acked-by: Matan Azrad > Acked-by: Cristian Dumitrescu > Acked-by: Jerin Jacob > Acked-by: Ajit Khaparde > --- > --- a/doc/guides/rel_notes/release_21_05.rst > +++ b/doc/guides/rel_notes/release_21_05.rst > @@ -163,6 +163,18 @@ New Features > ``show port (port_id) rxq (queue_id) desc used count`` > > > +* **Added support for meter PPS profile.** > + > + Currently meter algorithms only supports bytes per second(BPS). > + Add packet_mode in the meter profile parameters data structures > + to support packet per second (PPS) mode. > + So that it can meter traffic by packet per second. > + Packet_mode must be 0 when it is bytes mode. It is supposed to be in past tense. Reworded as follow: + Added packet mode in the meter profile parameters data structures + to support metering traffic by packet per second (PPS), + in addition to the initial bytes per second (BPS) mode (value 0). > + > +* **Updated MLX5 driver.** > + > + * Added support for meter profile packet per second mode (packet_mode). The mlx5 implementation is not part of this patch. This sentence will be removed. Please add a similar line in the mlx5 patch.
