date:20240708

From: Vanshika Shukla 

This series includes fixes for NXP DPAA drivers.

V3 changes:
Fixed compilation issue for "restrict MTU config for shared intf" patch.
Added back "mempool/dpaax: cache free optimization" patch.

V2 changes:
Removed "mempool/dpaax: cache free optimization" patch.

Apeksha Gupta (2):
  bus/dpaa: fix resource leak in variable dev
  common/dpaax: fix array overrun issue

Gagandeep Singh (3):
  bus/dpaa: fix bus scan for DMA devices
  common/dpaax: fix IOVA table cleanup
  bus/dpaa: remove unused code

Rohit Raj (2):
  bus/dpaa: remove redundant file descriptor check
  net/dpaa: restrict MTU config for shared intf

Sachin Saxena (1):
  mempool/dpaax: cache free optimization

 drivers/bus/dpaa/base/qbman/process.c|  7 ++---
 drivers/bus/dpaa/base/qbman/qman.c   | 31 --
 drivers/bus/dpaa/dpaa_bus.c  |  5 +++-
 drivers/bus/dpaa/include/fsl_qman.h  | 31 --
 drivers/bus/dpaa/version.map |  1 -
 drivers/common/dpaax/dpaax_iova_table.c  | 13 +-
 drivers/mempool/dpaa/dpaa_mempool.c  | 16 +++-
 drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 15 +++
 drivers/net/dpaa/dpaa_ethdev.c   | 33 ++--
 9 files changed, 75 insertions(+), 77 deletions(-)

-- 
2.25.1

[PATCH v3 1/8] bus/dpaa: fix bus scan for DMA devices

From: Gagandeep Singh 

if there is no sec devices available, code is not scanning QDMA dev
This patch fix this problem by adding a goto statement instead
of return in case no sec device available.

Fixes: 583f3732974f ("dma/dpaa: introduce DPAA DMA driver skeleton")
Cc: sta...@dpdk.org

Signed-off-by: Gagandeep Singh 
Signed-off-by: Vanshika Shukla 
---
 drivers/bus/dpaa/dpaa_bus.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index 64b748626b..b8f41ec069 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -221,7 +221,7 @@ dpaa_create_device_list(void)
 
if (dpaa_sec_available()) {
DPAA_BUS_LOG(INFO, "DPAA SEC devices are not available");
-   return 0;
+   goto qdma_dpaa;
}
 
/* Creating SEC Devices */
@@ -260,6 +260,7 @@ dpaa_create_device_list(void)
 
rte_dpaa_bus.device_count += i;
 
+qdma_dpaa:
/* Creating QDMA Device */
for (i = 0; i < RTE_DPAA_QDMA_DEVICES; i++) {
dev = calloc(1, sizeof(struct rte_dpaa_device));
-- 
2.25.1

[PATCH v3 2/8] bus/dpaa: fix resource leak in variable dev

From: Apeksha Gupta 

Resource leak:
variable dev is going out of scope leaks the storage.

Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle")
Cc: hka...@marvell.com
Cc: sta...@dpdk.org

Signed-off-by: Apeksha Gupta 
Signed-off-by: Vanshika Shukla 
---
 drivers/bus/dpaa/dpaa_bus.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c
index b8f41ec069..1f6997c77e 100644
--- a/drivers/bus/dpaa/dpaa_bus.c
+++ b/drivers/bus/dpaa/dpaa_bus.c
@@ -188,6 +188,7 @@ dpaa_create_device_list(void)
if (dev->intr_handle == NULL) {
DPAA_BUS_LOG(ERR, "Failed to allocate intr handle");
ret = -ENOMEM;
+   free(dev);
goto cleanup;
}
 
@@ -239,6 +240,7 @@ dpaa_create_device_list(void)
if (dev->intr_handle == NULL) {
DPAA_BUS_LOG(ERR, "Failed to allocate intr handle");
ret = -ENOMEM;
+   free(dev);
goto cleanup;
}
 
-- 
2.25.1

[PATCH v3 3/8] common/dpaax: fix IOVA table cleanup

From: Gagandeep Singh 

Fixes incorrect structure free

Fixes: 2f3d633aa593 ("common/dpaax: add library for PA/VA translation table")
Cc: sta...@dpdk.org

Signed-off-by: Gagandeep Singh 
Signed-off-by: Vanshika Shukla 
---
 drivers/common/dpaax/dpaax_iova_table.c | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/common/dpaax/dpaax_iova_table.c 
b/drivers/common/dpaax/dpaax_iova_table.c
index 9daac4bc03..d2a78f4c19 100644
--- a/drivers/common/dpaax/dpaax_iova_table.c
+++ b/drivers/common/dpaax/dpaax_iova_table.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2018 NXP
+ * Copyright 2018-2023 NXP
  */
 
 #include 
@@ -255,10 +255,7 @@ dpaax_iova_table_populate(void)
 void
 dpaax_iova_table_depopulate(void)
 {
-   if (dpaax_iova_table_p == NULL)
-   return;
-
-   rte_free(dpaax_iova_table_p->entries);
+   rte_free(dpaax_iova_table_p);
dpaax_iova_table_p = NULL;
 
DPAAX_DEBUG("IOVA Table cleaned");
-- 
2.25.1

[PATCH v3 4/8] common/dpaax: fix array overrun issue

From: Apeksha Gupta 

Out-of-bounds read, Overrunning dynamic array nodes at offset corresponding
to index variable j.

Fixes: 2f3d633aa593 ("common/dpaax: add library for PA/VA translation table")
Cc: sta...@dpdk.org

Signed-off-by: Apeksha Gupta 
Signed-off-by: Vanshika Shukla 
---
 drivers/common/dpaax/dpaax_iova_table.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/common/dpaax/dpaax_iova_table.c 
b/drivers/common/dpaax/dpaax_iova_table.c
index d2a78f4c19..860e702333 100644
--- a/drivers/common/dpaax/dpaax_iova_table.c
+++ b/drivers/common/dpaax/dpaax_iova_table.c
@@ -139,10 +139,12 @@ read_memory_node(unsigned int *count)
}
 
DPAAX_DEBUG("Device-tree memory node data:");
-   do {
+
+   while (j > 0) {
+   --j;
DPAAX_DEBUG("%08" PRIx64 " %08zu",
nodes[j].addr, nodes[j].len);
-   } while (--j);
+   }
 
 cleanup:
close(fd);
-- 
2.25.1

[PATCH v3 5/8] bus/dpaa: remove redundant file descriptor check

From: Rohit Raj 

This patch removes the redundant file descriptor check

Fixes: 2f3d633aa593 ("common/dpaax: add library for PA/VA translation table")
Cc: sta...@dpdk.org

Signed-off-by: Rohit Raj 
Signed-off-by: Vanshika Shukla 
---
 drivers/bus/dpaa/base/qbman/process.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/bus/dpaa/base/qbman/process.c 
b/drivers/bus/dpaa/base/qbman/process.c
index 59e0d641ce..2d805c5bd9 100644
--- a/drivers/bus/dpaa/base/qbman/process.c
+++ b/drivers/bus/dpaa/base/qbman/process.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)
  *
  * Copyright 2011-2016 Freescale Semiconductor Inc.
- * Copyright 2017,2020 NXP
+ * Copyright 2017,2020,2022,2024 NXP
  *
  */
 #include 
@@ -28,15 +28,16 @@ static int check_fd(void)
 {
int ret;
 
-   if (fd >= 0)
-   return 0;
ret = pthread_mutex_lock(&fd_init_lock);
assert(!ret);
+
/* check again with the lock held */
if (fd < 0)
fd = open(PROCESS_PATH, O_RDWR);
+
ret = pthread_mutex_unlock(&fd_init_lock);
assert(!ret);
+
return (fd >= 0) ? 0 : -ENODEV;
 }
 
-- 
2.25.1

[PATCH v3 6/8] bus/dpaa: remove unused code

From: Gagandeep Singh 

The slow poll code is not being used in DPDK DPAA driver sub-system.

Signed-off-by: Gagandeep Singh 
Signed-off-by: Vanshika Shukla 
---
 drivers/bus/dpaa/base/qbman/qman.c  | 31 -
 drivers/bus/dpaa/include/fsl_qman.h | 31 -
 drivers/bus/dpaa/version.map|  1 -
 3 files changed, 63 deletions(-)

diff --git a/drivers/bus/dpaa/base/qbman/qman.c 
b/drivers/bus/dpaa/base/qbman/qman.c
index b1166fcb1f..cc10def861 100644
--- a/drivers/bus/dpaa/base/qbman/qman.c
+++ b/drivers/bus/dpaa/base/qbman/qman.c
@@ -69,7 +69,6 @@ struct qman_portal {
/* interrupt sources processed by portal_isr(), configurable */
unsigned long irq_sources;
u32 use_eqcr_ci_stashing;
-   u32 slowpoll;   /* only used when interrupts are off */
/* only 1 volatile dequeue at a time */
struct qman_fq *vdqcr_owned;
u32 sdqcr;
@@ -569,7 +568,6 @@ qman_init_portal(struct qman_portal *portal,
INIT_LIST_HEAD(&portal->cgr_cbs);
spin_lock_init(&portal->cgr_lock);
portal->bits = 0;
-   portal->slowpoll = 0;
portal->sdqcr = QM_SDQCR_SOURCE_CHANNELS | QM_SDQCR_COUNT_UPTO3 |
QM_SDQCR_DEDICATED_PRECEDENCE | QM_SDQCR_TYPE_PRIO_QOS |
QM_SDQCR_TOKEN_SET(0xab) | QM_SDQCR_CHANNELS_DEDICATED;
@@ -1370,35 +1368,6 @@ void qman_dqrr_consume(struct qman_fq *fq,
qm_dqrr_next(&p->p);
 }
 
-int qman_poll_dqrr(unsigned int limit)
-{
-   struct qman_portal *p = get_affine_portal();
-   int ret;
-
-   ret = __poll_portal_fast(p, limit);
-   return ret;
-}
-
-void qman_poll(void)
-{
-   struct qman_portal *p = get_affine_portal();
-
-   if ((~p->irq_sources) & QM_PIRQ_SLOW) {
-   if (!(p->slowpoll--)) {
-   u32 is = qm_isr_status_read(&p->p) & ~p->irq_sources;
-   u32 active = __poll_portal_slow(p, is);
-
-   if (active) {
-   qm_isr_status_clear(&p->p, active);
-   p->slowpoll = SLOW_POLL_BUSY;
-   } else
-   p->slowpoll = SLOW_POLL_IDLE;
-   }
-   }
-   if ((~p->irq_sources) & QM_PIRQ_DQRI)
-   __poll_portal_fast(p, FSL_QMAN_POLL_LIMIT);
-}
-
 void qman_stop_dequeues(void)
 {
struct qman_portal *p = get_affine_portal();
diff --git a/drivers/bus/dpaa/include/fsl_qman.h 
b/drivers/bus/dpaa/include/fsl_qman.h
index acdfb45ad6..c0677976e8 100644
--- a/drivers/bus/dpaa/include/fsl_qman.h
+++ b/drivers/bus/dpaa/include/fsl_qman.h
@@ -1429,37 +1429,6 @@ __rte_internal
 void qman_dqrr_consume(struct qman_fq *fq,
   struct qm_dqrr_entry *dq);
 
-/**
- * qman_poll_dqrr - process DQRR (fast-path) entries
- * @limit: the maximum number of DQRR entries to process
- *
- * Use of this function requires that DQRR processing not be interrupt-driven.
- * Ie. the value returned by qman_irqsource_get() should not include
- * QM_PIRQ_DQRI. If the current CPU is sharing a portal hosted on another CPU,
- * this function will return -EINVAL, otherwise the return value is >=0 and
- * represents the number of DQRR entries processed.
- */
-__rte_internal
-int qman_poll_dqrr(unsigned int limit);
-
-/**
- * qman_poll
- *
- * Dispatcher logic on a cpu can use this to trigger any maintenance of the
- * affine portal. There are two classes of portal processing in question;
- * fast-path (which involves demuxing dequeue ring (DQRR) entries and tracking
- * enqueue ring (EQCR) consumption), and slow-path (which involves EQCR
- * thresholds, congestion state changes, etc). This function does whatever
- * processing is not triggered by interrupts.
- *
- * Note, if DQRR and some slow-path processing are poll-driven (rather than
- * interrupt-driven) then this function uses a heuristic to determine how often
- * to run slow-path processing - as slow-path processing introduces at least a
- * minimum latency each time it is run, whereas fast-path (DQRR) processing is
- * close to zero-cost if there is no work to be done.
- */
-void qman_poll(void);
-
 /**
  * qman_stop_dequeues - Stop h/w dequeuing to the s/w portal
  *
diff --git a/drivers/bus/dpaa/version.map b/drivers/bus/dpaa/version.map
index 1a840fd1a5..3f547f75cf 100644
--- a/drivers/bus/dpaa/version.map
+++ b/drivers/bus/dpaa/version.map
@@ -82,7 +82,6 @@ INTERNAL {
qman_irqsource_remove;
qman_modify_cgr;
qman_oos_fq;
-   qman_poll_dqrr;
qman_portal_dequeue;
qman_portal_poll_rx;
qman_query_fq_frm_cnt;
-- 
2.25.1

[PATCH v3 7/8] net/dpaa: restrict MTU config for shared intf

From: Rohit Raj 

Since DPDK was able to configure mtu in VSP/Shared interface  mode,
it was causing misconfiguration of the hw which further caused crashes.

This patch allow only kernel to config MTU in such cases

Signed-off-by: Rohit Raj 
Signed-off-by: Vanshika Shukla 
---
 drivers/net/dpaa/dpaa_ethdev.c | 33 +++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 44bac67803..060b8c678f 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -165,9 +166,15 @@ dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
uint32_t frame_size = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN
+ VLAN_TAG_SIZE;
uint32_t buffsz = dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM;
+   struct fman_if *fif = dev->process_private;
 
PMD_INIT_FUNC_TRACE();
 
+   if (fif->is_shared_mac) {
+   DPAA_PMD_ERR("Cannot configure mtu from DPDK in VSP mode.");
+   return -ENOTSUP;
+   }
+
/*
 * Refuse mtu that requires the support of scattered packets
 * when this feature has not been enabled before.
@@ -206,7 +213,8 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
struct rte_intr_handle *intr_handle;
uint32_t max_rx_pktlen;
int speed, duplex;
-   int ret, rx_status;
+   int ret, rx_status, socket_fd;
+   struct ifreq ifr;
 
PMD_INIT_FUNC_TRACE();
 
@@ -222,6 +230,26 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
 dpaa_intf->name);
return -EHOSTDOWN;
}
+
+   socket_fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
+   if (socket_fd == -1) {
+   DPAA_PMD_ERR("Cannot open IF socket");
+   return -errno;
+   }
+
+   strncpy(ifr.ifr_name, dpaa_intf->name, IFNAMSIZ - 1);
+
+   if (ioctl(socket_fd, SIOCGIFMTU, &ifr) < 0) {
+   DPAA_PMD_ERR("Cannot get interface mtu");
+   close(socket_fd);
+   return -errno;
+   }
+
+   close(socket_fd);
+   DPAA_PMD_INFO("Using kernel configured mtu size(%u)",
+ifr.ifr_mtu);
+
+   eth_conf->rxmode.mtu = ifr.ifr_mtu;
}
 
/* Rx offloads which are enabled by default */
@@ -249,7 +277,8 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
max_rx_pktlen = DPAA_MAX_RX_PKT_LEN;
}
 
-   fman_if_set_maxfrm(dev->process_private, max_rx_pktlen);
+   if (!fif->is_shared_mac)
+   fman_if_set_maxfrm(dev->process_private, max_rx_pktlen);
 
if (rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER) {
DPAA_PMD_DEBUG("enabling scatter mode");
-- 
2.25.1

[PATCH v3 8/8] mempool/dpaax: cache free optimization

From: Sachin Saxena 

 - Updates the cache threshold value as per
   the platform specific optimal value.

Signed-off-by: Sachin Saxena 
Signed-off-by: Vanshika Shukla 
---
 drivers/mempool/dpaa/dpaa_mempool.c  | 16 +++-
 drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 15 +++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/drivers/mempool/dpaa/dpaa_mempool.c 
b/drivers/mempool/dpaa/dpaa_mempool.c
index 21e8938cc6..9e3a743575 100644
--- a/drivers/mempool/dpaa/dpaa_mempool.c
+++ b/drivers/mempool/dpaa/dpaa_mempool.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- *   Copyright 2017,2019 NXP
+ *   Copyright 2017,2019,2023 NXP
  *
  */
 
@@ -51,6 +51,8 @@ dpaa_mbuf_create_pool(struct rte_mempool *mp)
struct bman_pool_params params = {
.flags = BMAN_POOL_FLAG_DYNAMIC_BPID
};
+   unsigned int lcore_id;
+   struct rte_mempool_cache *cache;
 
MEMPOOL_INIT_FUNC_TRACE();
 
@@ -118,6 +120,18 @@ dpaa_mbuf_create_pool(struct rte_mempool *mp)
rte_memcpy(bp_info, (void *)&rte_dpaa_bpid_info[bpid],
   sizeof(struct dpaa_bp_info));
mp->pool_data = (void *)bp_info;
+   /* Update per core mempool cache threshold to optimal value which is
+* number of buffers that can be released to HW buffer pool in
+* a single API call.
+*/
+   for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
+   cache = &mp->local_cache[lcore_id];
+   DPAA_MEMPOOL_DEBUG("lCore %d: cache->flushthresh %d -> %d\n",
+   lcore_id, cache->flushthresh,
+   (uint32_t)(cache->size + DPAA_MBUF_MAX_ACQ_REL));
+   if (cache->flushthresh)
+   cache->flushthresh = cache->size + 
DPAA_MBUF_MAX_ACQ_REL;
+   }
 
DPAA_MEMPOOL_INFO("BMAN pool created for bpid =%d", bpid);
return 0;
diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c 
b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c
index 4c9245cb81..fe82475b10 100644
--- a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c
+++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c
@@ -44,6 +44,8 @@ rte_hw_mbuf_create_pool(struct rte_mempool *mp)
struct dpaa2_bp_info *bp_info;
struct dpbp_attr dpbp_attr;
uint32_t bpid;
+   unsigned int lcore_id;
+   struct rte_mempool_cache *cache;
int ret;
 
avail_dpbp = dpaa2_alloc_dpbp_dev();
@@ -132,6 +134,19 @@ rte_hw_mbuf_create_pool(struct rte_mempool *mp)
DPAA2_MEMPOOL_DEBUG("BP List created for bpid =%d", dpbp_attr.bpid);
 
h_bp_list = bp_list;
+   /* Update per core mempool cache threshold to optimal value which is
+* number of buffers that can be released to HW buffer pool in
+* a single API call.
+*/
+   for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
+   cache = &mp->local_cache[lcore_id];
+   DPAA2_MEMPOOL_DEBUG("lCore %d: cache->flushthresh %d -> %d\n",
+   lcore_id, cache->flushthresh,
+   (uint32_t)(cache->size + DPAA2_MBUF_MAX_ACQ_REL));
+   if (cache->flushthresh)
+   cache->flushthresh = cache->size + 
DPAA2_MBUF_MAX_ACQ_REL;
+   }
+
return 0;
 err3:
rte_free(bp_info);
-- 
2.25.1

Re: [PATCH 07/15] net/ena/base: update copyrights comments

On 7/8/2024 8:02 AM, Brandes, Shai wrote:
> 
> 
>> -Original Message-
>> From: Hemant Agrawal 
>> Sent: Monday, July 8, 2024 7:09 AM
>> To: Ferruh Yigit ; Brandes, Shai
>> 
>> Cc: dev@dpdk.org; Hemant Agrawal 
>> Subject: RE: [EXTERNAL] [PATCH 07/15] net/ena/base: update copyrights
>> comments
>>
>> CAUTION: This email originated from outside of the organization. Do not click
>> links or open attachments unless you can confirm the sender and know the
>> content is safe.
>>
>>
>>
>> On 08-07-2024 00:27, Ferruh Yigit wrote:
>>> On 7/2/2024 3:46 PM, shaib...@amazon.com wrote:
 From: Shai Brandes 

 copyright dates are not mandatory to be maintained, therefore the
 range of years was removed.
 In addition, the copyrights lines were separated into two comments.

 Signed-off-by: Shai Brandes 
 ---
   drivers/net/ena/base/ena_com.c  | 4 ++--
   drivers/net/ena/base/ena_com.h  | 4 ++--
   drivers/net/ena/base/ena_defs/ena_admin_defs.h  | 5 +++--
   drivers/net/ena/base/ena_defs/ena_common_defs.h | 4 ++--
   drivers/net/ena/base/ena_defs/ena_eth_io_defs.h | 5 +++--
   drivers/net/ena/base/ena_defs/ena_includes.h| 4 ++--
   drivers/net/ena/base/ena_defs/ena_regs_defs.h   | 4 ++--
   drivers/net/ena/base/ena_eth_com.c  | 4 ++--
   drivers/net/ena/base/ena_eth_com.h  | 4 ++--
   drivers/net/ena/base/ena_plat.h | 4 ++--
   drivers/net/ena/base/ena_plat_dpdk.h| 4 ++--
   11 files changed, 24 insertions(+), 22 deletions(-)

 diff --git a/drivers/net/ena/base/ena_com.c
 b/drivers/net/ena/base/ena_com.c index ad4f3f9431..5f46e692b3 100644
 --- a/drivers/net/ena/base/ena_com.c
 +++ b/drivers/net/ena/base/ena_com.c
 @@ -1,5 +1,5 @@
 -/* SPDX-License-Identifier: BSD-3-Clause
 - * Copyright (c) 2015-2020 Amazon.com, Inc. or its affiliates.
 +/* SPDX-License-Identifier: BSD-3-Clause */
 +/* Copyright (c) Amazon.com, Inc. or its affiliates.
* All rights reserved.
*/

>>> Hi Shai,
>>>
>>> I don't know about implication of dropping the copyright year
>>> altogether, we need to ask to an expert.
>>>
>>> What I know is, a copyright expires after some year, so to hold the
>>> copyright, there needs to be a starting point. And people use ranges
>>> to extend this copyright year.
>>>
>>>
>>> Instead of removing the year altogether, it make sense to me to just
>>> keep the initial year and don't add range later as code updated, this
>>> also will be more consistent with rest of the code.
>>> Let me drop this patch from the set, and learn more from the experts.
>>> It can be included later, I don't think this is something urgent.
>>>
>>>
>>> Another aspect is, the history of a source file can be acquired from
>>> the pubic git repository, so when it is first merged, when updated,
>>> all these information is available.
>>> So this feels like no need to record these days in the source code
>>> files but I don't know if these git repository metadata information is 
>>> legally
>>>   valid and accepted.
>>>
>>>
>>> And I am not quite sure if it has really any value to worry about
>>> copyright for a publicly available device driver code anyway, but this
>>> is not my domain.
>>
>> Hi Shai,
>>
>>  Will you please just update the copyright year instead of removing the
>> year completely?  e.g. 2015-2020, 2024 or 2015-2024
>>
>> -Hemant
> [Brandes, Shai] 
> Hi Ferruh and Hemant, aws removed the copyrights' years range completely for 
> all our open source drivers based on our legal team and the open source 
> article that states that there is no need to provide years or ranges of years 
> for copyright notices in an OSS project. 
> https://www.linuxfoundation.org/blog/blog/copyright-notices-in-open-source-software-projects
> leaving this patch out or using a different years range will create code 
> difference between the dpdk driver and the HAL code it consumes, which is 
> common to all ENA drivers (which is less maintainable.)
> 

Hi Shai,

I made the comment to make sure you are protected, but if this is the
request coming from your legal team I think you already know what you
are doing and I am OK to continue with the patch.

By the way, thanks for the blog, it can be reference for future discussions.

RE: [PATCH 07/15] net/ena/base: update copyrights comments

2024-07-08 Thread Brandes, Shai



> -Original Message-
> From: Ferruh Yigit 
> Sent: Monday, July 8, 2024 11:38 AM
> To: Brandes, Shai ; Hemant Agrawal
> 
> Cc: dev@dpdk.org; Hemant Agrawal ;
> techbo...@dpdk.org
> Subject: RE: [EXTERNAL] [PATCH 07/15] net/ena/base: update copyrights
> comments
> 
> CAUTION: This email originated from outside of the organization. Do not click
> links or open attachments unless you can confirm the sender and know the
> content is safe.
> 
> 
> 
> On 7/8/2024 8:02 AM, Brandes, Shai wrote:
> >
> >
> >> -Original Message-
> >> From: Hemant Agrawal 
> >> Sent: Monday, July 8, 2024 7:09 AM
> >> To: Ferruh Yigit ; Brandes, Shai
> >> 
> >> Cc: dev@dpdk.org; Hemant Agrawal 
> >> Subject: RE: [EXTERNAL] [PATCH 07/15] net/ena/base: update copyrights
> >> comments
> >>
> >> CAUTION: This email originated from outside of the organization. Do
> >> not click links or open attachments unless you can confirm the sender
> >> and know the content is safe.
> >>
> >>
> >>
> >> On 08-07-2024 00:27, Ferruh Yigit wrote:
> >>> On 7/2/2024 3:46 PM, shaib...@amazon.com wrote:
>  From: Shai Brandes 
> 
>  copyright dates are not mandatory to be maintained, therefore the
>  range of years was removed.
>  In addition, the copyrights lines were separated into two comments.
> 
>  Signed-off-by: Shai Brandes 
>  ---
>    drivers/net/ena/base/ena_com.c  | 4 ++--
>    drivers/net/ena/base/ena_com.h  | 4 ++--
>    drivers/net/ena/base/ena_defs/ena_admin_defs.h  | 5 +++--
>    drivers/net/ena/base/ena_defs/ena_common_defs.h | 4 ++--
>    drivers/net/ena/base/ena_defs/ena_eth_io_defs.h | 5 +++--
>    drivers/net/ena/base/ena_defs/ena_includes.h| 4 ++--
>    drivers/net/ena/base/ena_defs/ena_regs_defs.h   | 4 ++--
>    drivers/net/ena/base/ena_eth_com.c  | 4 ++--
>    drivers/net/ena/base/ena_eth_com.h  | 4 ++--
>    drivers/net/ena/base/ena_plat.h | 4 ++--
>    drivers/net/ena/base/ena_plat_dpdk.h| 4 ++--
>    11 files changed, 24 insertions(+), 22 deletions(-)
> 
>  diff --git a/drivers/net/ena/base/ena_com.c
>  b/drivers/net/ena/base/ena_com.c index ad4f3f9431..5f46e692b3
>  100644
>  --- a/drivers/net/ena/base/ena_com.c
>  +++ b/drivers/net/ena/base/ena_com.c
>  @@ -1,5 +1,5 @@
>  -/* SPDX-License-Identifier: BSD-3-Clause
>  - * Copyright (c) 2015-2020 Amazon.com, Inc. or its affiliates.
>  +/* SPDX-License-Identifier: BSD-3-Clause */
>  +/* Copyright (c) Amazon.com, Inc. or its affiliates.
> * All rights reserved.
> */
> 
> >>> Hi Shai,
> >>>
> >>> I don't know about implication of dropping the copyright year
> >>> altogether, we need to ask to an expert.
> >>>
> >>> What I know is, a copyright expires after some year, so to hold the
> >>> copyright, there needs to be a starting point. And people use ranges
> >>> to extend this copyright year.
> >>>
> >>>
> >>> Instead of removing the year altogether, it make sense to me to just
> >>> keep the initial year and don't add range later as code updated,
> >>> this also will be more consistent with rest of the code.
> >>> Let me drop this patch from the set, and learn more from the experts.
> >>> It can be included later, I don't think this is something urgent.
> >>>
> >>>
> >>> Another aspect is, the history of a source file can be acquired from
> >>> the pubic git repository, so when it is first merged, when updated,
> >>> all these information is available.
> >>> So this feels like no need to record these days in the source code
> >>> files but I don't know if these git repository metadata information is
> legally
> >>>   valid and accepted.
> >>>
> >>>
> >>> And I am not quite sure if it has really any value to worry about
> >>> copyright for a publicly available device driver code anyway, but
> >>> this is not my domain.
> >>
> >> Hi Shai,
> >>
> >>  Will you please just update the copyright year instead of
> >> removing the year completely?  e.g. 2015-2020, 2024 or 2015-2024
> >>
> >> -Hemant
> > [Brandes, Shai]
> > Hi Ferruh and Hemant, aws removed the copyrights' years range
> completely for all our open source drivers based on our legal team and the
> open source article that states that there is no need to provide years or
> ranges of years for copyright notices in an OSS project.
> > https://www.linuxfoundation.org/blog/blog/copyright-notices-in-open-so
> > urce-software-projects leaving this patch out or using a different
> > years range will create code difference between the dpdk driver and
> > the HAL code it consumes, which is common to all ENA drivers (which is
> > less maintainable.)
> >
> 
> Hi Shai,
> 
> I made the comment to make sure you are protected, but if this is the
> request coming from your legal team I think you already know what you are
> doing and I am OK to continue with the patch.
> 
> By the way, thanks for the

[PATCH v2] eal/common: fix inconsistent representation of PCI numbers

2024-07-08 Thread Shani Peretz

DPDK allows for two ways to specify PCI device numbers:
a full version (":08:00.0") and a short version ("08:00.0").
The problem arises when the application uses one format (e.g., full)
when running testpmd, but then tries to use the other format (e.g., short)
in a subsequent command, leading to a failure.

The cmp_dev_name func, which is responsible for comparing PCI device names,
is not handling the inconsistent PCI number representations correctly.
The suggested fix is to use the pci_parse function, which can parse
the PCI device name and fill a struct rte_pci_addr with the standardized
representation of the PCI number.
By comparing the struct rte_pci_addr instances instead of the string
representations, the application can ensure consistent handling of
PCI device numbers, regardless of the format used.

Fixes: a3ee360f4440 ("eal: add hotplug add/remove device")
Cc: jblu...@infradead.org

Signed-off-by: Shani Peretz 
Acked-by: Dariusz Sosnowski 
Acked-by: Thomas Monjalon 
---
 app/test/test_vdev.c| 10 ++
 drivers/bus/pci/pci_common.c| 11 +++
 lib/eal/common/eal_common_dev.c | 11 ++-
 lib/eal/common/hotplug_mp.c | 11 ++-
 lib/eal/include/bus_driver.h| 18 ++
 lib/eal/include/rte_dev.h   | 16 
 lib/eal/linux/eal_dev.c | 10 +-
 lib/eal/version.map |  3 +++
 8 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/app/test/test_vdev.c b/app/test/test_vdev.c
index 3e262f30bc..860fa260af 100644
--- a/app/test/test_vdev.c
+++ b/app/test/test_vdev.c
@@ -20,12 +20,6 @@ static const char * const valid_keys[] = {
NULL,
 };
 
-static int
-cmp_dev_name(const struct rte_device *dev, const void *name)
-{
-   return strcmp(rte_dev_name(dev), name);
-}
-
 static int
 cmp_dev_match(const struct rte_device *dev, const void *_kvlist)
 {
@@ -82,7 +76,7 @@ test_vdev_bus(void)
printf("Failed to create vdev net_null_test0\n");
goto fail;
}
-   dev0 = vdev_bus->find_device(NULL, cmp_dev_name, "net_null_test0");
+   dev0 = vdev_bus->find_device(NULL, rte_cmp_dev_name, "net_null_test0");
if (dev0 == NULL) {
printf("Cannot find net_null_test0 vdev\n");
goto fail;
@@ -93,7 +87,7 @@ test_vdev_bus(void)
printf("Failed to create vdev net_null_test1\n");
goto fail;
}
-   dev1 = vdev_bus->find_device(NULL, cmp_dev_name, "net_null_test1");
+   dev1 = vdev_bus->find_device(NULL, rte_cmp_dev_name, "net_null_test1");
if (dev1 == NULL) {
printf("Cannot find net_null_test1 vdev\n");
goto fail;
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 889a48d2af..538d491067 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -502,6 +502,16 @@ rte_pci_dump(FILE *f)
}
 }
 
+static int
+pci_cmp_name(const struct rte_device *dev, const void *name2)
+{
+   struct rte_pci_addr name2_addr;
+   const struct rte_pci_device *dev1 = RTE_DEV_TO_PCI_CONST(dev);
+
+   dev->bus->parse(name2, &name2_addr);
+   return rte_pci_addr_cmp(&dev1->addr, &name2_addr);
+}
+
 static int
 pci_parse(const char *name, void *addr)
 {
@@ -956,6 +966,7 @@ struct rte_pci_bus rte_pci_bus = {
.plug = pci_plug,
.unplug = pci_unplug,
.parse = pci_parse,
+   .cmp_name = pci_cmp_name,
.devargs_parse = rte_pci_devargs_parse,
.dma_map = pci_dma_map,
.dma_unmap = pci_dma_unmap,
diff --git a/lib/eal/common/eal_common_dev.c b/lib/eal/common/eal_common_dev.c
index a99252b02f..12d68c3605 100644
--- a/lib/eal/common/eal_common_dev.c
+++ b/lib/eal/common/eal_common_dev.c
@@ -107,11 +107,12 @@ struct dev_next_ctx {
 #define CLSCTX(ptr) \
(((struct dev_next_ctx *)(intptr_t)ptr)->cls_str)
 
-static int cmp_dev_name(const struct rte_device *dev, const void *_name)
+int rte_cmp_dev_name(const struct rte_device *dev1, const void *name2)
 {
-   const char *name = _name;
+   if (dev1->bus->cmp_name)
+   return dev1->bus->cmp_name(dev1, name2);
 
-   return strcmp(dev->name, name);
+   return strcmp(dev1->name, (const char *)name2);
 }
 
 int
@@ -197,7 +198,7 @@ local_dev_probe(const char *devargs, struct rte_device 
**new_dev)
if (ret)
goto err_devarg;
 
-   dev = da->bus->find_device(NULL, cmp_dev_name, da->name);
+   dev = da->bus->find_device(NULL, rte_cmp_dev_name, da->name);
if (dev == NULL) {
EAL_LOG(ERR, "Cannot find device (%s)",
da->name);
@@ -335,7 +336,7 @@ rte_eal_hotplug_remove(const char *busname, const char 
*devname)
return -ENOENT;
}
 
-   dev = bus->find_device(NULL, cmp_dev_name, devname);
+   dev = bus->find_device(NULL, rte_cmp_dev_name, devn

[PATCH] net/mlx5: fix MTU configuration

2024-07-08 Thread Dariusz Sosnowski

Apply provided MTU, derived from rte_eth_conf.rxmode.mtu,
on port configuration.

Bugzilla ID: 1483
Fixes: e60fbd5b24fc ("mlx5: add device configure/start/stop")
Cc: sta...@dpdk.org

Signed-off-by: Dariusz Sosnowski 
Acked-by: Viacheslav Ovsiienko 
---
 drivers/net/mlx5/mlx5_ethdev.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 1b721cda5e..6a678d6dcc 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -154,6 +154,12 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
ret = mlx5_proc_priv_init(dev);
if (ret)
return ret;
+   ret = mlx5_dev_set_mtu(dev, dev->data->mtu);
+   if (ret) {
+   DRV_LOG(ERR, "port %u failed to set MTU to %u", 
dev->data->port_id,
+   dev->data->mtu);
+   return ret;
+   }
return 0;
 }

--
2.39.2

Re: [PATCH v2 0/4] support AVX2 instruction Rx/Tx function

On 7/8/2024 6:58 AM, Chaoyong He wrote:
> This patch series add the support of Rx/Tx function using the
> AVX2 instruction.
> 
> ---
> v2: rebase to the latest main branch.
> ---
> 
> Long Wu (4):
>   net/nfp: export more interfaces of NFDk
>   net/nfp: support AVX2 Tx function
>   net/nfp: support AVX2 Rx function
>   net/nfp: vector Rx function supports parsing ptype
>

I can see still fails to apply to main, I guess because of the trace
patchset, let me go one by one, first I will get trace one and later
will ask for a new version of this set again with a rebase.

Re: [PATCH 07/15] net/ena/base: update copyrights comments

On 7/2/2024 3:46 PM, shaib...@amazon.com wrote:
> From: Shai Brandes 
> 
> copyright dates are not mandatory to be maintained,
> therefore the range of years was removed.
> In addition, the copyrights lines were separated
> into two comments.
> 
> Signed-off-by: Shai Brandes 
>

Applied to dpdk-next-net/main, thanks.

Re: [PATCH v2 0/7] add trace support for control message

On 7/8/2024 3:45 AM, Chaoyong He wrote:
> This patch series add trace support for control message send
> to flower firmware.
> 
> ---
> v2: rebase to the latest main branch.
> ---
> 
> Chaoyong He (7):
>   net/nfp: add trace points about port
>   net/nfp: add trace point about tunnel
>   net/nfp: add trace point about Qos
>   net/nfp: refactor to prepare for add flow trace point
>   net/nfp: add trace point about flow rule
>   net/nfp: add trace point about flow rule pattern
>   net/nfp: add trace point about flow rule action
>

Still getting some github action errors, can you please check:
https://github.com/ferruhy/dpdk/actions/runs/9838241137

Re: [PATCH v2] net/memif: fix buffer overflow in zero copy Rx

On 7/8/2024 4:39 AM, Mihai Brodschi wrote:
> 
> 
> On 07/07/2024 21:46, Mihai Brodschi wrote:
>>
>>
>> On 07/07/2024 18:18, Mihai Brodschi wrote:
>>>
>>>
>>> On 07/07/2024 17:05, Ferruh Yigit wrote:

 My expectation is numbers should be like following:

 Initially:
  size = 256
  head = 0
  tail = 0

 In first refill:
  n_slots = 256
  head = 256
  tail = 0

 Subsequent run that 32 slots used:
  head = 256
  tail = 32
  n_slots = 32
  rte_pktmbuf_alloc_bulk(mq, buf[head & mask], n_slots);
   head & mask = 0
   // So it fills first 32 elements of buffer, which is inbound

 This will continue as above, combination of only gap filled and head
 masked with 'mask' provides the wrapping required.
>>>
>>> If I understand correctly, this works only if eth_memif_rx_zc always 
>>> processes
>>> a number of packets which is a power of 2, so that the ring's head always 
>>> wraps
>>> around at the end of a refill loop, never in the middle of it.
>>> Is there any reason this should be the case?
>>> Maybe the tests don't trigger the crash because this condition holds true 
>>> for them?
>>
>> Here's how to reproduce the crash on DPDK stable 23.11.1, using testpmd:
>>
>> Server:
>> # ./dpdk-testpmd --vdev=net_memif0,id=1,role=server,bsize=1024,rsize=8 
>> --single-file-segments -l2,3 --file-prefix test1 -- -i
>>
>> Client:
>> # ./dpdk-testpmd 
>> --vdev=net_memif0,id=1,role=client,bsize=1024,rsize=8,zero-copy=yes 
>> --single-file-segments -l4,5 --file-prefix test2 -- -i
>> testpmd> start
>>
>> Server:
>> testpmd> start tx_first
>> testpmt> set burst 15
>>
>> At this point, the client crashes with a segmentation fault.
>> Before the burst is set to 15, its default value is 32.
>> If the receiver processes packets in bursts of size 2^N, the crash does not 
>> occur.
>> Setting the burst size to any power of 2 works, anything else crashes.
>> After applying this patch, the crashes are completely gone.
> 
> Sorry, this might not crash with a segmentation fault. To confirm the mempool 
> is
> corrupted, please compile DPDK with debug=true and the c_args 
> -DRTE_LIBRTE_MEMPOOL_DEBUG.
> You should see the client panic when changing the burst size to not be a 
> power of 2.
> This also works on the latest main branch.
> 

Hi Mihai,

Right, if the buffer size is not multiple of burst size, issue is valid.
And as there is a requirement to have buffer size power of two, burst
should have the same.
I assume this issue is not caught before because default burst size is 32.

Can you please share some performance impact of the change, with two
possible solutions we discussed above?

Other option is to add this as a limitation to the memif zero copy, but
this won't be good for usability.

We can decide based on performance numbers.

Thanks,
ferruh

[PATCH v12 0/7] hash: add SVE support for bulk key lookup

This patchset adds SVE support for the signature comparison in the cuckoo
hash lookup and improves the existing NEON implementation. These
optimizations required changes to the data format and signature of the
relevant functions to support dense hitmasks (no padding) and having the
primary and secondary hitmasks interleaved instead of being in their own
array each.

Benchmarking the cuckoo hash perf test, I observed this effect on speed:
  There are no significant changes on Intel (ran on Sapphire Rapids)
  Neon is up to 7-10% faster (ran on ampere altra)
  128b SVE is about 3-5% slower than the optimized neon (ran on a graviton
3 cloud instance)
  256b SVE is about 0-3% slower than the optimized neon (ran on a graviton
3 cloud instance)

V2->V3:
  Remove a redundant if in the test
  Change a couple int to uint16_t in compare_signatures_dense
  Several codding-style fix

V3->V4:
  Rebase

V4->V5:
  Commit message

V5->V6:
  Move the arch-specific code into new arch-specific files
  Isolate the data struture refactor from adding SVE

V6->V7:
  Commit message
  Moved RTE_HASH_COMPARE_SVE to the last commit of the chain

V7->V8:
  Commit message
  Typos and missing spaces

V8->V9:
  Use __rte_unused instead of (void)
  Fix an indentation mistake

V9->V10:
  Fix more formating and indentation
  Move the new compare signature file directly in hash instead of being
in a new subdir
  Re-order includes
  Remove duplicated static check
  Move rte_hash_sig_compare_function's definition into a private header

V10->V11:
  Split the "pack the hitmask" commit into four commits:
Move the compare function enum out of the ABI
Move the compare function implementations into arch-specific files
Add a missing check on RTE_HASH_BUCKET_ENTRIES in case we change it
  in the future
Implement the dense hitmask
  Add missing header guards
  Move compare function enum into cuckoo_hash.c instead of its own header.

V11->V12:
  Change the name of the compare function file (remove the _pvt suffix)

Yoan Picchi (7):
  hash: make compare signature function enum private
  hash: split compare signature into arch-specific files
  hash: add a check on hash entry max size
  hash: pack the hitmask for hash in bulk lookup
  hash: optimize compare signature for NEON
  test/hash: check bulk lookup of keys after collision
  hash: add SVE support for bulk key lookup

 .mailmap  |   2 +
 app/test/test_hash.c  |  99 +---
 lib/hash/compare_signatures_arm.h | 121 +++
 lib/hash/compare_signatures_generic.h |  40 +
 lib/hash/compare_signatures_x86.h |  55 +++
 lib/hash/rte_cuckoo_hash.c| 207 ++
 lib/hash/rte_cuckoo_hash.h|  10 +-
 7 files changed, 410 insertions(+), 124 deletions(-)
 create mode 100644 lib/hash/compare_signatures_arm.h
 create mode 100644 lib/hash/compare_signatures_generic.h
 create mode 100644 lib/hash/compare_signatures_x86.h

-- 
2.25.1

[PATCH v12 3/7] hash: add a check on hash entry max size

If were to change RTE_HASH_BUCKET_ENTRIES to be over 8, it would no longer
fit in the vector (8*16b=128b), therefore failing to check some of the
signatures. This patch adds a compile time check to fallback to scalar
code in this case.

Signed-off-by: Yoan Picchi 
---
 lib/hash/compare_signatures_arm.h | 2 +-
 lib/hash/compare_signatures_x86.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/hash/compare_signatures_arm.h 
b/lib/hash/compare_signatures_arm.h
index 80b6afb7a5..74b3286c95 100644
--- a/lib/hash/compare_signatures_arm.h
+++ b/lib/hash/compare_signatures_arm.h
@@ -23,7 +23,7 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t 
*sec_hash_matches,
 
/* For match mask the first bit of every two bits indicates the match */
switch (sig_cmp_fn) {
-#if defined(__ARM_NEON)
+#if defined(__ARM_NEON) && RTE_HASH_BUCKET_ENTRIES <= 8
case RTE_HASH_COMPARE_NEON: {
uint16x8_t vmat, vsig, x;
int16x8_t shift = {-15, -13, -11, -9, -7, -5, -3, -1};
diff --git a/lib/hash/compare_signatures_x86.h 
b/lib/hash/compare_signatures_x86.h
index 11a82aced9..f77b37f1cd 100644
--- a/lib/hash/compare_signatures_x86.h
+++ b/lib/hash/compare_signatures_x86.h
@@ -23,7 +23,7 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t 
*sec_hash_matches,
 
/* For match mask the first bit of every two bits indicates the match */
switch (sig_cmp_fn) {
-#if defined(__SSE2__)
+#if defined(__SSE2__) && RTE_HASH_BUCKET_ENTRIES <= 8
case RTE_HASH_COMPARE_SSE:
/* Compare all signatures in the bucket */
*prim_hash_matches = 
_mm_movemask_epi8(_mm_cmpeq_epi16(_mm_load_si128(
-- 
2.25.1

[PATCH v12 1/7] hash: make compare signature function enum private

enum rte_hash_sig_compare_function is only used internally. This
patch move it out of the public ABI and into the C file.

Signed-off-by: Yoan Picchi 
---
 lib/hash/rte_cuckoo_hash.c | 10 ++
 lib/hash/rte_cuckoo_hash.h | 10 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index d87aa52b5b..e1d50e7d40 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -33,6 +33,16 @@ RTE_LOG_REGISTER_DEFAULT(hash_logtype, INFO);
 
 #include "rte_cuckoo_hash.h"
 
+/* Enum used to select the implementation of the signature comparison function 
to use
+ * eg: A system supporting SVE might want to use a NEON or scalar 
implementation.
+ */
+enum rte_hash_sig_compare_function {
+   RTE_HASH_COMPARE_SCALAR = 0,
+   RTE_HASH_COMPARE_SSE,
+   RTE_HASH_COMPARE_NEON,
+   RTE_HASH_COMPARE_NUM
+};
+
 /* Mask of all flags supported by this version */
 #define RTE_HASH_EXTRA_FLAGS_MASK (RTE_HASH_EXTRA_FLAGS_TRANS_MEM_SUPPORT | \
   RTE_HASH_EXTRA_FLAGS_MULTI_WRITER_ADD | \
diff --git a/lib/hash/rte_cuckoo_hash.h b/lib/hash/rte_cuckoo_hash.h
index a528f1d1a0..26a992419a 100644
--- a/lib/hash/rte_cuckoo_hash.h
+++ b/lib/hash/rte_cuckoo_hash.h
@@ -134,14 +134,6 @@ struct rte_hash_key {
char key[0];
 };
 
-/* All different signature compare functions */
-enum rte_hash_sig_compare_function {
-   RTE_HASH_COMPARE_SCALAR = 0,
-   RTE_HASH_COMPARE_SSE,
-   RTE_HASH_COMPARE_NEON,
-   RTE_HASH_COMPARE_NUM
-};
-
 /** Bucket structure */
 struct __rte_cache_aligned rte_hash_bucket {
uint16_t sig_current[RTE_HASH_BUCKET_ENTRIES];
@@ -199,7 +191,7 @@ struct __rte_cache_aligned rte_hash {
/**< Custom function used to compare keys. */
enum cmp_jump_table_case cmp_jump_table_idx;
/**< Indicates which compare function to use. */
-   enum rte_hash_sig_compare_function sig_cmp_fn;
+   unsigned int sig_cmp_fn;
/**< Indicates which signature compare function to use. */
uint32_t bucket_bitmask;
/**< Bitmask for getting bucket index from hash signature. */
-- 
2.25.1

[PATCH v12 2/7] hash: split compare signature into arch-specific files

Move the compare_signatures function into architecture-specific files
They all have the default scalar option as an option if we disable
vectorisation.

Signed-off-by: Yoan Picchi 
---
 .mailmap  |  1 +
 lib/hash/compare_signatures_arm.h | 55 +++
 lib/hash/compare_signatures_generic.h | 33 ++
 lib/hash/compare_signatures_x86.h | 48 
 lib/hash/rte_cuckoo_hash.c| 65 ---
 5 files changed, 145 insertions(+), 57 deletions(-)
 create mode 100644 lib/hash/compare_signatures_arm.h
 create mode 100644 lib/hash/compare_signatures_generic.h
 create mode 100644 lib/hash/compare_signatures_x86.h

diff --git a/.mailmap b/.mailmap
index f76037213d..ec525981fe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1661,6 +1661,7 @@ Yixue Wang 
 Yi Yang  
 Yi Zhang 
 Yoann Desmouceaux 
+Yoan Picchi 
 Yogesh Jangra 
 Yogev Chaimovich 
 Yongjie Gu 
diff --git a/lib/hash/compare_signatures_arm.h 
b/lib/hash/compare_signatures_arm.h
new file mode 100644
index 00..80b6afb7a5
--- /dev/null
+++ b/lib/hash/compare_signatures_arm.h
@@ -0,0 +1,55 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2016 Intel Corporation
+ * Copyright(c) 2018-2024 Arm Limited
+ */
+
+#ifndef _COMPARE_SIGNATURE_ARM_PVT_H_
+#define _COMPARE_SIGNATURE_ARM_PVT_H_
+
+#include 
+#include 
+#include 
+
+#include "rte_cuckoo_hash.h"
+
+static inline void
+compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,
+   const struct rte_hash_bucket *prim_bkt,
+   const struct rte_hash_bucket *sec_bkt,
+   uint16_t sig,
+   enum rte_hash_sig_compare_function sig_cmp_fn)
+{
+   unsigned int i;
+
+   /* For match mask the first bit of every two bits indicates the match */
+   switch (sig_cmp_fn) {
+#if defined(__ARM_NEON)
+   case RTE_HASH_COMPARE_NEON: {
+   uint16x8_t vmat, vsig, x;
+   int16x8_t shift = {-15, -13, -11, -9, -7, -5, -3, -1};
+
+   vsig = vld1q_dup_u16((uint16_t const *)&sig);
+   /* Compare all signatures in the primary bucket */
+   vmat = vceqq_u16(vsig,
+   vld1q_u16((uint16_t const *)prim_bkt->sig_current));
+   x = vshlq_u16(vandq_u16(vmat, vdupq_n_u16(0x8000)), shift);
+   *prim_hash_matches = (uint32_t)(vaddvq_u16(x));
+   /* Compare all signatures in the secondary bucket */
+   vmat = vceqq_u16(vsig,
+   vld1q_u16((uint16_t const *)sec_bkt->sig_current));
+   x = vshlq_u16(vandq_u16(vmat, vdupq_n_u16(0x8000)), shift);
+   *sec_hash_matches = (uint32_t)(vaddvq_u16(x));
+   }
+   break;
+#endif
+   default:
+   for (i = 0; i < RTE_HASH_BUCKET_ENTRIES; i++) {
+   *prim_hash_matches |=
+   ((sig == prim_bkt->sig_current[i]) << (i << 1));
+   *sec_hash_matches |=
+   ((sig == sec_bkt->sig_current[i]) << (i << 1));
+   }
+   }
+}
+
+#endif
diff --git a/lib/hash/compare_signatures_generic.h 
b/lib/hash/compare_signatures_generic.h
new file mode 100644
index 00..43587adcef
--- /dev/null
+++ b/lib/hash/compare_signatures_generic.h
@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2016 Intel Corporation
+ * Copyright(c) 2018-2024 Arm Limited
+ */
+
+#ifndef _COMPARE_SIGNATURE_GENERIC_PVT_H_
+#define _COMPARE_SIGNATURE_GENERIC_PVT_H_
+
+#include 
+#include 
+#include 
+
+#include "rte_cuckoo_hash.h"
+
+static inline void
+compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,
+   const struct rte_hash_bucket *prim_bkt,
+   const struct rte_hash_bucket *sec_bkt,
+   uint16_t sig,
+   enum rte_hash_sig_compare_function sig_cmp_fn)
+{
+   unsigned int i;
+
+   /* For match mask the first bit of every two bits indicates the match */
+   for (i = 0; i < RTE_HASH_BUCKET_ENTRIES; i++) {
+   *prim_hash_matches |=
+   ((sig == prim_bkt->sig_current[i]) << (i << 1));
+   *sec_hash_matches |=
+   ((sig == sec_bkt->sig_current[i]) << (i << 1));
+   }
+}
+
+#endif
diff --git a/lib/hash/compare_signatures_x86.h 
b/lib/hash/compare_signatures_x86.h
new file mode 100644
index 00..11a82aced9
--- /dev/null
+++ b/lib/hash/compare_signatures_x86.h
@@ -0,0 +1,48 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2016 Intel Corporation
+ * Copyright(c) 2018-2024 Arm Limited
+ */
+
+#ifndef _COMPARE_SIGNATURE_X86_PVT_H_
+#define _COMPARE_SIGNATURE_X86_PVT_H_
+
+#include 
+#include 
+#include 
+
+#include "rte_cuckoo_hash.h"
+
+static inline void
+compare_signatures(uint32_t

[PATCH v12 5/7] hash: optimize compare signature for NEON

Upon a successful comparison, NEON sets all the bits in the lane to 1
We can skip shifting by simply masking with specific masks.

Signed-off-by: Yoan Picchi 
Reviewed-by: Ruifeng Wang 
Reviewed-by: Nathan Brown 
---
 lib/hash/compare_signatures_arm.h | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/hash/compare_signatures_arm.h 
b/lib/hash/compare_signatures_arm.h
index 0fc657c49b..0245fec26f 100644
--- a/lib/hash/compare_signatures_arm.h
+++ b/lib/hash/compare_signatures_arm.h
@@ -34,21 +34,21 @@ compare_signatures_dense(uint16_t *hitmask_buffer,
switch (sig_cmp_fn) {
 #if defined(__ARM_NEON) && RTE_HASH_BUCKET_ENTRIES <= 8
case RTE_HASH_COMPARE_NEON: {
-   uint16x8_t vmat, vsig, x;
-   int16x8_t shift = {0, 1, 2, 3, 4, 5, 6, 7};
-   uint16_t low, high;
+   uint16x8_t vmat, hit1, hit2;
+   const uint16x8_t mask = {0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 
0x80};
+   const uint16x8_t vsig = vld1q_dup_u16((uint16_t const *)&sig);
 
-   vsig = vld1q_dup_u16((uint16_t const *)&sig);
/* Compare all signatures in the primary bucket */
-   vmat = vceqq_u16(vsig, vld1q_u16((uint16_t const 
*)prim_bucket_sigs));
-   x = vshlq_u16(vandq_u16(vmat, vdupq_n_u16(0x0001)), shift);
-   low = (uint16_t)(vaddvq_u16(x));
+   vmat = vceqq_u16(vsig, vld1q_u16(prim_bucket_sigs));
+   hit1 = vandq_u16(vmat, mask);
+
/* Compare all signatures in the secondary bucket */
-   vmat = vceqq_u16(vsig, vld1q_u16((uint16_t const 
*)sec_bucket_sigs));
-   x = vshlq_u16(vandq_u16(vmat, vdupq_n_u16(0x0001)), shift);
-   high = (uint16_t)(vaddvq_u16(x));
-   *hitmask_buffer = low | high << RTE_HASH_BUCKET_ENTRIES;
+   vmat = vceqq_u16(vsig, vld1q_u16(sec_bucket_sigs));
+   hit2 = vandq_u16(vmat, mask);
 
+   hit2 = vshlq_n_u16(hit2, RTE_HASH_BUCKET_ENTRIES);
+   hit2 = vorrq_u16(hit1, hit2);
+   *hitmask_buffer = vaddvq_u16(hit2);
}
break;
 #endif
-- 
2.25.1

[PATCH v12 4/7] hash: pack the hitmask for hash in bulk lookup

Current hitmask includes padding due to Intel's SIMD
implementation detail. This patch allows non Intel SIMD
implementations to benefit from a dense hitmask.
In addition, the new dense hitmask interweave the primary
and secondary matches which allow a better cache usage and
enable future improvements for the SIMD implementations
The default non SIMD path now use this dense mask.

Signed-off-by: Yoan Picchi 
Reviewed-by: Ruifeng Wang 
Reviewed-by: Nathan Brown 
---
 lib/hash/compare_signatures_arm.h |  47 ++
 lib/hash/compare_signatures_generic.h |  31 ---
 lib/hash/compare_signatures_x86.h |   9 +-
 lib/hash/rte_cuckoo_hash.c| 124 +++---
 4 files changed, 145 insertions(+), 66 deletions(-)

diff --git a/lib/hash/compare_signatures_arm.h 
b/lib/hash/compare_signatures_arm.h
index 74b3286c95..0fc657c49b 100644
--- a/lib/hash/compare_signatures_arm.h
+++ b/lib/hash/compare_signatures_arm.h
@@ -6,48 +6,57 @@
 #ifndef _COMPARE_SIGNATURE_ARM_PVT_H_
 #define _COMPARE_SIGNATURE_ARM_PVT_H_
 
+/*
+ * Arm's version uses a densely packed hitmask buffer:
+ * Every bit is in use.
+ */
+
 #include 
 #include 
 #include 
 
 #include "rte_cuckoo_hash.h"
 
+#define DENSE_HASH_BULK_LOOKUP 1
+
 static inline void
-compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,
-   const struct rte_hash_bucket *prim_bkt,
-   const struct rte_hash_bucket *sec_bkt,
+compare_signatures_dense(uint16_t *hitmask_buffer,
+   const uint16_t *prim_bucket_sigs,
+   const uint16_t *sec_bucket_sigs,
uint16_t sig,
enum rte_hash_sig_compare_function sig_cmp_fn)
 {
-   unsigned int i;
 
-   /* For match mask the first bit of every two bits indicates the match */
+   static_assert(sizeof(*hitmask_buffer) >= 2 * (RTE_HASH_BUCKET_ENTRIES / 
8),
+   "hitmask_buffer must be wide enough to fit a dense hitmask");
+
+   /* For match mask every bits indicates the match */
switch (sig_cmp_fn) {
 #if defined(__ARM_NEON) && RTE_HASH_BUCKET_ENTRIES <= 8
case RTE_HASH_COMPARE_NEON: {
uint16x8_t vmat, vsig, x;
-   int16x8_t shift = {-15, -13, -11, -9, -7, -5, -3, -1};
+   int16x8_t shift = {0, 1, 2, 3, 4, 5, 6, 7};
+   uint16_t low, high;
 
vsig = vld1q_dup_u16((uint16_t const *)&sig);
/* Compare all signatures in the primary bucket */
-   vmat = vceqq_u16(vsig,
-   vld1q_u16((uint16_t const *)prim_bkt->sig_current));
-   x = vshlq_u16(vandq_u16(vmat, vdupq_n_u16(0x8000)), shift);
-   *prim_hash_matches = (uint32_t)(vaddvq_u16(x));
+   vmat = vceqq_u16(vsig, vld1q_u16((uint16_t const 
*)prim_bucket_sigs));
+   x = vshlq_u16(vandq_u16(vmat, vdupq_n_u16(0x0001)), shift);
+   low = (uint16_t)(vaddvq_u16(x));
/* Compare all signatures in the secondary bucket */
-   vmat = vceqq_u16(vsig,
-   vld1q_u16((uint16_t const *)sec_bkt->sig_current));
-   x = vshlq_u16(vandq_u16(vmat, vdupq_n_u16(0x8000)), shift);
-   *sec_hash_matches = (uint32_t)(vaddvq_u16(x));
+   vmat = vceqq_u16(vsig, vld1q_u16((uint16_t const 
*)sec_bucket_sigs));
+   x = vshlq_u16(vandq_u16(vmat, vdupq_n_u16(0x0001)), shift);
+   high = (uint16_t)(vaddvq_u16(x));
+   *hitmask_buffer = low | high << RTE_HASH_BUCKET_ENTRIES;
+
}
break;
 #endif
default:
-   for (i = 0; i < RTE_HASH_BUCKET_ENTRIES; i++) {
-   *prim_hash_matches |=
-   ((sig == prim_bkt->sig_current[i]) << (i << 1));
-   *sec_hash_matches |=
-   ((sig == sec_bkt->sig_current[i]) << (i << 1));
+   for (unsigned int i = 0; i < RTE_HASH_BUCKET_ENTRIES; i++) {
+   *hitmask_buffer |= (sig == prim_bucket_sigs[i]) << i;
+   *hitmask_buffer |=
+   ((sig == sec_bucket_sigs[i]) << i) << 
RTE_HASH_BUCKET_ENTRIES;
}
}
 }
diff --git a/lib/hash/compare_signatures_generic.h 
b/lib/hash/compare_signatures_generic.h
index 43587adcef..1d065d4c28 100644
--- a/lib/hash/compare_signatures_generic.h
+++ b/lib/hash/compare_signatures_generic.h
@@ -6,27 +6,34 @@
 #ifndef _COMPARE_SIGNATURE_GENERIC_PVT_H_
 #define _COMPARE_SIGNATURE_GENERIC_PVT_H_
 
+/*
+ * The generic version could use either a dense or sparsely packed hitmask 
buffer,
+ * but the dense one is slightly faster.
+ */
+
 #include 
 #include 
 #include 
 
 #include "rte_cuckoo_hash.h"
 
+#define DENSE_HASH_BULK_LOOKUP 1
+
 static inline void
-compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,
-

[PATCH v12 6/7] test/hash: check bulk lookup of keys after collision

This patch adds unit test for rte_hash_lookup_bulk().
It also update the test_full_bucket test to the current number of entries
in a hash bucket.

Signed-off-by: Yoan Picchi 
Signed-off-by: Harjot Singh 
Reviewed-by: Ruifeng Wang 
Reviewed-by: Nathan Brown 
---
 .mailmap |  1 +
 app/test/test_hash.c | 99 ++--
 2 files changed, 77 insertions(+), 23 deletions(-)

diff --git a/.mailmap b/.mailmap
index ec525981fe..41a8a99a7c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -505,6 +505,7 @@ Hari Kumar Vemula 
 Harini Ramakrishnan 
 Hariprasad Govindharajan 
 Harish Patil  
+Harjot Singh 
 Harman Kalra 
 Harneet Singh 
 Harold Huang 
diff --git a/app/test/test_hash.c b/app/test/test_hash.c
index 24d3b547ad..ab3b37de3f 100644
--- a/app/test/test_hash.c
+++ b/app/test/test_hash.c
@@ -95,7 +95,7 @@ static uint32_t pseudo_hash(__rte_unused const void *keys,
__rte_unused uint32_t key_len,
__rte_unused uint32_t init_val)
 {
-   return 3;
+   return 3 | (3 << 16);
 }
 
 RTE_LOG_REGISTER(hash_logtype_test, test.hash, INFO);
@@ -115,8 +115,10 @@ static void print_key_info(const char *msg, const struct 
flow_key *key,
rte_log(RTE_LOG_DEBUG, hash_logtype_test, " @ pos %d\n", pos);
 }
 
+#define KEY_PER_BUCKET 8
+
 /* Keys used by unit test functions */
-static struct flow_key keys[5] = { {
+static struct flow_key keys[KEY_PER_BUCKET+1] = { {
.ip_src = RTE_IPV4(0x03, 0x02, 0x01, 0x00),
.ip_dst = RTE_IPV4(0x07, 0x06, 0x05, 0x04),
.port_src = 0x0908,
@@ -146,6 +148,30 @@ static struct flow_key keys[5] = { {
.port_src = 0x4948,
.port_dst = 0x4b4a,
.proto = 0x4c,
+}, {
+   .ip_src = RTE_IPV4(0x53, 0x52, 0x51, 0x50),
+   .ip_dst = RTE_IPV4(0x57, 0x56, 0x55, 0x54),
+   .port_src = 0x5958,
+   .port_dst = 0x5b5a,
+   .proto = 0x5c,
+}, {
+   .ip_src = RTE_IPV4(0x63, 0x62, 0x61, 0x60),
+   .ip_dst = RTE_IPV4(0x67, 0x66, 0x65, 0x64),
+   .port_src = 0x6968,
+   .port_dst = 0x6b6a,
+   .proto = 0x6c,
+}, {
+   .ip_src = RTE_IPV4(0x73, 0x72, 0x71, 0x70),
+   .ip_dst = RTE_IPV4(0x77, 0x76, 0x75, 0x74),
+   .port_src = 0x7978,
+   .port_dst = 0x7b7a,
+   .proto = 0x7c,
+}, {
+   .ip_src = RTE_IPV4(0x83, 0x82, 0x81, 0x80),
+   .ip_dst = RTE_IPV4(0x87, 0x86, 0x85, 0x84),
+   .port_src = 0x8988,
+   .port_dst = 0x8b8a,
+   .proto = 0x8c,
 } };
 
 /* Parameters used for hash table in unit test functions. Name set later. */
@@ -783,13 +809,15 @@ static int test_five_keys(void)
 
 /*
  * Add keys to the same bucket until bucket full.
- * - add 5 keys to the same bucket (hash created with 4 keys per bucket):
- *   first 4 successful, 5th successful, pushing existing item in bucket
- * - lookup the 5 keys: 5 hits
- * - add the 5 keys again: 5 OK
- * - lookup the 5 keys: 5 hits (updated data)
- * - delete the 5 keys: 5 OK
- * - lookup the 5 keys: 5 misses
+ * - add 9 keys to the same bucket (hash created with 8 keys per bucket):
+ *   first 8 successful, 9th successful, pushing existing item in bucket
+ * - lookup the 9 keys: 9 hits
+ * - bulk lookup for all the 9 keys: 9 hits
+ * - add the 9 keys again: 9 OK
+ * - lookup the 9 keys: 9 hits (updated data)
+ * - delete the 9 keys: 9 OK
+ * - lookup the 9 keys: 9 misses
+ * - bulk lookup for all the 9 keys: 9 misses
  */
 static int test_full_bucket(void)
 {
@@ -801,16 +829,17 @@ static int test_full_bucket(void)
.hash_func_init_val = 0,
.socket_id = 0,
};
+   const void *key_array[KEY_PER_BUCKET+1] = {0};
struct rte_hash *handle;
-   int pos[5];
-   int expected_pos[5];
+   int pos[KEY_PER_BUCKET+1];
+   int expected_pos[KEY_PER_BUCKET+1];
unsigned i;
-
+   int ret;
handle = rte_hash_create(¶ms_pseudo_hash);
RETURN_IF_ERROR(handle == NULL, "hash creation failed");
 
/* Fill bucket */
-   for (i = 0; i < 4; i++) {
+   for (i = 0; i < KEY_PER_BUCKET; i++) {
pos[i] = rte_hash_add_key(handle, &keys[i]);
print_key_info("Add", &keys[i], pos[i]);
RETURN_IF_ERROR(pos[i] < 0,
@@ -821,22 +850,36 @@ static int test_full_bucket(void)
 * This should work and will push one of the items
 * in the bucket because it is full
 */
-   pos[4] = rte_hash_add_key(handle, &keys[4]);
-   print_key_info("Add", &keys[4], pos[4]);
-   RETURN_IF_ERROR(pos[4] < 0,
-   "failed to add key (pos[4]=%d)", pos[4]);
-   expected_pos[4] = pos[4];
+   pos[KEY_PER_BUCKET] = rte_hash_add_key(handle, &keys[KEY_PER_BUCKET]);
+   print_key_info("Add", &keys[KEY_PER_BUCKET], pos[KEY_PER_BUCKET]);
+   RETURN_IF_ERROR(pos[KEY_PER_BUCKET] < 0,
+   "failed to add key (pos[%d]=%d)", KEY_PER_BUCKE

[PATCH v12 7/7] hash: add SVE support for bulk key lookup

- Implemented SVE code for comparing signatures in bulk lookup.
- New SVE code is ~5% slower than optimized NEON for N2 processor for
128b vectors.

Signed-off-by: Yoan Picchi 
Signed-off-by: Harjot Singh 
Reviewed-by: Nathan Brown 
Reviewed-by: Ruifeng Wang 
---
 lib/hash/compare_signatures_arm.h | 57 +++
 lib/hash/rte_cuckoo_hash.c|  8 -
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/lib/hash/compare_signatures_arm.h 
b/lib/hash/compare_signatures_arm.h
index 0245fec26f..86843b8a8a 100644
--- a/lib/hash/compare_signatures_arm.h
+++ b/lib/hash/compare_signatures_arm.h
@@ -51,6 +51,63 @@ compare_signatures_dense(uint16_t *hitmask_buffer,
*hitmask_buffer = vaddvq_u16(hit2);
}
break;
+#endif
+#if defined(RTE_HAS_SVE_ACLE)
+   case RTE_HASH_COMPARE_SVE: {
+   svuint16_t vsign, shift, sv_matches;
+   svbool_t pred, match, bucket_wide_pred;
+   int i = 0;
+   uint64_t vl = svcnth();
+
+   vsign = svdup_u16(sig);
+   shift = svindex_u16(0, 1);
+
+   if (vl >= 2 * RTE_HASH_BUCKET_ENTRIES && 
RTE_HASH_BUCKET_ENTRIES <= 8) {
+   svuint16_t primary_array_vect, secondary_array_vect;
+   bucket_wide_pred = svwhilelt_b16(0, 
RTE_HASH_BUCKET_ENTRIES);
+   primary_array_vect = svld1_u16(bucket_wide_pred, 
prim_bucket_sigs);
+   secondary_array_vect = svld1_u16(bucket_wide_pred, 
sec_bucket_sigs);
+
+   /* We merged the two vectors so we can do both 
comparisons at once */
+   primary_array_vect = svsplice_u16(bucket_wide_pred, 
primary_array_vect,
+   secondary_array_vect);
+   pred = svwhilelt_b16(0, 2*RTE_HASH_BUCKET_ENTRIES);
+
+   /* Compare all signatures in the buckets */
+   match = svcmpeq_u16(pred, vsign, primary_array_vect);
+   if (svptest_any(svptrue_b16(), match)) {
+   sv_matches = svdup_u16(1);
+   sv_matches = svlsl_u16_z(match, sv_matches, 
shift);
+   *hitmask_buffer = svorv_u16(svptrue_b16(), 
sv_matches);
+   }
+   } else {
+   do {
+   pred = svwhilelt_b16(i, 
RTE_HASH_BUCKET_ENTRIES);
+   uint16_t lower_half = 0;
+   uint16_t upper_half = 0;
+   /* Compare all signatures in the primary bucket 
*/
+   match = svcmpeq_u16(pred, vsign, svld1_u16(pred,
+   &prim_bucket_sigs[i]));
+   if (svptest_any(svptrue_b16(), match)) {
+   sv_matches = svdup_u16(1);
+   sv_matches = svlsl_u16_z(match, 
sv_matches, shift);
+   lower_half = svorv_u16(svptrue_b16(), 
sv_matches);
+   }
+   /* Compare all signatures in the secondary 
bucket */
+   match = svcmpeq_u16(pred, vsign, svld1_u16(pred,
+   &sec_bucket_sigs[i]));
+   if (svptest_any(svptrue_b16(), match)) {
+   sv_matches = svdup_u16(1);
+   sv_matches = svlsl_u16_z(match, 
sv_matches, shift);
+   upper_half = svorv_u16(svptrue_b16(), 
sv_matches)
+   << RTE_HASH_BUCKET_ENTRIES;
+   }
+   hitmask_buffer[i / 8] = upper_half | lower_half;
+   i += vl;
+   } while (i < RTE_HASH_BUCKET_ENTRIES);
+   }
+   }
+   break;
 #endif
default:
for (unsigned int i = 0; i < RTE_HASH_BUCKET_ENTRIES; i++) {
diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index 7512861aac..ba4093a887 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -40,6 +40,7 @@ enum rte_hash_sig_compare_function {
RTE_HASH_COMPARE_SCALAR = 0,
RTE_HASH_COMPARE_SSE,
RTE_HASH_COMPARE_NEON,
+   RTE_HASH_COMPARE_SVE,
RTE_HASH_COMPARE_NUM
 };
 
@@ -461,8 +462,13 @@ rte_hash_create(const struct rte_hash_parameters *params)
h->sig_cmp_fn = RTE_HASH_COMPARE_SSE;
else
 #elif defined(RTE_ARCH_ARM64)
-   if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_NEON))
+   if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_NEON)) {
h->sig_cmp_fn = RTE_HASH_COMPARE_NEON;
+#if defined(RTE_HAS_SVE_ACLE)
+

RE: [PATCH] crypto/qat: fix incorrect placement of oop offset

2024-07-08 Thread Dooley, Brian

Hi Arek,

> -Original Message-
> From: Kusztal, ArkadiuszX 
> Sent: Thursday, July 4, 2024 11:27 AM
> To: dev@dpdk.org
> Cc: gak...@marvell.com; Dooley, Brian ; Kusztal,
> ArkadiuszX ; sta...@dpdk.org
> Subject: [PATCH] crypto/qat: fix incorrect placement of oop offset
> 
> This patch fixes incorrect placement of OOP offset.
> Data preceding crypto operation is not copied to the output buffer, which is
> conformant to the API.
> 
> Fixes: a815a04cea05 ("crypto/qat: support symmetric build op request")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Arkadiusz Kusztal 
> ---
>  drivers/crypto/qat/dev/qat_crypto_pmd_gens.h | 18 +-
>  1 file changed, 13 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h
> b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h
> index 1f5d2583c4..83d5870cae 100644
> --- a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h
> +++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h
> @@ -399,7 +399,7 @@ qat_sym_convert_op_to_vec_chain(struct
> rte_crypto_op *op,
>   struct qat_sym_op_cookie *cookie)
>  {
>   union rte_crypto_sym_ofs ofs;
> - uint32_t max_len = 0;
> + uint32_t max_len = 0, oop_offset = 0;
>   uint32_t cipher_len = 0, cipher_ofs = 0;
>   uint32_t auth_len = 0, auth_ofs = 0;
>   int is_oop = (op->sym->m_dst != NULL) && @@ -473,6 +473,16 @@
> qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,
> 
>   max_len = RTE_MAX(cipher_ofs + cipher_len, auth_ofs + auth_len);
> 
> + /* If OOP, we need to keep in mind that offset needs to start where
> +  * cipher/auth starts, namely no offset on the smaller one
> +  */
> + if (is_oop) {
> + oop_offset = RTE_MIN(auth_ofs, cipher_ofs);
> + auth_ofs -= oop_offset;
> + cipher_ofs -= oop_offset;
> + max_len -= oop_offset;
> + }
> +
>   /* digest in buffer check. Needed only for wireless algos
>* or combined cipher-crc operations
>*/
> @@ -513,9 +523,7 @@ qat_sym_convert_op_to_vec_chain(struct
> rte_crypto_op *op,
>   max_len = RTE_MAX(max_len, auth_ofs + auth_len +
>   ctx->digest_length);
>   }
> -
> - /* Passing 0 as cipher & auth offsets are assigned into ofs later */
> - n_src = rte_crypto_mbuf_to_vec(op->sym->m_src, 0, max_len,
> + n_src = rte_crypto_mbuf_to_vec(op->sym->m_src, oop_offset,
> max_len,
>   in_sgl->vec, QAT_SYM_SGL_MAX_NUMBER);
>   if (unlikely(n_src < 0 || n_src > op->sym->m_src->nb_segs)) {
>   op->status = RTE_CRYPTO_OP_STATUS_ERROR; @@ -525,7
> +533,7 @@ qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,
> 
>   if (unlikely((op->sym->m_dst != NULL) &&
>   (op->sym->m_dst != op->sym->m_src))) {
> - int n_dst = rte_crypto_mbuf_to_vec(op->sym->m_dst, 0,
> + int n_dst = rte_crypto_mbuf_to_vec(op->sym->m_dst,
> oop_offset,
>   max_len, out_sgl->vec,
> QAT_SYM_SGL_MAX_NUMBER);
> 
>   if (n_dst < 0 || n_dst > op->sym->m_dst->nb_segs) {
> --
> 2.13.6

Acked-by: Brian Dooley

[v3] raw/zxdh:Optimize device resource mapping process

2024-07-08 Thread Yong Zhang

Use rte_pci_device to map device resources and delete
useless device search processes.

Signed-off-by: Yong Zhang 
---
 drivers/raw/zxdh/meson.build   |   2 +-
 drivers/raw/zxdh/zxdh_pci.c| 562 -
 drivers/raw/zxdh/zxdh_pci.h|  41 ---
 drivers/raw/zxdh/zxdh_rawdev.c |  93 +-
 4 files changed, 78 insertions(+), 620 deletions(-)
 delete mode 100644 drivers/raw/zxdh/zxdh_pci.c
 delete mode 100644 drivers/raw/zxdh/zxdh_pci.h

diff --git a/drivers/raw/zxdh/meson.build b/drivers/raw/zxdh/meson.build
index c9e5c83f1b..266d3db6d8 100644
--- a/drivers/raw/zxdh/meson.build
+++ b/drivers/raw/zxdh/meson.build
@@ -2,4 +2,4 @@
 #Copyright 2024 ZTE Corporation
 
 deps += ['rawdev', 'kvargs', 'mbuf', 'bus_pci']
-sources = files('zxdh_rawdev.c', 'zxdh_pci.c')
+sources = files('zxdh_rawdev.c')
diff --git a/drivers/raw/zxdh/zxdh_pci.c b/drivers/raw/zxdh/zxdh_pci.c
deleted file mode 100644
index 884e39109a..00
--- a/drivers/raw/zxdh/zxdh_pci.c
+++ /dev/null
@@ -1,562 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2024 ZTE Corporation
- */
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "zxdh_rawdev.h"
-#include "zxdh_pci.h"
-
-#define PCI_DEVICES_DIR  "/sys/bus/pci/devices"
-
-#define BAR0_IDX (0)
-#define BAR2_IDX (2)
-
-#define IORESOURCE_MEM   (0x0200)
-#define FILE_FMT_NVAL(2)
-
-#define STR_BUFF_LEN (128)
-
-#define BYTES_NO_SWAP(0)
-#define BYTES_SWAP   (1)
-
-#define PCI_CMD_OFFSET   (0x04)
-#define PCI_CMD_BYTES(2)
-#define PCI_CMD_MSE_BIT  (1)
-#define FPGA_VER_OFFSET  (0x420)
-#define FPGA_VER_BYTES   (4)
-#define BOM_ID_OFFSET(0x424)
-#define BOM_ID_BYTES (1)
-#define FPGA_PR_FLAG_OFFSET  (0x425)
-#define FPGA_PR_FLAG_BYTES   (1)
-#define BOARD_ID_OFFSET  (0x426)
-#define BOARD_ID_BYTES   (2)
-#define FPGA_MAKE_TIME_OFFSET(0x428)
-#define FPGA_MAKE_TIME_BYTES (4)
-
-#define PARA_PR_FLAG (0)
-#define PARA_FPGA_VER(1)
-#define PARA_FPGA_MAKE_TIME  (2)
-#define PARA_BOARD_ID(3)
-#define PARA_BOM_ID  (4)
-#define PARA_PCI_CMD (5)
-
-#define PCI_READ (0)
-#define PCI_WRITE(1)
-
-struct zxdh_pci_dev gdev;
-
-static int
-zxdh_gdma_rw_pci_config(struct zxdh_pci_dev *dev, uint8_t rw, uint offset, 
uint count, uint8_t *buf)
-{
-   int fd = -1;
-   uint res = 0;
-   int ret = -1;
-   char filename[FILE_PATH_LEN] = {0};
-
-   snprintf(filename, sizeof(filename), "/proc/bus/pci/%02x/%02x.%d",
-   dev->bus, dev->devid, dev->function);
-   fd = open(filename, O_RDWR);
-   if (fd < 0) {
-   snprintf(filename, sizeof(filename), 
"/proc/bus/pci/%04x:%02x/%02x.%d",
-   dev->domain, dev->bus, dev->devid, 
dev->function);
-   fd = open(filename, O_RDWR);
-   if (fd < 0) {
-   ZXDH_PMD_LOG(ERR, "Failed to open file:%s, fd:%d!", 
filename, fd);
-   return -1;
-   }
-   }
-
-   res = lseek(fd, offset, SEEK_SET);
-   if (res != offset) {
-   close(fd);
-   ZXDH_PMD_LOG(ERR, "Failed to lseek pci, res:%d!", res);
-   return -1;
-   }
-
-   if (rw == PCI_READ)
-   ret = read(fd, buf, count);
-   else
-   ret = write(fd, buf, count);
-
-   if (ret < 0) {
-   close(fd);
-   ZXDH_PMD_LOG(ERR, "Failed to rw pci:%d, ret:%d!", rw, ret);
-   return -1;
-   }
-
-   close(fd);
-   return 0;
-}
-
-static int
-zxdh_gdma_cfg_space_read(struct zxdh_pci_dev *dev, uint8_t ParaType, uint 
*pParaVer)
-{
-   int ret = 0;
-   uint8_t aRegVal[sizeof(uint)] = {0};
-   uint8_t ucLoop = 0;
-   uint8_t ucSwap = BYTES_NO_SWAP;
-   uint dwRegOffset = 0;
-   uint dwRegLen = 0;
-
-   if ((dev == NULL) || (pParaVer == NULL)) {
-   ZXDH_PMD_LOG(ERR, "Param is invalid!");
-   return -EINVAL;
-   }
-
-   switch (ParaType) {
-   case PARA_PR_FLAG:
-   dwRegOffset = FPGA_PR_FLAG_OFFSET;
-   dwRegLen= FPGA_PR_FLAG_BYTES;
-   ucSwap  = BYTES_NO_SWAP;
-   break;
-   case PARA_FPGA_VER:
-   dwRegOffset = FPGA_VER_OFFSET;
-   dwRegLen= FPGA_VER_BYTES;
-   ucSwap  = BYTES_NO_SWAP;
-   break;
-   case PARA_FPGA_MAKE_TIME:
-   dwRegOffset = FPGA_MAKE_TIME_OFFSET;
-   dwRegLen= FPGA_MAKE_TIME_BYTES;
-   ucSwap  = BYTES_NO_SWAP;
-   break;
-   case PARA_BOARD_ID:
-   dwRegOffset = BOARD_ID_OFFSET;
-   dwRegL

[PATCH] driver: crypto: scheduler: fix session size computation

2024-07-08 Thread jhascoet

From: Julien Hascoet 

The crypto scheduler session size computation was taking
into account only the worker session sizes and not its own.

Fixes: e2af4e403c1 ("crypto/scheduler: support DOCSIS security protocol")
Cc: sta...@dpdk.org

Signed-off-by: Julien Hascoet 
---
 drivers/crypto/scheduler/scheduler_pmd_ops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/scheduler/scheduler_pmd_ops.c 
b/drivers/crypto/scheduler/scheduler_pmd_ops.c
index a18f7a08b0..6e43438469 100644
--- a/drivers/crypto/scheduler/scheduler_pmd_ops.c
+++ b/drivers/crypto/scheduler/scheduler_pmd_ops.c
@@ -185,7 +185,7 @@ scheduler_session_size_get(struct scheduler_ctx *sched_ctx,
uint8_t session_type)
 {
uint8_t i = 0;
-   uint32_t max_priv_sess_size = 0;
+   uint32_t max_priv_sess_size = sizeof(struct scheduler_session_ctx);
 
/* Check what is the maximum private session size for all workers */
for (i = 0; i < sched_ctx->nb_workers; i++) {
-- 
2.34.1

[PATCH] vhost: fix offset while mmaping log base address

2024-07-08 Thread BillXiang

From: BillXiang 

For sanity the offset should be the last parameter of mmap.

Fixes: fbc4d24 ("vhost: fix offset while mmaping log base address")
Signed-off-by: BillXiang 
---
 lib/vhost/vhost_user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index 5f470da38a..0893ae80bb 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -2399,7 +2399,7 @@ vhost_user_set_log_base(struct virtio_net **pdev,
 * mmap from 0 to workaround a hugepage mmap bug: mmap will
 * fail when offset is not page size aligned.
 */
-   addr = mmap(0, size + off, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+   addr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, off);
alignment = get_blk_size(fd);
close(fd);
if (addr == MAP_FAILED) {
-- 
2.30.0

Re: [PATCH v3 2/8] bus/dpaa: fix resource leak in variable dev

On Mon, Jul 8, 2024 at 9:29 AM  wrote:
>
> From: Apeksha Gupta 
>
> Resource leak:
> variable dev is going out of scope leaks the storage.
>
> Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle")
> Cc: hka...@marvell.com
> Cc: sta...@dpdk.org
>
> Signed-off-by: Apeksha Gupta 
> Signed-off-by: Vanshika Shukla 

This lgtm.
Was this issue detected by the public CI coverity?
If so, please add a Coverity ID: tag.


-- 
David Marchand

Re: [PATCH v3 8/8] mempool/dpaax: cache free optimization

On Mon, Jul 8, 2024 at 9:31 AM  wrote:
> @@ -118,6 +120,18 @@ dpaa_mbuf_create_pool(struct rte_mempool *mp)
> rte_memcpy(bp_info, (void *)&rte_dpaa_bpid_info[bpid],
>sizeof(struct dpaa_bp_info));
> mp->pool_data = (void *)bp_info;
> +   /* Update per core mempool cache threshold to optimal value which is
> +* number of buffers that can be released to HW buffer pool in
> +* a single API call.
> +*/
> +   for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
> +   cache = &mp->local_cache[lcore_id];
> +   DPAA_MEMPOOL_DEBUG("lCore %d: cache->flushthresh %d -> %d\n",

No \n please.


> +   lcore_id, cache->flushthresh,
> +   (uint32_t)(cache->size + DPAA_MBUF_MAX_ACQ_REL));
> +   if (cache->flushthresh)
> +   cache->flushthresh = cache->size + 
> DPAA_MBUF_MAX_ACQ_REL;
> +   }
>
> DPAA_MEMPOOL_INFO("BMAN pool created for bpid =%d", bpid);
> return 0;


-- 
David Marchand

Minutes of DPDK Technical Board Meeting, 2024-06-12

2024-07-08 Thread Honnappa Nagarahalli

Members Attending:

Aaron Conole
Hemant Agarwal
Honnappa Nagarahalli (Chair)
Kevin Traynor
Morten Brorup
Stephen Hemminger
Thomas Monjalon

NOTE: The Technical Board meetings take place every second Wednesday at 3 pm UTC
on
https://zoom-lfx.platform.linuxfoundation.org/meeting/96459488340?password=d808f1f6-0a28-4165-929e-5a5bcae7efeb
Meetings are public, and DPDK community members are welcome to attend.
Agenda and minutes can be found at http://core.dpdk.org/techboard/minutes
Next Meeting: 26-June, Chair: Jerin Jacob Kollanukkaran

Minutes:

1) APAC Summit Status
• Schedule and speakers are online and marketing going well
• Currently 17 people registered, expected to go up in the coming weeks

2) zxdh PMD requires additional libraries and kernel modules which are not
part of DPDK
• It is good to document specific cases where the drivers will not be
accepted. For ex: a driver depends on an SDK that requires paid subscription.
• Document a use case where the SDK causes license pollution
• What’s the advantage for someone to upstream just the PMD?
• Should we capture the guidelines in DPDK documentation?
• There needs to be an SDK that can be downloaded to satisfy the
dependencies for a successful compilation in DPDK CI

3) Keeping the maintainer list updated
• Mark the maintainer as inactive

4) What to do with unmaintained code?
• The code could be removed when there are issues (which can’t be
resolved).
• If there are complex issues with the PMD or if there are bugs that
can’t be resolved by the community then the issues will be documented as known
issue.
• If there is a compilation issue that cannot be resolved by the
community, that part of code will be disabled at compile time.

5) Kevin Traynor will be out of office for summer. He is looking for help
to cover the GB meetings.

6) Update on initiatives – Security, AI, Hyperscalar
• As per the process – we should have these topics as common topics in
TB meetings and go over the status. This will ensure we are making progress.
• GB asked Thomas for progress in these initiatives. Agreed that Thomas
could be the backup and can build some slides for GB.
• However, the Tech Board should be responsible to make progress.
• Had a discussion on Falcon in Ultra Ethernet Consortium. One
possibility could be to present about DPDK in UEC

7) Following updates were provided to GB in the last meeting.
a) 'Boring Router' written by Robin Jarry to be hosted in dpdk.org
• A simple router using DPDK graph library, BSD Licensed
• Request approved by techboard
• The document is available:
https://people.redhat.com/~rjarry/posts/brouter-dpdk-hosting/
b) Addition of Linux Kernel uAPI header files to DPDK repo
• These contain userspace API needed for compiling vduse
• Other projects such as QEMU do this. Licence: GPL-2.0.
• Not approved by TechBoard
c) LTS approved for 3 year maintenance
d) Process/guideline for accepting PMDs being worked on

Re: [PATCH] net/nfp: fix offload drop flow rule failed

On 7/8/2024 6:37 AM, Chaoyong He wrote:
> From: Long Wu 
> 
> The issue is caused by an invalid exit logic in flow compile function.
> 
> Fixes: 4839d4b4e180 ("net/nfp: forbid offload flow rules with empty action 
> list")
> Cc: chaoyong...@corigine.com
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Long Wu 
> Reviewed-by: Chaoyong He 
> Reviewed-by: Peng Zhang 
>

Applied to dpdk-next-net/main, thanks.

Re: [PATCH v2] net/nfp: fix port action core dump

On 7/8/2024 4:12 AM, Chaoyong He wrote:
> From: Long Wu 
> 
> The app will be destroyed if add a port flow action which its
> destination port id is invalid.
> 
> Add a check to avoid the problem.
> 
> Fixes: bf4416016c66 ("net/nfp: split out flow item check logic")
> Fixes: 18c0ba1d69a8 ("net/nfp: split out flow action check logic")
> Cc: chaoyong...@corigine.com
> 
> Signed-off-by: Long Wu 
> Reviewed-by: Chaoyong He 
>

Applied to dpdk-next-net/main, thanks.

Re: [v2 1/1] docs: af_xdp device plugin repo update

On 5/1/2024 1:36 PM, Maryam Tahhan wrote:
> Fixup the references to the AF_XDP Device Plugin repo.
> 
> Fixes: 66a2aca4f512 ("docs: fix AF_XDP device plugin howto")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Maryam Tahhan 
>

Acked-by: Ciara Loftus 

Acked-by: Ferruh Yigit 


Applied to dpdk-next-net/main, thanks.

[PATCH v1 0/4] fbarray lookahead/lookbehind fixes

Once upon a time, a few patches were submitted by Vipin P R:

https://patches.dpdk.org/project/dpdk/patch/1673615669-21011-2-git-send-email-vip...@vmware.com/
https://patches.dpdk.org/project/dpdk/patch/1673615669-21011-3-git-send-email-vip...@vmware.com/
https://patches.dpdk.org/project/dpdk/patch/1673615669-21011-2-git-send-email-vip...@vmware.com/
https://patches.dpdk.org/project/dpdk/patch/1673615669-21011-3-git-send-email-vip...@vmware.com/

They were reviewed and changes were requested, but the author never followed up
and these patches kind of fell through the cracks. The patches fixed real bugs
in fbarray lookahead/lookbehind behavior, so now these bugs have resurfaced in
some customer reports.

This is a resubmit with improvements and added unit tests.

Anatoly Burakov (4):
  fbarray: fix incorrect lookahead behavior
  fbarray: fix incorrect lookbehind behavior
  fbarray: fix lookahead ignore mask handling
  fbarray: fix lookbehind ignore mask handling

 app/test/test_fbarray.c | 102 
 lib/eal/common/eal_common_fbarray.c |  28 ++--
 2 files changed, 123 insertions(+), 7 deletions(-)

-- 
2.43.0

[PATCH v1 1/4] fbarray: fix incorrect lookahead behavior

Currently, whenever last bit of current index mask is set (meaning, there is
potentially a run starting at the end of the mask), lookahead loop is entered.
In that loop, if the first bit of lookahead mask is not set, the lookahead is
stopped, and the current lookahead mask index is assigned to current index mask.
However, because at that point we are inside a for-loop that increments current
index mask after each iteration, this results in erroneous mask index
increment.

Fixlookahead to avoid erroneous increment, and add corresponding unit test.

Fixes: c44d09811b40 ("eal: add shared indexed file-backed array")
Cc: sta...@dpdk.org

Signed-off-by: Vipin P R 
Signed-off-by: Anatoly Burakov 
---
 app/test/test_fbarray.c | 23 +++
 lib/eal/common/eal_common_fbarray.c |  3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/test/test_fbarray.c b/app/test/test_fbarray.c
index 26a51e2a3e..bf89b99e5b 100644
--- a/app/test/test_fbarray.c
+++ b/app/test/test_fbarray.c
@@ -103,6 +103,14 @@ static int empty_msk_test_setup(void)
return 0;
 }
 
+static int lookahead_test_setup(void)
+{
+   /* set index 64 as used */
+   param.start = 64;
+   param.end = 64;
+   return init_array();
+}
+
 static int test_invalid(void)
 {
struct rte_fbarray dummy;
@@ -709,6 +717,20 @@ static int test_empty(void)
return TEST_SUCCESS;
 }
 
+static int test_lookahead(void)
+{
+   int ret;
+
+   /* run regular test first */
+   ret = test_find();
+   if (ret != TEST_SUCCESS)
+   return ret;
+
+   /* test if we can find free chunk while not starting with 0 */
+   TEST_ASSERT_EQUAL(rte_fbarray_find_next_n_free(¶m.arr, 1, 
param.start),
+   param.start + 1, "Free chunk index is wrong\n");
+   return TEST_SUCCESS;
+}
 
 static struct unit_test_suite fbarray_test_suite = {
.suite_name = "fbarray autotest",
@@ -723,6 +745,7 @@ static struct unit_test_suite fbarray_test_suite = {
TEST_CASE_ST(last_msk_test_setup, reset_array, test_find),
TEST_CASE_ST(full_msk_test_setup, reset_array, test_find),
TEST_CASE_ST(empty_msk_test_setup, reset_array, test_empty),
+   TEST_CASE_ST(lookahead_test_setup, reset_array, test_lookahead),
TEST_CASES_END()
}
 };
diff --git a/lib/eal/common/eal_common_fbarray.c 
b/lib/eal/common/eal_common_fbarray.c
index 0fe5bcfe06..2680b34823 100644
--- a/lib/eal/common/eal_common_fbarray.c
+++ b/lib/eal/common/eal_common_fbarray.c
@@ -236,7 +236,8 @@ find_next_n(const struct rte_fbarray *arr, unsigned int 
start, unsigned int n,
 * as well, so skip that on next iteration.
 */
ignore_msk = ~((1ULL << need) - 1);
-   msk_idx = lookahead_idx;
+   /* outer loop will increment msk_idx so add 1 */
+   msk_idx = lookahead_idx - 1;
break;
}
 
-- 
2.43.0

[PATCH v1 2/4] fbarray: fix incorrect lookbehind behavior

Currently, whenever first bit of current index mask is set (meaning, there is
potentially a run starting at the start of the mask), lookbehind loop is
entered. In that loop, if the last bit of lookbehind mask is not set, the
lookbehind is stopped, and the current lookbehind mask index is assigned to
current index mask. However, because at that point we are inside a while-loop
that decrements current index mask after each iteration, this results in
erroneous mask index decrement.

Fix lookbehind to avoid erroneous decrement, and add corresponding unit test.

Fixes: e1ca5dc86226 ("fbarray: add reverse finding of chunk")
Cc: sta...@dpdk.org

Signed-off-by: Vipin P R 
Signed-off-by: Anatoly Burakov 
---
 app/test/test_fbarray.c | 24 
 lib/eal/common/eal_common_fbarray.c |  3 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/test/test_fbarray.c b/app/test/test_fbarray.c
index bf89b99e5b..147d6e2a07 100644
--- a/app/test/test_fbarray.c
+++ b/app/test/test_fbarray.c
@@ -111,6 +111,14 @@ static int lookahead_test_setup(void)
return init_array();
 }
 
+static int lookbehind_test_setup(void)
+{
+   /* set index 63 as used */
+   param.start = 63;
+   param.end = 63;
+   return init_array();
+}
+
 static int test_invalid(void)
 {
struct rte_fbarray dummy;
@@ -732,6 +740,21 @@ static int test_lookahead(void)
return TEST_SUCCESS;
 }
 
+static int test_lookbehind(void)
+{
+   int ret, free_len = 2;
+
+   /* run regular test first */
+   ret = test_find();
+   if (ret != TEST_SUCCESS)
+   return ret;
+
+   /* test if we can find free chunk while crossing mask boundary */
+   TEST_ASSERT_EQUAL(rte_fbarray_find_prev_n_free(¶m.arr, param.start 
+ 1, free_len),
+   param.start - free_len, "Free chunk index is wrong\n");
+   return TEST_SUCCESS;
+}
+
 static struct unit_test_suite fbarray_test_suite = {
.suite_name = "fbarray autotest",
.setup = autotest_setup,
@@ -746,6 +769,7 @@ static struct unit_test_suite fbarray_test_suite = {
TEST_CASE_ST(full_msk_test_setup, reset_array, test_find),
TEST_CASE_ST(empty_msk_test_setup, reset_array, test_empty),
TEST_CASE_ST(lookahead_test_setup, reset_array, test_lookahead),
+   TEST_CASE_ST(lookbehind_test_setup, reset_array, 
test_lookbehind),
TEST_CASES_END()
}
 };
diff --git a/lib/eal/common/eal_common_fbarray.c 
b/lib/eal/common/eal_common_fbarray.c
index 2680b34823..b4f0b0b0c3 100644
--- a/lib/eal/common/eal_common_fbarray.c
+++ b/lib/eal/common/eal_common_fbarray.c
@@ -512,7 +512,8 @@ find_prev_n(const struct rte_fbarray *arr, unsigned int 
start, unsigned int n,
 * as well, so skip that on next iteration.
 */
ignore_msk = UINT64_MAX << need;
-   msk_idx = lookbehind_idx;
+   /* outer loop will decrement msk_idx so add 1 */
+   msk_idx = lookbehind_idx + 1;
break;
}
 
-- 
2.43.0

[PATCH v1 3/4] fbarray: fix lookahead ignore mask handling

When lookahead mask does not have its first bit set, we can infer that we've
lost our run. However, currently, we set ignore mask to ignore `need` number of
bits, which is incorrect because while there is no *current* run within those
bits, we might still be able to start a new run within those ignored bits later.

This issue is fixed by counting how many shifts it took to lose the run, and
this is the number of bits we should ignore (+1 to skip one we stopped on).
Also, add unit tests to reproduce the problem.

Fixes: c44d09811b40 ("eal: add shared indexed file-backed array")
Cc: sta...@dpdk.org

Signed-off-by: Vipin P R 
Signed-off-by: Anatoly Burakov 
---
 app/test/test_fbarray.c | 28 
 lib/eal/common/eal_common_fbarray.c | 13 ++---
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/app/test/test_fbarray.c b/app/test/test_fbarray.c
index 147d6e2a07..4b17ef6be3 100644
--- a/app/test/test_fbarray.c
+++ b/app/test/test_fbarray.c
@@ -755,6 +755,32 @@ static int test_lookbehind(void)
return TEST_SUCCESS;
 }
 
+static int test_lookahead_mask(void)
+{
+   /*
+* There is a certain type of lookahead behavior we want to test here,
+* namely masking of bits that were scanned with lookahead but that we
+* know do not match our criteria. This is achieved in following steps:
+*
+*   0. Look for a big enough chunk of free space (say, 62 elements)
+*   1. Trigger lookahead by breaking a run somewhere inside mask 0
+*  (indices 0-63)
+*   2. Fail lookahead by breaking the run somewhere inside mask 1
+*  (indices 64-127)
+*   3. Ensure that we can still find free space in mask 1 afterwards
+*/
+
+   /* break run on first mask */
+   rte_fbarray_set_used(¶m.arr, 61);
+   /* break run on second mask */
+   rte_fbarray_set_used(¶m.arr, 70);
+
+   /* we expect to find free space at 71 */
+   TEST_ASSERT_EQUAL(rte_fbarray_find_next_n_free(¶m.arr, 0, 62),
+   71, "Free chunk index is wrong\n");
+   return TEST_SUCCESS;
+}
+
 static struct unit_test_suite fbarray_test_suite = {
.suite_name = "fbarray autotest",
.setup = autotest_setup,
@@ -770,6 +796,8 @@ static struct unit_test_suite fbarray_test_suite = {
TEST_CASE_ST(empty_msk_test_setup, reset_array, test_empty),
TEST_CASE_ST(lookahead_test_setup, reset_array, test_lookahead),
TEST_CASE_ST(lookbehind_test_setup, reset_array, 
test_lookbehind),
+   /* setup for these tests is more complex so do it in test func 
*/
+   TEST_CASE_ST(NULL, reset_array, test_lookahead_mask),
TEST_CASES_END()
}
 };
diff --git a/lib/eal/common/eal_common_fbarray.c 
b/lib/eal/common/eal_common_fbarray.c
index b4f0b0b0c3..195f8394be 100644
--- a/lib/eal/common/eal_common_fbarray.c
+++ b/lib/eal/common/eal_common_fbarray.c
@@ -216,6 +216,8 @@ find_next_n(const struct rte_fbarray *arr, unsigned int 
start, unsigned int n,
for (lookahead_idx = msk_idx + 1; lookahead_idx < msk->n_masks;
lookahead_idx++) {
unsigned int s_idx, need;
+   uint64_t first_bit = 1;
+
lookahead_msk = msk->data[lookahead_idx];
 
/* if we're looking for free space, invert the mask */
@@ -225,17 +227,22 @@ find_next_n(const struct rte_fbarray *arr, unsigned int 
start, unsigned int n,
/* figure out how many consecutive bits we need here */
need = RTE_MIN(left, MASK_ALIGN);
 
-   for (s_idx = 0; s_idx < need - 1; s_idx++)
+   /* count number of shifts we performed */
+   for (s_idx = 0; s_idx < need - 1; s_idx++) {
lookahead_msk &= lookahead_msk >> 1ULL;
+   /* did we lose the run yet? */
+   if ((lookahead_msk & first_bit) == 0)
+   break;
+   }
 
/* if first bit is not set, we've lost the run */
-   if ((lookahead_msk & 1) == 0) {
+   if ((lookahead_msk & first_bit) == 0) {
/*
 * we've scanned this far, so we know there are
 * no runs in the space we've lookahead-scanned
 * as well, so skip that on next iteration.
 */
-   ignore_msk = ~((1ULL << need) - 1);
+   ignore_msk = ~((1ULL << (s_idx + 1)) - 1);
/* outer loop will increment msk_idx so add 1 */
msk_idx = lookahead_idx - 1;

[PATCH v1 4/4] fbarray: fix lookbehind ignore mask handling

When lookahead mask does not have its last bit set, we can infer that we've lost
our run. However, currently, we set ignore mask to ignore first `need` bits,
which is incorrect for two reasons: first, using `need` bits as ignore bit count
means we might miss opportunities to start a new run within those bits, and more
improtantly when doing lookbehind, we start looking from the top, so we should
be ignoring *last* N bits, not *first* N bits of the mask.

This issue is fixed by counting how many shifts it took to lose the run, and
this is the number of bits we should ignore from the top (+1 to skip one we
stopped on). Also, add unit tests to reproduce the problem.

Fixes: e1ca5dc86226 ("fbarray: add reverse finding of chunk")
Cc: sta...@dpdk.org

Signed-off-by: Vipin P R 
Signed-off-by: Anatoly Burakov 
---
 app/test/test_fbarray.c | 27 +++
 lib/eal/common/eal_common_fbarray.c |  9 +++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/app/test/test_fbarray.c b/app/test/test_fbarray.c
index 4b17ef6be3..13c6691e50 100644
--- a/app/test/test_fbarray.c
+++ b/app/test/test_fbarray.c
@@ -781,6 +781,32 @@ static int test_lookahead_mask(void)
return TEST_SUCCESS;
 }
 
+static int test_lookbehind_mask(void)
+{
+   /*
+* There is a certain type of lookbehind behavior we want to test here,
+* namely masking of bits that were scanned with lookbehind but that we
+* know do not match our criteria. This is achieved in two steps:
+*
+*   0. Look for a big enough chunk of free space (say, 62 elements)
+*   1. Trigger lookbehind by breaking a run somewhere inside mask 2
+*  (indices 128-191)
+*   2. Fail lookbehind by breaking the run somewhere inside mask 1
+*  (indices 64-127)
+*   3. Ensure that we can still find free space in mask 1 afterwards
+*/
+
+   /* break run on mask 2 */
+   rte_fbarray_set_used(¶m.arr, 130);
+   /* break run on mask 1 */
+   rte_fbarray_set_used(¶m.arr, 70);
+
+   /* start from 190, we expect to find free space at 8 */
+   TEST_ASSERT_EQUAL(rte_fbarray_find_prev_n_free(¶m.arr, 190, 62),
+   8, "Free chunk index is wrong\n");
+   return TEST_SUCCESS;
+}
+
 static struct unit_test_suite fbarray_test_suite = {
.suite_name = "fbarray autotest",
.setup = autotest_setup,
@@ -798,6 +824,7 @@ static struct unit_test_suite fbarray_test_suite = {
TEST_CASE_ST(lookbehind_test_setup, reset_array, 
test_lookbehind),
/* setup for these tests is more complex so do it in test func 
*/
TEST_CASE_ST(NULL, reset_array, test_lookahead_mask),
+   TEST_CASE_ST(NULL, reset_array, test_lookbehind_mask),
TEST_CASES_END()
}
 };
diff --git a/lib/eal/common/eal_common_fbarray.c 
b/lib/eal/common/eal_common_fbarray.c
index 195f8394be..63d8b731f5 100644
--- a/lib/eal/common/eal_common_fbarray.c
+++ b/lib/eal/common/eal_common_fbarray.c
@@ -508,8 +508,13 @@ find_prev_n(const struct rte_fbarray *arr, unsigned int 
start, unsigned int n,
/* figure out how many consecutive bits we need here */
need = RTE_MIN(left, MASK_ALIGN);
 
-   for (s_idx = 0; s_idx < need - 1; s_idx++)
+   /* count number of shifts we performed */
+   for (s_idx = 0; s_idx < need - 1; s_idx++) {
lookbehind_msk &= lookbehind_msk << 1ULL;
+   /* did we lose the run yet? */
+   if ((lookbehind_msk & last_bit) == 0)
+   break;
+   }
 
/* if last bit is not set, we've lost the run */
if ((lookbehind_msk & last_bit) == 0) {
@@ -518,7 +523,7 @@ find_prev_n(const struct rte_fbarray *arr, unsigned int 
start, unsigned int n,
 * no runs in the space we've lookbehind-scanned
 * as well, so skip that on next iteration.
 */
-   ignore_msk = UINT64_MAX << need;
+   ignore_msk = ~(UINT64_MAX << (MASK_ALIGN - 
s_idx - 1));
/* outer loop will decrement msk_idx so add 1 */
msk_idx = lookbehind_idx + 1;
break;
-- 
2.43.0

[PATCH v3] eal/common: fix inconsistent representation of PCI numbers

2024-07-08 Thread Shani Peretz

DPDK allows for two ways to specify PCI device numbers:
a full version (":08:00.0") and a short version ("08:00.0").
The problem arises when the application uses one format (e.g., full)
when running testpmd, but then tries to use the other format (e.g., short)
in a subsequent command, leading to a failure.

The cmp_dev_name func, which is responsible for comparing PCI device names,
is not handling the inconsistent PCI number representations correctly.
The suggested fix is to use the pci_parse function, which can parse
the PCI device name and fill a struct rte_pci_addr with the standardized
representation of the PCI number.
By comparing the struct rte_pci_addr instances instead of the string
representations, the application can ensure consistent handling of
PCI device numbers, regardless of the format used.

Fixes: a3ee360f4440 ("eal: add hotplug add/remove device")
Cc: jblu...@infradead.org

Signed-off-by: Shani Peretz 
Acked-by: Dariusz Sosnowski 
Acked-by: Thomas Monjalon 
---
 app/test/test_vdev.c| 10 ++
 drivers/bus/pci/pci_common.c| 11 +++
 lib/eal/common/eal_common_dev.c | 11 ++-
 lib/eal/common/hotplug_mp.c | 11 ++-
 lib/eal/include/bus_driver.h| 18 ++
 lib/eal/include/rte_dev.h   | 16 
 lib/eal/linux/eal_dev.c | 10 +-
 lib/eal/version.map |  3 +++
 8 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/app/test/test_vdev.c b/app/test/test_vdev.c
index 3e262f30bc..860fa260af 100644
--- a/app/test/test_vdev.c
+++ b/app/test/test_vdev.c
@@ -20,12 +20,6 @@ static const char * const valid_keys[] = {
NULL,
 };
 
-static int
-cmp_dev_name(const struct rte_device *dev, const void *name)
-{
-   return strcmp(rte_dev_name(dev), name);
-}
-
 static int
 cmp_dev_match(const struct rte_device *dev, const void *_kvlist)
 {
@@ -82,7 +76,7 @@ test_vdev_bus(void)
printf("Failed to create vdev net_null_test0\n");
goto fail;
}
-   dev0 = vdev_bus->find_device(NULL, cmp_dev_name, "net_null_test0");
+   dev0 = vdev_bus->find_device(NULL, rte_cmp_dev_name, "net_null_test0");
if (dev0 == NULL) {
printf("Cannot find net_null_test0 vdev\n");
goto fail;
@@ -93,7 +87,7 @@ test_vdev_bus(void)
printf("Failed to create vdev net_null_test1\n");
goto fail;
}
-   dev1 = vdev_bus->find_device(NULL, cmp_dev_name, "net_null_test1");
+   dev1 = vdev_bus->find_device(NULL, rte_cmp_dev_name, "net_null_test1");
if (dev1 == NULL) {
printf("Cannot find net_null_test1 vdev\n");
goto fail;
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 889a48d2af..538d491067 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -502,6 +502,16 @@ rte_pci_dump(FILE *f)
}
 }
 
+static int
+pci_cmp_name(const struct rte_device *dev, const void *name2)
+{
+   struct rte_pci_addr name2_addr;
+   const struct rte_pci_device *dev1 = RTE_DEV_TO_PCI_CONST(dev);
+
+   dev->bus->parse(name2, &name2_addr);
+   return rte_pci_addr_cmp(&dev1->addr, &name2_addr);
+}
+
 static int
 pci_parse(const char *name, void *addr)
 {
@@ -956,6 +966,7 @@ struct rte_pci_bus rte_pci_bus = {
.plug = pci_plug,
.unplug = pci_unplug,
.parse = pci_parse,
+   .cmp_name = pci_cmp_name,
.devargs_parse = rte_pci_devargs_parse,
.dma_map = pci_dma_map,
.dma_unmap = pci_dma_unmap,
diff --git a/lib/eal/common/eal_common_dev.c b/lib/eal/common/eal_common_dev.c
index a99252b02f..12d68c3605 100644
--- a/lib/eal/common/eal_common_dev.c
+++ b/lib/eal/common/eal_common_dev.c
@@ -107,11 +107,12 @@ struct dev_next_ctx {
 #define CLSCTX(ptr) \
(((struct dev_next_ctx *)(intptr_t)ptr)->cls_str)
 
-static int cmp_dev_name(const struct rte_device *dev, const void *_name)
+int rte_cmp_dev_name(const struct rte_device *dev1, const void *name2)
 {
-   const char *name = _name;
+   if (dev1->bus->cmp_name)
+   return dev1->bus->cmp_name(dev1, name2);
 
-   return strcmp(dev->name, name);
+   return strcmp(dev1->name, (const char *)name2);
 }
 
 int
@@ -197,7 +198,7 @@ local_dev_probe(const char *devargs, struct rte_device 
**new_dev)
if (ret)
goto err_devarg;
 
-   dev = da->bus->find_device(NULL, cmp_dev_name, da->name);
+   dev = da->bus->find_device(NULL, rte_cmp_dev_name, da->name);
if (dev == NULL) {
EAL_LOG(ERR, "Cannot find device (%s)",
da->name);
@@ -335,7 +336,7 @@ rte_eal_hotplug_remove(const char *busname, const char 
*devname)
return -ENOENT;
}
 
-   dev = bus->find_device(NULL, cmp_dev_name, devname);
+   dev = bus->find_device(NULL, rte_cmp_dev_name, devn

[RFC] test: remove dead cfgfile tests

2024-07-08 Thread Stephen Hemminger

The tests for the cfgfile library were never built since the conversion
to meson (in 2017). Remove the dead code and files, if someone wants
to fix them then they can be restored later.
See commit b5dc795a8a55 ("test: build app with meson as dpdk-test")

Signed-off-by: Stephen Hemminger 
---
 MAINTAINERS   |   2 -
 app/test/meson.build  |   2 -
 app/test/resource.c   | 276 ---
 app/test/resource.h   | 106 --
 app/test/test_cfgfile.c   | 334 --
 app/test/test_cfgfiles/etc/empty.ini  |   0
 .../test_cfgfiles/etc/empty_key_value.ini |   3 -
 .../test_cfgfiles/etc/invalid_section.ini |   3 -
 app/test/test_cfgfiles/etc/line_too_long.ini  |   3 -
 .../test_cfgfiles/etc/missing_section.ini |   2 -
 .../test_cfgfiles/etc/realloc_sections.ini| 128 ---
 app/test/test_cfgfiles/etc/sample1.ini|  12 -
 app/test/test_cfgfiles/etc/sample2.ini|  12 -
 13 files changed, 883 deletions(-)
 delete mode 100644 app/test/resource.c
 delete mode 100644 app/test/resource.h
 delete mode 100644 app/test/test_cfgfile.c
 delete mode 100644 app/test/test_cfgfiles/etc/empty.ini
 delete mode 100644 app/test/test_cfgfiles/etc/empty_key_value.ini
 delete mode 100644 app/test/test_cfgfiles/etc/invalid_section.ini
 delete mode 100644 app/test/test_cfgfiles/etc/line_too_long.ini
 delete mode 100644 app/test/test_cfgfiles/etc/missing_section.ini
 delete mode 100644 app/test/test_cfgfiles/etc/realloc_sections.ini
 delete mode 100644 app/test/test_cfgfiles/etc/sample1.ini
 delete mode 100644 app/test/test_cfgfiles/etc/sample2.ini

diff --git a/MAINTAINERS b/MAINTAINERS
index 533f707d5f..d18b1571ab 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1686,8 +1686,6 @@ F: app/test/test_argparse.c
 Configuration file
 M: Cristian Dumitrescu 
 F: lib/cfgfile/
-F: app/test/test_cfgfile.c
-F: app/test/test_cfgfiles/
 
 Interactive command line
 F: lib/cmdline/
diff --git a/app/test/meson.build b/app/test/meson.build
index e29258e6ec..aad988410c 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -36,7 +36,6 @@ source_file_deps = {
 'test_bitratestats.c': ['metrics', 'bitratestats', 'ethdev'] + 
sample_packet_forward_deps,
 'test_bpf.c': ['bpf', 'net'],
 'test_byteorder.c': [],
-#'test_cfgfile.c': ['cfgfile'],
 'test_cksum.c': ['net'],
 'test_cksum_perf.c': ['net'],
 'test_cmdline.c': [],
@@ -154,7 +153,6 @@ source_file_deps = {
 'test_reciprocal_division_perf.c': [],
 'test_red.c': ['sched'],
 'test_reorder.c': ['reorder'],
-#'test_resource.c': [],
 'test_rib.c': ['net', 'rib'],
 'test_rib6.c': ['net', 'rib'],
 'test_ring.c': ['ptr_compress'],
diff --git a/app/test/resource.c b/app/test/resource.c
deleted file mode 100644
index 34465f1668..00
--- a/app/test/resource.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2016 RehiveTech. All rights reserved.
- */
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-
-#include "resource.h"
-
-struct resource_list resource_list = TAILQ_HEAD_INITIALIZER(resource_list);
-
-size_t resource_size(const struct resource *r)
-{
-   return r->end - r->begin;
-}
-
-const struct resource *resource_find(const char *name)
-{
-   struct resource *r;
-
-   TAILQ_FOREACH(r, &resource_list, next) {
-   RTE_VERIFY(r->name);
-
-   if (!strcmp(r->name, name))
-   return r;
-   }
-
-   return NULL;
-}
-
-int resource_fwrite(const struct resource *r, FILE *f)
-{
-   const size_t goal = resource_size(r);
-   size_t total = 0;
-
-   while (total < goal) {
-   size_t wlen = fwrite(r->begin + total, 1, goal - total, f);
-   if (wlen == 0) {
-   perror(__func__);
-   return -1;
-   }
-
-   total += wlen;
-   }
-
-   return 0;
-}
-
-int resource_fwrite_file(const struct resource *r, const char *fname)
-{
-   FILE *f;
-   int ret;
-
-   f = fopen(fname, "w");
-   if (f == NULL) {
-   perror(__func__);
-   return -1;
-   }
-
-   ret = resource_fwrite(r, f);
-   fclose(f);
-   return ret;
-}
-
-#ifdef RTE_APP_TEST_RESOURCE_TAR
-#include 
-#include 
-
-static int do_copy(struct archive *r, struct archive *w)
-{
-   const void *buf;
-   size_t len;
-#if ARCHIVE_VERSION_NUMBER >= 300
-   int64_t off;
-#else
-   off_t off;
-#endif
-   int ret;
-
-   while (1) {
-   ret = archive_read_data_block(r, &buf, &len, &off);
-   if (ret == ARCHIVE_RETRY)
-   continue;
-
-   if (ret == ARCHIVE_EOF)
-   return 0;
-
-   if (ret != ARCHIVE_OK)
-   return ret;
-
-   do {
-

dts: dynamic config test suite implementation

Dynamic Configuration test suite for ensuring Poll Mode Driver's ability
to enable/disable promiscuous and allmulticast mode, and verify the
expected behavior in the following four test cases:

1. Default mode - verifies that promiscuous mode is enabled by default,
and packets with any destination MAC address are received and forwarded.
2. Disable promisc - turns off promiscuous mode and verifies that
packets with a destination MAC address matching that of the Rx port are
forwarded, while unknown MAC addresses are dropped.
3. Disable promisc broadcast - turns off promiscuous mode and verifies
that packets with a matching or broadcast destination MAC address are
forwarded.
4. Disable promisc multicast - turns off promiscuous mode and verifies
that packets with a multicast destination MAC address are dropped when
allmulticast mode is turned off, and forwarded when it is turned on.

Dean Marx (4):
  dts: add multicast set function to shell
  dts: add toggle option to send and capture
  dts: dynamic config test suite
  dts: dynamic config conf schema

 dts/framework/config/conf_yaml_schema.json|   3 +-
 dts/framework/remote_session/testpmd_shell.py |  46 ++
 dts/framework/test_suite.py   |   7 +-
 dts/tests/TestSuite_dynamic_config.py | 149 ++
 4 files changed, 203 insertions(+), 2 deletions(-)
 create mode 100644 dts/tests/TestSuite_dynamic_config.py

-- 
2.44.0

dts: add multicast set function to shell

added set multicast function for changing allmulticast mode within testpmd.

Signed-off-by: Dean Marx 
---
 dts/framework/remote_session/testpmd_shell.py | 46 +++
 1 file changed, 46 insertions(+)

diff --git a/dts/framework/remote_session/testpmd_shell.py 
b/dts/framework/remote_session/testpmd_shell.py
index ec22f72221..a0be0bd09d 100644
--- a/dts/framework/remote_session/testpmd_shell.py
+++ b/dts/framework/remote_session/testpmd_shell.py
@@ -806,6 +806,52 @@ def show_port_stats(self, port_id: int) -> 
TestPmdPortStats:
 
 return TestPmdPortStats.parse(output)
 
+def set_promisc(self, port: int, on: bool, verify: bool = True):
+"""Turns promiscuous mode on/off for the specified port.
+
+Args:
+port: Port number to use, should be within 0-32.
+on: If :data:`True`, turn promisc mode on, otherwise turn off.
+verify: If :data:`True` an additional command will be sent to 
verify that promisc mode
+is properly set. Defaults to :data:`True`.
+
+Raises:
+InteractiveCommandExecutionError: If `verify` is :data:`True` and 
promisc mode
+is not correctly set.
+"""
+promisc_output = self.send_command(f"set promisc {port} {'on' if on 
else 'off'}")
+if verify:
+stats = self.show_port_info(port_id=port)
+if on ^ stats.is_promiscuous_mode_enabled:
+self._logger.debug(f"Failed to set promisc mode on port 
{port}: \n{promisc_output}")
+raise InteractiveCommandExecutionError(
+f"Testpmd failed to set promisc mode on port {port}."
+)
+
+def set_multicast_all(self, on: bool, verify: bool = True):
+"""Turns multicast mode on/off for the specified port.
+
+Args:
+on: If :data:`True`, turns multicast mode on, otherwise turns off.
+verify: If :data:`True` an additional command will be sent to 
verify
+that multicast mode is properly set. Defaults to :data:`True`.
+
+Raises:
+InteractiveCommandExecutionError: If `verify` is :data:`True` and 
multicast
+mode is not properly set.
+"""
+multicast_output = self.send_command(f"set allmulti all {'on' if on 
else 'off'}")
+if verify:
+stats0 = self.show_port_info(port_id=0)
+stats1 = self.show_port_info(port_id=1)
+if on ^ (stats0.is_allmulticast_mode_enabled and 
stats1.is_allmulticast_mode_enabled):
+self._logger.debug(
+f"Failed to set multicast mode on all ports.: 
\n{multicast_output}"
+)
+raise InteractiveCommandExecutionError(
+"Testpmd failed to set multicast mode on all ports."
+)
+
 def close(self) -> None:
 """Overrides :meth:`~.interactive_shell.close`."""
 self.send_command("quit", "")
-- 
2.44.0

dts: add toggle option to send and capture

add option to skip _adjust_addresses method in send_packet_and_capture
when test cases involve sending packets with a preset MAC address.

Signed-off-by: Dean Marx 
---
 dts/framework/test_suite.py | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dts/framework/test_suite.py b/dts/framework/test_suite.py
index 694b2eba65..551a587525 100644
--- a/dts/framework/test_suite.py
+++ b/dts/framework/test_suite.py
@@ -185,6 +185,7 @@ def send_packet_and_capture(
 packet: Packet,
 filter_config: PacketFilteringConfig = PacketFilteringConfig(),
 duration: float = 1,
+adjust_addresses: bool = True,
 ) -> list[Packet]:
 """Send and receive `packet` using the associated TG.
 
@@ -195,11 +196,15 @@ def send_packet_and_capture(
 packet: The packet to send.
 filter_config: The filter to use when capturing packets.
 duration: Capture traffic for this amount of time after sending 
`packet`.
+adjust_addresses: If :data:'True', adjust addresses of the 
egressing packet with
+a default addressing scheme. If :data:'False', do not adjust 
the addresses of
+egressing packet.
 
 Returns:
 A list of received packets.
 """
-packet = self._adjust_addresses(packet)
+if adjust_addresses:
+packet = self._adjust_addresses(packet)
 return self.tg_node.send_packet_and_capture(
 packet,
 self._tg_port_egress,
-- 
2.44.0

dts: dynamic config conf schema

configuration schema to run dynamic configuration test suite.

Signed-off-by: Dean Marx 
---
 dts/framework/config/conf_yaml_schema.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dts/framework/config/conf_yaml_schema.json 
b/dts/framework/config/conf_yaml_schema.json
index f02a310bb5..d7b4afed7d 100644
--- a/dts/framework/config/conf_yaml_schema.json
+++ b/dts/framework/config/conf_yaml_schema.json
@@ -187,7 +187,8 @@
   "enum": [
 "hello_world",
 "os_udp",
-"pmd_buffer_scatter"
+"pmd_buffer_scatter",
+"dynamic_config"
   ]
 },
 "test_target": {
-- 
2.44.0

dts: dynamic config test suite

Suite for testing ability of Poll Mode Driver to turn promiscuous
mode on/off, allmulticast mode on/off, and show expected behavior
when sending packets with known, unknown, broadcast, and multicast
destination MAC addresses.

Signed-off-by: Dean Marx 
---
 dts/tests/TestSuite_dynamic_config.py | 149 ++
 1 file changed, 149 insertions(+)
 create mode 100644 dts/tests/TestSuite_dynamic_config.py

diff --git a/dts/tests/TestSuite_dynamic_config.py 
b/dts/tests/TestSuite_dynamic_config.py
new file mode 100644
index 00..326a57d60f
--- /dev/null
+++ b/dts/tests/TestSuite_dynamic_config.py
@@ -0,0 +1,149 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 University of New Hampshire
+
+"""Dynamic configuration capabilities test suite.
+
+This suite checks that it is possible to change the configuration of a port
+dynamically. The Poll Mode Driver should be able to enable and disable
+promiscuous mode on each port, as well as check the Rx and Tx packets of
+each port.
+
+If packets should be received and forwarded, or received and not forwarded,
+depending on the configuration, the port info should match the expected 
behavior.
+"""
+
+from time import sleep
+
+from scapy.layers.inet import IP  # type: ignore[import-untyped]
+from scapy.layers.l2 import Ether  # type: ignore[import-untyped]
+from scapy.packet import Raw  # type: ignore[import-untyped]
+
+from framework.params.testpmd import SimpleForwardingModes
+from framework.remote_session.testpmd_shell import TestPmdShell
+from framework.test_suite import TestSuite
+
+
+class TestDynamicConfig(TestSuite):
+"""Dynamic config suite.
+
+Use the show port commands to see the MAC address and promisc mode status
+of the Rx port on the DUT. The suite will check the Rx and Tx packets
+of each port after configuring promiscuous, multicast, and default mode
+on the DUT to verify the expected behavior. It consists of four test cases:
+
+1. Default mode: verify packets are received and forwarded.
+2. Disable promiscuous mode: verfiy that packets are received
+only for the packet with destination address matching the port address.
+3. Disable promiscuous mode broadcast: verify that packets with destination
+MAC address not matching the port are received and not forwarded, and 
verify
+that broadcast packets are received and forwarded.
+4. Disable promiscuous mode multicast: verify that packets with destination
+MAC address not matching the port are received and not forwarded, and 
verify
+that multicast packets are received and forwarded.
+"""
+
+def set_up_suite(self) -> None:
+"""Set up the test suite.
+
+Setup:
+Verify that at least two ports are open for session.
+"""
+self.verify(len(self._port_links) > 1, "Not enough ports")
+
+def send_packet_and_verify(self, should_receive: bool, mac_address: str) 
-> None:
+"""Generate, send and verify packets.
+
+Generate a packet and send to the DUT, verify that packet is forwarded 
from DUT to
+traffic generator if that behavior is expected.
+
+Args:
+should_receive: Indicate whether the packet should be received.
+mac_address: Destination MAC address to generate in packet.
+"""
+packet = Ether(dst=mac_address) / IP() / Raw(load="x")
+received = self.send_packet_and_capture(packet=packet, 
adjust_addresses=False)
+contains_packet = any(
+packet.haslayer(Raw) and b"x" in packet.load for packet in 
received
+)
+self.verify(
+should_receive == contains_packet,
+f"Packet was {'dropped' if should_receive else 'received'}",
+)
+
+def disable_promisc_setup(self, port_id: int) -> TestPmdShell:
+"""Sets up testpmd shell config for cases where promisc mode is 
disabled.
+
+Args:
+port_id: Port number to disable promisc mode on.
+
+Returns:
+shell: interactive testpmd shell object.
+"""
+shell = TestPmdShell(node=self.sut_node)
+shell.start()
+shell.set_promisc(port=port_id, on=False)
+shell.set_forward_mode(SimpleForwardingModes.io)
+return shell
+
+def test_default_mode(self) -> None:
+"""Tests default configuration.
+
+Creates a testpmd shell, verifies that promiscuous mode is enabled by 
default,
+and sends two packets; one matching source MAC address and one unknown.
+Verifies that both are received.
+"""
+testpmd = TestPmdShell(node=self.sut_node)
+isPromisc = testpmd.show_port_info(0).is_promiscuous_mode_enabled
+self.verify(isPromisc, "Promiscuous mode was not enabled by default.")
+testpmd.start()
+mac = testpmd.show_port_info(0).mac_address
+# send a packet with Rx port mac address
+self.send_packet_and_verify(should_receive

[PATCH v1 0/1] fix device queues initialization

2024-07-08 Thread Hernan Vargas

Fix to initialize device queues explicitly.

Hernan Vargas (1):
  drivers/baseband: fix device queues initialization

 drivers/baseband/acc/rte_acc100_pmd.c  | 1 +
 drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 2 ++
 drivers/baseband/fpga_lte_fec/fpga_lte_fec.c   | 2 ++
 drivers/baseband/la12xx/bbdev_la12xx.c | 2 ++
 4 files changed, 7 insertions(+)

-- 
2.37.1

[PATCH v1 1/1] drivers/baseband: fix device queues initialization

2024-07-08 Thread Hernan Vargas

To prevent incorrect readings, initialize FFT and MLDTS queues to 0.

Fixes: 089148fc3f09 ("bbdev: add operation type for MLDTS processing")
Cc: sta...@dpdk.org

Signed-off-by: Hernan Vargas 
---
 drivers/baseband/acc/rte_acc100_pmd.c  | 1 +
 drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 2 ++
 drivers/baseband/fpga_lte_fec/fpga_lte_fec.c   | 2 ++
 drivers/baseband/la12xx/bbdev_la12xx.c | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/drivers/baseband/acc/rte_acc100_pmd.c 
b/drivers/baseband/acc/rte_acc100_pmd.c
index ab69350080f0..9b12fa7048c2 100644
--- a/drivers/baseband/acc/rte_acc100_pmd.c
+++ b/drivers/baseband/acc/rte_acc100_pmd.c
@@ -1030,6 +1030,7 @@ acc100_dev_info_get(struct rte_bbdev *dev,
dev_info->num_queues[RTE_BBDEV_OP_LDPC_ENC] = 
d->acc_conf.q_dl_5g.num_aqs_per_groups *
d->acc_conf.q_dl_5g.num_qgroups;
dev_info->num_queues[RTE_BBDEV_OP_FFT] = 0;
+   dev_info->num_queues[RTE_BBDEV_OP_MLDTS] = 0;
dev_info->queue_priority[RTE_BBDEV_OP_TURBO_DEC] = 
d->acc_conf.q_ul_4g.num_qgroups;
dev_info->queue_priority[RTE_BBDEV_OP_TURBO_ENC] = 
d->acc_conf.q_dl_4g.num_qgroups;
dev_info->queue_priority[RTE_BBDEV_OP_LDPC_DEC] = 
d->acc_conf.q_ul_5g.num_qgroups;
diff --git a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c 
b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
index 9b253cde280d..dad16ad422b5 100644
--- a/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
+++ b/drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c
@@ -625,6 +625,8 @@ fpga_5gnr_dev_info_get(struct rte_bbdev *dev, struct 
rte_bbdev_driver_info *dev_
dev_info->num_queues[RTE_BBDEV_OP_TURBO_ENC] = 0;
dev_info->num_queues[RTE_BBDEV_OP_LDPC_DEC] = dev_info->max_num_queues 
/ 2;
dev_info->num_queues[RTE_BBDEV_OP_LDPC_ENC] = dev_info->max_num_queues 
/ 2;
+   dev_info->num_queues[RTE_BBDEV_OP_FFT] = 0;
+   dev_info->num_queues[RTE_BBDEV_OP_MLDTS] = 0;
dev_info->queue_priority[RTE_BBDEV_OP_LDPC_DEC] = 1;
dev_info->queue_priority[RTE_BBDEV_OP_LDPC_ENC] = 1;
 }
diff --git a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c 
b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
index a4a963f74dbf..c6a3c3805a04 100644
--- a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
+++ b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
@@ -659,6 +659,8 @@ fpga_dev_info_get(struct rte_bbdev *dev,
dev_info->num_queues[RTE_BBDEV_OP_TURBO_ENC] = dev_info->max_num_queues 
/ 2;
dev_info->num_queues[RTE_BBDEV_OP_LDPC_DEC] = 0;
dev_info->num_queues[RTE_BBDEV_OP_LDPC_ENC] = 0;
+   dev_info->num_queues[RTE_BBDEV_OP_FFT] = 0;
+   dev_info->num_queues[RTE_BBDEV_OP_MLDTS] = 0;
dev_info->queue_priority[RTE_BBDEV_OP_TURBO_DEC] = 1;
dev_info->queue_priority[RTE_BBDEV_OP_TURBO_ENC] = 1;
 }
diff --git a/drivers/baseband/la12xx/bbdev_la12xx.c 
b/drivers/baseband/la12xx/bbdev_la12xx.c
index bb754a539580..19039ba4ece1 100644
--- a/drivers/baseband/la12xx/bbdev_la12xx.c
+++ b/drivers/baseband/la12xx/bbdev_la12xx.c
@@ -108,6 +108,8 @@ la12xx_info_get(struct rte_bbdev *dev __rte_unused,
dev_info->num_queues[RTE_BBDEV_OP_TURBO_ENC] = 0;
dev_info->num_queues[RTE_BBDEV_OP_LDPC_DEC] = LA12XX_MAX_QUEUES / 2;
dev_info->num_queues[RTE_BBDEV_OP_LDPC_ENC] = LA12XX_MAX_QUEUES / 2;
+   dev_info->num_queues[RTE_BBDEV_OP_FFT] = 0;
+   dev_info->num_queues[RTE_BBDEV_OP_MLDTS] = 0;
dev_info->queue_priority[RTE_BBDEV_OP_LDPC_DEC] = 1;
dev_info->queue_priority[RTE_BBDEV_OP_LDPC_ENC] = 1;
rte_bbdev_log_debug("got device info from %u", dev->data->dev_id);
-- 
2.37.1

[PATCH v2 0/4] dts: initial dynamic config suite

Dynamic Configuration suite for ensuring the Poll Mode Driver's ability
to enable/disable promiscuous and allmulticast mode. Verifies the
expected behavior in the following four test cases:

1. Default mode - verifies that promiscuous mode is enabled by default,
and packets with any destination MAC address are forwarded.
2. Disable promisc - turns off promiscuous mode, verifies that packets
with destination MAC addresses matching that of the Rx port are
forwarded, while packets with unknown addresses are dropped.
3. Disable promisc broadcast - turns off promiscuous mode, verifies that
packets with matching or broadcast destination MAC addresses are
forwarded.
4. Disable promisc multicast - turns off promiscuous mode, verifies that
packets with multicast destination MAC addresses are dropped when
allmulticast mode is turned off, and forwarded when it is turned on.

Dean Marx (4):
  dts: add multicast set function to shell
  dts: add toggle option to send and capture
  dts: dynamic config conf schema
  dts: dynamic config test suite

 dts/framework/config/conf_yaml_schema.json|   3 +-
 dts/framework/remote_session/testpmd_shell.py |  46 ++
 dts/framework/test_suite.py   |   7 +-
 dts/tests/TestSuite_dynamic_config.py | 149 ++
 4 files changed, 203 insertions(+), 2 deletions(-)
 create mode 100644 dts/tests/TestSuite_dynamic_config.py

-- 
2.44.0

[PATCH v2 1/4] dts: add multicast set function to shell

added set multicast function for changing allmulticast mode within testpmd.

Signed-off-by: Dean Marx 
---
 dts/framework/remote_session/testpmd_shell.py | 46 +++
 1 file changed, 46 insertions(+)

diff --git a/dts/framework/remote_session/testpmd_shell.py 
b/dts/framework/remote_session/testpmd_shell.py
index ec22f72221..a0be0bd09d 100644
--- a/dts/framework/remote_session/testpmd_shell.py
+++ b/dts/framework/remote_session/testpmd_shell.py
@@ -806,6 +806,52 @@ def show_port_stats(self, port_id: int) -> 
TestPmdPortStats:
 
 return TestPmdPortStats.parse(output)
 
+def set_promisc(self, port: int, on: bool, verify: bool = True):
+"""Turns promiscuous mode on/off for the specified port.
+
+Args:
+port: Port number to use, should be within 0-32.
+on: If :data:`True`, turn promisc mode on, otherwise turn off.
+verify: If :data:`True` an additional command will be sent to 
verify that promisc mode
+is properly set. Defaults to :data:`True`.
+
+Raises:
+InteractiveCommandExecutionError: If `verify` is :data:`True` and 
promisc mode
+is not correctly set.
+"""
+promisc_output = self.send_command(f"set promisc {port} {'on' if on 
else 'off'}")
+if verify:
+stats = self.show_port_info(port_id=port)
+if on ^ stats.is_promiscuous_mode_enabled:
+self._logger.debug(f"Failed to set promisc mode on port 
{port}: \n{promisc_output}")
+raise InteractiveCommandExecutionError(
+f"Testpmd failed to set promisc mode on port {port}."
+)
+
+def set_multicast_all(self, on: bool, verify: bool = True):
+"""Turns multicast mode on/off for the specified port.
+
+Args:
+on: If :data:`True`, turns multicast mode on, otherwise turns off.
+verify: If :data:`True` an additional command will be sent to 
verify
+that multicast mode is properly set. Defaults to :data:`True`.
+
+Raises:
+InteractiveCommandExecutionError: If `verify` is :data:`True` and 
multicast
+mode is not properly set.
+"""
+multicast_output = self.send_command(f"set allmulti all {'on' if on 
else 'off'}")
+if verify:
+stats0 = self.show_port_info(port_id=0)
+stats1 = self.show_port_info(port_id=1)
+if on ^ (stats0.is_allmulticast_mode_enabled and 
stats1.is_allmulticast_mode_enabled):
+self._logger.debug(
+f"Failed to set multicast mode on all ports.: 
\n{multicast_output}"
+)
+raise InteractiveCommandExecutionError(
+"Testpmd failed to set multicast mode on all ports."
+)
+
 def close(self) -> None:
 """Overrides :meth:`~.interactive_shell.close`."""
 self.send_command("quit", "")
-- 
2.44.0

[PATCH v2 2/4] dts: add toggle option to send and capture

add option to skip _adjust_addresses method in send_packet_and_capture
when test cases involve sending packets with a preset MAC address.

Signed-off-by: Dean Marx 
---
 dts/framework/test_suite.py | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dts/framework/test_suite.py b/dts/framework/test_suite.py
index 694b2eba65..551a587525 100644
--- a/dts/framework/test_suite.py
+++ b/dts/framework/test_suite.py
@@ -185,6 +185,7 @@ def send_packet_and_capture(
 packet: Packet,
 filter_config: PacketFilteringConfig = PacketFilteringConfig(),
 duration: float = 1,
+adjust_addresses: bool = True,
 ) -> list[Packet]:
 """Send and receive `packet` using the associated TG.
 
@@ -195,11 +196,15 @@ def send_packet_and_capture(
 packet: The packet to send.
 filter_config: The filter to use when capturing packets.
 duration: Capture traffic for this amount of time after sending 
`packet`.
+adjust_addresses: If :data:'True', adjust addresses of the 
egressing packet with
+a default addressing scheme. If :data:'False', do not adjust 
the addresses of
+egressing packet.
 
 Returns:
 A list of received packets.
 """
-packet = self._adjust_addresses(packet)
+if adjust_addresses:
+packet = self._adjust_addresses(packet)
 return self.tg_node.send_packet_and_capture(
 packet,
 self._tg_port_egress,
-- 
2.44.0

[PATCH v2 3/4] dts: dynamic config conf schema

configuration schema to run dynamic configuration test suite.

Signed-off-by: Dean Marx 
---
 dts/framework/config/conf_yaml_schema.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dts/framework/config/conf_yaml_schema.json 
b/dts/framework/config/conf_yaml_schema.json
index f02a310bb5..d7b4afed7d 100644
--- a/dts/framework/config/conf_yaml_schema.json
+++ b/dts/framework/config/conf_yaml_schema.json
@@ -187,7 +187,8 @@
   "enum": [
 "hello_world",
 "os_udp",
-"pmd_buffer_scatter"
+"pmd_buffer_scatter",
+"dynamic_config"
   ]
 },
 "test_target": {
-- 
2.44.0

[PATCH v2 4/4] dts: dynamic config test suite

Suite for testing ability of Poll Mode Driver to turn promiscuous
mode on/off, allmulticast mode on/off, and show expected behavior
when sending packets with known, unknown, broadcast, and multicast
destination MAC addresses.

Signed-off-by: Dean Marx 
---
 dts/tests/TestSuite_dynamic_config.py | 149 ++
 1 file changed, 149 insertions(+)
 create mode 100644 dts/tests/TestSuite_dynamic_config.py

diff --git a/dts/tests/TestSuite_dynamic_config.py 
b/dts/tests/TestSuite_dynamic_config.py
new file mode 100644
index 00..326a57d60f
--- /dev/null
+++ b/dts/tests/TestSuite_dynamic_config.py
@@ -0,0 +1,149 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 University of New Hampshire
+
+"""Dynamic configuration capabilities test suite.
+
+This suite checks that it is possible to change the configuration of a port
+dynamically. The Poll Mode Driver should be able to enable and disable
+promiscuous mode on each port, as well as check the Rx and Tx packets of
+each port.
+
+If packets should be received and forwarded, or received and not forwarded,
+depending on the configuration, the port info should match the expected 
behavior.
+"""
+
+from time import sleep
+
+from scapy.layers.inet import IP  # type: ignore[import-untyped]
+from scapy.layers.l2 import Ether  # type: ignore[import-untyped]
+from scapy.packet import Raw  # type: ignore[import-untyped]
+
+from framework.params.testpmd import SimpleForwardingModes
+from framework.remote_session.testpmd_shell import TestPmdShell
+from framework.test_suite import TestSuite
+
+
+class TestDynamicConfig(TestSuite):
+"""Dynamic config suite.
+
+Use the show port commands to see the MAC address and promisc mode status
+of the Rx port on the DUT. The suite will check the Rx and Tx packets
+of each port after configuring promiscuous, multicast, and default mode
+on the DUT to verify the expected behavior. It consists of four test cases:
+
+1. Default mode: verify packets are received and forwarded.
+2. Disable promiscuous mode: verfiy that packets are received
+only for the packet with destination address matching the port address.
+3. Disable promiscuous mode broadcast: verify that packets with destination
+MAC address not matching the port are received and not forwarded, and 
verify
+that broadcast packets are received and forwarded.
+4. Disable promiscuous mode multicast: verify that packets with destination
+MAC address not matching the port are received and not forwarded, and 
verify
+that multicast packets are received and forwarded.
+"""
+
+def set_up_suite(self) -> None:
+"""Set up the test suite.
+
+Setup:
+Verify that at least two ports are open for session.
+"""
+self.verify(len(self._port_links) > 1, "Not enough ports")
+
+def send_packet_and_verify(self, should_receive: bool, mac_address: str) 
-> None:
+"""Generate, send and verify packets.
+
+Generate a packet and send to the DUT, verify that packet is forwarded 
from DUT to
+traffic generator if that behavior is expected.
+
+Args:
+should_receive: Indicate whether the packet should be received.
+mac_address: Destination MAC address to generate in packet.
+"""
+packet = Ether(dst=mac_address) / IP() / Raw(load="x")
+received = self.send_packet_and_capture(packet=packet, 
adjust_addresses=False)
+contains_packet = any(
+packet.haslayer(Raw) and b"x" in packet.load for packet in 
received
+)
+self.verify(
+should_receive == contains_packet,
+f"Packet was {'dropped' if should_receive else 'received'}",
+)
+
+def disable_promisc_setup(self, port_id: int) -> TestPmdShell:
+"""Sets up testpmd shell config for cases where promisc mode is 
disabled.
+
+Args:
+port_id: Port number to disable promisc mode on.
+
+Returns:
+shell: interactive testpmd shell object.
+"""
+shell = TestPmdShell(node=self.sut_node)
+shell.start()
+shell.set_promisc(port=port_id, on=False)
+shell.set_forward_mode(SimpleForwardingModes.io)
+return shell
+
+def test_default_mode(self) -> None:
+"""Tests default configuration.
+
+Creates a testpmd shell, verifies that promiscuous mode is enabled by 
default,
+and sends two packets; one matching source MAC address and one unknown.
+Verifies that both are received.
+"""
+testpmd = TestPmdShell(node=self.sut_node)
+isPromisc = testpmd.show_port_info(0).is_promiscuous_mode_enabled
+self.verify(isPromisc, "Promiscuous mode was not enabled by default.")
+testpmd.start()
+mac = testpmd.show_port_info(0).mac_address
+# send a packet with Rx port mac address
+self.send_packet_and_verify(should_receive

[PATCH v3 1/4] dts: add multicast set function to shell

added set multicast function for changing allmulticast mode within testpmd.

Signed-off-by: Dean Marx 
---
 dts/framework/remote_session/testpmd_shell.py | 46 +++
 1 file changed, 46 insertions(+)

diff --git a/dts/framework/remote_session/testpmd_shell.py 
b/dts/framework/remote_session/testpmd_shell.py
index ec22f72221..a0be0bd09d 100644
--- a/dts/framework/remote_session/testpmd_shell.py
+++ b/dts/framework/remote_session/testpmd_shell.py
@@ -806,6 +806,52 @@ def show_port_stats(self, port_id: int) -> 
TestPmdPortStats:
 
 return TestPmdPortStats.parse(output)
 
+def set_promisc(self, port: int, on: bool, verify: bool = True):
+"""Turns promiscuous mode on/off for the specified port.
+
+Args:
+port: Port number to use, should be within 0-32.
+on: If :data:`True`, turn promisc mode on, otherwise turn off.
+verify: If :data:`True` an additional command will be sent to 
verify that promisc mode
+is properly set. Defaults to :data:`True`.
+
+Raises:
+InteractiveCommandExecutionError: If `verify` is :data:`True` and 
promisc mode
+is not correctly set.
+"""
+promisc_output = self.send_command(f"set promisc {port} {'on' if on 
else 'off'}")
+if verify:
+stats = self.show_port_info(port_id=port)
+if on ^ stats.is_promiscuous_mode_enabled:
+self._logger.debug(f"Failed to set promisc mode on port 
{port}: \n{promisc_output}")
+raise InteractiveCommandExecutionError(
+f"Testpmd failed to set promisc mode on port {port}."
+)
+
+def set_multicast_all(self, on: bool, verify: bool = True):
+"""Turns multicast mode on/off for the specified port.
+
+Args:
+on: If :data:`True`, turns multicast mode on, otherwise turns off.
+verify: If :data:`True` an additional command will be sent to 
verify
+that multicast mode is properly set. Defaults to :data:`True`.
+
+Raises:
+InteractiveCommandExecutionError: If `verify` is :data:`True` and 
multicast
+mode is not properly set.
+"""
+multicast_output = self.send_command(f"set allmulti all {'on' if on 
else 'off'}")
+if verify:
+stats0 = self.show_port_info(port_id=0)
+stats1 = self.show_port_info(port_id=1)
+if on ^ (stats0.is_allmulticast_mode_enabled and 
stats1.is_allmulticast_mode_enabled):
+self._logger.debug(
+f"Failed to set multicast mode on all ports.: 
\n{multicast_output}"
+)
+raise InteractiveCommandExecutionError(
+"Testpmd failed to set multicast mode on all ports."
+)
+
 def close(self) -> None:
 """Overrides :meth:`~.interactive_shell.close`."""
 self.send_command("quit", "")
-- 
2.44.0

[PATCH v3 2/4] dts: add toggle option to send and capture

add option to skip _adjust_addresses method in send_packet_and_capture
when test cases involve sending packets with a preset MAC address.

Signed-off-by: Dean Marx 
---
 dts/framework/test_suite.py | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dts/framework/test_suite.py b/dts/framework/test_suite.py
index 694b2eba65..551a587525 100644
--- a/dts/framework/test_suite.py
+++ b/dts/framework/test_suite.py
@@ -185,6 +185,7 @@ def send_packet_and_capture(
 packet: Packet,
 filter_config: PacketFilteringConfig = PacketFilteringConfig(),
 duration: float = 1,
+adjust_addresses: bool = True,
 ) -> list[Packet]:
 """Send and receive `packet` using the associated TG.
 
@@ -195,11 +196,15 @@ def send_packet_and_capture(
 packet: The packet to send.
 filter_config: The filter to use when capturing packets.
 duration: Capture traffic for this amount of time after sending 
`packet`.
+adjust_addresses: If :data:'True', adjust addresses of the 
egressing packet with
+a default addressing scheme. If :data:'False', do not adjust 
the addresses of
+egressing packet.
 
 Returns:
 A list of received packets.
 """
-packet = self._adjust_addresses(packet)
+if adjust_addresses:
+packet = self._adjust_addresses(packet)
 return self.tg_node.send_packet_and_capture(
 packet,
 self._tg_port_egress,
-- 
2.44.0

[PATCH v3 3/4] dts: dynamic config conf schema

configuration schema to run dynamic configuration test suite.

Signed-off-by: Dean Marx 
---
 dts/framework/config/conf_yaml_schema.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dts/framework/config/conf_yaml_schema.json 
b/dts/framework/config/conf_yaml_schema.json
index f02a310bb5..d7b4afed7d 100644
--- a/dts/framework/config/conf_yaml_schema.json
+++ b/dts/framework/config/conf_yaml_schema.json
@@ -187,7 +187,8 @@
   "enum": [
 "hello_world",
 "os_udp",
-"pmd_buffer_scatter"
+"pmd_buffer_scatter",
+"dynamic_config"
   ]
 },
 "test_target": {
-- 
2.44.0

[PATCH v3 4/4] dts: dynamic config test suite

Suite for testing ability of Poll Mode Driver to turn promiscuous
mode on/off, allmulticast mode on/off, and show expected behavior
when sending packets with known, unknown, broadcast, and multicast
destination MAC addresses.

Signed-off-by: Dean Marx 
---
 dts/tests/TestSuite_dynamic_config.py | 149 ++
 1 file changed, 149 insertions(+)
 create mode 100644 dts/tests/TestSuite_dynamic_config.py

diff --git a/dts/tests/TestSuite_dynamic_config.py 
b/dts/tests/TestSuite_dynamic_config.py
new file mode 100644
index 00..a6e5384c50
--- /dev/null
+++ b/dts/tests/TestSuite_dynamic_config.py
@@ -0,0 +1,149 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 University of New Hampshire
+
+"""Dynamic configuration capabilities test suite.
+
+This suite checks that it is possible to change the configuration of a port
+dynamically. The Poll Mode Driver should be able to enable and disable
+promiscuous mode on each port, as well as check the Rx and Tx packets of
+each port.
+
+If packets should be received and forwarded, or received and not forwarded,
+depending on the configuration, the port info should match the expected 
behavior.
+"""
+
+from time import sleep
+
+from scapy.layers.inet import IP  # type: ignore[import-untyped]
+from scapy.layers.l2 import Ether  # type: ignore[import-untyped]
+from scapy.packet import Raw  # type: ignore[import-untyped]
+
+from framework.params.testpmd import SimpleForwardingModes
+from framework.remote_session.testpmd_shell import TestPmdShell
+from framework.test_suite import TestSuite
+
+
+class TestDynamicConfig(TestSuite):
+"""Dynamic config suite.
+
+Use the show port commands to see the MAC address and promisc mode status
+of the Rx port on the DUT. The suite will check the Rx and Tx packets
+of each port after configuring promiscuous, multicast, and default mode
+on the DUT to verify the expected behavior. It consists of four test cases:
+
+1. Default mode: verify packets are received and forwarded.
+2. Disable promiscuous mode: verify that packets are received
+only for the packet with destination address matching the port address.
+3. Disable promiscuous mode broadcast: verify that packets with destination
+MAC address not matching the port are received and not forwarded, and 
verify
+that broadcast packets are received and forwarded.
+4. Disable promiscuous mode multicast: verify that packets with destination
+MAC address not matching the port are received and not forwarded, and 
verify
+that multicast packets are received and forwarded.
+"""
+
+def set_up_suite(self) -> None:
+"""Set up the test suite.
+
+Setup:
+Verify that at least two ports are open for session.
+"""
+self.verify(len(self._port_links) > 1, "Not enough ports")
+
+def send_packet_and_verify(self, should_receive: bool, mac_address: str) 
-> None:
+"""Generate, send and verify packets.
+
+Generate a packet and send to the DUT, verify that packet is forwarded 
from DUT to
+traffic generator if that behavior is expected.
+
+Args:
+should_receive: Indicate whether the packet should be received.
+mac_address: Destination MAC address to generate in packet.
+"""
+packet = Ether(dst=mac_address) / IP() / Raw(load="x")
+received = self.send_packet_and_capture(packet=packet, 
adjust_addresses=False)
+contains_packet = any(
+packet.haslayer(Raw) and b"x" in packet.load for packet in 
received
+)
+self.verify(
+should_receive == contains_packet,
+f"Packet was {'dropped' if should_receive else 'received'}",
+)
+
+def disable_promisc_setup(self, port_id: int) -> TestPmdShell:
+"""Sets up testpmd shell config for cases where promisc mode is 
disabled.
+
+Args:
+port_id: Port number to disable promisc mode on.
+
+Returns:
+shell: interactive testpmd shell object.
+"""
+shell = TestPmdShell(node=self.sut_node)
+shell.start()
+shell.set_promisc(port=port_id, on=False)
+shell.set_forward_mode(SimpleForwardingModes.io)
+return shell
+
+def test_default_mode(self) -> None:
+"""Tests default configuration.
+
+Creates a testpmd shell, verifies that promiscuous mode is enabled by 
default,
+and sends two packets; one matching source MAC address and one unknown.
+Verifies that both are received.
+"""
+testpmd = TestPmdShell(node=self.sut_node)
+isPromisc = testpmd.show_port_info(0).is_promiscuous_mode_enabled
+self.verify(isPromisc, "Promiscuous mode was not enabled by default.")
+testpmd.start()
+mac = testpmd.show_port_info(0).mac_address
+# send a packet with Rx port mac address
+self.send_packet_and_verify(should_receive

Re: [PATCH v3] ethdev: Add link_speed lanes support

2024-07-08 Thread Damodharam Ammepalli

On Fri, Jul 5, 2024 at 10:35 AM Ferruh Yigit  wrote:
>
> On 6/17/2024 9:34 PM, Damodharam Ammepalli wrote:
> > +/**
> > + * @warning
> > + * @b EXPERIMENTAL: this API may change, or be removed, without prior 
> > notice
> > + *
> > + * Set speed lanes supported by the NIC.
> > + *
> > + * @param port_id
> > + *   The port identifier of the Ethernet device.
> > + * @param speed_lanes
> > + *   speed_lanes a non-zero value of number lanes for this speeds.
> > + *
> > + * @return
> > + *  - (>=0) valid input and supported by driver or hardware.
> > + *   - (-ENOTSUP) if underlying hardware OR driver doesn't support.
> > + * that operation.
> > + *   - (-EIO) if device is removed.
> > + *   - (-ENODEV)  if port_id invalid.
> > + */
> > +__rte_experimental
> > +int rte_eth_speed_lanes_set(uint16_t port_id, uint32_t speed_lanes_capa);
> >
>
> Doc build fails because of "@param speed_lanes":
>
> rte_ethdev.h:6971:
>   error: argument 'speed_lanes' of command @param is not found in the
> argument list of
>   rte_eth_speed_lanes_set(uint16_t port_id, uint32_t speed_lanes_capa)
> (warning treated as error, aborting now)
Ack

-- 
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 v3] ethdev: Add link_speed lanes support

2024-07-08 Thread Damodharam Ammepalli

On Fri, Jul 5, 2024 at 10:33 AM Ferruh Yigit  wrote:
>
> On 6/26/2024 3:19 AM, huangdengdui wrote:
> >
> > On 2024/6/26 5:07, Damodharam Ammepalli wrote:
> >> On Wed, Jun 19, 2024 at 8:23 PM huangdengdui  
> >> wrote:
> >>>
> >>> Hi Damodharam
> >>> Here are some suggestions. See below.
> >>>
> >> Thank you for the review.
> >>
> >>> On 2024/6/18 4:34, Damodharam Ammepalli wrote:
>  Update the eth_dev_ops structure with new function vectors
>  to get, get capabilities and set ethernet link speed lanes.
>  Update the testpmd to provide required config and information
>  display infrastructure.
> 
>  The supporting ethernet controller driver will register callbacks
>  to avail link speed lanes config and get services. This lanes
>  configuration is applicable only when the nic is forced to fixed
>  speeds. In Autonegiation mode, the hardware automatically
>  negotiates the number of lanes.
> 
> >>>
> >>>
>  +
>   /* *** configure txq/rxq, txd/rxd *** */
>   struct cmd_config_rx_tx {
>    cmdline_fixed_string_t port;
>  @@ -13238,6 +13459,9 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
>    (cmdline_parse_inst_t *)&cmd_set_port_setup_on,
> >
> > cut
> >
> 
>  @@ -993,7 +1022,7 @@ port_summary_display(portid_t port_id)
>    if (ret != 0)
>    return;
> 
>  - printf("%-4d " RTE_ETHER_ADDR_PRT_FMT " %-12s %-14s %-8s %s\n",
>  + printf("%-4d " RTE_ETHER_ADDR_PRT_FMT " %-12s %-14s %-8s %-8s\n",
> >>>
> >>> Does the lanes need to be printed?
> >> Ferruh in the previous comment, asked not to print.
> >>
> >
> > OK
> >
> >>>
>    port_id, RTE_ETHER_ADDR_BYTES(&mac_addr), name,
>    dev_info.driver_name, (link.link_status) ? ("up") : 
>  ("down"),
>    rte_eth_link_speed_to_str(link.link_speed));
>  @@ -7244,3 +7273,35 @@ show_mcast_macs(portid_t port_id)
>    printf("  %s\n", buf);
>    }
>   }
>  +
>  +int
>  +parse_speed_lanes(uint32_t lane, uint32_t *speed_lane)
>  +{
>  + uint8_t i;
>  +
>  + for (i = 0; i < RTE_DIM(speed_lane_name); i++) {
>  + if (speed_lane_name[i].value == lane) {
>  + *speed_lane = lane;
>  + return 0;
>  + }
>  + }
>  + return -1;
>  +}
>  +
> >
> > cut
> >
> 
>  +/**
>  + * This enum indicates the possible link speed lanes of an ethdev port.
>  + */
>  +enum rte_eth_speed_lanes {
>  + RTE_ETH_SPEED_LANE_NOLANE = 0,  /**< speed lanes unsupported mode 
>  or default */
>  + RTE_ETH_SPEED_LANE_1,   /**< Link speed lane  1 */
>  + RTE_ETH_SPEED_LANE_2,   /**< Link speed lanes 2 */
>  + RTE_ETH_SPEED_LANE_4,   /**< Link speed lanes 4 */
>  + RTE_ETH_SPEED_LANE_8,   /**< Link speed lanes 8 */
>  + RTE_ETH_SPEED_LANE_MAX,
>  +};
> >>>
> >>> Is it better to make the index equal to the lanes num?
> >>> enum rte_eth_speed_lanes {
> >>> RTE_ETH_SPEED_LANE_NOLANE = 0,  /**< speed lanes unsupported 
> >>> mode or default */
> >>> RTE_ETH_SPEED_LANE_1 = 1,   /**< Link speed lane  1 */
> >>> RTE_ETH_SPEED_LANE_2 = 2,   /**< Link speed lanes 2 */
> >>> RTE_ETH_SPEED_LANE_4 = 4,   /**< Link speed lanes 4 */
> >>> RTE_ETH_SPEED_LANE_8 = 8,   /**< Link speed lanes 8 */
> >>> RTE_ETH_SPEED_LANE_MAX,
> >>> };
> >>>
> >> I followed the existing enums code convention in rtelib. Your point
> >> makes sense too.
> >>
> >
> > I looked at the other enum code in the lib. There are many similar code 
> > styles.
> > Make the index meaningful to avoid conversion. For example, the 
> > parse_speed_lanes() function in this patch
> >
> >>> In addition, when lanes = 0, is it better to define it as Unknown?
> >>> If default lanes can return 0 lanes, The active lanes are different for 
> >>> each NIC,
> >>> users may be confused.
> >>>
> >> Ack. Are you proposing a new enum RTE_ETH_SPEED_LANE_UKNOWN or rename
> >> RTE_ETH_SPEED_LANE_NOLANE?
> >>
> >
> > I suggest changing the name to RTE_ETH_SPEED_LANE_UKNOWN,
> > Also change the comment to describe it as an unknown lane.
> >
> > This prevents the driver from always returning lanes=0
> > even if the driver knows the number of active lanes.
> >
>  +
>  +/* Translate from link speed lanes to speed lanes capa */
>  +#define RTE_ETH_SPEED_LANES_TO_CAPA(x) RTE_BIT32(x)
>  +
>  +/* This macro indicates link speed lanes capa mask */
>  +#define RTE_ETH_SPEED_LANES_CAPA_MASK(x) RTE_BIT32(RTE_ETH_SPEED_ ## x)
>  +
>  +/* A structure used to get and set lanes capabilities per link speed */
>  +struct rte_eth_speed_lanes_capa {
>  + uint32_t speed;
>  + uint32_t capa;
>  +};
>  +
> >
> > cut

[PATCH v4] ethdev: Add link_speed lanes support

2024-07-08 Thread Damodharam Ammepalli

Update the eth_dev_ops structure with new function vectors
to get, get capabilities and set ethernet link speed lanes.
Update the testpmd to provide required config and information
display infrastructure.

The supporting ethernet controller driver will register callbacks
to avail link speed lanes config and get services. This lanes
configuration is applicable only when the nic is forced to fixed
speeds. In Autonegiation mode, the hardware automatically
negotiates the number of lanes.

These are the new commands.

testpmd> show port 0 speed_lanes capabilities

 Supported speeds Valid lanes
---
 10 Gbps  1
 25 Gbps  1
 40 Gbps  4
 50 Gbps  1 2
 100 Gbps 1 2 4
 200 Gbps 2 4
 400 Gbps 4 8
testpmd>

testpmd>
testpmd> port stop 0
testpmd> port config 0 speed_lanes 4
testpmd> port config 0 speed 20 duplex full
testpmd> port start 0
testpmd>
testpmd> show port info 0

* Infos for port 0  *
MAC address: 14:23:F2:C3:BA:D2
Device name: :b1:00.0
Driver name: net_bnxt
Firmware-version: 228.9.115.0
Connect to socket: 2
memory allocation on the socket: 2
Link status: up
Link speed: 200 Gbps
Active Lanes: 4
Link duplex: full-duplex
Autoneg status: Off

Signed-off-by: Damodharam Ammepalli 
---
v2->v3 Consolidating the testpmd and rtelib patches into a single patch
as requested.
v3->v4 Addressed comments and fix help string and documentation.

 app/test-pmd/cmdline.c | 230 +
 app/test-pmd/config.c  |  69 ++-
 app/test-pmd/testpmd.h |   4 +
 lib/ethdev/ethdev_driver.h |  77 +
 lib/ethdev/rte_ethdev.c|  51 
 lib/ethdev/rte_ethdev.h|  92 +++
 lib/ethdev/version.map |   5 +
 7 files changed, 526 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index b7759e38a8..a507df31d8 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -284,6 +284,9 @@ static void cmd_help_long_parsed(void *parsed_result,
 
"dump_log_types\n"
"Dumps the log level for all the dpdk modules\n\n"
+
+   "show port (port_id) speed_lanes capabilities"
+   "   Show speed lanes capabilities of a port.\n\n"
);
}
 
@@ -823,6 +826,9 @@ static void cmd_help_long_parsed(void *parsed_result,
"port config (port_id) txq (queue_id) affinity 
(value)\n"
"Map a Tx queue with an aggregated port "
"of the DPDK port\n\n"
+
+   "port config (port_id|all) speed_lanes (0|1|4|8)\n"
+   "Set number of lanes for all ports or port_id for a 
forced speed\n\n"
);
}
 
@@ -1560,6 +1566,110 @@ static cmdline_parse_inst_t cmd_config_speed_specific = 
{
},
 };
 
+static int
+parse_speed_lanes_cfg(portid_t pid, uint32_t lanes)
+{
+   int ret;
+   uint32_t lanes_capa;
+
+   ret = parse_speed_lanes(lanes, &lanes_capa);
+   if (ret < 0) {
+   fprintf(stderr, "Unknown speed lane value: %d for port %d\n", 
lanes, pid);
+   return -1;
+   }
+
+   ret = rte_eth_speed_lanes_set(pid, lanes_capa);
+   if (ret == -ENOTSUP) {
+   fprintf(stderr, "Function not implemented\n");
+   return -1;
+   } else if (ret < 0) {
+   fprintf(stderr, "Set speed lanes failed\n");
+   return -1;
+   }
+
+   return 0;
+}
+
+/* *** display speed lanes per port capabilities *** */
+struct cmd_show_speed_lanes_result {
+   cmdline_fixed_string_t cmd_show;
+   cmdline_fixed_string_t cmd_port;
+   cmdline_fixed_string_t cmd_keyword;
+   portid_t cmd_pid;
+};
+
+static void
+cmd_show_speed_lanes_parsed(void *parsed_result,
+   __rte_unused struct cmdline *cl,
+   __rte_unused void *data)
+{
+   struct cmd_show_speed_lanes_result *res = parsed_result;
+   struct rte_eth_speed_lanes_capa *speed_lanes_capa;
+   unsigned int num;
+   int ret;
+
+   if (!rte_eth_dev_is_valid_port(res->cmd_pid)) {
+   fprintf(stderr, "Invalid port id %u\n", res->cmd_pid);
+   return;
+   }
+
+   ret = rte_eth_speed_lanes_get_capability(res->cmd_pid, NULL, 0);
+   if (ret == -ENOTSUP) {
+   fprintf(stderr, "Function not implemented\n");
+   return;
+   } else if (ret < 0) {
+   fprintf(stderr, "Get speed lanes capability failed: %d\n", ret);
+   return;
+   }
+
+   num = (unsigned int)ret;
+   speed_lanes_capa = calloc(num, sizeof(*speed_lanes_capa));
+   if (speed_lanes_capa == NULL) {
+   fprintf(stderr, "Failed to alloc speed

Re: [PATCH v4] ethdev: Add link_speed lanes support

2024-07-08 Thread Ajit Khaparde

On Mon, Jul 8, 2024 at 4:30 PM Damodharam Ammepalli
 wrote:
>
> Update the eth_dev_ops structure with new function vectors
> to get, get capabilities and set ethernet link speed lanes.
> Update the testpmd to provide required config and information
> display infrastructure.
>
> The supporting ethernet controller driver will register callbacks
> to avail link speed lanes config and get services. This lanes
> configuration is applicable only when the nic is forced to fixed
> speeds. In Autonegiation mode, the hardware automatically
> negotiates the number of lanes.
>
> These are the new commands.
>
> testpmd> show port 0 speed_lanes capabilities
>
>  Supported speeds Valid lanes
> ---
>  10 Gbps  1
>  25 Gbps  1
>  40 Gbps  4
>  50 Gbps  1 2
>  100 Gbps 1 2 4
>  200 Gbps 2 4
>  400 Gbps 4 8
> testpmd>
>
> testpmd>
> testpmd> port stop 0
> testpmd> port config 0 speed_lanes 4
> testpmd> port config 0 speed 20 duplex full
> testpmd> port start 0
> testpmd>
> testpmd> show port info 0
>
> * Infos for port 0  *
> MAC address: 14:23:F2:C3:BA:D2
> Device name: :b1:00.0
> Driver name: net_bnxt
> Firmware-version: 228.9.115.0
> Connect to socket: 2
> memory allocation on the socket: 2
> Link status: up
> Link speed: 200 Gbps
> Active Lanes: 4
> Link duplex: full-duplex
> Autoneg status: Off
>
> Signed-off-by: Damodharam Ammepalli 
Acked-by: Ajit Khaparde 


smime.p7s
Description: S/MIME Cryptographic Signature

Re: [PATCH v1] vhost: fix crash caused by accessing a freed vsocket

2024-07-08 Thread Gongming Chen




> On Jul 2, 2024, at 3:48 PM, Maxime Coquelin  
> wrote:
> 
> Hi Gongming,
> 
> On 5/10/24 09:28, Gongming Chen wrote:
>> Hi Maxime and Chenbo,
>> Do you have any suggestions for how to address this?
>> Looking forward to hearing from you!
> 
> Could you please have a try with latest DPDK main branch,
> and if it reproduces, rebase your series on top of it.
> 
> I don't think it has been fixed, but we've done significant changes in
> fdman in this release so we need a rebase anyways.
> 
> Thanks in advance,
> Maxime

Hi Maxime,

This bug still exists, I rebase the latest main branch and submit the v4 
version.
Thank you for your review, looking forward to hearing from you!

Thanks,
Gongming

> 
>> Thanks,
>> Gongming
>>> On Apr 3, 2024, at 11:52 PM, Gongming Chen  
>>> wrote:
>>> 
>>> Hi Maxime,
>>> Thanks for review.
>>> 
 On Apr 3, 2024, at 5:39 PM, Maxime Coquelin  
 wrote:
 
 Hi Gongming,
 
 It's the 9th time the patch has been sent.
 I'm not sure whether there are changes between them or these are just
 re-sends, but that's something to avoid.
 
>>> 
>>> Sorry, there's something wrong with my mailbox.
>>> I will send a v1 version as the latest patch, but they are actually the 
>>> same.
>>> 
 If there are differences, you should use versionning to highlight it.
 If unsure, please check the contributions guidelines first.
 
 Regarding the patch itself, I don't know if this is avoidable, but I
 would prefer we do not introduce yet another lock in there.
 
 Thanks,
 Maxime
 
>>> 
>>> I totally agree with your.
>>> Therefore, initially I hoped to solve this problem without introducing
>>> new lock. However, the result was not expected.
>>> 
>>> 1. The vsocket is shared between the event and reconnect threads by
>>> transmitting the vsocket pointer. Therefore, there is no way to protect
>>> vsocket through a simple vsocket lock.
>>> 
>>> 2. The event and reconnect threads can transmit vsocket pointers to
>>> each other, so there is no way to ensure that vsocket will not be
>>> accessed by locking the two threads separately.
>>> 
>>> 3. Therefore, on the vsocket resource, event and reconnect are in the
>>> same critical section. Only by locking two threads at the same time
>>> can the vsocket be ensured that it will not be accessed and can be
>>> freed safely.
>>> 
>>> Currently, app config, event, and reconnect threads respectively have
>>> locks corresponding to their own maintenance resources,
>>> vhost_user.mutex, pfdset->fd_mutex, and reconn_list.mutex.
>>> 
>>> I think there is a thread-level lock missing here to protect the
>>> critical section between threads, just like the rcu scene protection.
>>> 
>>> After app config acquires the write lock, it ensures that the event and
>>> reconnect threads are outside the critical section.
>>> This is to completely clean up the resources associated with vsocket
>>> and safely free vsocket.
>>> 
>>> Therefore, considering future expansion, if there may be more
>>> resources like vsocket, this thread lock can also be used to ensure
>>> that resources are safely released after complete cleanup.
>>> 
>>> In this way, the threads will be clearer, and the complicated try lock
>>> method is no longer needed.
>>> 
>>> Thanks,
>>> Gongming
> 
>

RE: [PATCH v2 0/4] support AVX2 instruction Rx/Tx function

2024-07-08 Thread Chaoyong He

> On 7/8/2024 6:58 AM, Chaoyong He wrote:
> > This patch series add the support of Rx/Tx function using the
> > AVX2 instruction.
> >
> > ---
> > v2: rebase to the latest main branch.
> > ---
> >
> > Long Wu (4):
> >   net/nfp: export more interfaces of NFDk
> >   net/nfp: support AVX2 Tx function
> >   net/nfp: support AVX2 Rx function
> >   net/nfp: vector Rx function supports parsing ptype
> >
> 
> I can see still fails to apply to main, I guess because of the trace 
> patchset, let
> me go one by one, first I will get trace one and later will ask for a new 
> version
> of this set again with a rebase.

We have also found the 'static_rte_common_nfp' problem you mentioned in the 
previous version patch series in our local CI environment.
We will make sure it be solved before we send out a new version patch series.
Thanks.

RE: [PATCH v2 0/7] add trace support for control message

2024-07-08 Thread Chaoyong He

> On 7/8/2024 3:45 AM, Chaoyong He wrote:
> > This patch series add trace support for control message send to flower
> > firmware.
> >
> > ---
> > v2: rebase to the latest main branch.
> > ---
> >
> > Chaoyong He (7):
> >   net/nfp: add trace points about port
> >   net/nfp: add trace point about tunnel
> >   net/nfp: add trace point about Qos
> >   net/nfp: refactor to prepare for add flow trace point
> >   net/nfp: add trace point about flow rule
> >   net/nfp: add trace point about flow rule pattern
> >   net/nfp: add trace point about flow rule action
> >
> 
> Still getting some github action errors, can you please check:
> https://github.com/ferruhy/dpdk/actions/runs/9838241137

Really thanks for your link to the CI workflows, we will analyze and try to 
solve it soon.

[PATCH v6 0/2] power: introduce PM QoS interface

The deeper the idle state, the lower the power consumption, but the longer
the resume time. Some service are delay sensitive and very except the low
resume time, like interrupt packet receiving mode.

And the "/sys/devices/system/cpu/cpuX/power/pm_qos_resume_latency_us" sysfs
interface is used to set and get the resume latency limit on the cpuX for
userspace. Please see the description in kernel document[1].
Each cpuidle governor in Linux select which idle state to enter based on
this CPU resume latency in their idle task.

The per-CPU PM QoS API can be used to control this CPU's idle state
selection and limit just enter the shallowest idle state to low the delay
after sleep by setting strict resume latency (zero value).

[1] 
https://www.kernel.org/doc/html/latest/admin-guide/abi-testing.html?highlight=pm_qos_resume_latency_us#abi-sys-devices-power-pm-qos-resume-latency-us

---
 v6:
  - update release_24_07.rst based on dpdk repo to resolve CI warning.
 v5:
  - use LINE_MAX to replace BUFSIZ, and use snprintf to replace sprintf.
 v4:
  - fix some comments basd on Stephen
  - add stdint.h include
  - add Acked-by Morten Brørup 
 v3:
  - add RTE_POWER_xxx prefix for some macro in header
  - add the check for lcore_id with rte_lcore_is_enabled
 v2:
  - use PM QoS on CPU wide to replace the one on system wide

Huisong Li (2):
  power: introduce PM QoS API on CPU wide
  examples/l3fwd-power: add PM QoS configuration

 doc/guides/prog_guide/power_man.rst|  24 ++
 doc/guides/rel_notes/release_24_07.rst |   4 +
 examples/l3fwd-power/main.c|  28 ++
 lib/power/meson.build  |   2 +
 lib/power/rte_power_qos.c  | 114 +
 lib/power/rte_power_qos.h  |  73 
 lib/power/version.map  |   2 +
 7 files changed, 247 insertions(+)
 create mode 100644 lib/power/rte_power_qos.c
 create mode 100644 lib/power/rte_power_qos.h

-- 
2.22.0

[PATCH v6 2/2] examples/l3fwd-power: add PM QoS configuration

Add PM QoS configuration to declease the delay after sleep in case of
entering deeper idle state.

Signed-off-by: Huisong Li 
Acked-by: Morten Brørup 
---
 examples/l3fwd-power/main.c | 28 
 1 file changed, 28 insertions(+)

diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index fba11da7ca..74a07afc6c 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "perf_core.h"
 #include "main.h"
@@ -2259,6 +2260,24 @@ init_power_library(void)
return -1;
}
}
+
+   RTE_LCORE_FOREACH(lcore_id) {
+   if (rte_lcore_is_enabled(lcore_id) == 0)
+   continue;
+   /*
+* Set the worker lcore's to have strict latency limit to allow
+* the CPU to enter the shallowest idle state.
+*/
+   ret = rte_power_qos_set_cpu_resume_latency(lcore_id,
+   RTE_POWER_QOS_STRICT_LATENCY_VALUE);
+   if (ret < 0) {
+   RTE_LOG(ERR, L3FWD_POWER,
+   "Failed to set strict resume latency on 
CPU%u.\n",
+   lcore_id);
+   return ret;
+   }
+   }
+
return ret;
 }
 
@@ -2298,6 +2317,15 @@ deinit_power_library(void)
}
}
}
+
+   RTE_LCORE_FOREACH(lcore_id) {
+   if (rte_lcore_is_enabled(lcore_id) == 0)
+   continue;
+   /* Restore the original value in kernel. */
+   rte_power_qos_set_cpu_resume_latency(lcore_id,
+   RTE_POWER_QOS_RESUME_LATENCY_NO_CONSTRAINT);
+   }
+
return ret;
 }
 
-- 
2.22.0

[PATCH v6 1/2] power: introduce PM QoS API on CPU wide

The deeper the idle state, the lower the power consumption, but the longer
the resume time. Some service are delay sensitive and very except the low
resume time, like interrupt packet receiving mode.

And the "/sys/devices/system/cpu/cpuX/power/pm_qos_resume_latency_us" sysfs
interface is used to set and get the resume latency limit on the cpuX for
userspace. Each cpuidle governor in Linux select which idle state to enter
based on this CPU resume latency in their idle task.

The per-CPU PM QoS API can be used to control this CPU's idle state
selection and limit just enter the shallowest idle state to low the delay
after sleep by setting strict resume latency (zero value).

Signed-off-by: Huisong Li 
Acked-by: Morten Brørup 
---
 doc/guides/prog_guide/power_man.rst|  24 ++
 doc/guides/rel_notes/release_24_07.rst |   4 +
 lib/power/meson.build  |   2 +
 lib/power/rte_power_qos.c  | 114 +
 lib/power/rte_power_qos.h  |  73 
 lib/power/version.map  |   2 +
 6 files changed, 219 insertions(+)
 create mode 100644 lib/power/rte_power_qos.c
 create mode 100644 lib/power/rte_power_qos.h

diff --git a/doc/guides/prog_guide/power_man.rst 
b/doc/guides/prog_guide/power_man.rst
index f6674efe2d..faa32b4320 100644
--- a/doc/guides/prog_guide/power_man.rst
+++ b/doc/guides/prog_guide/power_man.rst
@@ -249,6 +249,30 @@ Get Num Pkgs
 Get Num Dies
   Get the number of die's on a given package.
 
+
+PM QoS
+--
+
+The deeper the idle state, the lower the power consumption, but the longer
+the resume time. Some service are delay sensitive and very except the low
+resume time, like interrupt packet receiving mode.
+
+And the "/sys/devices/system/cpu/cpuX/power/pm_qos_resume_latency_us" sysfs
+interface is used to set and get the resume latency limit on the cpuX for
+userspace. Each cpuidle governor in Linux select which idle state to enter
+based on this CPU resume latency in their idle task.
+
+The per-CPU PM QoS API can be used to set and get the CPU resume latency based
+on this sysfs.
+
+The ``rte_power_qos_set_cpu_resume_latency()`` function can control the CPU's
+idle state selection in Linux and limit just to enter the shallowest idle state
+to low the delay of resuming service after sleeping by setting strict resume
+latency (zero value).
+
+The ``rte_power_qos_get_cpu_resume_latency()`` function can get the resume
+latency on specified CPU.
+
 References
 --
 
diff --git a/doc/guides/rel_notes/release_24_07.rst 
b/doc/guides/rel_notes/release_24_07.rst
index 1dd842df3a..af6fd82a3c 100644
--- a/doc/guides/rel_notes/release_24_07.rst
+++ b/doc/guides/rel_notes/release_24_07.rst
@@ -155,6 +155,10 @@ New Features
 
   Added an API that allows the user to reclaim the defer queue with RCU.
 
+* **Introduce per-CPU PM QoS interface.**
+
+  * Introduce per-CPU PM QoS interface to low the delay after sleep.
+
 
 Removed Items
 -
diff --git a/lib/power/meson.build b/lib/power/meson.build
index b8426589b2..8222e178b0 100644
--- a/lib/power/meson.build
+++ b/lib/power/meson.build
@@ -23,12 +23,14 @@ sources = files(
 'rte_power.c',
 'rte_power_uncore.c',
 'rte_power_pmd_mgmt.c',
+'rte_power_qos.c',
 )
 headers = files(
 'rte_power.h',
 'rte_power_guest_channel.h',
 'rte_power_pmd_mgmt.h',
 'rte_power_uncore.h',
+'rte_power_qos.h',
 )
 if cc.has_argument('-Wno-cast-qual')
 cflags += '-Wno-cast-qual'
diff --git a/lib/power/rte_power_qos.c b/lib/power/rte_power_qos.c
new file mode 100644
index 00..375746f832
--- /dev/null
+++ b/lib/power/rte_power_qos.c
@@ -0,0 +1,114 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 HiSilicon Limited
+ */
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include "power_common.h"
+#include "rte_power_qos.h"
+
+#define PM_QOS_SYSFILE_RESUME_LATENCY_US   \
+   "/sys/devices/system/cpu/cpu%u/power/pm_qos_resume_latency_us"
+
+int
+rte_power_qos_set_cpu_resume_latency(uint16_t lcore_id, int latency)
+{
+   char buf[LINE_MAX];
+   FILE *f;
+   int ret;
+
+   if (!rte_lcore_is_enabled(lcore_id)) {
+   POWER_LOG(ERR, "lcore id %u is not enabled", lcore_id);
+   return -EINVAL;
+   }
+
+   if (latency < 0) {
+   POWER_LOG(ERR, "latency should be greater than and equal to 0");
+   return -EINVAL;
+   }
+
+   ret = open_core_sysfs_file(&f, "w", PM_QOS_SYSFILE_RESUME_LATENCY_US, 
lcore_id);
+   if (ret != 0) {
+   POWER_LOG(ERR, "Failed to open 
"PM_QOS_SYSFILE_RESUME_LATENCY_US, lcore_id);
+   return ret;
+   }
+
+   /*
+* Based on the sysfs interface pm_qos_resume_latency_us under
+* @PM_QOS_SYSFILE_RESUME_LATENCY_US directory in kernel, their meanning
+* is as follows for different input string.
+* 1> the resume latenc

RE: [PATCH v2 0/7] add trace support for control message

2024-07-08 Thread Chaoyong He

> On 7/8/2024 3:45 AM, Chaoyong He wrote:
> > This patch series add trace support for control message send to flower
> > firmware.
> >
> > ---
> > v2: rebase to the latest main branch.
> > ---
> >
> > Chaoyong He (7):
> >   net/nfp: add trace points about port
> >   net/nfp: add trace point about tunnel
> >   net/nfp: add trace point about Qos
> >   net/nfp: refactor to prepare for add flow trace point
> >   net/nfp: add trace point about flow rule
> >   net/nfp: add trace point about flow rule pattern
> >   net/nfp: add trace point about flow rule action
> >
> 
> Still getting some github action errors, can you please check:
> https://github.com/ferruhy/dpdk/actions/runs/9838241137

In short, after some debug, seems we are not using the 'trace' library as its 
expect, so we decide to abandon this patch series. 

For details:

# The way we debug:
```
/home/hcy/dpdk-next-net-private/build/app/dpdk-testpmd -c 3 --no-huge -m 40 -d 
build/drivers -a 0:0.0 --vdev ne
```

# The back trace when problem occurs:
```
(gdb) bt
#0  rte_pmd_nfp_trace_cmsg_flow_pattern_meta_tci (cmsg=0x3) at 
../drivers/net/nfp/nfp_trace.h:239
#1  0x77c81879 in __rte_trace_point_register (
handle=0x702c5c98 <__rte_pmd_nfp_trace_cmsg_flow_pattern_meta_tci>,
name=0x702b36c0 <__rte_pmd_nfp_trace_cmsg_flow_pattern_meta_tci_name> 
"pmd.net.nfp.cmsg.flow.pattern.meta_tci", register_fn=0x7029ce8c 
)
at ../lib/eal/common/eal_common_trace.c:480
#2  0x7029eb0f in rte_pmd_nfp_trace_cmsg_flow_pattern_meta_tci_init ()
at ../drivers/net/nfp/nfp_trace.c:43
#3  0x77fd11ae in call_init (env=0x7fffdeb0, argv=0x7fffde48, 
argc=12,
l=) at dl-init.c:70
#4  call_init (l=, argc=12, argv=0x7fffde48, 
env=0x7fffdeb0) at dl-init.c:26
#5  0x77fd129c in _dl_init (main_map=0x716e10, argc=12, 
argv=0x7fffde48, env=0x7fffdeb0)
at dl-init.c:117
#6  0x715cef65 in __GI__dl_catch_exception (exception=, 
operate=,
args=) at 
/usr/src/debug/glibc-2.34-60.el9.x86_64/elf/dl-error-skeleton.c:182
#7  0x77fd7cbe in dl_open_worker (a=a@entry=0x7fffd730) at 
dl-open.c:803
#8  0x715cef08 in __GI__dl_catch_exception (exception=, 
operate=,
args=) at 
/usr/src/debug/glibc-2.34-60.el9.x86_64/elf/dl-error-skeleton.c:208
#9  0x77fd804f in _dl_open (file=, mode=-2147483646,
caller_dlopen=0x77c66e15 , nsid=-2, argc=12, 
argv=0x7fffde48,
env=0x7fffdeb0) at dl-open.c:879
#10 0x714d486c in dlopen_doit (a=a@entry=0x7fffd9a0) at dlopen.c:56
#11 0x715cef08 in __GI__dl_catch_exception 
(exception=exception@entry=0x7fffd900,
operate=, args=)
at /usr/src/debug/glibc-2.34-60.el9.x86_64/elf/dl-error-skeleton.c:208
#12 0x715cefd3 in __GI__dl_catch_error (objname=0x7fffd958, 
errstring=0x7fffd960,
mallocedp=0x7fffd957, operate=, args=)
at /usr/src/debug/glibc-2.34-60.el9.x86_64/elf/dl-error-skeleton.c:227
#13 0x714d433e in _dlerror_run (operate=operate@entry=0x714d4810 
,
args=args@entry=0x7fffd9a0) at dlerror.c:138
#14 0x714d4921 in dlopen_implementation (dl_caller=, 
mode=,
file=) at dlopen.c:71
#15 ___dlopen (file=, mode=) at dlopen.c:81
#16 0x77c66e15 in eal_dlopen (pathname=0x6439f0 
"build/drivers/librte_net_nfp.so")
at ../lib/eal/common/eal_common_options.c:506
#17 0x77c670ff in eal_plugins_init () at 
../lib/eal/common/eal_common_options.c:580
#18 0x77c8a03c in rte_eal_init (argc=12, argv=0x7fffde48) at 
../lib/eal/linux/eal.c:1015
#19 0x004bb305 in main (argc=12, argv=0x7fffde48) at 
../app/test-pmd/testpmd.c:4553
```

# The logic which cause the problem:
```
int
__rte_trace_point_register(rte_trace_point_t *handle, const char *name,
void (*register_fn)(void))
{
struct trace_point *tp;
uint16_t sz;

/* Sanity checks of arguments */
if (name == NULL || register_fn == NULL || handle == NULL) {
trace_err("invalid arguments");
rte_errno = EINVAL;
goto fail;
}

/* Check the size of the trace point object */
RTE_PER_LCORE(trace_point_sz) = 0;
register_fn(); // <-- Here, call with 
empty parameter list
if (RTE_PER_LCORE(trace_point_sz) == 0) {
trace_err("missing rte_trace_emit_header() in register fn");
rte_errno = EBADF;
goto fail;
}

...
}
```

```
RTE_TRACE_POINT(
rte_pmd_nfp_trace_cmsg_flow_meta,
RTE_TRACE_POINT_ARGS(void *cmsg),   // <--- Here, we need a 
parameter

struct nfp_fl_rule_metadata *meta = cmsg;
rte_trace_point_emit_u8(meta->key_len);
rte_trace_point_emit_u8(meta->mask_len);
rte_trace_point_emit_u8(meta->act_len);
rte_trace_point_emit_u8(meta->flags);
rte_trace_point_emit_u32(meta->host_ct

Re: [PATCH v6 2/2] examples/l3fwd-power: add PM QoS configuration

2024-07-08 Thread lihuisong (C)




在 2024/7/9 11:07, Stephen Hemminger 写道:

On Tue, 9 Jul 2024 10:29:27 +0800
Huisong Li  wrote:


+   RTE_LCORE_FOREACH(lcore_id) {
+   if (rte_lcore_is_enabled(lcore_id) == 0)
+   continue;


Why do you need this check? RTE_LCORE_FOREACH calls rte_next_lcore which
already skips lcores that are not enabled.

Yes, it is dead code. will delete it in next version. Thanks.

.

Re: [PATCH v12 0/7] hash: add SVE support for bulk key lookup

On Mon, Jul 8, 2024 at 2:14 PM Yoan Picchi  wrote:
>
> This patchset adds SVE support for the signature comparison in the cuckoo
> hash lookup and improves the existing NEON implementation. These
> optimizations required changes to the data format and signature of the
> relevant functions to support dense hitmasks (no padding) and having the
> primary and secondary hitmasks interleaved instead of being in their own
> array each.
>
> Benchmarking the cuckoo hash perf test, I observed this effect on speed:
>   There are no significant changes on Intel (ran on Sapphire Rapids)
>   Neon is up to 7-10% faster (ran on ampere altra)
>   128b SVE is about 3-5% slower than the optimized neon (ran on a graviton
> 3 cloud instance)
>   256b SVE is about 0-3% slower than the optimized neon (ran on a graviton
> 3 cloud instance)
>
> V2->V3:
>   Remove a redundant if in the test
>   Change a couple int to uint16_t in compare_signatures_dense
>   Several codding-style fix
>
> V3->V4:
>   Rebase
>
> V4->V5:
>   Commit message
>
> V5->V6:
>   Move the arch-specific code into new arch-specific files
>   Isolate the data struture refactor from adding SVE
>
> V6->V7:
>   Commit message
>   Moved RTE_HASH_COMPARE_SVE to the last commit of the chain
>
> V7->V8:
>   Commit message
>   Typos and missing spaces
>
> V8->V9:
>   Use __rte_unused instead of (void)
>   Fix an indentation mistake
>
> V9->V10:
>   Fix more formating and indentation
>   Move the new compare signature file directly in hash instead of being
> in a new subdir
>   Re-order includes
>   Remove duplicated static check
>   Move rte_hash_sig_compare_function's definition into a private header
>
> V10->V11:
>   Split the "pack the hitmask" commit into four commits:
> Move the compare function enum out of the ABI
> Move the compare function implementations into arch-specific files
> Add a missing check on RTE_HASH_BUCKET_ENTRIES in case we change it
>   in the future
> Implement the dense hitmask
>   Add missing header guards
>   Move compare function enum into cuckoo_hash.c instead of its own header.
>
> V11->V12:
>   Change the name of the compare function file (remove the _pvt suffix)
>
> Yoan Picchi (7):
>   hash: make compare signature function enum private
>   hash: split compare signature into arch-specific files
>   hash: add a check on hash entry max size
>   hash: pack the hitmask for hash in bulk lookup
>   hash: optimize compare signature for NEON
>   test/hash: check bulk lookup of keys after collision
>   hash: add SVE support for bulk key lookup
>
>  .mailmap  |   2 +
>  app/test/test_hash.c  |  99 +---
>  lib/hash/compare_signatures_arm.h | 121 +++
>  lib/hash/compare_signatures_generic.h |  40 +
>  lib/hash/compare_signatures_x86.h |  55 +++
>  lib/hash/rte_cuckoo_hash.c| 207 ++
>  lib/hash/rte_cuckoo_hash.h|  10 +-
>  7 files changed, 410 insertions(+), 124 deletions(-)
>  create mode 100644 lib/hash/compare_signatures_arm.h
>  create mode 100644 lib/hash/compare_signatures_generic.h
>  create mode 100644 lib/hash/compare_signatures_x86.h

I added RN updates, reformated commitlogs, fixed header guards and
removed some pvt leftover.
Series applied, thanks.


-- 
David Marchand

Re: [PATCH] dpdk-pmdinfo: remove unneeded whitespace

On Tue, Jul 2, 2024 at 1:59 PM Robin Jarry  wrote:
>
> Stephen Hemminger, Jul 01, 2024 at 19:58:
> > Fix the warning
> > $ flake8 --max-line-length=100 dpdk-pmdinfo.py
> > dpdk-pmdinfo.py:217:40: E203 whitespace before ':'
> >
> > Signed-off-by: Stephen Hemminger 
> Acked-by: Robin Jarry 

Applied, thanks.


-- 
David Marchand

Re: [PATCH] dpdk-devbind: fix indentation

On Tue, Jul 2, 2024 at 1:58 PM Robin Jarry  wrote:
>
> Stephen Hemminger, Jul 01, 2024 at 19:45:
> > The python check tool (flake8) is picky about the indentation
> > of continuation lines, and dpdk-devbind was not following standard.
> >
> > Error is:
> >E127 continuation line over-indented for visual indent
> >
> > Fixes: 2ff801515e49 ("usertools/devbind: update octeontx2 DMA device")
> > Signed-off-by: Stephen Hemminger 
> Acked-by: Robin Jarry 

Applied, thanks.


-- 
David Marchand

Re: [PATCH v2] usertools: add telemetry exporter

On Tue, Apr 16, 2024 at 3:47 PM Robin Jarry  wrote:
>
> For now the telemetry socket is local to the machine running a DPDK
> application. Also, there is no official "schema" for the exposed
> metrics. Add a framework and a script to collect and expose these
> metrics to telemetry and observability agree gators such as Prometheus,
> Carbon or Influxdb. The exposed data must be done with end-users in
> mind, some DPDK terminology or internals may not make sense to everyone.
>
> The script only serves as an entry point and does not know anything
> about any specific metrics nor JSON data structures exposed in the
> telemetry socket.
>
> It uses dynamically loaded endpoint exporters which are basic python
> files that must implement two functions:
>
>  def info() -> dict[MetricName, MetricInfo]:
>  Mapping of metric names to their description and type.
>
>  def metrics(sock: TelemetrySocket) -> list[MetricValue]:
>  Request data from sock and return it as metric values. A metric
>  value is a 3-tuple: (name: str, value: any, labels: dict). Each
>  name must be present in info().
>
> The sock argument passed to metrics() has a single method:
>
>  def cmd(self, uri: str, arg: any = None) -> dict | list:
>  Request JSON data to the telemetry socket and parse it to python
>  values.
>
> The main script invokes endpoints and exports the data into an output
> format. For now, only two formats are implemented:
>
> * openmetrics/prometheus: text based format exported via a local HTTP
>   server.
> * carbon/graphite: binary (python pickle) format exported to a distant
>   carbon TCP server.
>
> As a starting point, 3 built-in endpoints are implemented:
>
> * counters: ethdev hardware counters
> * cpu: lcore usage
> * memory: overall memory usage
>
> The goal is to keep all built-in endpoints in the DPDK repository so
> that they can be updated along with the telemetry JSON data structures.
>
> Example output for the openmetrics:// format:
>
>  ~# dpdk-telemetry-exporter.py -o openmetrics://:9876 &
>  INFO using endpoint: counters (from .../telemetry-endpoints/counters.py)
>  INFO using endpoint: cpu (from .../telemetry-endpoints/cpu.py)
>  INFO using endpoint: memory (from .../telemetry-endpoints/memory.py)
>  INFO listening on port 9876
>  [1] 838829
>
>  ~$ curl http://127.0.0.1:9876/
>  # HELP dpdk_cpu_total_cycles Total number of CPU cycles.
>  # TYPE dpdk_cpu_total_cycles counter
>  # HELP dpdk_cpu_busy_cycles Number of busy CPU cycles.
>  # TYPE dpdk_cpu_busy_cycles counter
>  dpdk_cpu_total_cycles{cpu="73", numa="0"} 4353385274702980
>  dpdk_cpu_busy_cycles{cpu="73", numa="0"} 6215932860
>  dpdk_cpu_total_cycles{cpu="9", numa="0"} 4353385274745740
>  dpdk_cpu_busy_cycles{cpu="9", numa="0"} 6215932860
>  dpdk_cpu_total_cycles{cpu="8", numa="0"} 4353383451895540
>  dpdk_cpu_busy_cycles{cpu="8", numa="0"} 6171923160
>  dpdk_cpu_total_cycles{cpu="72", numa="0"} 4353385274817320
>  dpdk_cpu_busy_cycles{cpu="72", numa="0"} 6215932860
>  # HELP dpdk_memory_total_bytes The total size of reserved memory in bytes.
>  # TYPE dpdk_memory_total_bytes gauge
>  # HELP dpdk_memory_used_bytes The currently used memory in bytes.
>  # TYPE dpdk_memory_used_bytes gauge
>  dpdk_memory_total_bytes 1073741824
>  dpdk_memory_used_bytes 794197376
>
> Link: 
> https://prometheus.io/docs/instrumenting/exposition_formats/#text-based-format
> Link: 
> https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#text-format
> Link: 
> https://graphite.readthedocs.io/en/latest/feeding-carbon.html#the-pickle-protocol
> Link: 
> https://github.com/influxdata/telegraf/tree/master/plugins/inputs/prometheus
> Signed-off-by: Robin Jarry 

Applied, thanks.


-- 
David Marchand

Re: [PATCH] telemetry: lower log level when legacy is not configured

On Fri, Jul 5, 2024 at 11:05 AM Bruce Richardson
 wrote:
>
> On Fri, Jul 05, 2024 at 11:00:20AM +0200, Robin Jarry wrote:
> > When starting any DPDK application, this warning log is displayed:
> >
> >  TELEMETRY: No legacy callbacks, legacy socket not created
> >
> > This brings unnecessary attention, lower the log level to DEBUG.
> >
> > Signed-off-by: Robin Jarry 
> Acked-by: Bruce Richardson 

Applied, thanks.


-- 
David Marchand

Re: [PATCH] devtools: fix version variable not initialized

On Thu, Jun 27, 2024 at 4:28 PM David Marchand
 wrote:
> On Wed, Apr 17, 2024 at 11:32 AM Dengdui Huang  
> wrote:
> >
> > The version variable is not initialized. Therefore, if the -V option
> > is not specified, the value of $version is obtained from the context,
> > which may cause the version map parsing failure.
> >
> > Fixes: 6edec7f202ac ("devtools: list symbols by version")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Dengdui Huang 
> Reviewed-by: David Marchand 

Applied, thanks.


-- 
David Marchand

Re: [PATCH v1 0/4] fbarray lookahead/lookbehind fixes

On Mon, Jul 8, 2024 at 6:07 PM Anatoly Burakov
 wrote:
>
> Once upon a time, a few patches were submitted by Vipin P R:
>
> https://patches.dpdk.org/project/dpdk/patch/1673615669-21011-2-git-send-email-vip...@vmware.com/
> https://patches.dpdk.org/project/dpdk/patch/1673615669-21011-3-git-send-email-vip...@vmware.com/
> https://patches.dpdk.org/project/dpdk/patch/1673615669-21011-2-git-send-email-vip...@vmware.com/
> https://patches.dpdk.org/project/dpdk/patch/1673615669-21011-3-git-send-email-vip...@vmware.com/
>
> They were reviewed and changes were requested, but the author never followed 
> up
> and these patches kind of fell through the cracks. The patches fixed real bugs
> in fbarray lookahead/lookbehind behavior, so now these bugs have resurfaced in
> some customer reports.
>
> This is a resubmit with improvements and added unit tests.
>
> Anatoly Burakov (4):
>   fbarray: fix incorrect lookahead behavior
>   fbarray: fix incorrect lookbehind behavior
>   fbarray: fix lookahead ignore mask handling
>   fbarray: fix lookbehind ignore mask handling
>
>  app/test/test_fbarray.c | 102 
>  lib/eal/common/eal_common_fbarray.c |  28 ++--
>  2 files changed, 123 insertions(+), 7 deletions(-)

Thank you, series applied.


-- 
David Marchand

[v3] raw/zxdh:Optimize device resource mapping process

2024-07-08 Thread Yong Zhang

Use rte_pci_device to map device resources and delete
useless device search processes.

Signed-off-by: Yong Zhang 
---
 drivers/raw/zxdh/meson.build   |   2 +-
 drivers/raw/zxdh/zxdh_pci.c| 562 -
 drivers/raw/zxdh/zxdh_pci.h|  41 ---
 drivers/raw/zxdh/zxdh_rawdev.c |  93 +-
 4 files changed, 78 insertions(+), 620 deletions(-)
 delete mode 100644 drivers/raw/zxdh/zxdh_pci.c
 delete mode 100644 drivers/raw/zxdh/zxdh_pci.h

diff --git a/drivers/raw/zxdh/meson.build b/drivers/raw/zxdh/meson.build
index c9e5c83f1b..266d3db6d8 100644
--- a/drivers/raw/zxdh/meson.build
+++ b/drivers/raw/zxdh/meson.build
@@ -2,4 +2,4 @@
 #Copyright 2024 ZTE Corporation
 
 deps += ['rawdev', 'kvargs', 'mbuf', 'bus_pci']
-sources = files('zxdh_rawdev.c', 'zxdh_pci.c')
+sources = files('zxdh_rawdev.c')
diff --git a/drivers/raw/zxdh/zxdh_pci.c b/drivers/raw/zxdh/zxdh_pci.c
deleted file mode 100644
index 884e39109a..00
--- a/drivers/raw/zxdh/zxdh_pci.c
+++ /dev/null
@@ -1,562 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2024 ZTE Corporation
- */
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "zxdh_rawdev.h"
-#include "zxdh_pci.h"
-
-#define PCI_DEVICES_DIR  "/sys/bus/pci/devices"
-
-#define BAR0_IDX (0)
-#define BAR2_IDX (2)
-
-#define IORESOURCE_MEM   (0x0200)
-#define FILE_FMT_NVAL(2)
-
-#define STR_BUFF_LEN (128)
-
-#define BYTES_NO_SWAP(0)
-#define BYTES_SWAP   (1)
-
-#define PCI_CMD_OFFSET   (0x04)
-#define PCI_CMD_BYTES(2)
-#define PCI_CMD_MSE_BIT  (1)
-#define FPGA_VER_OFFSET  (0x420)
-#define FPGA_VER_BYTES   (4)
-#define BOM_ID_OFFSET(0x424)
-#define BOM_ID_BYTES (1)
-#define FPGA_PR_FLAG_OFFSET  (0x425)
-#define FPGA_PR_FLAG_BYTES   (1)
-#define BOARD_ID_OFFSET  (0x426)
-#define BOARD_ID_BYTES   (2)
-#define FPGA_MAKE_TIME_OFFSET(0x428)
-#define FPGA_MAKE_TIME_BYTES (4)
-
-#define PARA_PR_FLAG (0)
-#define PARA_FPGA_VER(1)
-#define PARA_FPGA_MAKE_TIME  (2)
-#define PARA_BOARD_ID(3)
-#define PARA_BOM_ID  (4)
-#define PARA_PCI_CMD (5)
-
-#define PCI_READ (0)
-#define PCI_WRITE(1)
-
-struct zxdh_pci_dev gdev;
-
-static int
-zxdh_gdma_rw_pci_config(struct zxdh_pci_dev *dev, uint8_t rw, uint offset, 
uint count, uint8_t *buf)
-{
-   int fd = -1;
-   uint res = 0;
-   int ret = -1;
-   char filename[FILE_PATH_LEN] = {0};
-
-   snprintf(filename, sizeof(filename), "/proc/bus/pci/%02x/%02x.%d",
-   dev->bus, dev->devid, dev->function);
-   fd = open(filename, O_RDWR);
-   if (fd < 0) {
-   snprintf(filename, sizeof(filename), 
"/proc/bus/pci/%04x:%02x/%02x.%d",
-   dev->domain, dev->bus, dev->devid, 
dev->function);
-   fd = open(filename, O_RDWR);
-   if (fd < 0) {
-   ZXDH_PMD_LOG(ERR, "Failed to open file:%s, fd:%d!", 
filename, fd);
-   return -1;
-   }
-   }
-
-   res = lseek(fd, offset, SEEK_SET);
-   if (res != offset) {
-   close(fd);
-   ZXDH_PMD_LOG(ERR, "Failed to lseek pci, res:%d!", res);
-   return -1;
-   }
-
-   if (rw == PCI_READ)
-   ret = read(fd, buf, count);
-   else
-   ret = write(fd, buf, count);
-
-   if (ret < 0) {
-   close(fd);
-   ZXDH_PMD_LOG(ERR, "Failed to rw pci:%d, ret:%d!", rw, ret);
-   return -1;
-   }
-
-   close(fd);
-   return 0;
-}
-
-static int
-zxdh_gdma_cfg_space_read(struct zxdh_pci_dev *dev, uint8_t ParaType, uint 
*pParaVer)
-{
-   int ret = 0;
-   uint8_t aRegVal[sizeof(uint)] = {0};
-   uint8_t ucLoop = 0;
-   uint8_t ucSwap = BYTES_NO_SWAP;
-   uint dwRegOffset = 0;
-   uint dwRegLen = 0;
-
-   if ((dev == NULL) || (pParaVer == NULL)) {
-   ZXDH_PMD_LOG(ERR, "Param is invalid!");
-   return -EINVAL;
-   }
-
-   switch (ParaType) {
-   case PARA_PR_FLAG:
-   dwRegOffset = FPGA_PR_FLAG_OFFSET;
-   dwRegLen= FPGA_PR_FLAG_BYTES;
-   ucSwap  = BYTES_NO_SWAP;
-   break;
-   case PARA_FPGA_VER:
-   dwRegOffset = FPGA_VER_OFFSET;
-   dwRegLen= FPGA_VER_BYTES;
-   ucSwap  = BYTES_NO_SWAP;
-   break;
-   case PARA_FPGA_MAKE_TIME:
-   dwRegOffset = FPGA_MAKE_TIME_OFFSET;
-   dwRegLen= FPGA_MAKE_TIME_BYTES;
-   ucSwap  = BYTES_NO_SWAP;
-   break;
-   case PARA_BOARD_ID:
-   dwRegOffset = BOARD_ID_OFFSET;
-   dwRegL

raw/zxdh: introduce zxdh raw device driver

2024-07-08 Thread zhang.yong25

Hi David,

I have made some changes as suggested. Is there anything else that needs to be 
changed?

Thanks

Original

From: DavidMarchand 
To: 张勇10313449;
Cc: dev@dpdk.org ;
Date: 2024年06月12日 19:28
Subject: Re: raw/zxdh: introduce zxdh raw device driver

Hello,

On Wed, Jun 12, 2024 at 1:01 PM  wrote:
> From 7da90caa892abc0ab27fc11e892f6616f4bc8c9a Mon Sep 17 00:00:00 2001
> From: Yong Zhang  
> Date: Wed, 12 Jun 2024 17:35:34 +0800
> Subject: [PATCH] raw/zxdh: introduce zxdh raw device driver
> 
> Introduce rawdev driver support for ZXDH which
> can help to connect two separate hosts with each other.
> 
> Signed-off-by: Yong Zhang  

Please check your mail settings, this patch was received base64 encoded.
It confuses a lot of our tools in the CI.

On the patch itself, I had a (really) quick look.

I see checks on DPDK version, please remove compat code, it does not
make sense in the main repository.
This looks to be a PCI driver, please convert this driver and do not
expose a vdev.
Please use RTE_LOG_LINE() / RTE_LOG_LINE_PREFIX() instead of direct
call to rte_log.

--  
David Marchand

[PATCH v7 2/2] examples/l3fwd-power: add PM QoS configuration

Add PM QoS configuration to declease the delay after sleep in case of
entering deeper idle state.

Signed-off-by: Huisong Li 
Acked-by: Morten Brørup 
---
 examples/l3fwd-power/main.c | 24 
 1 file changed, 24 insertions(+)

diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index fba11da7ca..d518e19467 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "perf_core.h"
 #include "main.h"
@@ -2259,6 +2260,22 @@ init_power_library(void)
return -1;
}
}
+
+   RTE_LCORE_FOREACH(lcore_id) {
+   /*
+* Set the worker lcore's to have strict latency limit to allow
+* the CPU to enter the shallowest idle state.
+*/
+   ret = rte_power_qos_set_cpu_resume_latency(lcore_id,
+   RTE_POWER_QOS_STRICT_LATENCY_VALUE);
+   if (ret < 0) {
+   RTE_LOG(ERR, L3FWD_POWER,
+   "Failed to set strict resume latency on 
CPU%u.\n",
+   lcore_id);
+   return ret;
+   }
+   }
+
return ret;
 }
 
@@ -2298,6 +2315,13 @@ deinit_power_library(void)
}
}
}
+
+   RTE_LCORE_FOREACH(lcore_id) {
+   /* Restore the original value in kernel. */
+   rte_power_qos_set_cpu_resume_latency(lcore_id,
+   RTE_POWER_QOS_RESUME_LATENCY_NO_CONSTRAINT);
+   }
+
return ret;
 }
 
-- 
2.22.0

[PATCH v7 0/2] power: introduce PM QoS interface

The deeper the idle state, the lower the power consumption, but the longer
the resume time. Some service are delay sensitive and very except the low
resume time, like interrupt packet receiving mode.

And the "/sys/devices/system/cpu/cpuX/power/pm_qos_resume_latency_us" sysfs
interface is used to set and get the resume latency limit on the cpuX for
userspace. Please see the description in kernel document[1].
Each cpuidle governor in Linux select which idle state to enter based on
this CPU resume latency in their idle task.

The per-CPU PM QoS API can be used to control this CPU's idle state
selection and limit just enter the shallowest idle state to low the delay
after sleep by setting strict resume latency (zero value).

[1] 
https://www.kernel.org/doc/html/latest/admin-guide/abi-testing.html?highlight=pm_qos_resume_latency_us#abi-sys-devices-power-pm-qos-resume-latency-us

---
 v7:
  - remove a dead code rte_lcore_is_enabled in patch[2/2]
 v6:
  - update release_24_07.rst based on dpdk repo to resolve CI warning.
 v5:
  - use LINE_MAX to replace BUFSIZ, and use snprintf to replace sprintf.
 v4:
  - fix some comments basd on Stephen
  - add stdint.h include
  - add Acked-by Morten Brørup 
 v3:
  - add RTE_POWER_xxx prefix for some macro in header
  - add the check for lcore_id with rte_lcore_is_enabled
 v2:
  - use PM QoS on CPU wide to replace the one on system wide

Huisong Li (2):
  power: introduce PM QoS API on CPU wide
  examples/l3fwd-power: add PM QoS configuration

 doc/guides/prog_guide/power_man.rst|  24 ++
 doc/guides/rel_notes/release_24_07.rst |   4 +
 examples/l3fwd-power/main.c|  24 ++
 lib/power/meson.build  |   2 +
 lib/power/rte_power_qos.c  | 114 +
 lib/power/rte_power_qos.h  |  73 
 lib/power/version.map  |   2 +
 7 files changed, 243 insertions(+)
 create mode 100644 lib/power/rte_power_qos.c
 create mode 100644 lib/power/rte_power_qos.h

-- 
2.22.0

[PATCH v7 1/2] power: introduce PM QoS API on CPU wide