Re: [PATCH v4 11/14] log: add a per line log helper

[David Marchand]

On Tue, Dec 19, 2023 at 6:16 PM Stephen Hemminger
 wrote:
>
> On Tue, 19 Dec 2023 16:45:19 +0100
> Thomas Monjalon  wrote:
>
> > 18/12/2023 15:38, David Marchand:
> > > +#ifdef RTE_TOOLCHAIN_GCC
> > > +#define RTE_LOG_CHECK_NO_NEWLINE(fmt) \
> > > +   static_assert(!__builtin_strchr(fmt, '\n'), \
> > > +   "This log format string contains a \\n")
> > > +#else
> > > +#define RTE_LOG_CHECK_NO_NEWLINE(...)
> > > +#endif
> >
> > No support in clang?
>
> clang has static assert, but probably not builtin_strchr

clang seems to have support for __builtin_strchr (which was not
obvious to me when I first looked at it).
Testing with clang ("thanks" to net/mlx4), I realised that this check
relies on some gnu extension (constant folding) which breaks
compilation with -pedantic.

An additional check on PEDANTIC is needed, and I can then add support for clang.


-- 
David Marchand

[PATCH v6 1/3] node: support to add next node to ethdev Rx node

[Rakesh Kudurumalla]

By default all packets received on ethdev_rx node
is forwarded to pkt_cls node.This patch provides
library support to add a new node as next node to
ethdev_rx node and forward packet to new node from
rx node.

Signed-off-by: Rakesh Kudurumalla 
---
V6: Addressed comments
updated documentation

 lib/node/ethdev_ctrl.c  | 49 -
 lib/node/rte_node_eth_api.h | 18 ++
 lib/node/version.map|  3 +++
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/lib/node/ethdev_ctrl.c b/lib/node/ethdev_ctrl.c
index d564b80e37..ab54b7f0d4 100644
--- a/lib/node/ethdev_ctrl.c
+++ b/lib/node/ethdev_ctrl.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(C) 2020 Marvell International Ltd.
  */
-
+#include 
 #include 
 
 #include 
@@ -129,3 +129,50 @@ rte_node_eth_config(struct rte_node_ethdev_config *conf, 
uint16_t nb_confs,
ctrl.nb_graphs = nb_graphs;
return 0;
 }
+
+int
+rte_node_ethdev_rx_next_update(rte_node_t id, const char *edge_name)
+{
+   struct ethdev_rx_node_main *data;
+   ethdev_rx_node_elem_t *elem;
+   char **next_nodes;
+   int rc = -EINVAL;
+   uint32_t size;
+   uint16_t i = 0;
+
+   if (edge_name == NULL)
+   goto exit;
+
+   size = rte_node_edge_get(id, NULL);
+
+   if (size == RTE_NODE_ID_INVALID)
+   goto exit;
+
+   next_nodes = calloc(size + 1, sizeof(*next_nodes));
+   if (next_nodes == NULL) {
+   rc = -ENOMEM;
+   goto exit;
+   }
+
+   size = rte_node_edge_get(id, next_nodes);
+
+   while (next_nodes[i] != NULL) {
+   if (strcmp(edge_name, next_nodes[i]) == 0) {
+   data = ethdev_rx_get_node_data_get();
+   elem = data->head;
+   while (elem->next != data->head) {
+   if (elem->nid == id) {
+   elem->ctx.cls_next = i;
+   rc = 0;
+   goto found;
+   }
+   elem = elem->next;
+   }
+   }
+   i++;
+   }
+found:
+   free(next_nodes);
+exit:
+   return rc;
+}
diff --git a/lib/node/rte_node_eth_api.h b/lib/node/rte_node_eth_api.h
index eaae50772d..d2f705e908 100644
--- a/lib/node/rte_node_eth_api.h
+++ b/lib/node/rte_node_eth_api.h
@@ -22,6 +22,7 @@ extern "C" {
 
 #include 
 #include 
+#include 
 #include 
 
 /**
@@ -57,6 +58,23 @@ struct rte_node_ethdev_config {
  */
 int rte_node_eth_config(struct rte_node_ethdev_config *cfg,
uint16_t cnt, uint16_t nb_graphs);
+
+/**
+ * Update ethdev rx next node.
+ *
+ * @param id
+ *   Node id whose edge is to be updated.
+ * @param edge_name
+ *   Name of the next node.
+ *
+ * @return
+ *   ENINVAL: Either of input parameters are invalid
+ *   ENOMEM: If memory allocation failed
+ *   0 on successful initialization.
+ */
+__rte_experimental
+int rte_node_ethdev_rx_next_update(rte_node_t id, const char *edge_name);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/node/version.map b/lib/node/version.map
index 99ffcdd414..6bdb944c4c 100644
--- a/lib/node/version.map
+++ b/lib/node/version.map
@@ -19,4 +19,7 @@ EXPERIMENTAL {
rte_node_ip4_reassembly_configure;
rte_node_udp4_dst_port_add;
rte_node_udp4_usr_node_add;
+
+   # added in 24.03
+   rte_node_ethdev_rx_next_update;
 };
-- 
2.25.1

[PATCH v6 2/3] app/graph: add ethdev forward command

[Rakesh Kudurumalla]

Adds a txport to forward packet for every rxport

Mapping will be used to forward packets to txport
received on rxport

Following commands are exposed:
- ethdev forward  "

Signed-off-by: Rakesh Kudurumalla 
---
 app/graph/cli.c|  1 +
 app/graph/ethdev.c | 63 ++
 app/graph/ethdev.h |  1 +
 app/graph/ethdev_priv.h|  8 +
 doc/guides/tools/graph.rst |  4 +++
 5 files changed, 77 insertions(+)

diff --git a/app/graph/cli.c b/app/graph/cli.c
index 30b12312d6..76f5b8e670 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -32,6 +32,7 @@ cmdline_parse_ctx_t modules_ctx[] = {
(cmdline_parse_inst_t *)ðdev_prom_mode_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_ip4_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_ip6_cmd_ctx,
+   (cmdline_parse_inst_t *)ðdev_forward_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_help_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_rx_cmd_ctx,
diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index c9b09168c1..bb502a6134 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -38,6 +38,9 @@ cmd_ethdev_ip4_addr_help[] = "ethdev  ip4 addr 
add  netmask tx_port_id = portid_tx;
+   rc = 0;
+   } else {
+   rc = -EINVAL;
+   }
+
+   return rc;
+}
+
+static void
+cli_ethdev_forward(void *parsed_result, __rte_unused struct cmdline *cl, void 
*data __rte_unused)
+{
+   struct ethdev_fwd_cmd_tokens *res = parsed_result;
+   int rc = -EINVAL;
+
+   rc = ethdev_forward_config(res->tx_dev, res->rx_dev);
+   if (rc < 0)
+   printf(MSG_CMD_FAIL, res->cmd);
+}
+
+cmdline_parse_token_string_t ethdev_fwd_cfg =
+   TOKEN_STRING_INITIALIZER(struct ethdev_fwd_cmd_tokens, cmd, "ethdev");
+cmdline_parse_token_string_t ethdev_fwd_cmd =
+   TOKEN_STRING_INITIALIZER(struct ethdev_fwd_cmd_tokens, fwd, "forward");
+cmdline_parse_token_string_t ethdev_tx_device =
+   TOKEN_STRING_INITIALIZER(struct ethdev_fwd_cmd_tokens, tx_dev, NULL);
+cmdline_parse_token_string_t ethdev_rx_device =
+   TOKEN_STRING_INITIALIZER(struct ethdev_fwd_cmd_tokens, rx_dev, NULL);
+
+cmdline_parse_inst_t ethdev_forward_cmd_ctx = {
+   .f = cli_ethdev_forward,
+   .data = NULL,
+   .help_str = cmd_ethdev_forward_help,
+   .tokens = {
+  (void *)ðdev_fwd_cfg,
+  (void *)ðdev_fwd_cmd,
+  (void *)ðdev_tx_device,
+  (void *)ðdev_rx_device,
+  NULL,
+   },
+};
diff --git a/app/graph/ethdev.h b/app/graph/ethdev.h
index 94d3247a2c..836052046b 100644
--- a/app/graph/ethdev.h
+++ b/app/graph/ethdev.h
@@ -15,6 +15,7 @@ extern cmdline_parse_inst_t ethdev_mtu_cmd_ctx;
 extern cmdline_parse_inst_t ethdev_prom_mode_cmd_ctx;
 extern cmdline_parse_inst_t ethdev_ip4_cmd_ctx;
 extern cmdline_parse_inst_t ethdev_ip6_cmd_ctx;
+extern cmdline_parse_inst_t ethdev_forward_cmd_ctx;
 extern cmdline_parse_inst_t ethdev_cmd_ctx;
 extern cmdline_parse_inst_t ethdev_help_cmd_ctx;
 
diff --git a/app/graph/ethdev_priv.h b/app/graph/ethdev_priv.h
index f231f3f3e1..af79553438 100644
--- a/app/graph/ethdev_priv.h
+++ b/app/graph/ethdev_priv.h
@@ -61,6 +61,13 @@ struct ethdev_ip6_cmd_tokens {
cmdline_fixed_string_t mask;
 };
 
+struct ethdev_fwd_cmd_tokens {
+   cmdline_fixed_string_t cmd;
+   cmdline_fixed_string_t fwd;
+   cmdline_fixed_string_t tx_dev;
+   cmdline_fixed_string_t rx_dev;
+};
+
 struct ethdev_cmd_tokens {
cmdline_fixed_string_t cmd;
cmdline_fixed_string_t dev;
@@ -104,6 +111,7 @@ struct ethdev_config {
 
 struct ethdev {
TAILQ_ENTRY(ethdev) next;
+   uint16_t tx_port_id;
struct ethdev_config config;
struct ipv4_addr_config ip4_addr;
struct ipv6_addr_config ip6_addr;
diff --git a/doc/guides/tools/graph.rst b/doc/guides/tools/graph.rst
index 1855d12891..0b07c12cec 100644
--- a/doc/guides/tools/graph.rst
+++ b/doc/guides/tools/graph.rst
@@ -195,6 +195,9 @@ file to express the requested use case configuration.
| ethdev  mtu | | Command to configure MTU of 
DPDK|   Yes   |Yes   |
|  | | port.   
| |  |

+--+---+-+--+
+   | ethdev forward  | | Command to configure port   
|   No|Yes   |
+   | | | forwading of DPDK   
| |  |
+   
+--+---+-+--+
|  | ethdev  promiscuous  | | Command to enable/disable   
|   Yes   |Yes   |
|  |   | | promiscuous mode on DPDK port.  
| |  |

+--+---+-+--+
@@ -297,6 +300,7 @@ Example: ``dpdk

[PATCH v6 3/3] app/graph: implement port forward usecase

[Rakesh Kudurumalla]

Added portforward usecase.In this usecase
packets received Rx port is forwarded to
respective Tx port.

Signed-off-by: Rakesh Kudurumalla 
---
 app/graph/ethdev.c   |  13 ++
 app/graph/ethdev.h   |   1 +
 app/graph/examples/l2fwd.cli |  41 +
 app/graph/examples/l2fwd_pcap.cli|  37 +
 app/graph/graph.c|   8 +-
 app/graph/l2fwd.c| 152 +++
 app/graph/l2fwd.h|  11 ++
 app/graph/meson.build|   1 +
 app/graph/module_api.h   |   1 +
 doc/guides/tools/graph.rst   |  21 +++
 doc/guides/tools/img/graph-usecase-l2fwd.svg |  92 +++
 11 files changed, 377 insertions(+), 1 deletion(-)
 create mode 100644 app/graph/examples/l2fwd.cli
 create mode 100644 app/graph/examples/l2fwd_pcap.cli
 create mode 100644 app/graph/l2fwd.c
 create mode 100644 app/graph/l2fwd.h
 create mode 100644 doc/guides/tools/img/graph-usecase-l2fwd.svg

diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index bb502a6134..a622275338 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -76,6 +76,19 @@ ethdev_port_by_id(uint16_t port_id)
return NULL;
 }
 
+int16_t
+ethdev_txport_by_rxport_get(uint16_t portid_rx)
+{
+   int portid = -EINVAL;
+   struct ethdev *port;
+
+   port = ethdev_port_by_id(portid_rx);
+   if (port)
+   portid = port->tx_port_id;
+
+   return portid;
+}
+
 void *
 ethdev_mempool_list_by_portid(uint16_t portid)
 {
diff --git a/app/graph/ethdev.h b/app/graph/ethdev.h
index 836052046b..ec457b89bf 100644
--- a/app/graph/ethdev.h
+++ b/app/graph/ethdev.h
@@ -36,6 +36,7 @@ void ethdev_stop(void);
 void *ethdev_mempool_list_by_portid(uint16_t portid);
 int16_t ethdev_portid_by_ip4(uint32_t ip, uint32_t mask);
 int16_t ethdev_portid_by_ip6(uint8_t *ip, uint8_t *mask);
+int16_t ethdev_txport_by_rxport_get(uint16_t portid_rx);
 void ethdev_list_clean(void);
 
 #endif
diff --git a/app/graph/examples/l2fwd.cli b/app/graph/examples/l2fwd.cli
new file mode 100644
index 00..861e83bd70
--- /dev/null
+++ b/app/graph/examples/l2fwd.cli
@@ -0,0 +1,41 @@
+; SPDX-License-Identifier: BSD-3-Clause
+; Copyright(c) 2023 Marvell.
+
+;
+; Graph configuration for given usecase
+;
+graph l2fwd coremask 0xff bsz 32 tmo 10 model default pcap_enable 1 
num_pcap_pkts 10 pcap_file /tmp/output.pcap
+
+;
+; Mempools to be attached with ethdev
+;
+mempool mempool0 size 8192 buffers 4000 cache 256 numa 0
+
+;
+; DPDK devices and configuration.
+;
+; Note: Customize the parameters below to match your setup.
+;
+ethdev 0002:01:00.1 rxq 1 txq 8 mempool0
+ethdev 0002:01:00.4 rxq 1 txq 8 mempool0
+ethdev 0002:01:00.6 rxq 1 txq 8 mempool0
+ethdev 0002:02:00.0 rxq 1 txq 8 mempool0
+
+;
+; Rx/Tx port mapping
+;
+ethdev forward 0002:01:00.4 0002:02:00.0
+ethdev forward 0002:01:00.1 0002:01:00.6
+
+;
+; Port-Queue-Core mapping for ethdev_rx node
+;
+ethdev_rx map port 0002:02:00.0 queue 0 core 1
+ethdev_rx map port 0002:01:00.6 queue 0 core 2
+
+;
+; Graph start command to create graph.
+;
+; Note: No more command should come after this.
+;
+graph start
diff --git a/app/graph/examples/l2fwd_pcap.cli 
b/app/graph/examples/l2fwd_pcap.cli
new file mode 100644
index 00..67308b3b72
--- /dev/null
+++ b/app/graph/examples/l2fwd_pcap.cli
@@ -0,0 +1,37 @@
+; SPDX-License-Identifier: BSD-3-Clause
+; Copyright(c) 2023 Marvell.
+
+;
+; Graph configuration for given usecase
+;
+graph l2fwd coremask 0xff bsz 32 tmo 10 model default pcap_enable 1 
num_pcap_pkts 10 pcap_file /tmp/output.pcap
+
+;
+; Mempools to be attached with ethdev
+;
+mempool mempool0 size 8192 buffers 4000 cache 256 numa 0
+
+;
+; DPDK devices and configuration.
+;
+; Note: Customize the parameters below to match your setup.
+;
+ethdev net_pcap0 rxq 1 txq 8 mempool0
+ethdev net_pcap1 rxq 1 txq 8 mempool0
+
+;
+; Rx/Tx port mapping
+;
+ethdev forward net_pcap1 net_pcap0
+
+;
+; Port-Queue-Core mapping for ethdev_rx node
+;
+ethdev_rx map port net_pcap0 queue 0 core 1
+
+;
+; Graph start command to create graph.
+;
+; Note: No more command should come after this.
+;
+graph start
diff --git a/app/graph/graph.c b/app/graph/graph.c
index a65723a196..4e0441f1a7 100644
--- a/app/graph/graph.c
+++ b/app/graph/graph.c
@@ -24,7 +24,7 @@ cmd_graph_help[] = "graph  bsz  tmo  
coremask  "
   "model  pcap_enable <0 | 1> 
num_pcap_pkts "
   "pcap_file ";
 
-static const char * const supported_usecases[] = {"l3fwd"};
+static const char * const supported_usecases[] = {"l3fwd", "l2fwd"};
 struct graph_config graph_config;
 bool graph_started;
 
@@ -273,6 +273,12 @@ cli_graph_start(__rte_unused void *parsed_result, 
__rte_unused struct cmdline *c
break;
}
}
+   if (!strcmp(graph_config.usecases[i].name, "l2

[PATCH] net/i40e: support FEC feature

[Qiming Yang]

This patch enabled FEC set and get functions.

Signed-off-by: Qiming Yang 
---
 drivers/net/i40e/i40e_ethdev.c | 183 +
 1 file changed, 183 insertions(+)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 3ca226156b..1eb49176d1 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -405,6 +405,11 @@ static void i40e_ethertype_filter_restore(struct i40e_pf 
*pf);
 static void i40e_tunnel_filter_restore(struct i40e_pf *pf);
 static void i40e_filter_restore(struct i40e_pf *pf);
 static void i40e_notify_all_vfs_link_status(struct rte_eth_dev *dev);
+static int i40e_fec_get_capability(struct rte_eth_dev *dev, struct 
rte_eth_fec_capa *speed_fec_capa,
+  unsigned int num);
+static int i40e_fec_get(struct rte_eth_dev *dev, uint32_t *fec_capa);
+static int i40e_fec_set(struct rte_eth_dev *dev, uint32_t fec_capa);
+
 
 static const char *const valid_keys[] = {
ETH_I40E_FLOATING_VEB_ARG,
@@ -519,6 +524,9 @@ static const struct eth_dev_ops i40e_eth_dev_ops = {
.tm_ops_get   = i40e_tm_ops_get,
.tx_done_cleanup  = i40e_tx_done_cleanup,
.get_monitor_addr = i40e_get_monitor_addr,
+   .fec_get_capability   = i40e_fec_get_capability,
+   .fec_get  = i40e_fec_get,
+   .fec_set  = i40e_fec_set,
 };
 
 /* store statistics names and its offset in stats structure */
@@ -12159,6 +12167,181 @@ i40e_cloud_filter_qinq_create(struct i40e_pf *pf)
return ret;
 }
 
+static int
+i40e_fec_get_capability(struct rte_eth_dev *dev, struct rte_eth_fec_capa 
*speed_fec_capa,
+  unsigned int num)
+{
+   struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+   num = 0;
+
+   if (hw->mac.type == I40E_MAC_X722 &&
+   !(hw->flags & I40E_HW_FLAG_X722_FEC_REQUEST_CAPABLE)) {
+   PMD_DRV_LOG(ERR, "Setting FEC encoding not supported by"
+" firmware. Please update the NVM image.\n");
+   return 0;
+   }
+
+   if (hw->device_id == I40E_DEV_ID_25G_SFP28 ||
+   hw->device_id == I40E_DEV_ID_25G_B) {
+   if (speed_fec_capa) {
+   speed_fec_capa[num].speed = RTE_ETH_SPEED_NUM_25G;
+   speed_fec_capa[num].capa = 
RTE_ETH_FEC_MODE_CAPA_MASK(NOFEC) |
+RTE_ETH_FEC_MODE_CAPA_MASK(BASER) |
+RTE_ETH_FEC_MODE_CAPA_MASK(AUTO) |
+RTE_ETH_FEC_MODE_CAPA_MASK(RS);
+   }
+   num++;
+   }
+
+   if (hw->device_id == I40E_DEV_ID_KX_X722) {
+   if (speed_fec_capa) {
+   speed_fec_capa[num].speed = RTE_ETH_SPEED_NUM_25G;
+   speed_fec_capa[num].capa = 
RTE_ETH_FEC_MODE_CAPA_MASK(AUTO) |
+RTE_ETH_FEC_MODE_CAPA_MASK(RS);
+   }
+   num++;
+   }
+
+   return num;
+}
+
+static int
+i40e_fec_get(struct rte_eth_dev *dev, uint32_t *fec_capa)
+{
+   struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+   struct i40e_aq_get_phy_abilities_resp abilities;
+   u32 temp_fec_capa = 0;
+   u8 fec_cfg;
+   int ret = 0;
+
+   /* Get the current phy config */
+   memset(&abilities, 0, sizeof(abilities));
+   ret = i40e_aq_get_phy_capabilities(hw, false, false, &abilities,
+ NULL);
+   if (ret) {
+   PMD_DRV_LOG(ERR, "Failed to get PHY capabilities: %d\n",
+   ret);
+   return -ENOTSUP;
+   }
+
+   fec_cfg = abilities.fec_cfg_curr_mod_ext_info;
+   if (fec_cfg & I40E_AQ_SET_FEC_AUTO)
+   temp_fec_capa = RTE_ETH_FEC_MODE_CAPA_MASK(AUTO);
+
+   if (fec_cfg & I40E_AQ_SET_FEC_REQUEST_KR ||
+   fec_cfg & I40E_AQ_SET_FEC_ABILITY_KR)
+   temp_fec_capa = RTE_ETH_FEC_MODE_CAPA_MASK(BASER);
+
+   if (fec_cfg & I40E_AQ_SET_FEC_REQUEST_RS ||
+   fec_cfg & I40E_AQ_SET_FEC_ABILITY_RS)
+   temp_fec_capa = RTE_ETH_FEC_MODE_CAPA_MASK(RS);
+
+   if (fec_cfg == 0)
+   temp_fec_capa = RTE_ETH_FEC_MODE_CAPA_MASK(NOFEC);
+
+   *fec_capa = temp_fec_capa;
+
+   return 0;
+}
+
+static int
+i40e_fec_set(struct rte_eth_dev *dev, uint32_t fec_capa)
+{
+   struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+   struct i40e_aq_get_phy_abilities_resp abilities;
+   struct i40e_aq_set_phy_config config = { 0 };
+   enum i40e_status_code status;
+   u8 req_fec;
+   int ret = 0;
+
+   if (hw->device_id != I40E_DEV_ID_25G_SFP28 &&
+   hw->device_id != I40E_DEV_ID_25G_B &&
+   hw->device_id != I40E_DEV_ID_KX_

Re: [PATCH] windows: install sched.h header

[Bruce Richardson]

On Tue, Dec 19, 2023 at 12:17:37PM -0800, Tyler Retzlaff wrote:
> rte_os.h includes sched.h so install sched.h to allow DPDK installed to
> DESTDIR to be usable.
> 
> Signed-off-by: Tyler Retzlaff 
> ---
Acked-by: Bruce Richardson 

Re: [PATCH] app/dma-perf: replace pktmbuf with mempool objects

[Varghese, Vipin]

just received an update marking this as `Superseded`. I will send again 
with `ACK` also



Thank you Morten for the understanding



*From:* Morten Brørup 
*Sent:* 12 December 2023 23:39
*To:* Varghese, Vipin ; Bruce Richardson 

*Cc:* Yigit, Ferruh ; dev@dpdk.org 
; sta...@dpdk.org ; 
honest.ji...@foxmail.com ; P, Thiyagarajan 


*Subject:* RE: [PATCH] app/dma-perf: replace pktmbuf with mempool objects


Caution: This message originated from an External Source. Use proper 
caution when opening attachments, clicking links, or responding.



*From:*Varghese, Vipin [mailto:vipin.vargh...@amd.com]
*Sent:* Tuesday, 12 December 2023 18.14

Sharing a few critical points based on my exposure to the dma-perf 
application below




On Tue, Dec 12, 2023 at 04:16:20PM +0100, Morten Brørup wrote:
> +TO: Bruce, please stop me if I'm completely off track here.
>
> > From: Ferruh Yigit [mailto:ferruh.yi...@amd.com 
] Sent: Tuesday, 12

> > December 2023 15.38
> >
> > On 12/12/2023 11:40 AM, Morten Brørup wrote:
> > >> From: Vipin Varghese [mailto:vipin.vargh...@amd.com 
] Sent: Tuesday,

> > >> 12 December 2023 11.38
> > >>
> > >> Replace pktmbuf pool with mempool, this allows increase in MOPS
> > >> especially in lower buffer size. Using Mempool, allows to 
reduce the

> > >> extra CPU cycles.
> > >
> > > I get the point of this change: It tests the performance of copying
> > raw memory objects using respectively rte_memcpy and DMA, without the
> > mbuf indirection overhead.
> > >
> > > However, I still consider the existing test relevant: The 
performance

> > of copying packets using respectively rte_memcpy and DMA.
> > >
> >
> > This is DMA performance test application and packets are not used,
> > using pktmbuf just introduces overhead to the main focus of the
> > application.
> >
> > I am not sure if pktmuf selected intentionally for this test
> > application, but I assume it is there because of historical reasons.
>
> I think pktmbuf was selected intentionally, to provide more accurate
> results for application developers trying to determine when to use
> rte_memcpy and when to use DMA. Much like the "copy breakpoint" in Linux
> Ethernet drivers is used to determine which code path to take for each
> received packet.

yes Ferruh, this is the right understanding. In DPDK example we 
already have


dma-forward application which makes use of pktmbuf payload to copy over

new pktmbuf payload area.

by moving to mempool, we are actually now focusing on source and 
destination buffers.


This allows to create mempool objects with 2MB and 1GB src-dst areas. 
Thus allowing


to focus src to dst copy. With pktmbuf we were not able to achieve the 
same.



>
> Most applications will be working with pktmbufs, so these applications
> will also experience the pktmbuf overhead. Performance testing with the
> same overhead as the application will be better to help the application
> developer determine when to use rte_memcpy and when to use DMA when
> working with pktmbufs.

Morten thank you for the input, but as shared above DPDK example 
dma-fwd does


justice to such scenario. inline to test-compress-perf & 
test-crypto-perf IMHO test-dma-perf


should focus on getting best values of dma engine and memcpy comparision.


>
> (Furthermore, for the pktmbuf tests, I wonder if copying performance
> could also depend on IOVA mode and RTE_IOVA_IN_MBUF.)
>
> Nonetheless, there may also be use cases where raw mempool objects are
> being copied by rte_memcpy or DMA, so adding tests for these use cases
> are useful.
>
>
> @Bruce, you were also deeply involved in the DMA library, and probably
> have more up-to-date practical experience with it. Am I right that
> pktmbuf overhead in these tests provides more "real life use"-like
> results? Or am I completely off track with my thinking here, i.e. the
> pktmbuf overhead is only noise?
>
I'm actually not that familiar with the dma-test application, so can't
comment on the specific overhead involved here. In the general case, if we
are just talking about the overhead of dereferencing the mbufs then I 
would
expect the overhead to be negligible. However, if we are looking to 
include

the cost of allocation and freeing of buffers, I'd try to avoid that as it
is a cost that would have to be paid for both SW copies and HW copies, so
should not count when calculating offload cost.

Bruce, as per test-dma-perf there is no repeated pktmbuf-alloc or 
pktmbuf-free.


Hence I disagree that the overhead discussed for pkmbuf here is not 
related to alloc and free.


But the cost as per my investigation goes into fetching the cacheline 
and performing mtod on


each iteration.

/Bruce

I can rewrite the logic to make use pktmbuf objects by sending the src 
and dst with pre-computed


mtod to avoid the overhead. But this will not resolve the 2MB and 1GB 
huge page cop

Re: [PATCH] app/dma-perf: replace pktmbuf with mempool objects

[David Marchand]

On Wed, Dec 20, 2023 at 10:18 AM Varghese, Vipin  wrote:
>
> just received an update marking this as `Superseded`. I will send again with 
> `ACK` also

I saw multiple versions of a patch, with the last one marked as
deferred, so I cleaned the previous revision as superseded.
There are many instances when people are not cleaning their stuff in patchwork.

If something is wrong with it, then please fix yourself.
Thanks.


-- 
David Marchand

RE: [PATCH] config/x86: config support for AMD EPYC processors

[Tummala, Sivaprasad]

[AMD Official Use Only - General]

Hi Morten,

> -Original Message-
> From: Morten Brørup 
> Sent: Wednesday, December 20, 2023 12:58 PM
> To: Tummala, Sivaprasad ;
> david.march...@redhat.com; ktray...@redhat.com; tho...@monjalon.net;
> konstantin.anan...@huawei.com; konstantin.v.anan...@yandex.ru;
> bruce.richard...@intel.com; maxime.coque...@redhat.com;
> acon...@redhat.com; Yigit, Ferruh 
> Cc: dev@dpdk.org
> Subject: RE: [PATCH] config/x86: config support for AMD EPYC processors
>
> Caution: This message originated from an External Source. Use proper caution
> when opening attachments, clicking links, or responding.
>
>
> > From: Sivaprasad Tummala [mailto:sivaprasad.tumm...@amd.com]
> > Sent: Wednesday, 20 December 2023 08.11
> >
> > On x86 platforms, max lcores are limited to 128 by default.
> >
> > On AMD EPYC processors, this limit was adjusted for native builds in
> > the previous patch.
> > https://patches.dpdk.org/project/dpdk/patch/
> > 20230925151027.558546-1-sivaprasad.tumm...@amd.com/
> >
> > As agreed earlier in mailing list, this patch adjusts the limit for
> > specific AMD EPYC target/cross builds.
> >
> > Signed-off-by: Sivaprasad Tummala 
> > ---
>
> [...]
>
> > +foreach m:epyc_zen_cores.keys()
> > +if m.contains(cpu_instruction_set)
> > +dpdk_conf.set('RTE_MAX_LCORE', epyc_zen_cores[m])
> > + break
>
> The indentation of "break" uses a mix of tab and spaces, and should be fixed.
Thanks for spotting this. Will fix this in v2.
>
> Acked-by: Morten Brørup 

[PATCH v3 0/3] net/iavf: support Tx LLDP on scalar and AVX512

[Zhichao Zeng]

This patch set adds an IAVF testpmd command "set tx lldp on|off" which
will register an mbuf dynfield IAVF_TX_LLDP_DYNFIELD, currently only
supported turning on.

IAVF will fill the SWTCH_UPLINK bit in the Tx context descriptor based on
the mbuf dynfield to send the LLDP packet.

For avx512, need to close the Tx port first, then "set tx lldp on", and
reopen the port to select correct Tx path.

---
v3: non-lldp packet do not use the context descriptor
v2: split into patch set, refine commit log

Zhichao Zeng (3):
  net/iavf: support Tx LLDP on scalar
  net/iavf: support Tx LLDP on AVX512
  net/iavf: add Tx LLDP command

 doc/guides/rel_notes/release_24_03.rst  |  3 +
 drivers/net/iavf/iavf_rxtx.c| 23 ++-
 drivers/net/iavf/iavf_rxtx.h|  3 +
 drivers/net/iavf/iavf_rxtx_vec_avx512.c | 20 +++
 drivers/net/iavf/iavf_rxtx_vec_common.h |  6 ++
 drivers/net/iavf/iavf_testpmd.c | 80 +
 drivers/net/iavf/meson.build|  3 +
 drivers/net/iavf/rte_pmd_iavf.h |  4 ++
 8 files changed, 140 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/iavf/iavf_testpmd.c

-- 
2.34.1

[PATCH v3 1/3] net/iavf: support Tx LLDP on scalar

[Zhichao Zeng]

This patch adds an mbuf dynfield IAVF_TX_LLDP_DYNFIELD to determine
whether or not to fill the SWTCH_UPLINK bit in the Tx context descriptor
to send LLDP packet.

Signed-off-by: Zhichao Zeng 
---
 drivers/net/iavf/iavf_rxtx.c| 18 --
 drivers/net/iavf/rte_pmd_iavf.h |  4 
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index f19aa14646..2ecd8637c5 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -85,6 +85,8 @@ uint64_t rte_pmd_ifd_dynflag_proto_xtr_tcp_mask;
 uint64_t rte_pmd_ifd_dynflag_proto_xtr_ip_offset_mask;
 uint64_t rte_pmd_ifd_dynflag_proto_xtr_ipsec_crypto_said_mask;
 
+int iavf_tx_lldp_dynfield_offset = -1;
+
 uint8_t
 iavf_proto_xtr_type_to_rxdid(uint8_t flex_type)
 {
@@ -2418,8 +2420,9 @@ iavf_xmit_cleanup(struct iavf_tx_queue *txq)
 
 /* Check if the context descriptor is needed for TX offloading */
 static inline uint16_t
-iavf_calc_context_desc(uint64_t flags, uint8_t vlan_flag)
+iavf_calc_context_desc(struct rte_mbuf *mb, uint8_t vlan_flag)
 {
+   uint64_t flags = mb->ol_flags;
if (flags & (RTE_MBUF_F_TX_TCP_SEG | RTE_MBUF_F_TX_UDP_SEG |
RTE_MBUF_F_TX_TUNNEL_MASK | RTE_MBUF_F_TX_OUTER_IP_CKSUM |
RTE_MBUF_F_TX_OUTER_UDP_CKSUM))
@@ -2427,6 +2430,12 @@ iavf_calc_context_desc(uint64_t flags, uint8_t vlan_flag)
if (flags & RTE_MBUF_F_TX_VLAN &&
vlan_flag & IAVF_TX_FLAGS_VLAN_TAG_LOC_L2TAG2)
return 1;
+
+   if (iavf_tx_lldp_dynfield_offset ==
+   rte_mbuf_dynfield_lookup(IAVF_TX_LLDP_DYNFIELD, NULL))
+   if (*RTE_MBUF_DYNFIELD(mb,
+   iavf_tx_lldp_dynfield_offset, uint8_t *) > 0)
+   return 1;
return 0;
 }
 
@@ -2446,6 +2455,11 @@ iavf_fill_ctx_desc_cmd_field(volatile uint64_t *field, 
struct rte_mbuf *m,
<< IAVF_TXD_CTX_QW1_CMD_SHIFT;
}
 
+   if (*RTE_MBUF_DYNFIELD(m,
+   iavf_tx_lldp_dynfield_offset, uint8_t *) > 0)
+   cmd |= IAVF_TX_CTX_DESC_SWTCH_UPLINK
+   << IAVF_TXD_CTX_QW1_CMD_SHIFT;
+
*field |= cmd;
 }
 
@@ -2826,7 +2840,7 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, 
uint16_t nb_pkts)
 
nb_desc_data = mb->nb_segs;
nb_desc_ctx =
-   iavf_calc_context_desc(mb->ol_flags, txq->vlan_flag);
+   iavf_calc_context_desc(mb, txq->vlan_flag);
nb_desc_ipsec = !!(mb->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD);
 
/**
diff --git a/drivers/net/iavf/rte_pmd_iavf.h b/drivers/net/iavf/rte_pmd_iavf.h
index 56d453fc4c..7d888ce6bd 100644
--- a/drivers/net/iavf/rte_pmd_iavf.h
+++ b/drivers/net/iavf/rte_pmd_iavf.h
@@ -23,6 +23,8 @@
 extern "C" {
 #endif
 
+#define IAVF_TX_LLDP_DYNFIELD "intel_pmd_dynfield_tx_lldp"
+
 /**
  * The supported network flexible descriptor's extraction metadata format.
  */
@@ -95,6 +97,8 @@ extern uint64_t rte_pmd_ifd_dynflag_proto_xtr_tcp_mask;
 extern uint64_t rte_pmd_ifd_dynflag_proto_xtr_ip_offset_mask;
 extern uint64_t rte_pmd_ifd_dynflag_proto_xtr_ipsec_crypto_said_mask;
 
+extern int iavf_tx_lldp_dynfield_offset;
+
 /**
  * The mbuf dynamic field pointer for flexible descriptor's extraction 
metadata.
  */
-- 
2.34.1

[PATCH v3 2/3] net/iavf: support Tx LLDP on AVX512

[Zhichao Zeng]

This patch adds an avx512 ctx Tx path that supports context descriptor,
filling in the SWTCH_UPLINK bit based on mbuf dynfield
IAVF_TX_LLDP_DYNFIELD to support sending LLDP packet.

Signed-off-by: Zhichao Zeng 
---
 drivers/net/iavf/iavf_rxtx.c|  5 +
 drivers/net/iavf/iavf_rxtx.h|  3 +++
 drivers/net/iavf/iavf_rxtx_vec_avx512.c | 20 
 drivers/net/iavf/iavf_rxtx_vec_common.h |  6 ++
 4 files changed, 34 insertions(+)

diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 2ecd8637c5..90a2d19c05 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -4053,6 +4053,11 @@ iavf_set_tx_function(struct rte_eth_dev *dev)
dev->tx_pkt_prepare = iavf_prep_pkts;
PMD_DRV_LOG(DEBUG, "Using AVX512 OFFLOAD Vector 
Tx (port %d).",
dev->data->port_id);
+   } else if (check_ret == IAVF_VECTOR_CTX_PATH) {
+   dev->tx_pkt_burst = 
iavf_xmit_pkts_vec_avx512_ctx;
+   dev->tx_pkt_prepare = iavf_prep_pkts;
+   PMD_DRV_LOG(DEBUG, "Using AVX512 CONTEXT Vector 
Tx (port %d).",
+   dev->data->port_id);
} else {
dev->tx_pkt_burst = 
iavf_xmit_pkts_vec_avx512_ctx_offload;
dev->tx_pkt_prepare = iavf_prep_pkts;
diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h
index f432f9d956..ee52864915 100644
--- a/drivers/net/iavf/iavf_rxtx.h
+++ b/drivers/net/iavf/iavf_rxtx.h
@@ -66,6 +66,7 @@
 #define IAVF_VECTOR_PATH 0
 #define IAVF_VECTOR_OFFLOAD_PATH 1
 #define IAVF_VECTOR_CTX_OFFLOAD_PATH 2
+#define IAVF_VECTOR_CTX_PATH 3
 
 #define DEFAULT_TX_RS_THRESH 32
 #define DEFAULT_TX_FREE_THRESH   32
@@ -752,6 +753,8 @@ uint16_t iavf_xmit_pkts_vec_avx512_offload(void *tx_queue,
   uint16_t nb_pkts);
 uint16_t iavf_xmit_pkts_vec_avx512_ctx_offload(void *tx_queue, struct rte_mbuf 
**tx_pkts,
  uint16_t nb_pkts);
+uint16_t iavf_xmit_pkts_vec_avx512_ctx(void *tx_queue, struct rte_mbuf 
**tx_pkts,
+ uint16_t nb_pkts);
 int iavf_txq_vec_setup_avx512(struct iavf_tx_queue *txq);
 
 uint8_t iavf_proto_xtr_type_to_rxdid(uint8_t xtr_type);
diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx512.c 
b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
index 7a7df6d258..3ae5e4973c 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_avx512.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
@@ -2,6 +2,7 @@
  * Copyright(c) 2020 Intel Corporation
  */
 
+#include "rte_pmd_iavf.h"
 #include "iavf_rxtx_vec_common.h"
 
 #include 
@@ -2206,6 +2207,10 @@ ctx_vtx1(volatile struct iavf_tx_desc *txdp, struct 
rte_mbuf *pkt,
low_ctx_qw |= (uint64_t)pkt->vlan_tci << 
IAVF_TXD_CTX_QW0_L2TAG2_PARAM;
}
}
+   if (*RTE_MBUF_DYNFIELD(pkt,
+   iavf_tx_lldp_dynfield_offset, uint8_t *) > 0)
+   high_ctx_qw |= IAVF_TX_CTX_DESC_SWTCH_UPLINK
+   << IAVF_TXD_CTX_QW1_CMD_SHIFT;
uint64_t high_data_qw = (IAVF_TX_DESC_DTYPE_DATA |
((uint64_t)flags  << IAVF_TXD_QW1_CMD_SHIFT) |
((uint64_t)pkt->data_len << 
IAVF_TXD_QW1_TX_BUF_SZ_SHIFT));
@@ -2258,6 +2263,10 @@ ctx_vtx(volatile struct iavf_tx_desc *txdp,
(uint64_t)pkt[1]->vlan_tci << 
IAVF_TXD_QW1_L2TAG1_SHIFT;
}
}
+   if (*RTE_MBUF_DYNFIELD(pkt[1],
+   iavf_tx_lldp_dynfield_offset, uint8_t *) > 0)
+   hi_ctx_qw1 |= IAVF_TX_CTX_DESC_SWTCH_UPLINK
+   << IAVF_TXD_CTX_QW1_CMD_SHIFT;
 
if (pkt[0]->ol_flags & RTE_MBUF_F_TX_VLAN) {
if (vlan_flag & IAVF_TX_FLAGS_VLAN_TAG_LOC_L2TAG2) {
@@ -2270,6 +2279,10 @@ ctx_vtx(volatile struct iavf_tx_desc *txdp,
(uint64_t)pkt[0]->vlan_tci << 
IAVF_TXD_QW1_L2TAG1_SHIFT;
}
}
+   if (*RTE_MBUF_DYNFIELD(pkt[0],
+   iavf_tx_lldp_dynfield_offset, uint8_t *) > 0)
+   hi_ctx_qw0 |= IAVF_TX_CTX_DESC_SWTCH_UPLINK
+   << IAVF_TXD_CTX_QW1_CMD_SHIFT;
 
if (offload) {
iavf_txd_enable_offload(pkt[1], &hi_data_qw1);
@@ -2520,3 +2533,10 @@ iavf_xmit_pkts_vec_avx512_ctx_offload(void *tx_queue, 
struct rte_mbuf **tx_pkts,
 {
return iavf_xmit_pkts_vec_avx512_ctx_cmn(tx_queue, tx_pkts, nb_pkts, 
true);
 }
+
+uint16_t
+iavf_xmit_pkts_vec_avx512_ctx(void *tx_queue, struct rte_mbuf **tx_pkts,
+ uint16_t nb_

[PATCH v3 3/3] net/iavf: add Tx LLDP command

[Zhichao Zeng]

This patch adds an IAVF testpmd command "set tx lldp on|off" which
will register an mbuf dynfield IAVF_TX_LLDP_DYNFIELD to indicate
the need to send LLDP packet. Currently, it only supports turning on.

For avx512, need to close the Tx port first, then "set tx lldp on",
and reopen the port to select correct Tx path.

Signed-off-by: Zhichao Zeng 
---
 doc/guides/rel_notes/release_24_03.rst |  3 +
 drivers/net/iavf/iavf_testpmd.c| 80 ++
 drivers/net/iavf/meson.build   |  3 +
 3 files changed, 86 insertions(+)
 create mode 100644 drivers/net/iavf/iavf_testpmd.c

diff --git a/doc/guides/rel_notes/release_24_03.rst 
b/doc/guides/rel_notes/release_24_03.rst
index 6f8ad27808..f94e18c33a 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -55,6 +55,9 @@ New Features
  Also, make sure to start the actual text at the margin.
  ===
 
+* **Updated Intel iavf driver.**
+
+  * Added support for Tx LLDP packet on scalar and avx512.
 
 Removed Items
 -
diff --git a/drivers/net/iavf/iavf_testpmd.c b/drivers/net/iavf/iavf_testpmd.c
new file mode 100644
index 00..3c4c2e7c3c
--- /dev/null
+++ b/drivers/net/iavf/iavf_testpmd.c
@@ -0,0 +1,80 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2016 Intel Corporation.
+ */
+
+#include 
+
+#include 
+
+#include 
+#include 
+
+#include "testpmd.h"
+#include "iavf_log.h"
+
+struct cmd_enable_tx_lldp_result {
+   cmdline_fixed_string_t set;
+   cmdline_fixed_string_t tx;
+   cmdline_fixed_string_t lldp;
+   cmdline_fixed_string_t what;
+};
+
+static cmdline_parse_token_string_t cmd_enable_tx_lldp_set =
+   TOKEN_STRING_INITIALIZER(struct cmd_enable_tx_lldp_result,
+   set, "set");
+static cmdline_parse_token_string_t cmd_enable_tx_lldp_tx =
+   TOKEN_STRING_INITIALIZER(struct cmd_enable_tx_lldp_result,
+   tx, "tx");
+static cmdline_parse_token_string_t cmd_enable_tx_lldp_lldp =
+   TOKEN_STRING_INITIALIZER(struct cmd_enable_tx_lldp_result,
+   lldp, "lldp");
+static cmdline_parse_token_string_t cmd_enable_tx_lldp_what =
+   TOKEN_STRING_INITIALIZER(struct cmd_enable_tx_lldp_result,
+   what, "on#off");
+
+static void
+cmd_enable_tx_lldp_parsed(void *parsed_result,
+   __rte_unused struct cmdline *cl, __rte_unused void *data)
+{
+   struct cmd_enable_tx_lldp_result *res = parsed_result;
+   const struct rte_mbuf_dynfield iavf_tx_lldp_dynfield = {
+   .name = IAVF_TX_LLDP_DYNFIELD,
+   .size = sizeof(uint8_t),
+   .align = __alignof__(uint8_t),
+   .flags = 0
+   };
+
+   if (strcmp(res->what, "on") == 0) {
+   iavf_tx_lldp_dynfield_offset =
+   rte_mbuf_dynfield_register(&iavf_tx_lldp_dynfield);
+   PMD_DRV_LOG(DEBUG, "iavf_tx_lldp_dynfield_offset: %d",
+   iavf_tx_lldp_dynfield_offset);
+   if (iavf_tx_lldp_dynfield_offset < 0)
+   PMD_DRV_LOG(ERR, "rte mbuf dynfield register failed");
+   }
+}
+
+static cmdline_parse_inst_t cmd_enable_tx_lldp = {
+   .f = cmd_enable_tx_lldp_parsed,
+   .data = NULL,
+   .help_str = "set iavf tx lldp on|off",
+   .tokens = {
+   (void *)&cmd_enable_tx_lldp_set,
+   (void *)&cmd_enable_tx_lldp_tx,
+   (void *)&cmd_enable_tx_lldp_lldp,
+   (void *)&cmd_enable_tx_lldp_what,
+   NULL,
+   },
+};
+
+static struct testpmd_driver_commands iavf_cmds = {
+   .commands = {
+   {
+   &cmd_enable_tx_lldp,
+   "set tx lldp (on|off)\n"
+   "Set iavf Tx lldp packet(currently only supported on)\n\n",
+   },
+   { NULL, NULL },
+   },
+};
+TESTPMD_ADD_DRIVER_COMMANDS(iavf_cmds)
diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build
index a6ce2725c3..83aebd5596 100644
--- a/drivers/net/iavf/meson.build
+++ b/drivers/net/iavf/meson.build
@@ -8,6 +8,9 @@ endif
 cflags += ['-Wno-strict-aliasing']
 
 includes += include_directories('../../common/iavf')
+
+testpmd_sources = files('iavf_testpmd.c')
+
 deps += ['common_iavf', 'security', 'cryptodev']
 
 sources = files(
-- 
2.34.1

Re: [RFC] doc/linux_gsg: add amd configuration section

[Varghese, Vipin]

Got `Superseded` is there a new version shared for `AMD tuning guide`?

On 10/10/2023 9:04 PM, Vipin Varghese wrote:

Caution: This message originated from an External Source. Use proper caution 
when opening attachments, clicking links, or responding.


Add AMD EPYC SoC tuning guide as new setcion of linux getting
started guide.

Signed-off-by: Vipin Varghese
---
  doc/guides/linux_gsg/amd_platform.rst | 63 +++
  doc/guides/linux_gsg/index.rst|  1 +
  2 files changed, 64 insertions(+)
  create mode 100644 doc/guides/linux_gsg/amd_platform.rst

diff --git a/doc/guides/linux_gsg/amd_platform.rst 
b/doc/guides/linux_gsg/amd_platform.rst
new file mode 100644
index 00..cdb535e9c0
--- /dev/null
+++ b/doc/guides/linux_gsg/amd_platform.rst
@@ -0,0 +1,63 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2023 Advanced Micro Devices, Inc. All rights reserved.
+
+How to get best performance on AMD platform
+===
+
+This document shares step-by-step guide for configuring AMD EPYC SoC across 
various families for getting best performance for DPDK applications.
+Various factors like BIOS, Numa Per Socket, Memory per Numa, near-far from IO 
device affects the overall performance.
+
+These are covered in various sections of tuning guides shared below.
+
+
+Tuning Guide for AMD EPYC SoC
+-
+
+#. 
`MILAN`_
+
+#. 
`GENOA`_
+
+#. 
`BERGAMO|SIENNA`_
+
+
+General Requirements
+
+
+Memory
+~~
+
+Refer `Memory Configuration` section for SoC specific details.
+
+Note: general thumb rule is to ensure that each memory channel has at least 
one memory DIMM populated. The ideal memory size for each is at least 8|16|32 
GB ECC modules.
+
+
+BIOS
+
+
+Refer `BIOS Performance` section in tuning guide for recommended settings.
+
+
+Linux Grub
+--
+
+Refer `Linux OS & Kernel` in tuning guide for recommended settings.
+
+
+NIC and Accelerator
+---
+
+AMD EPYC supports PCIe Generation of 1|2|3|4|5 depending upon SoC families. 
For best performance ensure the right slots are used which provides adequate 
bandwidth.
+
+Use ``lspci`` to check the speed of a PCI slot ::
+
+  lspci -s 41:00.0 -vv | grep LnkSta
+
+  LnkSta: Speed 16GT/s, Width x16, TrErr- Train- SlotClk+ DLActive- ...
+  LnkSta2: Current De-emphasis Level: -6dB, EqualizationComplete+ ...
+
+
+Compiler
+---
+
+Refer `Compiler Flags` for recommended version and `-march` flags.
+
diff --git a/doc/guides/linux_gsg/index.rst b/doc/guides/linux_gsg/index.rst
index c3e67bf9ec..ecdaf35eec 100644
--- a/doc/guides/linux_gsg/index.rst
+++ b/doc/guides/linux_gsg/index.rst
@@ -21,3 +21,4 @@ Getting Started Guide for Linux
  linux_eal_parameters
  enable_func
  nic_perf_intel_platform
+amd_platform
--
2.34.1

Re: [RFC] doc/linux_gsg: add amd configuration section

[David Marchand]

On Wed, Dec 20, 2023 at 10:25 AM Varghese, Vipin  wrote:
>
> Got `Superseded` is there a new version shared for `AMD tuning guide`?

That's a question for yourself.
I saw two patches with the same title.
More checks were passing on the more recent one.
I marked the first as superseded.


-- 
David Marchand

Re: [RFC] doc/linux_gsg: add amd configuration section

[Varghese, Vipin]

On 12/20/2023 2:57 PM, David Marchand wrote:

Caution: This message originated from an External Source. Use proper caution 
when opening attachments, clicking links, or responding.


On Wed, Dec 20, 2023 at 10:25 AM Varghese, Vipin  wrote:

Got `Superseded` is there a new version shared for `AMD tuning guide`?

That's a question for yourself.
I saw two patches with the same title.


I am searching for the second one that you have mentioned.


More checks were passing on the more recent one.
I marked the first as superseded.


I will reach out in slack if I am not able to find so.





--
David Marchand

Re: [RFC] doc/linux_gsg: add amd configuration section

[David Marchand]

On Wed, Dec 20, 2023 at 10:31 AM Varghese, Vipin  wrote:
> On 12/20/2023 2:57 PM, David Marchand wrote:
> > Caution: This message originated from an External Source. Use proper 
> > caution when opening attachments, clicking links, or responding.
> >
> >
> > On Wed, Dec 20, 2023 at 10:25 AM Varghese, Vipin  
> > wrote:
> >> Got `Superseded` is there a new version shared for `AMD tuning guide`?
> > That's a question for yourself.
> > I saw two patches with the same title.
>
> I am searching for the second one that you have mentioned.
>
> > More checks were passing on the more recent one.
> > I marked the first as superseded.
>
> I will reach out in slack if I am not able to find so.

https://patchwork.dpdk.org/project/dpdk/list/?submitter=2511&state=*


-- 
David Marchand

Re: [RFC] doc/linux_gsg: add amd configuration section

[Varghese, Vipin]

On 12/20/2023 3:02 PM, David Marchand wrote:

Caution: This message originated from an External Source. Use proper caution 
when opening attachments, clicking links, or responding.


On Wed, Dec 20, 2023 at 10:31 AM Varghese, Vipin  wrote:

On 12/20/2023 2:57 PM, David Marchand wrote:

Caution: This message originated from an External Source. Use proper caution 
when opening attachments, clicking links, or responding.


On Wed, Dec 20, 2023 at 10:25 AM Varghese, Vipin  wrote:

Got `Superseded` is there a new version shared for `AMD tuning guide`?

That's a question for yourself.
I saw two patches with the same title.

I am searching for the second one that you have mentioned.


More checks were passing on the more recent one.
I marked the first as superseded.

I will reach out in slack if I am not able to find so.

https://patchwork.dpdk.org/project/dpdk/list/?submitter=2511&state=*



I now understand. Checked the same, and fixed the windows git-bash. Did 
not notice this,


Thanks for helping.




--
David Marchand

Re: [PATCH v2 24/24] doc: port representors in cnxk

[Thomas Monjalon]

19/12/2023 18:40, Harman Kalra:
> +The CNXK driver supports port representor model by adding virtual ethernet
> +ports providing a logical representation in DPDK for physical function(PF) or
> +SR-IOV virtual function (VF) devices for control and monitoring.
> +
> +Base device or parent device underneath these representor ports is a eswitch
> +device which is not a cnxk ethernet device but has NIC RX and TX 
> capabilities.
> +Each representor port is represented by a RQ and SQ pair of this eswitch
> +device.
> +
> +Current implementation supports representors for both physical function and
> +virtual function.

A doc comes with its implementation, so no need to say "current implementation".

> +
> +These port representor ethdev instances can be spawned on an as needed basis
> +through configuration parameters passed to the driver of the underlying
> +base device using devargs ``-a ,representor=pf*vf*``
> +
> +.. note::
> +
> +   Representor ports to be created for respective representees should be
> +   defined via these representor devargs.
> +   Eg. To create a representor for representee PF1VF0, devargs to be passed
> +   is ``-a ,representor=pf0vf0``
> +
> +   For PF representor
> +   ``-a ,representor=pf2``
> +
> +   For defining range of vfs, say 5 representor ports under a PF
> +   ``-a ,representor=pf0vf[0-4]``
> +
> +   For representing different VFs under different PFs
> +   ``-a ,representor=pf0vf[1,2],representor=pf1vf[2-5]``

It looks like something we should describe globally for ethdev,
instead of driver documentation.

> +In case of exception path (i.e. until the flow definition is offloaded to the
> +hardware), packets transmitted by the VFs shall be received by these
> +representor port, while packets transmitted by representor ports shall be
> +received by respective VFs.

Not clear. How is it related to any offload?

> +On receiving the VF traffic via these representor ports, applications holding
> +these representor ports can decide to offload the traffic flow into the HW.
> +Henceforth the matching traffic shall be directly steered to the respective
> +VFs without being received by the application.

Using "these" makes no sense here. Please prefer "the representor ports".

> +Current virtual representor port PMD supports following operations:

Again, no need of "current".

[...]
> +---++---+
> | 2 | NPC| --log-level='pmd\.net.cnxk\.flow,8'   |
> +---++---+
> +   | 3 | REP| --log-level='pmd\.net.cnxk\.rep,8'   |
> +   +---++---+
> +   | 4 | ESW| --log-level='pmd\.net.cnxk\.esw,8'   |
> +   +---++---+

Why it is not aligned?

> --- a/doc/guides/nics/features/cnxk_vf.ini
> +++ b/doc/guides/nics/features/cnxk_vf.ini
> @@ -64,6 +64,8 @@ mpls = Y
>  nvgre= Y
>  pppoes   = Y
>  raw  = Y
> +represented_port = Y
> +port_representor = Y
>  sctp = Y

It should be in alphabetical order.

Re: [PATCH 1/2] doc: updated incorrect value for IP frag max fragments

[Thomas Monjalon]

19/12/2023 16:17, Euan Bourke:
> +Each table entry can hold information about packets of up to 
> ``RTE_LIBRTE_IP_FRAG_MAX_FRAGS`` fragments,
> +where ``RTE_LIBRTE_IP_FRAG_MAX_FRAGS`` defaults to:

Instead of repeating the name, you can use "it".

> +
> +.. literalinclude:: ../../../config/rte_config.h
> +:start-after: /* ip_fragmentation defines */
> +:lines: 1

Relying on the comment before is a bit fragile here.
Please use "start-at".

[PATCH v7 1/3] node: support to add next node to ethdev Rx node

[Rakesh Kudurumalla]

By default all packets received on ethdev_rx node
is forwarded to pkt_cls node.This patch provides
library support to add a new node as next node to
ethdev_rx node and forward packet to new node from
rx node.

Signed-off-by: Rakesh Kudurumalla 
---
v7: 
   Remove warning
 lib/node/ethdev_ctrl.c  | 49 -
 lib/node/rte_node_eth_api.h | 18 ++
 lib/node/version.map|  3 +++
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/lib/node/ethdev_ctrl.c b/lib/node/ethdev_ctrl.c
index d564b80e37..ab54b7f0d4 100644
--- a/lib/node/ethdev_ctrl.c
+++ b/lib/node/ethdev_ctrl.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(C) 2020 Marvell International Ltd.
  */
-
+#include 
 #include 
 
 #include 
@@ -129,3 +129,50 @@ rte_node_eth_config(struct rte_node_ethdev_config *conf, 
uint16_t nb_confs,
ctrl.nb_graphs = nb_graphs;
return 0;
 }
+
+int
+rte_node_ethdev_rx_next_update(rte_node_t id, const char *edge_name)
+{
+   struct ethdev_rx_node_main *data;
+   ethdev_rx_node_elem_t *elem;
+   char **next_nodes;
+   int rc = -EINVAL;
+   uint32_t size;
+   uint16_t i = 0;
+
+   if (edge_name == NULL)
+   goto exit;
+
+   size = rte_node_edge_get(id, NULL);
+
+   if (size == RTE_NODE_ID_INVALID)
+   goto exit;
+
+   next_nodes = calloc(size + 1, sizeof(*next_nodes));
+   if (next_nodes == NULL) {
+   rc = -ENOMEM;
+   goto exit;
+   }
+
+   size = rte_node_edge_get(id, next_nodes);
+
+   while (next_nodes[i] != NULL) {
+   if (strcmp(edge_name, next_nodes[i]) == 0) {
+   data = ethdev_rx_get_node_data_get();
+   elem = data->head;
+   while (elem->next != data->head) {
+   if (elem->nid == id) {
+   elem->ctx.cls_next = i;
+   rc = 0;
+   goto found;
+   }
+   elem = elem->next;
+   }
+   }
+   i++;
+   }
+found:
+   free(next_nodes);
+exit:
+   return rc;
+}
diff --git a/lib/node/rte_node_eth_api.h b/lib/node/rte_node_eth_api.h
index eaae50772d..d2f705e908 100644
--- a/lib/node/rte_node_eth_api.h
+++ b/lib/node/rte_node_eth_api.h
@@ -22,6 +22,7 @@ extern "C" {
 
 #include 
 #include 
+#include 
 #include 
 
 /**
@@ -57,6 +58,23 @@ struct rte_node_ethdev_config {
  */
 int rte_node_eth_config(struct rte_node_ethdev_config *cfg,
uint16_t cnt, uint16_t nb_graphs);
+
+/**
+ * Update ethdev rx next node.
+ *
+ * @param id
+ *   Node id whose edge is to be updated.
+ * @param edge_name
+ *   Name of the next node.
+ *
+ * @return
+ *   ENINVAL: Either of input parameters are invalid
+ *   ENOMEM: If memory allocation failed
+ *   0 on successful initialization.
+ */
+__rte_experimental
+int rte_node_ethdev_rx_next_update(rte_node_t id, const char *edge_name);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/node/version.map b/lib/node/version.map
index 99ffcdd414..6bdb944c4c 100644
--- a/lib/node/version.map
+++ b/lib/node/version.map
@@ -19,4 +19,7 @@ EXPERIMENTAL {
rte_node_ip4_reassembly_configure;
rte_node_udp4_dst_port_add;
rte_node_udp4_usr_node_add;
+
+   # added in 24.03
+   rte_node_ethdev_rx_next_update;
 };
-- 
2.25.1

[PATCH v7 2/3] app/graph: add ethdev forward command

[Rakesh Kudurumalla]

Adds a txport to forward packet for every rxport

Mapping will be used to forward packets to txport
received on rxport

Following commands are exposed:
- ethdev forward  "

Signed-off-by: Rakesh Kudurumalla 
---
 app/graph/cli.c|  1 +
 app/graph/ethdev.c | 63 ++
 app/graph/ethdev.h |  1 +
 app/graph/ethdev_priv.h|  8 +
 doc/guides/tools/graph.rst |  4 +++
 5 files changed, 77 insertions(+)

diff --git a/app/graph/cli.c b/app/graph/cli.c
index 30b12312d6..76f5b8e670 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -32,6 +32,7 @@ cmdline_parse_ctx_t modules_ctx[] = {
(cmdline_parse_inst_t *)ðdev_prom_mode_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_ip4_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_ip6_cmd_ctx,
+   (cmdline_parse_inst_t *)ðdev_forward_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_help_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_rx_cmd_ctx,
diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index c9b09168c1..bb502a6134 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -38,6 +38,9 @@ cmd_ethdev_ip4_addr_help[] = "ethdev  ip4 addr 
add  netmask tx_port_id = portid_tx;
+   rc = 0;
+   } else {
+   rc = -EINVAL;
+   }
+
+   return rc;
+}
+
+static void
+cli_ethdev_forward(void *parsed_result, __rte_unused struct cmdline *cl, void 
*data __rte_unused)
+{
+   struct ethdev_fwd_cmd_tokens *res = parsed_result;
+   int rc = -EINVAL;
+
+   rc = ethdev_forward_config(res->tx_dev, res->rx_dev);
+   if (rc < 0)
+   printf(MSG_CMD_FAIL, res->cmd);
+}
+
+cmdline_parse_token_string_t ethdev_fwd_cfg =
+   TOKEN_STRING_INITIALIZER(struct ethdev_fwd_cmd_tokens, cmd, "ethdev");
+cmdline_parse_token_string_t ethdev_fwd_cmd =
+   TOKEN_STRING_INITIALIZER(struct ethdev_fwd_cmd_tokens, fwd, "forward");
+cmdline_parse_token_string_t ethdev_tx_device =
+   TOKEN_STRING_INITIALIZER(struct ethdev_fwd_cmd_tokens, tx_dev, NULL);
+cmdline_parse_token_string_t ethdev_rx_device =
+   TOKEN_STRING_INITIALIZER(struct ethdev_fwd_cmd_tokens, rx_dev, NULL);
+
+cmdline_parse_inst_t ethdev_forward_cmd_ctx = {
+   .f = cli_ethdev_forward,
+   .data = NULL,
+   .help_str = cmd_ethdev_forward_help,
+   .tokens = {
+  (void *)ðdev_fwd_cfg,
+  (void *)ðdev_fwd_cmd,
+  (void *)ðdev_tx_device,
+  (void *)ðdev_rx_device,
+  NULL,
+   },
+};
diff --git a/app/graph/ethdev.h b/app/graph/ethdev.h
index 94d3247a2c..836052046b 100644
--- a/app/graph/ethdev.h
+++ b/app/graph/ethdev.h
@@ -15,6 +15,7 @@ extern cmdline_parse_inst_t ethdev_mtu_cmd_ctx;
 extern cmdline_parse_inst_t ethdev_prom_mode_cmd_ctx;
 extern cmdline_parse_inst_t ethdev_ip4_cmd_ctx;
 extern cmdline_parse_inst_t ethdev_ip6_cmd_ctx;
+extern cmdline_parse_inst_t ethdev_forward_cmd_ctx;
 extern cmdline_parse_inst_t ethdev_cmd_ctx;
 extern cmdline_parse_inst_t ethdev_help_cmd_ctx;
 
diff --git a/app/graph/ethdev_priv.h b/app/graph/ethdev_priv.h
index f231f3f3e1..af79553438 100644
--- a/app/graph/ethdev_priv.h
+++ b/app/graph/ethdev_priv.h
@@ -61,6 +61,13 @@ struct ethdev_ip6_cmd_tokens {
cmdline_fixed_string_t mask;
 };
 
+struct ethdev_fwd_cmd_tokens {
+   cmdline_fixed_string_t cmd;
+   cmdline_fixed_string_t fwd;
+   cmdline_fixed_string_t tx_dev;
+   cmdline_fixed_string_t rx_dev;
+};
+
 struct ethdev_cmd_tokens {
cmdline_fixed_string_t cmd;
cmdline_fixed_string_t dev;
@@ -104,6 +111,7 @@ struct ethdev_config {
 
 struct ethdev {
TAILQ_ENTRY(ethdev) next;
+   uint16_t tx_port_id;
struct ethdev_config config;
struct ipv4_addr_config ip4_addr;
struct ipv6_addr_config ip6_addr;
diff --git a/doc/guides/tools/graph.rst b/doc/guides/tools/graph.rst
index 1855d12891..d33af8ff2a 100644
--- a/doc/guides/tools/graph.rst
+++ b/doc/guides/tools/graph.rst
@@ -195,6 +195,9 @@ file to express the requested use case configuration.
| ethdev  mtu | | Command to configure MTU of 
DPDK|   Yes   |Yes   |
|  | | port.   
| |  |

+--+---+-+--+
+   | ethdev forward  | | Command to configure port   
|   No|Yes   |
+   | | | forwarding of DPDK  
| |  |
+   
+--+---+-+--+
|  | ethdev  promiscuous  | | Command to enable/disable   
|   Yes   |Yes   |
|  |   | | promiscuous mode on DPDK port.  
| |  |

+--+---+-+--+
@@ -297,6 +300,7 @@ Example: ``dpdk

[PATCH v7 3/3] app/graph: implement port forward usecase

[Rakesh Kudurumalla]

Added portforward usecase.In this usecase
packets received Rx port is forwarded to
respective Tx port.

Signed-off-by: Rakesh Kudurumalla 
---
 app/graph/ethdev.c   |  13 ++
 app/graph/ethdev.h   |   1 +
 app/graph/examples/l2fwd.cli |  41 +
 app/graph/examples/l2fwd_pcap.cli|  37 +
 app/graph/graph.c|   8 +-
 app/graph/l2fwd.c| 152 +++
 app/graph/l2fwd.h|  11 ++
 app/graph/meson.build|   1 +
 app/graph/module_api.h   |   1 +
 doc/guides/tools/graph.rst   |  21 +++
 doc/guides/tools/img/graph-usecase-l2fwd.svg |  92 +++
 11 files changed, 377 insertions(+), 1 deletion(-)
 create mode 100644 app/graph/examples/l2fwd.cli
 create mode 100644 app/graph/examples/l2fwd_pcap.cli
 create mode 100644 app/graph/l2fwd.c
 create mode 100644 app/graph/l2fwd.h
 create mode 100644 doc/guides/tools/img/graph-usecase-l2fwd.svg

diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index bb502a6134..a622275338 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -76,6 +76,19 @@ ethdev_port_by_id(uint16_t port_id)
return NULL;
 }
 
+int16_t
+ethdev_txport_by_rxport_get(uint16_t portid_rx)
+{
+   int portid = -EINVAL;
+   struct ethdev *port;
+
+   port = ethdev_port_by_id(portid_rx);
+   if (port)
+   portid = port->tx_port_id;
+
+   return portid;
+}
+
 void *
 ethdev_mempool_list_by_portid(uint16_t portid)
 {
diff --git a/app/graph/ethdev.h b/app/graph/ethdev.h
index 836052046b..ec457b89bf 100644
--- a/app/graph/ethdev.h
+++ b/app/graph/ethdev.h
@@ -36,6 +36,7 @@ void ethdev_stop(void);
 void *ethdev_mempool_list_by_portid(uint16_t portid);
 int16_t ethdev_portid_by_ip4(uint32_t ip, uint32_t mask);
 int16_t ethdev_portid_by_ip6(uint8_t *ip, uint8_t *mask);
+int16_t ethdev_txport_by_rxport_get(uint16_t portid_rx);
 void ethdev_list_clean(void);
 
 #endif
diff --git a/app/graph/examples/l2fwd.cli b/app/graph/examples/l2fwd.cli
new file mode 100644
index 00..861e83bd70
--- /dev/null
+++ b/app/graph/examples/l2fwd.cli
@@ -0,0 +1,41 @@
+; SPDX-License-Identifier: BSD-3-Clause
+; Copyright(c) 2023 Marvell.
+
+;
+; Graph configuration for given usecase
+;
+graph l2fwd coremask 0xff bsz 32 tmo 10 model default pcap_enable 1 
num_pcap_pkts 10 pcap_file /tmp/output.pcap
+
+;
+; Mempools to be attached with ethdev
+;
+mempool mempool0 size 8192 buffers 4000 cache 256 numa 0
+
+;
+; DPDK devices and configuration.
+;
+; Note: Customize the parameters below to match your setup.
+;
+ethdev 0002:01:00.1 rxq 1 txq 8 mempool0
+ethdev 0002:01:00.4 rxq 1 txq 8 mempool0
+ethdev 0002:01:00.6 rxq 1 txq 8 mempool0
+ethdev 0002:02:00.0 rxq 1 txq 8 mempool0
+
+;
+; Rx/Tx port mapping
+;
+ethdev forward 0002:01:00.4 0002:02:00.0
+ethdev forward 0002:01:00.1 0002:01:00.6
+
+;
+; Port-Queue-Core mapping for ethdev_rx node
+;
+ethdev_rx map port 0002:02:00.0 queue 0 core 1
+ethdev_rx map port 0002:01:00.6 queue 0 core 2
+
+;
+; Graph start command to create graph.
+;
+; Note: No more command should come after this.
+;
+graph start
diff --git a/app/graph/examples/l2fwd_pcap.cli 
b/app/graph/examples/l2fwd_pcap.cli
new file mode 100644
index 00..67308b3b72
--- /dev/null
+++ b/app/graph/examples/l2fwd_pcap.cli
@@ -0,0 +1,37 @@
+; SPDX-License-Identifier: BSD-3-Clause
+; Copyright(c) 2023 Marvell.
+
+;
+; Graph configuration for given usecase
+;
+graph l2fwd coremask 0xff bsz 32 tmo 10 model default pcap_enable 1 
num_pcap_pkts 10 pcap_file /tmp/output.pcap
+
+;
+; Mempools to be attached with ethdev
+;
+mempool mempool0 size 8192 buffers 4000 cache 256 numa 0
+
+;
+; DPDK devices and configuration.
+;
+; Note: Customize the parameters below to match your setup.
+;
+ethdev net_pcap0 rxq 1 txq 8 mempool0
+ethdev net_pcap1 rxq 1 txq 8 mempool0
+
+;
+; Rx/Tx port mapping
+;
+ethdev forward net_pcap1 net_pcap0
+
+;
+; Port-Queue-Core mapping for ethdev_rx node
+;
+ethdev_rx map port net_pcap0 queue 0 core 1
+
+;
+; Graph start command to create graph.
+;
+; Note: No more command should come after this.
+;
+graph start
diff --git a/app/graph/graph.c b/app/graph/graph.c
index a65723a196..4e0441f1a7 100644
--- a/app/graph/graph.c
+++ b/app/graph/graph.c
@@ -24,7 +24,7 @@ cmd_graph_help[] = "graph  bsz  tmo  
coremask  "
   "model  pcap_enable <0 | 1> 
num_pcap_pkts "
   "pcap_file ";
 
-static const char * const supported_usecases[] = {"l3fwd"};
+static const char * const supported_usecases[] = {"l3fwd", "l2fwd"};
 struct graph_config graph_config;
 bool graph_started;
 
@@ -273,6 +273,12 @@ cli_graph_start(__rte_unused void *parsed_result, 
__rte_unused struct cmdline *c
break;
}
}
+   if (!strcmp(graph_config.usecases[i].name, "l2

Re: [PATCH 1/2] doc: updated incorrect value for IP frag max fragments

[Bruce Richardson]

On Wed, Dec 20, 2023 at 10:42:28AM +0100, Thomas Monjalon wrote:
> 19/12/2023 16:17, Euan Bourke:
> > +Each table entry can hold information about packets of up to 
> > ``RTE_LIBRTE_IP_FRAG_MAX_FRAGS`` fragments,
> > +where ``RTE_LIBRTE_IP_FRAG_MAX_FRAGS`` defaults to:
> 
> Instead of repeating the name, you can use "it".
> 
In this instance, I actually think it's better to repeat the name - as "it"
would read strangely, and could refer to "table entry" or "information"
either.

/Bruce

[RFC PATCH v1 0/5] test case blocking and logging

[Juraj Linkeš]

We currently don't store test cases that couldn't be executed because of
a previous failure, such as when a test suite setup failed, resulting in
no executed test cases.

In order to record the test cases that couldn't be executed, we must
know the lists of test suites and test cases ahead of the actual test
suite execution, as an error could occur before we even start executing
test suites.

In addition, the patch series contains two refactors.

The first refactor is closely related. The dts.py was renamed to
runner.py and given a clear purpose - running the test suites and all
other orchestration needed to run test suites. The logic for this was
not all in the original dts.py module and it was brought there. The
runner is also responsible for recording results, which is the blocked
test cases are recorded.

The other refactor, logging, is related to the first refactor. The
logging module was simplified while extending capabilities. Each test
suite logs into its own log file in addition to the main log file which
the runner must handle (as it knows when we start executing particular
test suites). The runner also handles the switching between execution
stages for the purposes of logging.

Juraj Linkeš (5):
  dts: convert dts.py methods to class
  dts: move test suite execution logic to DTSRunner
  dts: process test suites at the beginning of run
  dts: block all testcases when earlier setup fails
  dts: refactor logging configuration

 dts/framework/config/__init__.py  |   8 +-
 dts/framework/dts.py  | 228 
 dts/framework/logger.py   | 162 +++---
 dts/framework/remote_session/__init__.py  |   4 +-
 dts/framework/remote_session/os_session.py|   6 +-
 .../remote_session/remote/__init__.py |   7 +-
 .../remote/interactive_remote_session.py  |   7 +-
 .../remote/interactive_shell.py   |   7 +-
 .../remote_session/remote/remote_session.py   |   8 +-
 .../remote_session/remote/ssh_session.py  |   5 +-
 dts/framework/runner.py   | 499 ++
 dts/framework/test_result.py  | 365 +++--
 dts/framework/test_suite.py   | 193 +--
 dts/framework/testbed_model/node.py   |  10 +-
 dts/framework/testbed_model/scapy.py  |   6 +-
 .../testbed_model/traffic_generator.py|   5 +-
 dts/main.py   |  12 +-
 dts/tests/TestSuite_smoke_tests.py|   2 +-
 18 files changed, 830 insertions(+), 704 deletions(-)
 delete mode 100644 dts/framework/dts.py
 create mode 100644 dts/framework/runner.py

-- 
2.34.1

[RFC PATCH v1 1/5] dts: convert dts.py methods to class

[Juraj Linkeš]

The dts.py module deviates from the rest of the code without a clear
reason. Converting it into a class and using better naming will improve
organization and code readability.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/config/__init__.py |   3 -
 dts/framework/dts.py | 228 -
 dts/framework/runner.py  | 243 +++
 dts/main.py  |   6 +-
 4 files changed, 247 insertions(+), 233 deletions(-)
 delete mode 100644 dts/framework/dts.py
 create mode 100644 dts/framework/runner.py

diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py
index 9b32cf0532..497847afb9 100644
--- a/dts/framework/config/__init__.py
+++ b/dts/framework/config/__init__.py
@@ -314,6 +314,3 @@ def load_config() -> Configuration:
 config: dict[str, Any] = warlock.model_factory(schema, 
name="_Config")(config_data)
 config_obj: Configuration = Configuration.from_dict(dict(config))
 return config_obj
-
-
-CONFIGURATION = load_config()
diff --git a/dts/framework/dts.py b/dts/framework/dts.py
deleted file mode 100644
index 25d6942d81..00
--- a/dts/framework/dts.py
+++ /dev/null
@@ -1,228 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2019 Intel Corporation
-# Copyright(c) 2022-2023 PANTHEON.tech s.r.o.
-# Copyright(c) 2022-2023 University of New Hampshire
-
-import sys
-
-from .config import (
-CONFIGURATION,
-BuildTargetConfiguration,
-ExecutionConfiguration,
-TestSuiteConfig,
-)
-from .exception import BlockingTestSuiteError
-from .logger import DTSLOG, getLogger
-from .test_result import BuildTargetResult, DTSResult, ExecutionResult, Result
-from .test_suite import get_test_suites
-from .testbed_model import SutNode, TGNode
-from .utils import check_dts_python_version
-
-dts_logger: DTSLOG = getLogger("DTSRunner")
-result: DTSResult = DTSResult(dts_logger)
-
-
-def run_all() -> None:
-"""
-The main process of DTS. Runs all build targets in all executions from the 
main
-config file.
-"""
-global dts_logger
-global result
-
-# check the python version of the server that run dts
-check_dts_python_version()
-
-sut_nodes: dict[str, SutNode] = {}
-tg_nodes: dict[str, TGNode] = {}
-try:
-# for all Execution sections
-for execution in CONFIGURATION.executions:
-sut_node = sut_nodes.get(execution.system_under_test_node.name)
-tg_node = tg_nodes.get(execution.traffic_generator_node.name)
-
-try:
-if not sut_node:
-sut_node = SutNode(execution.system_under_test_node)
-sut_nodes[sut_node.name] = sut_node
-if not tg_node:
-tg_node = TGNode(execution.traffic_generator_node)
-tg_nodes[tg_node.name] = tg_node
-result.update_setup(Result.PASS)
-except Exception as e:
-failed_node = execution.system_under_test_node.name
-if sut_node:
-failed_node = execution.traffic_generator_node.name
-dts_logger.exception(f"Creation of node {failed_node} failed.")
-result.update_setup(Result.FAIL, e)
-
-else:
-_run_execution(sut_node, tg_node, execution, result)
-
-except Exception as e:
-dts_logger.exception("An unexpected error has occurred.")
-result.add_error(e)
-raise
-
-finally:
-try:
-for node in (sut_nodes | tg_nodes).values():
-node.close()
-result.update_teardown(Result.PASS)
-except Exception as e:
-dts_logger.exception("Final cleanup of nodes failed.")
-result.update_teardown(Result.ERROR, e)
-
-# we need to put the sys.exit call outside the finally clause to make sure
-# that unexpected exceptions will propagate
-# in that case, the error that should be reported is the uncaught 
exception as
-# that is a severe error originating from the framework
-# at that point, we'll only have partial results which could be impacted 
by the
-# error causing the uncaught exception, making them uninterpretable
-_exit_dts()
-
-
-def _run_execution(
-sut_node: SutNode,
-tg_node: TGNode,
-execution: ExecutionConfiguration,
-result: DTSResult,
-) -> None:
-"""
-Run the given execution. This involves running the execution setup as well 
as
-running all build targets in the given execution.
-"""
-dts_logger.info(f"Running execution with SUT 
'{execution.system_under_test_node.name}'.")
-execution_result = result.add_execution(sut_node.config)
-execution_result.add_sut_info(sut_node.node_info)
-
-try:
-sut_node.set_up_execution(execution)
-execution_result.update_setup(Result.PASS)
-except Exception as e:
-dts_logger.exception("Execution setup failed

[RFC PATCH v1 2/5] dts: move test suite execution logic to DTSRunner

[Juraj Linkeš]

Move the code responsible for running the test suite from the
TestSuite class to the DTSRunner class. This restructuring decision
was made to consolidate and unify the related logic into a single unit.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/runner.py | 156 +---
 dts/framework/test_suite.py | 134 +--
 2 files changed, 147 insertions(+), 143 deletions(-)

diff --git a/dts/framework/runner.py b/dts/framework/runner.py
index 5b077c5805..5e145a8066 100644
--- a/dts/framework/runner.py
+++ b/dts/framework/runner.py
@@ -5,6 +5,7 @@
 
 import logging
 import sys
+from types import MethodType
 
 from .config import (
 BuildTargetConfiguration,
@@ -12,10 +13,18 @@
 ExecutionConfiguration,
 TestSuiteConfig,
 )
-from .exception import BlockingTestSuiteError
+from .exception import BlockingTestSuiteError, SSHTimeoutError, 
TestCaseVerifyError
 from .logger import DTSLOG, getLogger
-from .test_result import BuildTargetResult, DTSResult, ExecutionResult, Result
-from .test_suite import get_test_suites
+from .settings import SETTINGS
+from .test_result import (
+BuildTargetResult,
+DTSResult,
+ExecutionResult,
+Result,
+TestCaseResult,
+TestSuiteResult,
+)
+from .test_suite import TestSuite, get_test_suites
 from .testbed_model import SutNode, TGNode
 from .utils import check_dts_python_version
 
@@ -148,7 +157,7 @@ def _run_build_target(
 build_target_result.update_setup(Result.FAIL, e)
 
 else:
-self._run_all_suites(sut_node, tg_node, execution, 
build_target_result)
+self._run_test_suites(sut_node, tg_node, execution, 
build_target_result)
 
 finally:
 try:
@@ -158,7 +167,7 @@ def _run_build_target(
 self._logger.exception("Build target teardown failed.")
 build_target_result.update_teardown(Result.FAIL, e)
 
-def _run_all_suites(
+def _run_test_suites(
 self,
 sut_node: SutNode,
 tg_node: TGNode,
@@ -175,7 +184,7 @@ def _run_all_suites(
 execution.test_suites[:0] = 
[TestSuiteConfig.from_dict("smoke_tests")]
 for test_suite_config in execution.test_suites:
 try:
-self._run_single_suite(
+self._run_test_suite(
 sut_node, tg_node, execution, build_target_result, 
test_suite_config
 )
 except BlockingTestSuiteError as e:
@@ -189,7 +198,7 @@ def _run_all_suites(
 if end_build_target:
 break
 
-def _run_single_suite(
+def _run_test_suite(
 self,
 sut_node: SutNode,
 tg_node: TGNode,
@@ -198,6 +207,9 @@ def _run_single_suite(
 test_suite_config: TestSuiteConfig,
 ) -> None:
 """Runs a single test suite.
+Setup, execute and teardown the whole suite.
+Suite execution consists of running all test cases scheduled to be 
executed.
+A test cast run consists of setup, execution and teardown of said test 
case.
 
 Args:
 sut_node: Node to run tests on.
@@ -222,13 +234,131 @@ def _run_single_suite(
 else:
 for test_suite_class in test_suite_classes:
 test_suite = test_suite_class(
-sut_node,
-tg_node,
-test_suite_config.test_cases,
-execution.func,
-build_target_result,
+sut_node, tg_node, test_suite_config.test_cases
+)
+
+test_suite_name = test_suite.__class__.__name__
+test_suite_result = 
build_target_result.add_test_suite(test_suite_name)
+try:
+self._logger.info(f"Starting test suite setup: 
{test_suite_name}")
+test_suite.set_up_suite()
+test_suite_result.update_setup(Result.PASS)
+self._logger.info(f"Test suite setup successful: 
{test_suite_name}")
+except Exception as e:
+self._logger.exception(f"Test suite setup ERROR: 
{test_suite_name}")
+test_suite_result.update_setup(Result.ERROR, e)
+
+else:
+self._execute_test_suite(
+execution.func, test_suite, test_suite_result
+)
+
+finally:
+try:
+test_suite.tear_down_suite()
+sut_node.kill_cleanup_dpdk_apps()
+test_suite_result.update_teardown(Result.PASS)
+except Exception as e:
+self._logger.exception(
+f"Test suite teardown ERROR: {test_suite_name}"
+)
+self._logger.warning(
+f"Test suite '{test_suite_name}' teardown failed, "
+   

[RFC PATCH v1 3/5] dts: process test suites at the beginning of run

[Juraj Linkeš]

We initialize test suite/case objects at the start of
the program and store them with custom execution config
(add test case names) in Execution. This change helps
identify errors with test suites earlier, and we have
access to the right data when programs crash earlier.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/config/__init__.py   |   5 +-
 dts/framework/runner.py| 309 -
 dts/framework/test_suite.py|  59 +-
 dts/tests/TestSuite_smoke_tests.py |   2 +-
 4 files changed, 217 insertions(+), 158 deletions(-)

diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py
index 497847afb9..d65ac625f8 100644
--- a/dts/framework/config/__init__.py
+++ b/dts/framework/config/__init__.py
@@ -238,7 +238,6 @@ class ExecutionConfiguration:
 system_under_test_node: SutNodeConfiguration
 traffic_generator_node: TGNodeConfiguration
 vdevs: list[str]
-skip_smoke_tests: bool
 
 @staticmethod
 def from_dict(
@@ -247,9 +246,10 @@ def from_dict(
 build_targets: list[BuildTargetConfiguration] = list(
 map(BuildTargetConfiguration.from_dict, d["build_targets"])
 )
+if not d.get("skip_smoke_tests", False):
+d["test_suites"].insert(0, "smoke_tests")
 test_suites: list[TestSuiteConfig] = 
list(map(TestSuiteConfig.from_dict, d["test_suites"]))
 sut_name = d["system_under_test_node"]["node_name"]
-skip_smoke_tests = d.get("skip_smoke_tests", False)
 assert sut_name in node_map, f"Unknown SUT {sut_name} in execution {d}"
 system_under_test_node = node_map[sut_name]
 assert isinstance(
@@ -270,7 +270,6 @@ def from_dict(
 build_targets=build_targets,
 perf=d["perf"],
 func=d["func"],
-skip_smoke_tests=skip_smoke_tests,
 test_suites=test_suites,
 system_under_test_node=system_under_test_node,
 traffic_generator_node=traffic_generator_node,
diff --git a/dts/framework/runner.py b/dts/framework/runner.py
index 5e145a8066..acc3342f0c 100644
--- a/dts/framework/runner.py
+++ b/dts/framework/runner.py
@@ -3,9 +3,14 @@
 # Copyright(c) 2022-2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2022-2023 University of New Hampshire
 
+import importlib
+import inspect
 import logging
+import re
 import sys
-from types import MethodType
+from copy import deepcopy
+from dataclasses import dataclass
+from types import MethodType, ModuleType
 
 from .config import (
 BuildTargetConfiguration,
@@ -13,7 +18,12 @@
 ExecutionConfiguration,
 TestSuiteConfig,
 )
-from .exception import BlockingTestSuiteError, SSHTimeoutError, 
TestCaseVerifyError
+from .exception import (
+BlockingTestSuiteError,
+ConfigurationError,
+SSHTimeoutError,
+TestCaseVerifyError,
+)
 from .logger import DTSLOG, getLogger
 from .settings import SETTINGS
 from .test_result import (
@@ -24,25 +34,55 @@
 TestCaseResult,
 TestSuiteResult,
 )
-from .test_suite import TestSuite, get_test_suites
+from .test_suite import TestSuite
 from .testbed_model import SutNode, TGNode
 from .utils import check_dts_python_version
 
 
+@dataclass
+class TestSuiteSetup:
+test_suite: type[TestSuite]
+test_cases: list[MethodType]
+
+def processed_config(self) -> TestSuiteConfig:
+return TestSuiteConfig(
+test_suite=self.test_suite.__name__,
+test_cases=[test_case.__name__ for test_case in self.test_cases],
+)
+
+
+@dataclass
+class Execution:
+config: ExecutionConfiguration
+test_suite_setups: list[TestSuiteSetup]
+
+def processed_config(self) -> ExecutionConfiguration:
+"""
+Creating copy of execution config witch add test-case names.
+"""
+modified_execution_config = deepcopy(self.config)
+modified_execution_config.test_suites[:] = [
+test_suite.processed_config() for test_suite in 
self.test_suite_setups
+]
+return modified_execution_config
+
+
 class DTSRunner:
 _logger: DTSLOG
 _result: DTSResult
-_configuration: Configuration
+_executions: list[Execution]
 
 def __init__(self, configuration: Configuration):
 self._logger = getLogger("DTSRunner")
 self._result = DTSResult(self._logger)
-self._configuration = configuration
+self._executions = create_executions(configuration.executions)
 
 def run(self):
 """
 The main process of DTS. Runs all build targets in all executions from 
the main
 config file.
+Suite execution consists of running all test cases scheduled to be 
executed.
+A test case run consists of setup, execution and teardown of said test 
case.
 """
 # check the python version of the server that run dts
 check_dts_python_version()
@@ -50,22 +90,22 @@ def run(self):
 tg_nodes: dict[str, TGNode] = {}
 try:
 # for 

[RFC PATCH v1 4/5] dts: block all testcases when earlier setup fails

[Juraj Linkeš]

In case of a failure during execution, build target or suite setup
the test case results will be recorded as blocked. We also unify
methods add_ to add_child_result to be more consistently.
Now we store the corresponding config in each result with child
configs and parent result.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/runner.py  |  12 +-
 dts/framework/test_result.py | 361 ---
 2 files changed, 216 insertions(+), 157 deletions(-)

diff --git a/dts/framework/runner.py b/dts/framework/runner.py
index acc3342f0c..28570d4a1c 100644
--- a/dts/framework/runner.py
+++ b/dts/framework/runner.py
@@ -74,7 +74,7 @@ class DTSRunner:
 
 def __init__(self, configuration: Configuration):
 self._logger = getLogger("DTSRunner")
-self._result = DTSResult(self._logger)
+self._result = DTSResult(configuration, self._logger)
 self._executions = create_executions(configuration.executions)
 
 def run(self):
@@ -150,7 +150,7 @@ def _run_execution(
 "Running execution with SUT "
 f"'{execution.config.system_under_test_node.name}'."
 )
-execution_result = self._result.add_execution(sut_node.config)
+execution_result = 
self._result.add_child_result(execution.processed_config())
 execution_result.add_sut_info(sut_node.node_info)
 
 try:
@@ -190,7 +190,7 @@ def _run_build_target(
 Run the given build target.
 """
 self._logger.info(f"Running build target '{build_target.name}'.")
-build_target_result = execution_result.add_build_target(build_target)
+build_target_result = execution_result.add_child_result(build_target)
 
 try:
 sut_node.set_up_build_target(build_target)
@@ -265,7 +265,9 @@ def _run_test_suite(
 """
 test_suite = test_suite_setup.test_suite(sut_node, tg_node)
 test_suite_name = test_suite_setup.test_suite.__name__
-test_suite_result = build_target_result.add_test_suite(test_suite_name)
+test_suite_result = build_target_result.add_child_result(
+test_suite_setup.processed_config()
+)
 try:
 self._logger.info(f"Starting test suite setup: {test_suite_name}")
 test_suite.set_up_suite()
@@ -308,7 +310,7 @@ def _execute_test_suite(
 """
 for test_case_method in test_cases:
 test_case_name = test_case_method.__name__
-test_case_result = test_suite_result.add_test_case(test_case_name)
+test_case_result = 
test_suite_result.add_child_result(test_case_name)
 all_attempts = SETTINGS.re_run + 1
 attempt_nr = 1
 self._run_test_case(test_case_method, test_suite, test_case_result)
diff --git a/dts/framework/test_result.py b/dts/framework/test_result.py
index 4c2e7e2418..dba2c55d36 100644
--- a/dts/framework/test_result.py
+++ b/dts/framework/test_result.py
@@ -9,6 +9,7 @@
 import os.path
 from collections.abc import MutableSequence
 from enum import Enum, auto
+from typing import Any, Union
 
 from .config import (
 OS,
@@ -16,9 +17,11 @@
 BuildTargetConfiguration,
 BuildTargetInfo,
 Compiler,
+Configuration,
 CPUType,
-NodeConfiguration,
+ExecutionConfiguration,
 NodeInfo,
+TestSuiteConfig,
 )
 from .exception import DTSError, ErrorSeverity
 from .logger import DTSLOG
@@ -35,6 +38,7 @@ class Result(Enum):
 FAIL = auto()
 ERROR = auto()
 SKIP = auto()
+BLOCK = auto()
 
 def __bool__(self) -> bool:
 return self is self.PASS
@@ -63,42 +67,6 @@ def __bool__(self) -> bool:
 return bool(self.result)
 
 
-class Statistics(dict):
-"""
-A helper class used to store the number of test cases by its result
-along a few other basic information.
-Using a dict provides a convenient way to format the data.
-"""
-
-def __init__(self, dpdk_version: str | None):
-super(Statistics, self).__init__()
-for result in Result:
-self[result.name] = 0
-self["PASS RATE"] = 0.0
-self["DPDK VERSION"] = dpdk_version
-
-def __iadd__(self, other: Result) -> "Statistics":
-"""
-Add a Result to the final count.
-"""
-self[other.name] += 1
-self["PASS RATE"] = (
-float(self[Result.PASS.name]) * 100 / sum(self[result.name] for 
result in Result)
-)
-return self
-
-def __str__(self) -> str:
-"""
-Provide a string representation of the data.
-"""
-stats_str = ""
-for key, value in self.items():
-stats_str += f"{key:<12} = {value}\n"
-# according to docs, we should use \n when writing to text files
-# on all platforms
-return stats_str
-
-
 class BaseResult(object):
 """
 The Base class for all results. Stores the results of
@@ -109,6 +77,12 @@ class BaseResult(object):
 setup_res

[RFC PATCH v1 5/5] dts: refactor logging configuration

[Juraj Linkeš]

Refactor logging for improved configuration and flexibility,
investigating unclear arguments and exploring alternatives
for logging test suites into separate files. In addition,
efforts were made to ensure that the modules remained
independent from the logger module, enabling potential use
by other consumers.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/logger.py   | 162 --
 dts/framework/remote_session/__init__.py  |   4 +-
 dts/framework/remote_session/os_session.py|   6 +-
 .../remote_session/remote/__init__.py |   7 +-
 .../remote/interactive_remote_session.py  |   7 +-
 .../remote/interactive_shell.py   |   7 +-
 .../remote_session/remote/remote_session.py   |   8 +-
 .../remote_session/remote/ssh_session.py  |   5 +-
 dts/framework/runner.py   |  13 +-
 dts/framework/test_result.py  |   6 +-
 dts/framework/test_suite.py   |   6 +-
 dts/framework/testbed_model/node.py   |  10 +-
 dts/framework/testbed_model/scapy.py  |   6 +-
 .../testbed_model/traffic_generator.py|   5 +-
 dts/main.py   |   6 +-
 15 files changed, 124 insertions(+), 134 deletions(-)

diff --git a/dts/framework/logger.py b/dts/framework/logger.py
index bb2991e994..43c49c2d03 100644
--- a/dts/framework/logger.py
+++ b/dts/framework/logger.py
@@ -10,108 +10,98 @@
 
 import logging
 import os.path
-from typing import TypedDict
-
-from .settings import SETTINGS
+from enum import Enum
+from logging import FileHandler, StreamHandler
+from pathlib import Path
 
 date_fmt = "%Y/%m/%d %H:%M:%S"
-stream_fmt = "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+stream_fmt = "%(asctime)s - %(stage)s - %(name)s - %(levelname)s - %(message)s"
 
 
-class LoggerDictType(TypedDict):
-logger: "DTSLOG"
-name: str
-node: str
+def init_logger(verbose: bool, output_dir: str):
+logging.raiseExceptions = False
 
+DTSLog._output_dir = output_dir
+logging.setLoggerClass(DTSLog)
 
-# List for saving all using loggers
-Loggers: list[LoggerDictType] = []
+root_logger = logging.getLogger()
+root_logger.setLevel(1)
 
+sh = StreamHandler()
+sh.setFormatter(logging.Formatter(stream_fmt, date_fmt))
+sh.setLevel(logging.INFO)
+if verbose:
+sh.setLevel(logging.DEBUG)
+root_logger.addHandler(sh)
 
-class DTSLOG(logging.LoggerAdapter):
-"""
-DTS log class for framework and testsuite.
-"""
+if not os.path.exists(output_dir):
+os.mkdir(output_dir)
 
-_logger: logging.Logger
-node: str
-sh: logging.StreamHandler
-fh: logging.FileHandler
-verbose_fh: logging.FileHandler
+add_file_handlers(Path(output_dir, "dts"))
 
-def __init__(self, logger: logging.Logger, node: str = "suite"):
-self._logger = logger
-# 1 means log everything, this will be used by file handlers if their 
level
-# is not set
-self._logger.setLevel(1)
 
-self.node = node
+def add_file_handlers(log_file_path: Path) -> list[FileHandler]:
+root_logger = logging.getLogger()
 
-# add handler to emit to stdout
-sh = logging.StreamHandler()
-sh.setFormatter(logging.Formatter(stream_fmt, date_fmt))
-sh.setLevel(logging.INFO)  # console handler default level
+fh = FileHandler(f"{log_file_path}.log")
+fh.setFormatter(logging.Formatter(stream_fmt, date_fmt))
+root_logger.addHandler(fh)
 
-if SETTINGS.verbose is True:
-sh.setLevel(logging.DEBUG)
+verbose_fh = FileHandler(f"{log_file_path}.verbose.log")
+verbose_fh.setFormatter(
+logging.Formatter(
+
"%(asctime)s|%(stage)s|%(name)s|%(levelname)s|%(pathname)s|%(lineno)d|"
+"%(funcName)s|%(process)d|%(thread)d|%(threadName)s|%(message)s",
+datefmt=date_fmt,
+)
+)
+root_logger.addHandler(verbose_fh)
 
-self._logger.addHandler(sh)
-self.sh = sh
+return [fh, verbose_fh]
 
-# prepare the output folder
-if not os.path.exists(SETTINGS.output_dir):
-os.mkdir(SETTINGS.output_dir)
 
-logging_path_prefix = os.path.join(SETTINGS.output_dir, node)
+class DtsStage(Enum):
+pre_execution = "pre-execution"
+execution = "execution"
+build_target = "build-target"
+suite = "suite"
+post_execution = "post-execution"
 
-fh = logging.FileHandler(f"{logging_path_prefix}.log")
-fh.setFormatter(
-logging.Formatter(
-fmt="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-datefmt=date_fmt,
-)
-)
+def __str__(self) -> str:
+return self.value
 
-self._logger.addHandler(fh)
-self.fh = fh
-
-# This outputs EVERYTHING, intended for post-mortem debugging
-# Also optimized for processing via AWK (awk -F '|' ...)
-verbose_fh = logg

[Bug 1337] [21.11.5] iavf driver stuck in rte_eal_alarm_cancel

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=1337

Bug ID: 1337
   Summary: [21.11.5] iavf driver stuck in rte_eal_alarm_cancel
   Product: DPDK
   Version: 21.11
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: ethdev
  Assignee: dev@dpdk.org
  Reporter: ktray...@redhat.com
  Target Milestone: ---

With iavf device in OVS and dpdk 21.11.5.

OVS main thread is calling rte_eth_dev_configure()...iavf_queues_req_reset()
and is getting stuck in rte_eal_alarm_cancel() waiting for alarms to be
cancelled.

eal-intr-thread is stuck in application callback as it is requesting
reconfiguration and waiting for current configure to be completed in the main
thread.

The issue was introduced with the patch below. There are some related patches
in this area that were not previously backported and newer ones to come.

commit b965aceffdb9dd8d2501314c174716617371d752
Author: Mingjin Ye 
Date:   Wed Jun 14 09:53:03 2023 +

net/iavf: fix abnormal disable HW interrupt

[ upstream commit 675a104e2e940ec476e8b469725e8465d01c0098 ]

For command VIRTCHNL_OP_REQUEST_QUEUES, polling access to the admin
queue has the issue of access overruns after disabling interrupt. That
results in FW disabling HW interrupt for protection purposes.

The updates/changes in this patch:
1. Remove the polling admin queue processing and use the generic interrupt
processing instead.
2. Release redundant queue resource before stopping processing interrupt
events.

Fixes: 22b123a36d07 ("net/avf: initialize PMD")
Fixes: ef807926e148 ("net/iavf: support requesting additional queues from
PF")
Fixes: 84108425054a ("net/iavf: support asynchronous virtual channel
message")

Signed-off-by: Mingjin Ye 
Acked-by: Qi Zhang 

-- 
You are receiving this mail because:
You are the assignee for the bug.

[PATCH v2] app/dma-perf: replace pktmbuf with mempool objects

[Vipin Varghese]

From: Vipin Varghese 

Replace pktmbuf pool with mempool, this allows increase in MOPS
especially in lower buffer size. Using Mempool, allows to reduce
the extra CPU cycles.

Changes made are
1. pktmbuf pool create with mempool create.
2. create src & dst pointer array from the appropaite numa.
3. use get pool and put for mempool objects.
4. remove pktmbuf_mtod for dma and cpu memcpy.

v2 changes:
 - add ACK from  Morten Brørup

v1 changes:
 - pktmbuf pool create with mempool create.
 - create src & dst pointer array from the appropaite numa.
 - use get pool and put for mempool objects.
 - remove pktmbuf_mtod for dma and cpu memcpy.

Test Results for pktmbuf vs mempool:


Format: Buffer Size | % AVG cycles | % AVG Gbps

Category-1: HW-DSA
---
  64|-13.11| 14.97
 128|-41.49|  0.41
 256| -1.85|  1.20
 512| -9.38|  8.81
1024|  1.82| -2.00
1518|  0.00| -0.80
2048|  1.03| -0.91
4096|  0.00| -0.35
8192|  0.07| -0.08

Category-2: MEMCPY
---
  64|-12.50|14.14
 128|-40.63|67.26
 256|-38.78|59.35
 512|-30.26|43.36
1024|-21.80|27.04
1518|-16.23|19.33
2048|-14.75|16.81
4096| -9.56|10.01
8192| -3.32| 3.12

Signed-off-by: Vipin Varghese 
Acked-by: Morten Brørup 
Tested-by: Thiyagrajan P 
---
---
 app/test-dma-perf/benchmark.c | 74 +--
 1 file changed, 44 insertions(+), 30 deletions(-)

diff --git a/app/test-dma-perf/benchmark.c b/app/test-dma-perf/benchmark.c
index 9b1f58c78c..dc6f16cc01 100644
--- a/app/test-dma-perf/benchmark.c
+++ b/app/test-dma-perf/benchmark.c
@@ -43,8 +43,8 @@ struct lcore_params {
uint16_t kick_batch;
uint32_t buf_size;
uint16_t test_secs;
-   struct rte_mbuf **srcs;
-   struct rte_mbuf **dsts;
+   void **srcs;
+   void **dsts;
volatile struct worker_info worker_info;
 };
 
@@ -110,17 +110,17 @@ output_result(uint8_t scenario_id, uint32_t lcore_id, 
char *dma_name, uint16_t r
 }
 
 static inline void
-cache_flush_buf(__rte_unused struct rte_mbuf **array,
+cache_flush_buf(__rte_unused void **array,
__rte_unused uint32_t buf_size,
__rte_unused uint32_t nr_buf)
 {
 #ifdef RTE_ARCH_X86_64
char *data;
-   struct rte_mbuf **srcs = array;
+   void **srcs = array;
uint32_t i, offset;
 
for (i = 0; i < nr_buf; i++) {
-   data = rte_pktmbuf_mtod(srcs[i], char *);
+   data = (char *) srcs[i];
for (offset = 0; offset < buf_size; offset += 64)
__builtin_ia32_clflush(data + offset);
}
@@ -224,8 +224,8 @@ do_dma_mem_copy(void *p)
const uint32_t nr_buf = para->nr_buf;
const uint16_t kick_batch = para->kick_batch;
const uint32_t buf_size = para->buf_size;
-   struct rte_mbuf **srcs = para->srcs;
-   struct rte_mbuf **dsts = para->dsts;
+   void **srcs = para->srcs;
+   void **dsts = para->dsts;
uint16_t nr_cpl;
uint64_t async_cnt = 0;
uint32_t i;
@@ -241,8 +241,12 @@ do_dma_mem_copy(void *p)
while (1) {
for (i = 0; i < nr_buf; i++) {
 dma_copy:
-   ret = rte_dma_copy(dev_id, 0, 
rte_mbuf_data_iova(srcs[i]),
-   rte_mbuf_data_iova(dsts[i]), buf_size, 0);
+   ret = rte_dma_copy(dev_id,
+   0,
+   (rte_iova_t) srcs[i],
+   (rte_iova_t) dsts[i],
+   buf_size,
+   0);
if (unlikely(ret < 0)) {
if (ret == -ENOSPC) {
do_dma_submit_and_poll(dev_id, 
&async_cnt, worker_info);
@@ -276,8 +280,8 @@ do_cpu_mem_copy(void *p)
volatile struct worker_info *worker_info = &(para->worker_info);
const uint32_t nr_buf = para->nr_buf;
const uint32_t buf_size = para->buf_size;
-   struct rte_mbuf **srcs = para->srcs;
-   struct rte_mbuf **dsts = para->dsts;
+   void **srcs = para->srcs;
+   void **dsts = para->dsts;
uint32_t i;
 
worker_info->stop_flag = false;
@@ -288,8 +292,8 @@ do_cpu_mem_copy(void *p)
 
while (1) {
for (i = 0; i < nr_buf; i++) {
-   const void *src = rte_pktmbuf_mtod(dsts[i], void *);
-   void *dst = rte_pktmbuf_mtod(srcs[i], void *);
+   const void *src = (void *) dsts[i];
+   void *dst = (void *) srcs[i];
 
/* copy buffer form src to dst */
rte_memcpy(dst, src, (size_t)buf_size);
@@ -303,8 +307,8 @@ do_cpu_mem_copy(void *p)
 }
 
 static int
-setup_memory_env(struct test_configure *cfg, struct rte_mbuf ***srcs,
-   struct rte_mbuf ***dsts)
+setup_memory_env(struct test_configure *cfg, void 

RE: [EXT] Re: [PATCH 2/2] examples/ipsec-secgw: update stats when freeing packets

[Anoob Joseph]

Hi Stephen,

Please see inline.

Thanks,
Anoob

> -Original Message-
> From: Stephen Hemminger 
> Sent: Tuesday, December 19, 2023 10:49 PM
> To: Anoob Joseph 
> Cc: Radu Nicolau ; Akhil Goyal
> ; Konstantin Ananyev
> ; Jerin Jacob Kollanukkaran
> ; dev@dpdk.org
> Subject: [EXT] Re: [PATCH 2/2] examples/ipsec-secgw: update stats when
> freeing packets
> 
> External Email
> 
> --
> On Tue, 19 Dec 2023 10:59:23 +0530
> Anoob Joseph  wrote:
> 
> > Instead of freeing directly, use commonly used function which also
> > updates stats.
> >
> > Signed-off-by: Anoob Joseph 
> > ---
> >  examples/ipsec-secgw/ipsec_process.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/examples/ipsec-secgw/ipsec_process.c
> > b/examples/ipsec-secgw/ipsec_process.c
> > index b0cece3ad1..ddbe30745b 100644
> > --- a/examples/ipsec-secgw/ipsec_process.c
> > +++ b/examples/ipsec-secgw/ipsec_process.c
> > @@ -22,7 +22,7 @@ free_cops(struct rte_crypto_op *cop[], uint32_t n)
> > uint32_t i;
> >
> > for (i = 0; i != n; i++)
> > -   rte_pktmbuf_free(cop[i]->sym->m_src);
> > +   free_pkts(&cop[i]->sym->m_src, 1);
> 
> Also, free_pkts is using a loop and should be using rte_pktmbuf_free_bulk()
> instead.

[Anoob] Indeed. Will push a separate patch for addressing the same. Thanks for 
pointing out.

21.11.6 patches review and test

[Kevin Traynor]

Hi all,

Here is a list of patches targeted for stable release 21.11.6.

The planned date for the final release is 12 January.

Please help with testing and validation of your use cases and report
any issues/results with reply-all to this mail. For the final release
the fixes and reported validations will be added to the release notes.

A release candidate tarball can be found at:

https://dpdk.org/browse/dpdk-stable/tag/?id=v21.11.6-rc1

These patches are located at branch 21.11 of dpdk-stable repo:
https://dpdk.org/browse/dpdk-stable/

Thanks.

Kevin

---
Aakash Sasidharan (2):
  event/cnxk: fix return values for capability API
  test/event: fix crypto null device creation

Abdullah Sevincer (1):
  event/dlb2: fix disable PASID

Akhil Goyal (3):
  common/cnxk: fix different size bit operations
  net/cnxk: fix uninitialized variable
  net/cnxk: fix uninitialized variable

Alexander Kozyrev (2):
  net/mlx5: fix MPRQ stride size to accommodate the headroom
  ethdev: fix ESP packet type description

Amit Prakash Shukla (2):
  common/cnxk: fix DPI memzone name
  dma/cnxk: fix device state

Anoob Joseph (2):
  cryptodev: add missing doc for security context
  doc: replace code blocks with includes in security guide

Ashwin Sekhar T K (1):
  common/cnxk: fix aura disable handling

Beilei Xing (1):
  net/i40e: fix FDIR queue receives broadcast packets

Bing Zhao (1):
  net/mlx5: fix shared Rx queue list management

Brian Dooley (3):
  test/crypto: fix IV in some vectors
  test/crypto: skip some synchronous tests with CPU crypto
  examples/ipsec-secgw: fix partial overflow

Bruce Richardson (8):
  crypto/ipsec_mb: add dependency check for cross build
  event/sw: remove obsolete comment
  net/i40e: fix buffer leak on Rx reconfiguration
  eventdev: fix device pointer for vdev-based devices
  eventdev: fix missing driver names in info struct
  ethdev: fix function name in comment
  event/dlb2: fix name check in self-test
  event/dlb2: fix missing queue ordering capability flag

Chaoyong He (6):
  net/nfp: fix Tx descriptor free logic of NFD3
  net/nfp: fix DMA error after abnormal exit
  net/nfp: fix link status interrupt
  net/nfp: fix reconfigure logic in PF initialization
  net/nfp: fix reconfigure logic in VF initialization
  net/nfp: fix reconfigure logic of set MAC address

Chengwen Feng (1):
  net/hns3: fix traffic management thread safety

Ciara Loftus (1):
  net/af_xdp: make compatible with libbpf 0.8.0

Ciara Power (2):
  crypto/qat: fix NULL algorithm digest placement
  crypto/qat: fix raw API null algorithm digest

Dariusz Sosnowski (4):
  common/mlx5: fix controller index parsing
  net/mlx5: fix use after free on Rx queue start
  net/mlx5: fix hairpin queue states
  net/mlx5: fix hairpin queue unbind

David Christensen (1):
  net/tap: use MAC address parse API instead of local parser

David Marchand (18):
  mempool: fix default ops for an empty mempool
  eventdev: fix symbol export for port maintenance
  common/cnxk: remove dead Meson code
  app/bbdev: fix link with NXP LA12XX
  net/iavf: fix checksum offloading
  net/iavf: fix Tx debug
  net/iavf: remove log from Tx prepare function
  net/iavf: fix TSO with big segments
  net/ice: remove log from Tx prepare function
  net/ice: fix TSO with big segments
  net/mlx5: fix leak in sysfs port name translation
  net/bonding: fix link status callback stop
  net/tap: fix L4 checksum offloading
  net/tap: fix IPv4 checksum offloading
  net/iavf: fix indent in Tx path
  doc: remove restriction on ixgbe vector support
  doc: fix some ordered lists
  doc: remove number of commands in vDPA guide

Dengdui Huang (14):
  net/hns3: fix VF default MAC modified when set failed
  net/hns3: fix error code for multicast resource
  net/hns3: fix flushing multicast MAC address
  app/testpmd: fix help string
  net/hns3: fix unchecked Rx free threshold
  net/hns3: fix double stats for IMP and global reset
  net/hns3: remove reset log in secondary
  net/hns3: fix multiple reset detected log
  net/hns3: refactor interrupt state query
  net/hns3: fix mailbox sync
  net/hns3: fix IMP or global reset
  net/hns3: fix ignored reset event
  net/hns3: fix reset event status
  net/hns3: fix VF reset handler interruption

Eli Britstein (1):
  net/mlx5: zero UDP checksum over IPv4 in encapsulation

Feifei Wang (1):
  app/pipeline: add sigint handler

Fengjiang Liu (1):
  net/virtio: fix missing next flag in Tx packed ring

Ferruh Yigit (3):
  net/txgbe: fix out of bound access
  mempool: fix get function documentation
  mempool: clarify enqueue/dequeue ops documentation

Gagandeep Singh (1):
  bus/dpaa: fix build with asserts for GCC 13

Gregory Etelson (1):
  eal/

[PATCH 1/4] common/qat: add files specific to GEN5

[Nishikant Nayak]

Adding GEN5 files for handling GEN5 specific operaions.
These files are inherited from the existing files/APIs
which has some changes specific GEN5 requirements
Also updated the mailmap file.

Signed-off-by: Nishikant Nayak 
---
 .mailmap  |   1 +
 drivers/common/qat/dev/qat_dev_gen5.c | 336 ++
 .../adf_transport_access_macros_gen5.h|  51 +++
 .../adf_transport_access_macros_gen5vf.h  |  48 +++
 drivers/crypto/qat/dev/qat_crypto_pmd_gen5.c  | 336 ++
 5 files changed, 772 insertions(+)
 create mode 100644 drivers/common/qat/dev/qat_dev_gen5.c
 create mode 100644 
drivers/common/qat/qat_adf/adf_transport_access_macros_gen5.h
 create mode 100644 
drivers/common/qat/qat_adf/adf_transport_access_macros_gen5vf.h
 create mode 100644 drivers/crypto/qat/dev/qat_crypto_pmd_gen5.c

diff --git a/.mailmap b/.mailmap
index ab0742a382..ef8e0b79e5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1027,6 +1027,7 @@ Ning Li  
 Nipun Gupta  
 Nir Efrati 
 Nirmoy Das 
+Nishikant Nayak 
 Nithin Dabilpuram  

 Nitin Saxena 
 Nitzan Weller 
diff --git a/drivers/common/qat/dev/qat_dev_gen5.c 
b/drivers/common/qat/dev/qat_dev_gen5.c
new file mode 100644
index 00..dc2bcd5650
--- /dev/null
+++ b/drivers/common/qat/dev/qat_dev_gen5.c
@@ -0,0 +1,336 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Intel Corporation
+ */
+
+#include 
+#include 
+
+#include "qat_device.h"
+#include "qat_qp.h"
+#include "adf_transport_access_macros_gen5vf.h"
+#include "adf_pf2vf_msg.h"
+#include "qat_pf2vf.h"
+
+#include 
+#include 
+#include 
+#include 
+
+#define BITS_PER_LONG  (sizeof(unsigned long) * 8)
+#define BITS_PER_ULONG (sizeof(unsigned long) * 8)
+
+#define VFIO_PCI_LCE_DEVICE_CFG_REGION_INDEX   VFIO_PCI_NUM_REGIONS
+#define VFIO_PCI_LCE_CY_CFG_REGION_INDEX   (VFIO_PCI_NUM_REGIONS + 2)
+#define VFIO_PCI_LCE_RING_CFG_REGION_INDEX (VFIO_PCI_NUM_REGIONS + 4)
+
+#define min_t(type, x, y) ({\
+   type __min1 = (x);  \
+   type __min2 = (y);  \
+   __min1 < __min2 ? __min1 : __min2; })
+
+/**
+ * struct lce_vfio_dev_cap - LCE device capabilities
+ *
+ * Device level capabilities and service level capabilities
+ */
+struct lce_vfio_dev_cap {
+   uint16_t device_num;
+   uint16_t device_type;
+
+#define LCE_DEVICE_CAP_DYNAMIC_BANK BIT(31)
+   uint32_t capability_mask;
+   uint32_t extended_capabilities;
+   uint16_t max_banks;
+   uint16_t max_rings_per_bank;
+   uint16_t arb_mask;
+
+#define SERV_TYPE_DCBIT(0)
+#define SERV_TYPE_SYM   BIT(1)
+#define SERV_TYPE_ASYM  BIT(2)
+#define SERV_TYPE_DMA   BIT(3)
+   uint16_t services;
+   uint16_t pkg_id;
+   uint16_t node_id;
+
+#define LCE_DEVICE_NAME_SIZE64
+   __u8 device_name[LCE_DEVICE_NAME_SIZE];
+};
+
+#define LCE_DEVICE_MAX_BANKS2080
+#define LCE_DEVICE_BITMAP_SIZE  \
+   __KERNEL_DIV_ROUND_UP(LCE_DEVICE_MAX_BANKS, BITS_PER_LONG)
+
+/* struct lce_vfio_dev_cy_cap - CY capabilities of LCE device */
+struct lce_vfio_dev_cy_cap {
+   uint32_t nr_banks;
+   unsigned long bitmap[LCE_DEVICE_BITMAP_SIZE];
+};
+
+#define LCE_QAT_NID_LOCAL  0x7
+#define LCE_QAT_FUNC_LOCAL 0x3ff
+#define LCE_QAT_RID_LOCAL  0xf
+#define LCE_QAT_PASID_LOCAL0xf
+
+struct lce_qat_domain {
+   uint32_t nid:3;
+   uint32_t fid:7;
+   uint32_t ftype  :2;
+   uint32_t vfid   :13;
+   uint32_t rid:4;
+   uint32_t vld:1;
+   uint32_t desc_over  :1;
+   uint32_t pasid_vld  :1;
+   uint32_t pasid  :20;
+};
+
+struct lce_qat_buf_domain {
+   uint32_t bank_id:   20;
+#define LCE_REQ_BUFFER_DOMAIN   1UL
+#define LCE_RES_BUFFER_DOMAIN   2UL
+#define LCE_SRC_BUFFER_DOMAIN   4UL
+#define LCE_DST_BUFFER_DOMAIN   8UL
+   uint32_t type:  4;
+   uint32_t resv:  8;
+   struct lce_qat_domain dom;
+};
+
+/* QAT GEN 5 specific macros */
+#define QAT_GEN5_BUNDLE_NUMLCE_DEVICE_MAX_BANKS
+#define QAT_GEN5_QPS_PER_BUNDLE_NUM1
+
+struct qat_dev_gen5_extra {
+   struct qat_qp_hw_data
+   qp_gen5_data[QAT_GEN5_BUNDLE_NUM][QAT_GEN5_QPS_PER_BUNDLE_NUM];
+};
+
+static struct qat_pf2vf_dev qat_pf2vf_gen5 = {
+   .pf2vf_offset = ADF_4XXXIOV_PF2VM_OFFSET,
+   .vf2pf_offset = ADF_4XXXIOV_VM2PF_OFFSET,
+   .pf2vf_type_shift = ADF_PFVF_2X_MSGTYPE_SHIFT,
+   .pf2vf_type_mask = ADF_PFVF_2X_MSGTYPE_MASK,
+   .pf2vf_data_shift = ADF_PFVF_2X_MSGDATA_SHIFT,
+   .pf2vf_data_mask = ADF_PFVF_2X_MSGDATA_MASK,
+};
+
+static int
+qat_select_valid_queue_gen5(struct qat_pci_device *qat_dev, int qp_id,
+   enum qat_service_type service_type)
+{
+   int i = 0, valid_qps = 0;
+   struct qat_dev_gen5_extra *dev_extra = qat_dev->dev_private;
+

[PATCH 2/4] common/qat: update common driver to support GEN5

[Nishikant Nayak]

Adding GEN5 specific macros which is required for updating
the support for GEN5 features.
Also this patch adds other macros which is being used by GEN5
Specific APIs.

Signed-off-by: Nishikant Nayak 
---
 drivers/common/qat/meson.build|  2 +
 .../qat/qat_adf/adf_transport_access_macros.h |  1 +
 drivers/common/qat/qat_adf/icp_qat_fw.h   | 27 ++
 drivers/common/qat/qat_adf/icp_qat_fw_la.h| 51 +++
 drivers/common/qat/qat_common.h   |  1 +
 drivers/common/qat/qat_device.c   |  9 
 6 files changed, 91 insertions(+)

diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build
index 5c36fbb270..35389e5aba 100644
--- a/drivers/common/qat/meson.build
+++ b/drivers/common/qat/meson.build
@@ -82,6 +82,7 @@ sources += files(
 'dev/qat_dev_gen2.c',
 'dev/qat_dev_gen3.c',
 'dev/qat_dev_gen4.c',
+'dev/qat_dev_gen5.c',
 )
 includes += include_directories(
 'qat_adf',
@@ -108,6 +109,7 @@ if qat_crypto
 'dev/qat_crypto_pmd_gen2.c',
 'dev/qat_crypto_pmd_gen3.c',
 'dev/qat_crypto_pmd_gen4.c',
+'dev/qat_crypto_pmd_gen5.c',
 ]
 sources += files(join_paths(qat_crypto_relpath, f))
 endforeach
diff --git a/drivers/common/qat/qat_adf/adf_transport_access_macros.h 
b/drivers/common/qat/qat_adf/adf_transport_access_macros.h
index 12a7258c60..19bd812419 100644
--- a/drivers/common/qat/qat_adf/adf_transport_access_macros.h
+++ b/drivers/common/qat/qat_adf/adf_transport_access_macros.h
@@ -47,6 +47,7 @@
 #define ADF_RING_SIZE_512 0x03
 #define ADF_RING_SIZE_4K 0x06
 #define ADF_RING_SIZE_16K 0x08
+#define ADF_RING_SIZE_64K 0x0A
 #define ADF_RING_SIZE_4M 0x10
 #define ADF_MIN_RING_SIZE ADF_RING_SIZE_128
 #define ADF_MAX_RING_SIZE ADF_RING_SIZE_4M
diff --git a/drivers/common/qat/qat_adf/icp_qat_fw.h 
b/drivers/common/qat/qat_adf/icp_qat_fw.h
index 3aa17ae041..b06b7ec989 100644
--- a/drivers/common/qat/qat_adf/icp_qat_fw.h
+++ b/drivers/common/qat/qat_adf/icp_qat_fw.h
@@ -123,6 +123,11 @@ struct icp_qat_fw_comn_resp {
 #define ICP_QAT_FW_COMN_NULL_VERSION_FLAG_BITPOS 0
 #define ICP_QAT_FW_COMN_NULL_VERSION_FLAG_MASK 0x1
 
+/* GEN5 specific Common Header fields */
+#define ICP_QAT_FW_COMN_DESC_LAYOUT_BITPOS 5
+#define ICP_QAT_FW_COMN_DESC_LAYOUT_MASK 0x3
+#define ICP_QAT_FW_COMN_GEN5_DESC_LAYOUT 3
+
 #define ICP_QAT_FW_COMN_OV_SRV_TYPE_GET(icp_qat_fw_comn_req_hdr_t) \
icp_qat_fw_comn_req_hdr_t.service_type
 
@@ -168,6 +173,12 @@ struct icp_qat_fw_comn_resp {
(((valid) & ICP_QAT_FW_COMN_VALID_FLAG_MASK) << \
 ICP_QAT_FW_COMN_VALID_FLAG_BITPOS)
 
+#define ICP_QAT_FW_COMN_HDR_FLAGS_BUILD_GEN5(valid, desc_layout) \
+   valid) & ICP_QAT_FW_COMN_VALID_FLAG_MASK) << \
+   ICP_QAT_FW_COMN_VALID_FLAG_BITPOS) | \
+   (((desc_layout) & ICP_QAT_FW_COMN_DESC_LAYOUT_MASK) << \
+   ICP_QAT_FW_COMN_DESC_LAYOUT_BITPOS))
+
 #define QAT_COMN_PTR_TYPE_BITPOS 0
 #define QAT_COMN_PTR_TYPE_MASK 0x1
 #define QAT_COMN_CD_FLD_TYPE_BITPOS 1
@@ -180,10 +191,20 @@ struct icp_qat_fw_comn_resp {
 #define QAT_COMN_EXT_FLAGS_MASK 0x1
 #define QAT_COMN_EXT_FLAGS_USED 0x1
 
+/* GEN5 specific Common Request Flags fields */
+#define QAT_COMN_KEYBUF_USAGE_BITPOS 1
+#define QAT_COMN_KEYBUF_USAGE_MASK 0x1
+#define QAT_COMN_KEY_BUFFER_USED 1
+
 #define ICP_QAT_FW_COMN_FLAGS_BUILD(cdt, ptr) \
cdt) & QAT_COMN_CD_FLD_TYPE_MASK) << QAT_COMN_CD_FLD_TYPE_BITPOS) \
 | (((ptr) & QAT_COMN_PTR_TYPE_MASK) << QAT_COMN_PTR_TYPE_BITPOS))
 
+#define ICP_QAT_FW_COMN_FLAGS_BUILD_GEN5(ptr, keybuf) \
+   ptr) & QAT_COMN_PTR_TYPE_MASK) << QAT_COMN_PTR_TYPE_BITPOS) | \
+(((keybuf) & QAT_COMN_PTR_TYPE_MASK) << \
+  QAT_COMN_KEYBUF_USAGE_BITPOS))
+
 #define ICP_QAT_FW_COMN_PTR_TYPE_GET(flags) \
QAT_FIELD_GET(flags, QAT_COMN_PTR_TYPE_BITPOS, QAT_COMN_PTR_TYPE_MASK)
 
@@ -249,6 +270,8 @@ struct icp_qat_fw_comn_resp {
 #define QAT_COMN_RESP_CMP_END_OF_LAST_BLK_MASK 0x1
 #define QAT_COMN_RESP_UNSUPPORTED_REQUEST_BITPOS 2
 #define QAT_COMN_RESP_UNSUPPORTED_REQUEST_MASK 0x1
+#define QAT_COMN_RESP_INVALID_PARAM_BITPOS 1
+#define QAT_COMN_RESP_INVALID_PARAM_MASK 0x1
 #define QAT_COMN_RESP_XLT_WA_APPLIED_BITPOS 0
 #define QAT_COMN_RESP_XLT_WA_APPLIED_MASK 0x1
 
@@ -280,6 +303,10 @@ struct icp_qat_fw_comn_resp {
QAT_FIELD_GET(status, QAT_COMN_RESP_UNSUPPORTED_REQUEST_BITPOS, \
QAT_COMN_RESP_UNSUPPORTED_REQUEST_MASK)
 
+#define ICP_QAT_FW_COMN_RESP_INVALID_PARAM_STAT_GET(status) \
+   QAT_FIELD_GET(status, QAT_COMN_RESP_INVALID_PARAM_BITPOS, \
+   QAT_COMN_RESP_INVALID_PARAM_MASK)
+
 #define ICP_QAT_FW_COMN_STATUS_FLAG_OK 0
 #define ICP_QAT_FW_COMN_STATUS_FLAG_ERROR 1
 #define ICP_QAT_FW_COMN_STATUS_CMP_END_OF_LAST_BLK_FLAG_CLR 0
diff --git a/drivers/common/qat/qat_adf/icp_qat_fw_la.h 
b/drivers/common/qat/qat_adf/icp_qat_fw_la.h
index 70f0effa62..f61241d12a 100644
--- a/drivers/common/qat/qat_adf/

[PATCH 3/4] crypto/qat: update headers for GEN5 support

[Nishikant Nayak]

This patch handles the changes required for updating the common
header fields specific to GEN5, Also added/updated of the response
processing APIs based on GEN5 requirement.

Signed-off-by: Nishikant Nayak 
---
 drivers/crypto/qat/qat_sym.c | 10 -
 drivers/crypto/qat/qat_sym.h | 60 +++-
 drivers/crypto/qat/qat_sym_session.c | 52 
 drivers/crypto/qat/qat_sym_session.h |  5 ++-
 lib/cryptodev/rte_crypto_sym.h   |  3 ++
 5 files changed, 126 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c
index 6e03bde841..8fbb8831ab 100644
--- a/drivers/crypto/qat/qat_sym.c
+++ b/drivers/crypto/qat/qat_sym.c
@@ -179,8 +179,14 @@ uint16_t
 qat_sym_dequeue_burst(void *qp, struct rte_crypto_op **ops,
uint16_t nb_ops)
 {
-   return qat_dequeue_op_burst(qp, (void **)ops,
-   qat_sym_process_response, nb_ops);
+   struct qat_qp *tmp_qp = (struct qat_qp *)qp;
+
+   if (tmp_qp->qat_dev_gen == QAT_GEN5)
+   return qat_dequeue_op_burst(qp, (void **)ops,
+   qat_sym_process_response_gen5, nb_ops);
+   else
+   return qat_dequeue_op_burst(qp, (void **)ops,
+   qat_sym_process_response, nb_ops);
 }
 
 int
diff --git a/drivers/crypto/qat/qat_sym.h b/drivers/crypto/qat/qat_sym.h
index 71e9d5f34b..7db21fc341 100644
--- a/drivers/crypto/qat/qat_sym.h
+++ b/drivers/crypto/qat/qat_sym.h
@@ -95,6 +95,12 @@
 /* Maximum data length for single pass GMAC: 2^14-1 */
 #define QAT_AES_GMAC_SPC_MAX_SIZE 16383
 
+/* Digest length for GCM Algo is 16 bytes */
+#define GCM_256_DIGEST_LEN 16
+
+/* IV length for GCM algo is 12 bytes */
+#define GCM_IV_LENGTH  12
+
 struct qat_sym_session;
 
 struct qat_sym_sgl {
@@ -383,6 +389,52 @@ qat_sym_process_response(void **op, uint8_t *resp, void 
*op_cookie,
return 1;
 }
 
+static __rte_always_inline int
+qat_sym_process_response_gen5(void **op, uint8_t *resp,
+   void *op_cookie __rte_unused,
+   uint64_t *dequeue_err_count __rte_unused)
+{
+   struct icp_qat_fw_comn_resp *resp_msg =
+   (struct icp_qat_fw_comn_resp *)resp;
+   struct rte_crypto_op *rx_op = (struct rte_crypto_op *)(uintptr_t)
+   (resp_msg->opaque_data);
+   struct qat_sym_session *sess;
+
+#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
+   QAT_DP_HEXDUMP_LOG(DEBUG, "qat_response:", (uint8_t *)resp_msg,
+   sizeof(struct icp_qat_fw_comn_resp));
+#endif
+
+   sess = CRYPTODEV_GET_SYM_SESS_PRIV(rx_op->sym->session);
+
+   rx_op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+
+   if (ICP_QAT_FW_COMN_STATUS_FLAG_OK !=
+   ICP_QAT_FW_COMN_RESP_UNSUPPORTED_REQUEST_STAT_GET(
+   resp_msg->comn_hdr.comn_status))
+   rx_op->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
+
+   else if (ICP_QAT_FW_COMN_STATUS_FLAG_OK !=
+   ICP_QAT_FW_COMN_RESP_INVALID_PARAM_STAT_GET(
+   resp_msg->comn_hdr.comn_status))
+   rx_op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+
+   if (sess->qat_dir == ICP_QAT_HW_CIPHER_DECRYPT) {
+   if (ICP_QAT_FW_LA_VER_STATUS_FAIL ==
+   ICP_QAT_FW_COMN_RESP_CRYPTO_STAT_GET(
+   resp_msg->comn_hdr.comn_status))
+   rx_op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
+   }
+
+   *op = (void *)rx_op;
+
+   /*
+* return 1 as dequeue op only move on to the next op
+* if one was ready to return to API
+*/
+   return 1;
+}
+
 int
 qat_sym_configure_dp_ctx(struct rte_cryptodev *dev, uint16_t qp_id,
struct rte_crypto_raw_dp_ctx *raw_dp_ctx,
@@ -448,7 +500,13 @@ qat_sym_preprocess_requests(void **ops __rte_unused,
 
 static inline void
 qat_sym_process_response(void **op __rte_unused, uint8_t *resp __rte_unused,
-   void *op_cookie __rte_unused)
+   void *op_cookie __rte_unused, uint64_t *dequeue_err_count __rte_unused)
+{
+}
+
+static inline void
+qat_sym_process_response_gen5(void **op __rte_unused, uint8_t *resp 
__rte_unused,
+   void *op_cookie __rte_unused, uint64_t *dequeue_err_count __rte_unused)
 {
 }
 
diff --git a/drivers/crypto/qat/qat_sym_session.c 
b/drivers/crypto/qat/qat_sym_session.c
index 9f4f6c3d93..c97d6509b8 100644
--- a/drivers/crypto/qat/qat_sym_session.c
+++ b/drivers/crypto/qat/qat_sym_session.c
@@ -136,6 +136,9 @@ qat_sym_cd_auth_set(struct qat_sym_session *cdesc,
 static void
 qat_sym_session_init_common_hdr(struct qat_sym_session *session);
 
+static void
+qat_sym_session_init_gen5_hdr(struct qat_sym_session *session);
+
 /* Req/cd init functions */
 
 static void
@@ -738,6 +741,12 @@ qat_sym_session_set_parameters(struct rte_cryptodev *dev,
session->qat_cmd);
return -ENOTSUP;
}
+
+   if (qat_dev_gen == QAT_

[PATCH 4/4] test/cryptodev: add tests for GCM with AAD

[Nishikant Nayak]

Adding one new unit test code for validating the features
added as part of GCM with 64 byte AAD.
The new test case adds one new test for GCM algo for both
encrypt and decrypt operations.

Signed-off-by: Nishikant Nayak 
---
 app/test/test_cryptodev.c   | 48 +---
 app/test/test_cryptodev_aead_test_vectors.h | 62 +
 2 files changed, 103 insertions(+), 7 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 58561ededf..73581db8cd 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -12156,6 +12156,18 @@ test_AES_GCM_auth_decryption_test_case_256_7(void)
return test_authenticated_decryption(&gcm_test_case_256_7);
 }
 
+static int
+test_AES_GCM_auth_decryption_test_case_256_8(void)
+{
+   return test_authenticated_decryption(&gcm_test_case_256_8);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_256_8(void)
+{
+   return test_authenticated_encryption(&gcm_test_case_256_8);
+}
+
 static int
 test_AES_GCM_auth_decryption_test_case_aad_1(void)
 {
@@ -12275,10 +12287,16 @@ test_authenticated_encryption_oop(const struct 
aead_test_data *tdata)
 
/* Verify the capabilities */
struct rte_cryptodev_sym_capability_idx cap_idx;
+   const struct rte_cryptodev_symmetric_capability *capability;
cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
cap_idx.algo.aead = tdata->algo;
-   if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-   &cap_idx) == NULL)
+   capability = rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+   &cap_idx);
+   if (capability == NULL)
+   return TEST_SKIPPED;
+   if (rte_cryptodev_sym_capability_check_aead(
+   capability, tdata->key.len, tdata->auth_tag.len,
+   tdata->aad.len, tdata->iv.len))
return TEST_SKIPPED;
 
rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
@@ -12381,16 +12399,22 @@ test_authenticated_decryption_oop(const struct 
aead_test_data *tdata)
 
/* Verify the capabilities */
struct rte_cryptodev_sym_capability_idx cap_idx;
+   const struct rte_cryptodev_symmetric_capability *capability;
cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
cap_idx.algo.aead = tdata->algo;
-   if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-   &cap_idx) == NULL)
-   return TEST_SKIPPED;
+   capability = rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+   &cap_idx);
 
/* not supported with CPU crypto and raw data-path APIs*/
if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO ||
global_api_test_type == CRYPTODEV_RAW_API_TEST)
return TEST_SKIPPED;
+   if (capability == NULL)
+   return TEST_SKIPPED;
+   if (rte_cryptodev_sym_capability_check_aead(
+   capability, tdata->key.len, tdata->auth_tag.len,
+   tdata->aad.len, tdata->iv.len))
+   return TEST_SKIPPED;
 
if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
(!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
@@ -15411,10 +15435,16 @@ test_authenticated_encryption_SGL(const struct 
aead_test_data *tdata,
 
/* Verify the capabilities */
struct rte_cryptodev_sym_capability_idx cap_idx;
+   const struct rte_cryptodev_symmetric_capability *capability;
cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
cap_idx.algo.aead = tdata->algo;
-   if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-   &cap_idx) == NULL)
+   capability = rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+   &cap_idx);
+   if (capability == NULL)
+   return TEST_SKIPPED;
+   if (rte_cryptodev_sym_capability_check_aead(
+   capability, tdata->key.len, tdata->auth_tag.len,
+   tdata->aad.len, tdata->iv.len))
return TEST_SKIPPED;
 
/*
@@ -16853,6 +16883,8 @@ static struct unit_test_suite 
cryptodev_aes_gcm_auth_testsuite  = {
test_AES_GCM_auth_encryption_test_case_256_6),
TEST_CASE_ST(ut_setup, ut_teardown,
test_AES_GCM_auth_encryption_test_case_256_7),
+   TEST_CASE_ST(ut_setup, ut_teardown,
+   test_AES_GCM_auth_encryption_test_case_256_8),
 
/** AES GCM Authenticated Decryption 256 bits key */
TEST_CASE_ST(ut_setup, ut_teardown,
@@ -16869,6 +16901,8 @@ static struct unit_test_suite 
cryptodev_aes_gcm_auth_testsuite  = {
test_AES_GCM_auth_decryption_test_case_256_6),
TEST_CASE_ST(ut_setup, ut_teardown,
test_AES_GCM_auth_decryption_test_case_256_7),
+   TEST_CASE_ST(ut_setup, ut_teardown,

Re: [PATCH v4 12/14] lib: convert to per line logging

[Thomas Monjalon]

18/12/2023 15:38, David Marchand:
> Convert many libraries that call RTE_LOG(... "\n", ...) to RTE_LOG_LINE.
> 
> Note:
> - for acl and sched libraries that still has some debug multilines
>   messages, a direct call to RTE_LOG is used: this will make it easier to
>   notice such special cases,

[...]
>  129 files changed, 2280 insertions(+), 2279 deletions(-)

It would be nice to keep RTE_LOG() only for multi-line as you do,
and use RTE_LOG_LINE only in wrapper macros specific per library.
This patch is using RTE_LOG_LINE directly in multiple places
in libraries which do not have a dedicated wrapper macro.
Would it be  possible to introduce new wrappers for these libraries
in this patch?

Re: [PATCH v4 12/14] lib: convert to per line logging

[David Marchand]

On Wed, Dec 20, 2023 at 2:46 PM Thomas Monjalon  wrote:
>
> 18/12/2023 15:38, David Marchand:
> > Convert many libraries that call RTE_LOG(... "\n", ...) to RTE_LOG_LINE.
> >
> > Note:
> > - for acl and sched libraries that still has some debug multilines
> >   messages, a direct call to RTE_LOG is used: this will make it easier to
> >   notice such special cases,
>
> [...]
> >  129 files changed, 2280 insertions(+), 2279 deletions(-)
>
> It would be nice to keep RTE_LOG() only for multi-line as you do,
> and use RTE_LOG_LINE only in wrapper macros specific per library.
> This patch is using RTE_LOG_LINE directly in multiple places
> in libraries which do not have a dedicated wrapper macro.
> Would it be  possible to introduce new wrappers for these libraries
> in this patch?

It is doable and not too difficult to achieve with some scripting.
I'll try in the v5 (since I need to send a new revision for build with
-pedantic).


-- 
David Marchand

[PATCH v3 0/3] Improve optional lib support

[Bruce Richardson]

This patchset builds on the previous v1 and v2, and the discussion
which followed about what libraries should be optional. While still
a long way to go from the position suggested in the v2 discussion,
this set moves us a bit further along the road.

The first patch is a direct v3 from previous versions, changing the
tracking from a list of optional libs to a list of mandatory ones.
The second patch then knocks off another 5 libs off the mandatory
list - all are libs which should have few dependencies in other
components, but which some common sample apps like l3fwd depend upon.
It should be possible to make other libs optional in future, but to
do so likely requires code-changes to #ifdef out support in places.

To that end, patch 3 is an RFC to add support for "optional libs" to
the build system. For now, nothing uses this, but it may be useful if
someone does want to take on the task of removing a hard dependency
from one component on another and making it optional.

Bruce Richardson (3):
  build: track mandatory rather than optional libs
  build: remove 5 libs from mandatory list
  build: RFC - add support for optional dependencies

 app/test/meson.build |  4 +--
 drivers/meson.build  |  7 +
 lib/meson.build  | 72 
 3 files changed, 35 insertions(+), 48 deletions(-)

--
2.40.1

[PATCH v3 1/3] build: track mandatory rather than optional libs

[Bruce Richardson]

DPDK now has more optional libraries than mandatory ones, so invert the
list stored in the meson.build file from the optional ones to the
"always_enable" ones. As well as being a shorter list:

* we can remove the loop building up the "always_enable" list
  dynamically from the optional list
* it better aligns with the drivers/meson.build file which maintains an
  always_enable list.

Signed-off-by: Bruce Richardson 
Acked-by: Morten Brørup 
---
 lib/meson.build | 70 +
 1 file changed, 24 insertions(+), 46 deletions(-)

diff --git a/lib/meson.build b/lib/meson.build
index 6c143ce5a6..8c922d3097 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -75,52 +75,29 @@ if is_ms_compiler
 ]
 endif
 
-optional_libs = [
-'bbdev',
-'bitratestats',
-'bpf',
-'cfgfile',
-'compressdev',
-'cryptodev',
-'dispatcher',
-'distributor',
-'dmadev',
-'efd',
-'eventdev',
-'gpudev',
-'graph',
-'gro',
-'gso',
-'ip_frag',
-'ipsec',
-'jobstats',
-'latencystats',
-'member',
-'metrics',
-'mldev',
-'node',
-'pcapng',
-'pdcp',
-'pdump',
-'pipeline',
-'port',
-'power',
-'rawdev',
-'regexdev',
-'reorder',
-'sched',
-'security',
-'table',
-'vhost',
+always_enable = [
+'acl',
+'cmdline',
+'eal',
+'ethdev',
+'fib',
+'hash',
+'kvargs',
+'log',
+'lpm',
+'mbuf',
+'mempool',
+'meter',
+'net',
+'pci',
+'rcu',
+'rib',
+'ring',
+'stack',
+'telemetry',
+'timer',
 ]
 
-always_enable = []
-foreach l:libraries
-if not optional_libs.contains(l)
-always_enable += l
-endif
-endforeach
-
 enable_deprecated_libs = []
 foreach l:run_command(list_dir_globs, get_option('enable_deprecated_libs'),
 check: true).stdout().split()
@@ -136,9 +113,10 @@ enable_libs = run_command(list_dir_globs, 
get_option('enable_libs'), check: true
 require_libs = true
 if enable_libs.length() == 0
 require_libs = false
-enable_libs += optional_libs
+enable_libs = libraries
+else
+enable_libs += always_enable
 endif
-enable_libs += always_enable
 
 default_cflags = machine_args
 default_cflags += ['-DALLOW_EXPERIMENTAL_API']
-- 
2.40.1

[PATCH v3 2/3] build: remove 5 libs from mandatory list

[Bruce Richardson]

Remove five more libs from the mandatory build list. Only one needing
any special treatment is LPM, which is an optional dependency for some
secondary process autotests.

Signed-off-by: Bruce Richardson 
---
 app/test/meson.build | 4 ++--
 lib/meson.build  | 5 -
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/test/meson.build b/app/test/meson.build
index dcc93f4a43..6389ae83ee 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -7,7 +7,7 @@ sources += files('commands.c', 'test.c')
 
 # optional dependencies: some files may use these - and so we should link them 
in -
 # but do not explicitly require them so they are not listed in the per-file 
lists below
-optional_deps = ['crypto_scheduler']
+optional_deps = ['crypto_scheduler', 'lpm']
 
 # some other utility C files, providing functions used by various tests
 # so we need to include these deps in the dependency list for the files using 
those fns.
@@ -126,7 +126,7 @@ source_file_deps = {
 'test_memzone.c': [],
 'test_meter.c': ['meter'],
 'test_metrics.c': ['metrics'],
-'test_mp_secondary.c': ['hash', 'lpm'],
+'test_mp_secondary.c': ['hash'],
 'test_net_ether.c': ['net'],
 'test_pcapng.c': ['ethdev', 'net', 'pcapng', 'bus_vdev'],
 'test_pdcp.c': ['eventdev', 'pdcp', 'net', 'timer', 'security'],
diff --git a/lib/meson.build b/lib/meson.build
index 8c922d3097..72e9138d14 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -76,26 +76,21 @@ if is_ms_compiler
 endif
 
 always_enable = [
-'acl',
 'cmdline',
 'eal',
 'ethdev',
-'fib',
 'hash',
 'kvargs',
 'log',
-'lpm',
 'mbuf',
 'mempool',
 'meter',
 'net',
 'pci',
 'rcu',
-'rib',
 'ring',
 'stack',
 'telemetry',
-'timer',
 ]
 
 enable_deprecated_libs = []
-- 
2.40.1

[PATCH v3 3/3] build: RFC - add support for optional dependencies

[Bruce Richardson]

In order to remove more libraries from the mandatory list, we need to
have support for optionally having a dependency from a driver or library
to another driver or lib. This patch adds this support by adding a new
optional_deps variable, the contents of which are added to the deps list
if those optional dependencies are present in the build.

Signed-off-by: Bruce Richardson 
---
 drivers/meson.build | 7 +++
 lib/meson.build | 7 +++
 2 files changed, 14 insertions(+)

diff --git a/drivers/meson.build b/drivers/meson.build
index 5ba534049a..af2d8da5a8 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -127,6 +127,7 @@ foreach subpath:subdirs
 includes = [include_directories(drv_path)]
 # set up internal deps. Drivers can append/override as necessary
 deps = std_deps
+optional_deps = []
 # ext_deps: Stores external library dependency got
 # using dependency() (preferred) or find_library().
 # For the find_library() case (but not with dependency()) we also
@@ -168,6 +169,12 @@ foreach subpath:subdirs
 # get dependency objs from strings
 shared_deps = ext_deps
 static_deps = ext_deps
+foreach d:optional_deps
+#if optional dep exists, add it to the deps list
+if is_variable('shared_rte_' + d)
+deps += d
+endif
+endforeach
 foreach d:deps
 if not build
 break
diff --git a/lib/meson.build b/lib/meson.build
index 72e9138d14..733412c276 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -140,6 +140,7 @@ foreach l:libraries
 # external package/library requirements
 ext_deps = []
 deps = []
+optional_deps = []
 # eal is standard dependency once built
 if dpdk_conf.has('RTE_LIB_EAL')
 deps += ['eal']
@@ -177,6 +178,12 @@ foreach l:libraries
 
 shared_deps = ext_deps
 static_deps = ext_deps
+foreach d:optional_deps
+#if optional dep exists, add it to the deps list
+if is_variable('shared_rte_' + d)
+deps += d
+endif
+endforeach
 foreach d:deps
 if not build
 break
-- 
2.40.1

Re: [dpdk-dev] [PATCH] net/ixgbe: update data->eth_link status on start

[Riyadi Selamat]

[PATCH] telemetry: correct json empty dictionaries

[Jonathan Erb]

Fix to allow telemetry to handle empty dictionaries correctly.

This patch resolves an issue where empty dictionaries are reported
by telemetry as '[]' rather than '{}'. Initializing the output
buffer based on the container type resolves the issue.

Signed-off-by: Jonathan Erb 
---
 .mailmap  | 2 +-
 lib/telemetry/telemetry.c | 6 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index ab0742a382..a3302ba7a1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -675,7 +675,7 @@ John Ousterhout 
 John Romein 
 John W. Linville 
 Jonas Pfefferle  
-Jonathan Erb  
+Jonathan Erb 
 Jonathan Tsai 
 Jon DeVree 
 Jon Loeliger 
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index 92982842a8..0788a32210 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -169,7 +169,11 @@ container_to_json(const struct rte_tel_data *d, char 
*out_buf, size_t buf_len)
d->type != TEL_ARRAY_INT && d->type != TEL_ARRAY_STRING)
return snprintf(out_buf, buf_len, "null");
 
-   used = rte_tel_json_empty_array(out_buf, buf_len, 0);
+   if (d->type == RTE_TEL_DICT)
+   used = rte_tel_json_empty_obj(out_buf, buf_len, 0);
+   else
+   used = rte_tel_json_empty_array(out_buf, buf_len, 0);
+
if (d->type == TEL_ARRAY_UINT)
for (i = 0; i < d->data_len; i++)
used = rte_tel_json_add_array_uint(out_buf,
-- 
2.34.1

RE: [PATCH v3 3/3] build: RFC - add support for optional dependencies

[Morten Brørup]

> From: Bruce Richardson [mailto:bruce.richard...@intel.com]
> Sent: Wednesday, 20 December 2023 15.22
> 
> In order to remove more libraries from the mandatory list, we need to
> have support for optionally having a dependency from a driver or
> library
> to another driver or lib. This patch adds this support by adding a new
> optional_deps variable, the contents of which are added to the deps
> list
> if those optional dependencies are present in the build.
> 
> Signed-off-by: Bruce Richardson 
> ---
>  drivers/meson.build | 7 +++
>  lib/meson.build | 7 +++
>  2 files changed, 14 insertions(+)
> 
> diff --git a/drivers/meson.build b/drivers/meson.build
> index 5ba534049a..af2d8da5a8 100644
> --- a/drivers/meson.build
> +++ b/drivers/meson.build
> @@ -127,6 +127,7 @@ foreach subpath:subdirs
>  includes = [include_directories(drv_path)]
>  # set up internal deps. Drivers can append/override as
> necessary
>  deps = std_deps
> +optional_deps = []

(I'm a meson noob, so please bear with my stupid questions.)

Is a separate "optional_deps" necessary? If a driver has any of these 
dependencies, why can it not just add them to the "deps" in the driver's 
meson.build file?

Ohhh... It's the other way around: The driver only depends on the other 
(optional) lib if that other lib is enabled! Correct?

Either way, please add an in-line comment describing optional_deps in the 
meson.build file.

>  # ext_deps: Stores external library dependency got
>  # using dependency() (preferred) or find_library().
>  # For the find_library() case (but not with dependency()) we
> also
> @@ -168,6 +169,12 @@ foreach subpath:subdirs
>  # get dependency objs from strings
>  shared_deps = ext_deps
>  static_deps = ext_deps
> +foreach d:optional_deps
> +#if optional dep exists, add it to the deps list
> +if is_variable('shared_rte_' + d)
> +deps += d
> +endif
> +endforeach
>  foreach d:deps
>  if not build
>  break

The same feedback also applies to the lib/meson.build changes.

RE: [PATCH v3 2/3] build: remove 5 libs from mandatory list

[Morten Brørup]

> From: Bruce Richardson [mailto:bruce.richard...@intel.com]
> Sent: Wednesday, 20 December 2023 15.22
> 
> Remove five more libs from the mandatory build list. Only one needing
> any special treatment is LPM, which is an optional dependency for some
> secondary process autotests.
> 
> Signed-off-by: Bruce Richardson 
> ---

Good stuff.

Acked-by: Morten Brørup 


As previously discussed, I would like to see 'meter' become optional too, but 
it's probably too deeply embedded into the ethdev lib.

And I somehow missed that the 'telemetry' lib was not optional when it was 
added, so now we're stuck with all the bloat that comes with it. :-(

[PATCH v5 00/13] Detect superfluous newline in logs

[David Marchand]

Getting readable and consistent logs is important when running a DPDK
application, especially when troubleshooting.
A common issue with logs is when a DPDK change do not add (or on the
contrary add too many \n) in the format string.

This issue would only get noticed when actually hitting this log (which
may be a situation hard to reach).

This series proposes to introduce a new RTE_LOG_LINE helper that is
responsible for logging a one line message and spews a build error (with
gcc) if any \n is part of the format string.


Since the v1 discussion on the cover letter, I changed my mind, and made the
choice to break existing logging helpers exported in the public API.
The reasoning is that those should not be used in the first place:
logs should be produced only by the library that registers the logtype.

Some multiline logging for debugging and the test assert macros are
still present, but in this case an explicit call to RTE_LOG() is done.
This can be checked with a simple:
$ git grep -E 'RTE_LOG(_DP)?\(' -- lib/ :^lib/log/
lib/acl/acl_bld.c:  RTE_LOG(DEBUG, ACL, "Build phase for ACL \"%s\":\n"
lib/acl/acl_gen.c:  RTE_LOG(DEBUG, ACL, "Gen phase for ACL \"%s\":\n"
lib/bpf/bpf_validate.c: RTE_LOG(DEBUG, BPF, "%s(%p) stats:\n"
lib/bpf/bpf_validate.c: RTE_LOG(DEBUG, BPF,
lib/eal/common/eal_common_debug.c:  RTE_LOG(CRIT, EAL, "Error - 
exiting with code: %d\n"
lib/eal/include/rte_test.h: RTE_LOG(ERR, EAL, "Test assert %s line 
%d failed: "   \
lib/ip_frag/ip_frag_common.h:#defineIP_FRAG_LOG(lvl, fmt, args...)  
RTE_LOG(lvl, IPFRAG, fmt, ##args)
lib/sched/rte_sched.c:  RTE_LOG(DEBUG, SCHED, "Low level config for pipe 
profile %u:\n"
lib/sched/rte_sched.c:  RTE_LOG(DEBUG, SCHED, "Low level config for subport 
profile %u:\n"
lib/vhost/vhost.h:  RTE_LOG_DP(DEBUG, VHOST_DATA, "VHOST_DATA: (%s) %s", 
dev->ifname, packet); \


Changes since v4:
- fixed build with -pedantic,
- reworked patch 12 so it introduce new logging helpers (like for rcu),
- moved the transition to RTE_LOG_LINE previously in patch 12 to the
  last patch of this v5 series,

Changes since v3:
- fixed some checkpatch complaints,

Changes since RFC v2:
- sent as non RFC,
- fixed format string crossing line boundaries,
- avoided potential collision with BPF_ namespace,

Changes since RFC v1:
- rebased after Stephen log changes,
- added more fixes as I was making progress on the topic,
- added a check so dpdk developers stop using RTE_LOG(),
- added preparation patches, like "lib: replace logging helpers",
- converted all libraries, keeping some special cases with explicit
  calls to RTE_LOG,


-- 
David Marchand

David Marchand (13):
  hash: remove some dead code
  regexdev: fix logtype register
  lib: use dedicated logtypes and macros
  lib: add newline in logs
  lib: remove redundant newline from logs
  eal/linux: remove log paraphrasing the doc
  bpf: remove log level in internal helper
  lib: simplify multilines log messages
  lib: add more logging helpers
  vhost: improve log for memory dumping configuration
  log: add a per line log helper
  lib: replace logging helpers
  lib: use per line logging in helpers

 devtools/checkpatches.sh   |   8 +
 drivers/crypto/ipsec_mb/ipsec_mb_ops.c |   2 +-
 lib/acl/acl_bld.c  |  28 +-
 lib/acl/acl_gen.c  |   8 +-
 lib/acl/acl_log.h  |   2 +
 lib/acl/rte_acl.c  |   8 +-
 lib/acl/tb_mem.c   |   4 +-
 lib/bbdev/rte_bbdev.c  |  11 +-
 lib/bpf/bpf.c  |   2 +-
 lib/bpf/bpf_convert.c  |  16 +-
 lib/bpf/bpf_exec.c |  12 +-
 lib/bpf/bpf_impl.h |   5 +-
 lib/bpf/bpf_jit_arm64.c|   8 +-
 lib/bpf/bpf_jit_x86.c  |   4 +-
 lib/bpf/bpf_load.c |   2 +-
 lib/bpf/bpf_load_elf.c |  24 +-
 lib/bpf/bpf_pkt.c  |   4 +-
 lib/bpf/bpf_stub.c |   6 +-
 lib/bpf/bpf_validate.c |  44 +-
 lib/cfgfile/rte_cfgfile.c  |  18 +-
 lib/compressdev/rte_compressdev_internal.h |   5 +-
 lib/compressdev/rte_compressdev_pmd.c  |   4 +-
 lib/cryptodev/rte_cryptodev.c  |   4 +-
 lib/cryptodev/rte_cryptodev.h  |  22 +-
 lib/dispatcher/rte_dispatcher.c|  12 +-
 lib/dmadev/rte_dmadev.c|   8 +-
 lib/eal/common/eal_common_bus.c|  22 +-
 lib/eal/common/eal_common_class.c  |   6 +-
 lib/eal/common/eal_common_config.c |   2 +-
 lib/eal/common/eal_common_debug.c  |   8 +-
 lib/eal/common/eal_common_dev.c|  80 +-
 lib/eal/common/eal_common_devargs.c|  18 +-
 lib/eal/common/eal_common_dynmem.c |  34 +-
 lib/eal/common/eal_common_fbarray.c|  12 +-
 lib/eal/common/eal_com

[PATCH v5 01/13] hash: remove some dead code

[David Marchand]

This macro is not used.

Fixes: 769b2de7fb52 ("hash: implement RCU resources reclamation")
Cc: sta...@dpdk.org

Signed-off-by: David Marchand 
Reviewed-by: Stephen Hemminger 
Reviewed-by: Tyler Retzlaff 
---
 lib/hash/rte_cuckoo_hash.h | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/lib/hash/rte_cuckoo_hash.h b/lib/hash/rte_cuckoo_hash.h
index f7afc4dd79..8ea793c66e 100644
--- a/lib/hash/rte_cuckoo_hash.h
+++ b/lib/hash/rte_cuckoo_hash.h
@@ -29,17 +29,6 @@
 #define RETURN_IF_TRUE(cond, retval)
 #endif
 
-#if defined(RTE_LIBRTE_HASH_DEBUG)
-#define ERR_IF_TRUE(cond, fmt, args...) do { \
-   if (cond) { \
-   RTE_LOG(ERR, HASH, fmt, ##args); \
-   return; \
-   } \
-} while (0)
-#else
-#define ERR_IF_TRUE(cond, fmt, args...)
-#endif
-
 #include 
 #include 
 
-- 
2.43.0

[PATCH v5 02/13] regexdev: fix logtype register

[David Marchand]

This library logtype was not initialized so its logs would end up under
the 0 logtype, iow, RTE_LOGTYPE_EAL.

Fixes: b25246beaefc ("regexdev: add core functions")
Cc: sta...@dpdk.org

Signed-off-by: David Marchand 
Reviewed-by: Stephen Hemminger 
Reviewed-by: Tyler Retzlaff 
Acked-by: Ori Kam 
---
 lib/regexdev/rte_regexdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/regexdev/rte_regexdev.c b/lib/regexdev/rte_regexdev.c
index caec069182..d38a85eb0b 100644
--- a/lib/regexdev/rte_regexdev.c
+++ b/lib/regexdev/rte_regexdev.c
@@ -19,7 +19,7 @@ static struct {
struct rte_regexdev_data data[RTE_MAX_REGEXDEV_DEVS];
 } *rte_regexdev_shared_data;
 
-int rte_regexdev_logtype;
+RTE_LOG_REGISTER_DEFAULT(rte_regexdev_logtype, INFO);
 
 static uint16_t
 regexdev_find_free_dev(void)
-- 
2.43.0

[PATCH v5 03/13] lib: use dedicated logtypes and macros

[David Marchand]

No printf!
When a dedicated log helper exists, use it.
And no usurpation please: a library should log under its logtype
(see the eventdev rx adapter update for example).

Note: the RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET macro is renamed for
consistency with the rest of eventdev (private) macros.

Cc: sta...@dpdk.org

Signed-off-by: David Marchand 
Reviewed-by: Stephen Hemminger 
Reviewed-by: Tyler Retzlaff 
Reviewed-by: Andrew Rybchenko 
---
 lib/cryptodev/rte_cryptodev.c   |  2 +-
 lib/ethdev/ethdev_driver.c  |  4 ++--
 lib/ethdev/ethdev_private.c |  2 +-
 lib/ethdev/rte_class_eth.c  |  2 +-
 lib/eventdev/rte_event_dma_adapter.c|  4 ++--
 lib/eventdev/rte_event_eth_rx_adapter.c | 12 ++--
 lib/eventdev/rte_eventdev.c |  6 +++---
 lib/mempool/rte_mempool_ops.c   |  2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c
index 25e3ec12d1..ead8c9a623 100644
--- a/lib/cryptodev/rte_cryptodev.c
+++ b/lib/cryptodev/rte_cryptodev.c
@@ -2684,7 +2684,7 @@ rte_cryptodev_driver_id_get(const char *name)
int driver_id = -1;
 
if (name == NULL) {
-   RTE_LOG(DEBUG, CRYPTODEV, "name pointer NULL");
+   CDEV_LOG_DEBUG("name pointer NULL");
return -1;
}
 
diff --git a/lib/ethdev/ethdev_driver.c b/lib/ethdev/ethdev_driver.c
index fff4b7b4cd..55a9dcc565 100644
--- a/lib/ethdev/ethdev_driver.c
+++ b/lib/ethdev/ethdev_driver.c
@@ -487,7 +487,7 @@ rte_eth_devargs_parse(const char *dargs, struct 
rte_eth_devargs *eth_da)
pair = &args.pairs[i];
if (strcmp("representor", pair->key) == 0) {
if (eth_da->type != RTE_ETH_REPRESENTOR_NONE) {
-   RTE_LOG(ERR, EAL, "duplicated representor key: 
%s\n",
+   RTE_ETHDEV_LOG(ERR, "duplicated representor 
key: %s\n",
dargs);
result = -1;
goto parse_cleanup;
@@ -713,7 +713,7 @@ rte_eth_representor_id_get(uint16_t port_id,
if (info->ranges[i].controller != controller)
continue;
if (info->ranges[i].id_end < info->ranges[i].id_base) {
-   RTE_LOG(WARNING, EAL, "Port %hu invalid representor ID 
Range %u - %u, entry %d\n",
+   RTE_ETHDEV_LOG(WARNING, "Port %hu invalid representor 
ID Range %u - %u, entry %d\n",
port_id, info->ranges[i].id_base,
info->ranges[i].id_end, i);
continue;
diff --git a/lib/ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c
index e98b7188b0..0e1c7b23c1 100644
--- a/lib/ethdev/ethdev_private.c
+++ b/lib/ethdev/ethdev_private.c
@@ -182,7 +182,7 @@ rte_eth_devargs_parse_representor_ports(char *str, void 
*data)
RTE_DIM(eth_da->representor_ports));
 done:
if (str == NULL)
-   RTE_LOG(ERR, EAL, "wrong representor format: %s\n", str);
+   RTE_ETHDEV_LOG(ERR, "wrong representor format: %s\n", str);
return str == NULL ? -1 : 0;
 }
 
diff --git a/lib/ethdev/rte_class_eth.c b/lib/ethdev/rte_class_eth.c
index b61dae849d..311beb17cb 100644
--- a/lib/ethdev/rte_class_eth.c
+++ b/lib/ethdev/rte_class_eth.c
@@ -165,7 +165,7 @@ eth_dev_iterate(const void *start,
valid_keys = eth_params_keys;
kvargs = rte_kvargs_parse(str, valid_keys);
if (kvargs == NULL) {
-   RTE_LOG(ERR, EAL, "cannot parse argument list\n");
+   RTE_ETHDEV_LOG(ERR, "cannot parse argument list\n");
rte_errno = EINVAL;
return NULL;
}
diff --git a/lib/eventdev/rte_event_dma_adapter.c 
b/lib/eventdev/rte_event_dma_adapter.c
index af4b5ad388..cbf9405438 100644
--- a/lib/eventdev/rte_event_dma_adapter.c
+++ b/lib/eventdev/rte_event_dma_adapter.c
@@ -1046,7 +1046,7 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t 
dma_dev_id, uint16_t vchan,
sizeof(struct 
dma_vchan_info),
0, adapter->socket_id);
if (dev_info->vchanq == NULL) {
-   printf("Queue pair add not supported\n");
+   RTE_EDEV_LOG_ERR("Queue pair add not 
supported");
return -ENOMEM;
}
}
@@ -1057,7 +1057,7 @@ rte_event_dma_adapter_vchan_add(uint8_t id, int16_t 
dma_dev_id, uint16_t vchan,
sizeof(struct dma_vchan_info),
0, adapter->socket_id);
if (dev_info->tqmap == NULL

[PATCH v5 04/13] lib: add newline in logs

[David Marchand]

Fix places leading to a log message not terminated with a newline.

Cc: sta...@dpdk.org

Signed-off-by: David Marchand 
Acked-by: Stephen Hemminger 
Reviewed-by: Tyler Retzlaff 
Reviewed-by: Andrew Rybchenko 
---
 lib/eal/common/eal_common_options.c |  2 +-
 lib/eal/linux/eal_hugepage_info.c   |  2 +-
 lib/eal/linux/eal_interrupts.c  |  2 +-
 lib/ethdev/ethdev_pci.h |  2 +-
 lib/ethdev/rte_ethdev.c | 40 ++---
 lib/lpm/rte_lpm6.c  |  6 ++---
 lib/power/guest_channel.c   |  2 +-
 lib/power/rte_power_pmd_mgmt.c  |  6 ++---
 8 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/lib/eal/common/eal_common_options.c 
b/lib/eal/common/eal_common_options.c
index a6d21f1cba..e9ba01fb89 100644
--- a/lib/eal/common/eal_common_options.c
+++ b/lib/eal/common/eal_common_options.c
@@ -2141,7 +2141,7 @@ rte_vect_set_max_simd_bitwidth(uint16_t bitwidth)
struct internal_config *internal_conf =
eal_get_internal_configuration();
if (internal_conf->max_simd_bitwidth.forced) {
-   RTE_LOG(NOTICE, EAL, "Cannot set max SIMD bitwidth - user 
runtime override enabled");
+   RTE_LOG(NOTICE, EAL, "Cannot set max SIMD bitwidth - user 
runtime override enabled\n");
return -EPERM;
}
 
diff --git a/lib/eal/linux/eal_hugepage_info.c 
b/lib/eal/linux/eal_hugepage_info.c
index 581d9dfc91..36a495fb1f 100644
--- a/lib/eal/linux/eal_hugepage_info.c
+++ b/lib/eal/linux/eal_hugepage_info.c
@@ -403,7 +403,7 @@ inspect_hugedir_cb(const struct walk_hugedir_data *whd)
struct stat st;
 
if (fstat(whd->file_fd, &st) < 0)
-   RTE_LOG(DEBUG, EAL, "%s(): stat(\"%s\") failed: %s",
+   RTE_LOG(DEBUG, EAL, "%s(): stat(\"%s\") failed: %s\n",
__func__, whd->file_name, strerror(errno));
else
(*total_size) += st.st_size;
diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c
index d4919dff45..eabac24992 100644
--- a/lib/eal/linux/eal_interrupts.c
+++ b/lib/eal/linux/eal_interrupts.c
@@ -1542,7 +1542,7 @@ rte_intr_efd_enable(struct rte_intr_handle *intr_handle, 
uint32_t nb_efd)
/* only check, initialization would be done in vdev driver.*/
if ((uint64_t)rte_intr_efd_counter_size_get(intr_handle) >
sizeof(union rte_intr_read_buffer)) {
-   RTE_LOG(ERR, EAL, "the efd_counter_size is oversized");
+   RTE_LOG(ERR, EAL, "the efd_counter_size is 
oversized\n");
return -EINVAL;
}
} else {
diff --git a/lib/ethdev/ethdev_pci.h b/lib/ethdev/ethdev_pci.h
index 320e3e0093..ddb559aa95 100644
--- a/lib/ethdev/ethdev_pci.h
+++ b/lib/ethdev/ethdev_pci.h
@@ -31,7 +31,7 @@ rte_eth_copy_pci_info(struct rte_eth_dev *eth_dev,
struct rte_pci_device *pci_dev)
 {
if ((eth_dev == NULL) || (pci_dev == NULL)) {
-   RTE_ETHDEV_LOG(ERR, "NULL pointer eth_dev=%p pci_dev=%p",
+   RTE_ETHDEV_LOG(ERR, "NULL pointer eth_dev=%p pci_dev=%p\n",
(void *)eth_dev, (void *)pci_dev);
return;
}
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 3858983fcc..b9d99ece15 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -724,7 +724,7 @@ rte_eth_dev_get_port_by_name(const char *name, uint16_t 
*port_id)
uint16_t pid;
 
if (name == NULL) {
-   RTE_ETHDEV_LOG(ERR, "Cannot get port ID from NULL name");
+   RTE_ETHDEV_LOG(ERR, "Cannot get port ID from NULL name\n");
return -EINVAL;
}
 
@@ -2394,41 +2394,41 @@ rte_eth_rx_hairpin_queue_setup(uint16_t port_id, 
uint16_t rx_queue_id,
nb_rx_desc = cap.max_nb_desc;
if (nb_rx_desc > cap.max_nb_desc) {
RTE_ETHDEV_LOG(ERR,
-   "Invalid value for nb_rx_desc(=%hu), should be: <= %hu",
+   "Invalid value for nb_rx_desc(=%hu), should be: <= 
%hu\n",
nb_rx_desc, cap.max_nb_desc);
return -EINVAL;
}
if (conf->peer_count > cap.max_rx_2_tx) {
RTE_ETHDEV_LOG(ERR,
-   "Invalid value for number of peers for Rx queue(=%u), 
should be: <= %hu",
+   "Invalid value for number of peers for Rx queue(=%u), 
should be: <= %hu\n",
conf->peer_count, cap.max_rx_2_tx);
return -EINVAL;
}
if (conf->use_locked_device_memory && !cap.rx_cap.locked_device_memory) 
{
RTE_ETHDEV_LOG(ERR,
-   "Attempt to use locked device memory for Rx queue, 
which is not supported");
+   "Attempt to use locked device memory for Rx queue, 
which is not supported\n");
return -EINVAL;
}
   

[PATCH v5 05/13] lib: remove redundant newline from logs

[David Marchand]

Fix places where two newline characters may be logged.

Cc: sta...@dpdk.org

Signed-off-by: David Marchand 
Acked-by: Stephen Hemminger 
Reviewed-by: Chengwen Feng 
Acked-by: Mattias Rönnblom 
---
Changes since RFC v1:
- split fixes on direct calls to printf or RTE_LOG in a previous patch,

---
 drivers/crypto/ipsec_mb/ipsec_mb_ops.c  |   2 +-
 lib/bbdev/rte_bbdev.c   |   6 +-
 lib/cfgfile/rte_cfgfile.c   |  14 ++--
 lib/compressdev/rte_compressdev_pmd.c   |   4 +-
 lib/cryptodev/rte_cryptodev.c   |   2 +-
 lib/dispatcher/rte_dispatcher.c |  12 +--
 lib/dmadev/rte_dmadev.c |   2 +-
 lib/eal/windows/eal_memory.c|   2 +-
 lib/eventdev/eventdev_pmd.h |   6 +-
 lib/eventdev/rte_event_crypto_adapter.c |  12 +--
 lib/eventdev/rte_event_dma_adapter.c|  14 ++--
 lib/eventdev/rte_event_eth_rx_adapter.c |  28 +++
 lib/eventdev/rte_event_eth_tx_adapter.c |   2 +-
 lib/eventdev/rte_event_timer_adapter.c  |   4 +-
 lib/eventdev/rte_eventdev.c |   4 +-
 lib/metrics/rte_metrics_telemetry.c |   2 +-
 lib/mldev/rte_mldev.c   | 102 
 lib/net/rte_net_crc.c   |   6 +-
 lib/node/ethdev_rx.c|   4 +-
 lib/node/ip4_lookup.c   |   2 +-
 lib/node/ip6_lookup.c   |   2 +-
 lib/node/kernel_rx.c|   8 +-
 lib/node/kernel_tx.c|   4 +-
 lib/rcu/rte_rcu_qsbr.c  |   4 +-
 lib/rcu/rte_rcu_qsbr.h  |   8 +-
 lib/stack/rte_stack.c   |   8 +-
 lib/vhost/vhost_crypto.c|   6 +-
 27 files changed, 135 insertions(+), 135 deletions(-)

diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c 
b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
index 52d6d010c7..f21f9cc5a0 100644
--- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
+++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
@@ -407,7 +407,7 @@ ipsec_mb_ipc_request(const struct rte_mp_msg *mp_msg, const 
void *peer)
resp_param->result = ipsec_mb_qp_release(dev, qp_id);
break;
default:
-   CDEV_LOG_ERR("invalid mp request type\n");
+   CDEV_LOG_ERR("invalid mp request type");
}
 
 out:
diff --git a/lib/bbdev/rte_bbdev.c b/lib/bbdev/rte_bbdev.c
index cfebea09c7..e09bb97abb 100644
--- a/lib/bbdev/rte_bbdev.c
+++ b/lib/bbdev/rte_bbdev.c
@@ -1106,12 +1106,12 @@ rte_bbdev_queue_intr_ctl(uint16_t dev_id, uint16_t 
queue_id, int epfd, int op,
 
intr_handle = dev->intr_handle;
if (intr_handle == NULL) {
-   rte_bbdev_log(ERR, "Device %u intr handle unset\n", dev_id);
+   rte_bbdev_log(ERR, "Device %u intr handle unset", dev_id);
return -ENOTSUP;
}
 
if (queue_id >= RTE_MAX_RXTX_INTR_VEC_ID) {
-   rte_bbdev_log(ERR, "Device %u queue_id %u is too big\n",
+   rte_bbdev_log(ERR, "Device %u queue_id %u is too big",
dev_id, queue_id);
return -ENOTSUP;
}
@@ -1120,7 +1120,7 @@ rte_bbdev_queue_intr_ctl(uint16_t dev_id, uint16_t 
queue_id, int epfd, int op,
ret = rte_intr_rx_ctl(intr_handle, epfd, op, vec, data);
if (ret && (ret != -EEXIST)) {
rte_bbdev_log(ERR,
-   "dev %u q %u int ctl error op %d epfd %d vec 
%u\n",
+   "dev %u q %u int ctl error op %d epfd %d vec 
%u",
dev_id, queue_id, op, epfd, vec);
return ret;
}
diff --git a/lib/cfgfile/rte_cfgfile.c b/lib/cfgfile/rte_cfgfile.c
index eefba6e408..2f9cc0722a 100644
--- a/lib/cfgfile/rte_cfgfile.c
+++ b/lib/cfgfile/rte_cfgfile.c
@@ -137,7 +137,7 @@ rte_cfgfile_check_params(const struct 
rte_cfgfile_parameters *params)
unsigned int i;
 
if (!params) {
-   CFG_LOG(ERR, "missing cfgfile parameters\n");
+   CFG_LOG(ERR, "missing cfgfile parameters");
return -EINVAL;
}
 
@@ -150,7 +150,7 @@ rte_cfgfile_check_params(const struct 
rte_cfgfile_parameters *params)
}
 
if (valid_comment == 0) {
-   CFG_LOG(ERR, "invalid comment characters %c\n",
+   CFG_LOG(ERR, "invalid comment characters %c",
   params->comment_character);
return -ENOTSUP;
}
@@ -188,7 +188,7 @@ rte_cfgfile_load_with_params(const char *filename, int 
flags,
lineno++;
if ((len >= sizeof(buffer) - 1) && (buffer[len-1] != '\n')) {
CFG_LOG(ERR, " line %d - no \\n found on string. "
-   "Check if line too long\n", lineno);
+   "Check if line too long", lineno);
goto error1;
}
/* skip parsing if comment character found */
@@ -209,7 +209

[PATCH v5 06/13] eal/linux: remove log paraphrasing the doc

[David Marchand]

An error log message does not need to paraphrase the DPDK documentation.

Signed-off-by: David Marchand 
Acked-by: Stephen Hemminger 
Acked-by: Tyler Retzlaff 
---
 lib/eal/linux/eal_timer.c | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/eal/linux/eal_timer.c b/lib/eal/linux/eal_timer.c
index 3a30284e3a..df9ad61ae9 100644
--- a/lib/eal/linux/eal_timer.c
+++ b/lib/eal/linux/eal_timer.c
@@ -152,11 +152,7 @@ rte_eal_hpet_init(int make_default)
}
eal_hpet = mmap(NULL, 1024, PROT_READ, MAP_SHARED, fd, 0);
if (eal_hpet == MAP_FAILED) {
-   RTE_LOG(ERR, EAL, "ERROR: Cannot mmap "DEV_HPET"!\n"
-   "Please enable CONFIG_HPET_MMAP in your kernel 
configuration "
-   "to allow HPET support.\n"
-   "To run without using HPET, unset 
RTE_LIBEAL_USE_HPET "
-   "in your build configuration or use '--no-hpet' 
EAL flag.\n");
+   RTE_LOG(ERR, EAL, "ERROR: Cannot mmap "DEV_HPET"!\n");
close(fd);
internal_conf->no_hpet = 1;
return -1;
-- 
2.43.0

[PATCH v5 07/13] bpf: remove log level in internal helper

[David Marchand]

There is no other log level than debug, simplify this helper.

Signed-off-by: David Marchand 
Acked-by: Stephen Hemminger 
Acked-by: Tyler Retzlaff 
---
 lib/bpf/bpf_validate.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/bpf/bpf_validate.c b/lib/bpf/bpf_validate.c
index 95b9ef99ef..f246b3c5eb 100644
--- a/lib/bpf/bpf_validate.c
+++ b/lib/bpf/bpf_validate.c
@@ -2178,18 +2178,18 @@ restore_eval_state(struct bpf_verifier *bvf, struct 
inst_node *node)
 }
 
 static void
-log_eval_state(const struct bpf_verifier *bvf, const struct ebpf_insn *ins,
-   uint32_t pc, int32_t loglvl)
+log_dbg_eval_state(const struct bpf_verifier *bvf, const struct ebpf_insn *ins,
+   uint32_t pc)
 {
const struct bpf_eval_state *st;
const struct bpf_reg_val *rv;
 
-   rte_log(loglvl, rte_bpf_logtype, "%s(pc=%u):\n", __func__, pc);
+   RTE_BPF_LOG(DEBUG, "%s(pc=%u):\n", __func__, pc);
 
st = bvf->evst;
rv = st->rv + ins->dst_reg;
 
-   rte_log(loglvl, rte_bpf_logtype,
+   RTE_BPF_LOG(DEBUG,
"r%u={\n"
"\tv={type=%u, size=%zu},\n"
"\tmask=0x%" PRIx64 ",\n"
@@ -2269,7 +2269,7 @@ evaluate(struct bpf_verifier *bvf)
}
}
 
-   log_eval_state(bvf, ins + idx, idx, RTE_LOG_DEBUG);
+   log_dbg_eval_state(bvf, ins + idx, idx);
bvf->evin = NULL;
}
 
-- 
2.43.0

[PATCH v5 08/13] lib: simplify multilines log messages

[David Marchand]

Those error log messages don't need to span on multiple lines.

Signed-off-by: David Marchand 
Acked-by: Tyler Retzlaff 
Reviewed-by: Andrew Rybchenko 
---
Changes since RFC v2:
- fixed format string crossing line boundaries,

---
 lib/acl/tb_mem.c|  4 ++--
 lib/bpf/bpf_stub.c  |  6 ++
 lib/eal/windows/eal_hugepages.c |  4 ++--
 lib/ethdev/rte_ethdev.c | 12 
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/lib/acl/tb_mem.c b/lib/acl/tb_mem.c
index 6a9d96aaed..4ee65b23da 100644
--- a/lib/acl/tb_mem.c
+++ b/lib/acl/tb_mem.c
@@ -26,8 +26,8 @@ tb_pool(struct tb_mem_pool *pool, size_t sz)
size = sz + pool->alignment - 1;
block = calloc(1, size + sizeof(*pool->block));
if (block == NULL) {
-   RTE_LOG(ERR, ACL, "%s(%zu)\n failed, currently allocated "
-   "by pool: %zu bytes\n", __func__, sz, pool->alloc);
+   RTE_LOG(ERR, ACL, "%s(%zu) failed, currently allocated by pool: 
%zu bytes\n",
+   __func__, sz, pool->alloc);
siglongjmp(pool->fail, -ENOMEM);
return NULL;
}
diff --git a/lib/bpf/bpf_stub.c b/lib/bpf/bpf_stub.c
index ebc5343896..83c2203622 100644
--- a/lib/bpf/bpf_stub.c
+++ b/lib/bpf/bpf_stub.c
@@ -19,8 +19,7 @@ rte_bpf_elf_load(const struct rte_bpf_prm *prm, const char 
*fname,
return NULL;
}
 
-   RTE_BPF_LOG(ERR, "%s() is not supported with current config\n"
-   "rebuild with libelf installed\n",
+   RTE_BPF_LOG(ERR, "%s() is not supported, rebuild with libelf 
installed\n",
__func__);
rte_errno = ENOTSUP;
return NULL;
@@ -36,8 +35,7 @@ rte_bpf_convert(const struct bpf_program *prog)
return NULL;
}
 
-   RTE_BPF_LOG(ERR, "%s() is not supported with current config\n"
-   "rebuild with libpcap installed\n",
+   RTE_BPF_LOG(ERR, "%s() is not supported, rebuild with libpcap 
installed\n",
__func__);
rte_errno = ENOTSUP;
return NULL;
diff --git a/lib/eal/windows/eal_hugepages.c b/lib/eal/windows/eal_hugepages.c
index b007dceb39..775c67e4c4 100644
--- a/lib/eal/windows/eal_hugepages.c
+++ b/lib/eal/windows/eal_hugepages.c
@@ -105,8 +105,8 @@ int
 eal_hugepage_info_init(void)
 {
if (hugepage_claim_privilege() < 0) {
-   RTE_LOG(ERR, EAL, "Cannot claim hugepage privilege\n"
-   "Verify that large-page support privilege is assigned to the 
current user\n");
+   RTE_LOG(ERR, EAL,
+   "Cannot claim hugepage privilege, check large-page 
support privilege\n");
return -1;
}
 
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index b9d99ece15..9dd0efa9d8 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -6709,8 +6709,7 @@ rte_eth_ip_reassembly_capability_get(uint16_t port_id,
 
if (dev->data->dev_configured == 0) {
RTE_ETHDEV_LOG(ERR,
-   "Device with port_id=%u is not configured.\n"
-   "Cannot get IP reassembly capability\n",
+   "port_id=%u is not configured, cannot get IP reassembly 
capability\n",
port_id);
return -EINVAL;
}
@@ -6745,8 +6744,7 @@ rte_eth_ip_reassembly_conf_get(uint16_t port_id,
 
if (dev->data->dev_configured == 0) {
RTE_ETHDEV_LOG(ERR,
-   "Device with port_id=%u is not configured.\n"
-   "Cannot get IP reassembly configuration\n",
+   "port_id=%u is not configured, cannot get IP reassembly 
configuration\n",
port_id);
return -EINVAL;
}
@@ -6779,16 +6777,14 @@ rte_eth_ip_reassembly_conf_set(uint16_t port_id,
 
if (dev->data->dev_configured == 0) {
RTE_ETHDEV_LOG(ERR,
-   "Device with port_id=%u is not configured.\n"
-   "Cannot set IP reassembly configuration\n",
+   "port_id=%u is not configured, cannot set IP reassembly 
configuration\n",
port_id);
return -EINVAL;
}
 
if (dev->data->dev_started != 0) {
RTE_ETHDEV_LOG(ERR,
-   "Device with port_id=%u started,\n"
-   "cannot configure IP reassembly params.\n",
+   "port_id=%u is started, cannot configure IP reassembly 
params.\n",
port_id);
return -EINVAL;
}
-- 
2.43.0

[PATCH v5 10/13] vhost: improve log for memory dumping configuration

[David Marchand]

Add the device name as a prefix of logs associated to madvise() calls.

Signed-off-by: David Marchand 
Acked-by: Stephen Hemminger 
---
 lib/vhost/iotlb.c  | 18 +-
 lib/vhost/vhost.h  |  2 +-
 lib/vhost/vhost_user.c | 26 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lib/vhost/iotlb.c b/lib/vhost/iotlb.c
index 87ac0e5126..10ab77262e 100644
--- a/lib/vhost/iotlb.c
+++ b/lib/vhost/iotlb.c
@@ -54,16 +54,16 @@ vhost_user_iotlb_share_page(struct vhost_iotlb_entry *a, 
struct vhost_iotlb_entr
 }
 
 static void
-vhost_user_iotlb_set_dump(struct vhost_iotlb_entry *node)
+vhost_user_iotlb_set_dump(struct virtio_net *dev, struct vhost_iotlb_entry 
*node)
 {
uint64_t start;
 
start = node->uaddr + node->uoffset;
-   mem_set_dump((void *)(uintptr_t)start, node->size, true, 
RTE_BIT64(node->page_shift));
+   mem_set_dump(dev, (void *)(uintptr_t)start, node->size, true, 
RTE_BIT64(node->page_shift));
 }
 
 static void
-vhost_user_iotlb_clear_dump(struct vhost_iotlb_entry *node,
+vhost_user_iotlb_clear_dump(struct virtio_net *dev, struct vhost_iotlb_entry 
*node,
struct vhost_iotlb_entry *prev, struct vhost_iotlb_entry *next)
 {
uint64_t start, end;
@@ -80,7 +80,7 @@ vhost_user_iotlb_clear_dump(struct vhost_iotlb_entry *node,
end = RTE_ALIGN_FLOOR(end, RTE_BIT64(node->page_shift));
 
if (end > start)
-   mem_set_dump((void *)(uintptr_t)start, end - start, false,
+   mem_set_dump(dev, (void *)(uintptr_t)start, end - start, false,
RTE_BIT64(node->page_shift));
 }
 
@@ -204,7 +204,7 @@ vhost_user_iotlb_cache_remove_all(struct virtio_net *dev)
vhost_user_iotlb_wr_lock_all(dev);
 
RTE_TAILQ_FOREACH_SAFE(node, &dev->iotlb_list, next, temp_node) {
-   vhost_user_iotlb_clear_dump(node, NULL, NULL);
+   vhost_user_iotlb_clear_dump(dev, node, NULL, NULL);
 
TAILQ_REMOVE(&dev->iotlb_list, node, next);
vhost_user_iotlb_remove_notify(dev, node);
@@ -230,7 +230,7 @@ vhost_user_iotlb_cache_random_evict(struct virtio_net *dev)
if (!entry_idx) {
struct vhost_iotlb_entry *next_node = 
RTE_TAILQ_NEXT(node, next);
 
-   vhost_user_iotlb_clear_dump(node, prev_node, next_node);
+   vhost_user_iotlb_clear_dump(dev, node, prev_node, 
next_node);
 
TAILQ_REMOVE(&dev->iotlb_list, node, next);
vhost_user_iotlb_remove_notify(dev, node);
@@ -285,7 +285,7 @@ vhost_user_iotlb_cache_insert(struct virtio_net *dev, 
uint64_t iova, uint64_t ua
vhost_user_iotlb_pool_put(dev, new_node);
goto unlock;
} else if (node->iova > new_node->iova) {
-   vhost_user_iotlb_set_dump(new_node);
+   vhost_user_iotlb_set_dump(dev, new_node);
 
TAILQ_INSERT_BEFORE(node, new_node, next);
dev->iotlb_cache_nr++;
@@ -293,7 +293,7 @@ vhost_user_iotlb_cache_insert(struct virtio_net *dev, 
uint64_t iova, uint64_t ua
}
}
 
-   vhost_user_iotlb_set_dump(new_node);
+   vhost_user_iotlb_set_dump(dev, new_node);
 
TAILQ_INSERT_TAIL(&dev->iotlb_list, new_node, next);
dev->iotlb_cache_nr++;
@@ -322,7 +322,7 @@ vhost_user_iotlb_cache_remove(struct virtio_net *dev, 
uint64_t iova, uint64_t si
if (iova < node->iova + node->size) {
struct vhost_iotlb_entry *next_node = 
RTE_TAILQ_NEXT(node, next);
 
-   vhost_user_iotlb_clear_dump(node, prev_node, next_node);
+   vhost_user_iotlb_clear_dump(dev, node, prev_node, 
next_node);
 
TAILQ_REMOVE(&dev->iotlb_list, node, next);
vhost_user_iotlb_remove_notify(dev, node);
diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h
index f8624fba3d..5f24911190 100644
--- a/lib/vhost/vhost.h
+++ b/lib/vhost/vhost.h
@@ -1062,6 +1062,6 @@ mbuf_is_consumed(struct rte_mbuf *m)
return true;
 }
 
-void mem_set_dump(void *ptr, size_t size, bool enable, uint64_t alignment);
+void mem_set_dump(struct virtio_net *dev, void *ptr, size_t size, bool enable, 
uint64_t alignment);
 
 #endif /* _VHOST_NET_CDEV_H_ */
diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index e36312181a..413f068bcd 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -763,7 +763,7 @@ hua_to_alignment(struct rte_vhost_memory *mem, void *ptr)
 }
 
 void
-mem_set_dump(void *ptr, size_t size, bool enable, uint64_t pagesz)
+mem_set_dump(struct virtio_net *dev, void *ptr, size_t size, bool enable, 
uint64_t pagesz)
 {
 #ifdef MADV_DONTDUMP
void *start = RTE_PTR_ALIGN_FLOOR(ptr, pagesz);
@@ -771,8 +771,8 @@ mem_set_dump(void *ptr, size_t size, bool enable, uint

[PATCH v5 11/13] log: add a per line log helper

[David Marchand]

gcc builtin __builtin_strchr can be used as a static assertion to check
whether passed format strings contain a \n.
This can be useful to detect double \n in log messages.

Signed-off-by: David Marchand 
Acked-by: Stephen Hemminger 
Acked-by: Chengwen Feng 
---
Changes since v4:
- fixed build with -pedantic,

Changes since v3:
- fixed some checkpatch complaints,

Changes since RFC v1:
- added a check in checkpatches.sh,

---
 devtools/checkpatches.sh |  8 
 lib/log/rte_log.h| 21 +
 2 files changed, 29 insertions(+)

diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index 10b79ca2bc..10d1bf490b 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -53,6 +53,14 @@ print_usage () {
 check_forbidden_additions() { # 
res=0
 
+   # refrain from new calls to RTE_LOG
+   awk -v FOLDERS="lib" \
+   -v EXPRESSIONS="RTE_LOG\\\(" \
+   -v RET_ON_FAIL=1 \
+   -v MESSAGE='Prefer RTE_LOG_LINE' \
+   -f $(dirname $(readlink -f $0))/check-forbidden-tokens.awk \
+   "$1" || res=1
+
# refrain from new additions of rte_panic() and rte_exit()
# multiple folders and expressions are separated by spaces
awk -v FOLDERS="lib drivers" \
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index 3394746103..5ba198ba24 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -17,6 +17,7 @@
 extern "C" {
 #endif
 
+#include 
 #include 
 #include 
 #include 
@@ -358,6 +359,26 @@ int rte_vlog(uint32_t level, uint32_t logtype, const char 
*format, va_list ap)
 RTE_LOGTYPE_ ## t, # t ": " __VA_ARGS__) : \
 0)
 
+#if defined(RTE_TOOLCHAIN_GCC) && !defined(PEDANTIC)
+#define RTE_LOG_CHECK_NO_NEWLINE(fmt) \
+   static_assert(!__builtin_strchr(fmt, '\n'), \
+   "This log format string contains a \\n")
+#else
+#define RTE_LOG_CHECK_NO_NEWLINE(...)
+#endif
+
+#define RTE_LOG_LINE(l, t, ...) do { \
+   RTE_LOG_CHECK_NO_NEWLINE(RTE_FMT_HEAD(__VA_ARGS__ ,)); \
+   RTE_LOG(l, t, RTE_FMT(RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
+   RTE_FMT_TAIL(__VA_ARGS__ ,))); \
+} while (0)
+
+#define RTE_LOG_DP_LINE(l, t, ...) do { \
+   RTE_LOG_CHECK_NO_NEWLINE(RTE_FMT_HEAD(__VA_ARGS__ ,)); \
+   RTE_LOG_DP(l, t, RTE_FMT(RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
+   RTE_FMT_TAIL(__VA_ARGS__ ,))); \
+} while (0)
+
 #define RTE_LOG_REGISTER_IMPL(type, name, level)   \
 int type;  \
 RTE_INIT(__##type) \
-- 
2.43.0

[PATCH v5 13/13] lib: use per line logging in helpers

[David Marchand]

Use RTE_LOG_LINE in existing macros that append a \n.
This will help catching unwanted newline character or multilines
in log messages.

Signed-off-by: David Marchand 
Reviewed-by: Chengwen Feng 
Reviewed-by: Andrew Rybchenko 
---
Changes since v4:
- converted more helpers,

Changes since v3:
- fixed some checkpatch complaints,

Changes since RFC v1:
- converted all logging helpers in lib/,

---
 lib/acl/acl_log.h  |  4 ++--
 lib/bbdev/rte_bbdev.c  |  5 +++--
 lib/bpf/bpf_impl.h |  2 +-
 lib/cfgfile/rte_cfgfile.c  |  4 ++--
 lib/compressdev/rte_compressdev_internal.h |  5 +++--
 lib/cryptodev/rte_cryptodev.h  | 22 ++
 lib/dmadev/rte_dmadev.c|  6 --
 lib/eal/common/eal_private.h   |  4 ++--
 lib/eal/windows/include/rte_windows.h  |  6 +++---
 lib/efd/rte_efd.c  |  4 ++--
 lib/ethdev/rte_ethdev.h|  3 +--
 lib/eventdev/eventdev_pmd.h| 12 ++--
 lib/eventdev/rte_event_timer_adapter.c | 17 ++---
 lib/fib/fib_log.h  |  4 ++--
 lib/gpudev/gpudev.c|  6 --
 lib/graph/graph_private.h  |  7 ---
 lib/hash/rte_cuckoo_hash.c |  4 ++--
 lib/hash/rte_fbk_hash.c|  4 ++--
 lib/hash/rte_hash_crc.c|  4 ++--
 lib/hash/rte_thash.c   |  4 ++--
 lib/hash/rte_thash_gfni.c  |  4 ++--
 lib/ip_frag/ip_frag_common.h   |  4 ++--
 lib/latencystats/rte_latencystats.c|  4 ++--
 lib/lpm/lpm_log.h  |  4 ++--
 lib/mbuf/mbuf_log.h|  4 ++--
 lib/member/member.h|  4 ++--
 lib/mempool/rte_mempool.h  |  4 ++--
 lib/metrics/rte_metrics_telemetry.c|  4 ++--
 lib/mldev/rte_mldev.h  |  5 +++--
 lib/net/rte_net_crc.c  |  8 
 lib/node/node_private.h|  8 +---
 lib/pdump/rte_pdump.c  |  5 ++---
 lib/pipeline/rte_pipeline.c|  4 ++--
 lib/port/port_log.h|  4 ++--
 lib/power/guest_channel.c  |  4 ++--
 lib/power/power_common.h   |  6 +++---
 lib/rawdev/rte_rawdev_pmd.h|  4 ++--
 lib/rcu/rte_rcu_qsbr.c |  2 +-
 lib/rcu/rte_rcu_qsbr.h |  8 +++-
 lib/regexdev/rte_regexdev.h|  3 +--
 lib/reorder/rte_reorder.c  |  4 ++--
 lib/rib/rib_log.h  |  4 ++--
 lib/ring/rte_ring.c|  4 ++--
 lib/sched/rte_sched_log.h  |  4 ++--
 lib/stack/stack_pvt.h  |  4 ++--
 lib/table/table_log.h  |  4 ++--
 lib/telemetry/telemetry.c  |  4 +---
 lib/vhost/fd_man.c |  4 ++--
 lib/vhost/vhost.h  |  4 ++--
 lib/vhost/vhost_crypto.c   |  6 +++---
 50 files changed, 133 insertions(+), 129 deletions(-)

diff --git a/lib/acl/acl_log.h b/lib/acl/acl_log.h
index 2d7c376058..d2310401a8 100644
--- a/lib/acl/acl_log.h
+++ b/lib/acl/acl_log.h
@@ -4,5 +4,5 @@
 
 extern int acl_logtype;
 #define RTE_LOGTYPE_ACLacl_logtype
-#define ACL_LOG(level, fmt, ...) \
-   RTE_LOG(level, ACL, fmt "\n", ## __VA_ARGS__)
+#define ACL_LOG(level, ...) \
+   RTE_LOG_LINE(level, ACL, "" __VA_ARGS__)
diff --git a/lib/bbdev/rte_bbdev.c b/lib/bbdev/rte_bbdev.c
index e09bb97abb..13bde3c25b 100644
--- a/lib/bbdev/rte_bbdev.c
+++ b/lib/bbdev/rte_bbdev.c
@@ -28,10 +28,11 @@
 
 /* BBDev library logging ID */
 RTE_LOG_REGISTER_DEFAULT(bbdev_logtype, NOTICE);
+#define RTE_LOGTYPE_BBDEV bbdev_logtype
 
 /* Helper macro for logging */
-#define rte_bbdev_log(level, fmt, ...) \
-   rte_log(RTE_LOG_ ## level, bbdev_logtype, fmt "\n", ##__VA_ARGS__)
+#define rte_bbdev_log(level, ...) \
+   RTE_LOG_LINE(level, BBDEV, "" __VA_ARGS__)
 
 #define rte_bbdev_log_debug(fmt, ...) \
rte_bbdev_log(DEBUG, RTE_STR(__LINE__) ":%s() " fmt, __func__, \
diff --git a/lib/bpf/bpf_impl.h b/lib/bpf/bpf_impl.h
index 6a82ae4ef2..1a3d97d0c7 100644
--- a/lib/bpf/bpf_impl.h
+++ b/lib/bpf/bpf_impl.h
@@ -30,7 +30,7 @@ extern int rte_bpf_logtype;
 #define RTE_LOGTYPE_BPF rte_bpf_logtype
 
 #defineRTE_BPF_LOG_LINE(lvl, fmt, args...) \
-   RTE_LOG(lvl, BPF, fmt "\n", ##args)
+   RTE_LOG_LINE(lvl, BPF, fmt, ##args)
 
 static inline size_t
 bpf_size(uint32_t bpf_op_sz)
diff --git a/lib/cfgfile/rte_cfgfile.c b/lib/cfgfile/rte_cfgfile.c
index 2f9cc0722a..6a5e4fd942 100644
--- a/lib/cfgfile/rte_cfgfile.c
+++ b/lib/cfgfile/rte_cfgfile.c
@@ -29,10 +29,10 @@ struct rte_cfgfile {
 
 /* Setting up dynamic logging 8< */
 RTE_LOG_REGISTER_DEFAULT(cfgfile_logtype, INFO);
+#define RTE_LOGTY

Re: [PATCH v5 11/13] log: add a per line log helper

[David Marchand]

On Wed, Dec 20, 2023 at 4:39 PM David Marchand
 wrote:
>
> gcc builtin __builtin_strchr can be used as a static assertion to check
> whether passed format strings contain a \n.
> This can be useful to detect double \n in log messages.
>
> Signed-off-by: David Marchand 
> Acked-by: Stephen Hemminger 
> Acked-by: Chengwen Feng 
> ---
> Changes since v4:
> - fixed build with -pedantic,

Unfortunately, upon testing, clang does not support constant
expression folding in (Ubuntu 20.04 and Fedora 37 at least) older
versions.
So we may manage to make this check work with clang, but that's for the future.


-- 
David Marchand

Re: [PATCH v3 3/3] build: RFC - add support for optional dependencies

[Bruce Richardson]

On Wed, Dec 20, 2023 at 04:08:08PM +0100, Morten Brørup wrote:
> > From: Bruce Richardson [mailto:bruce.richard...@intel.com]
> > Sent: Wednesday, 20 December 2023 15.22
> > 
> > In order to remove more libraries from the mandatory list, we need to
> > have support for optionally having a dependency from a driver or
> > library
> > to another driver or lib. This patch adds this support by adding a new
> > optional_deps variable, the contents of which are added to the deps
> > list
> > if those optional dependencies are present in the build.
> > 
> > Signed-off-by: Bruce Richardson 
> > ---
> >  drivers/meson.build | 7 +++
> >  lib/meson.build | 7 +++
> >  2 files changed, 14 insertions(+)
> > 
> > diff --git a/drivers/meson.build b/drivers/meson.build
> > index 5ba534049a..af2d8da5a8 100644
> > --- a/drivers/meson.build
> > +++ b/drivers/meson.build
> > @@ -127,6 +127,7 @@ foreach subpath:subdirs
> >  includes = [include_directories(drv_path)]
> >  # set up internal deps. Drivers can append/override as
> > necessary
> >  deps = std_deps
> > +optional_deps = []
> 
> (I'm a meson noob, so please bear with my stupid questions.)
> 
> Is a separate "optional_deps" necessary? If a driver has any of these 
> dependencies, why can it not just add them to the "deps" in the driver's 
> meson.build file?
> 
> Ohhh... It's the other way around: The driver only depends on the other 
> (optional) lib if that other lib is enabled! Correct?
> 
Yes, it's a shortcut to save an app having to manually check for its
optional dependency itself in the meson.build file.

However, this is only really useful if it's an optional dependency where we
just have #ifdefs in the C code for it. For the initial example I was
thinking of to try and use it - meter lib in ethdev - something that simple
is not enough. So long as there are extra C files or headers that need to
be built when a dependency is present, we need to change the meson.build
file to explicitly check anyway. Hence it's only an RFC until such time as
we find a use-case or two that uses it.

/Bruce

Re: [PATCH v3 2/3] build: remove 5 libs from mandatory list

[Bruce Richardson]

On Wed, Dec 20, 2023 at 04:18:32PM +0100, Morten Brørup wrote:
> > From: Bruce Richardson [mailto:bruce.richard...@intel.com]
> > Sent: Wednesday, 20 December 2023 15.22
> > 
> > Remove five more libs from the mandatory build list. Only one needing
> > any special treatment is LPM, which is an optional dependency for some
> > secondary process autotests.
> > 
> > Signed-off-by: Bruce Richardson 
> > ---
> 
> Good stuff.
> 
> Acked-by: Morten Brørup 
> 
> 
> As previously discussed, I would like to see 'meter' become optional too, but 
> it's probably too deeply embedded into the ethdev lib.
> 
The metering stuff I think is in separate files, so it might not be too
difficult to separate.

> And I somehow missed that the 'telemetry' lib was not optional when it was 
> added, so now we're stuck with all the bloat that comes with it. :-(

I've been thinking about this, and I will hopefully try prototyping some
ways to make it optional in future. Will probably need function stubs
somewhere to make things clean.

As with the meter stuff, it's probably just a matter of having a bit of
time to look at it.

/Bruce

Re: [PATCH v3 5/6] examples/qos_sched: fix lcore ID restriction

[Stephen Hemminger]

On Wed, 20 Dec 2023 07:45:00 +0100
Sivaprasad Tummala  wrote:

> diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c
> index e97273152a..22fe76eeb5 100644
> --- a/examples/qos_sched/args.c
> +++ b/examples/qos_sched/args.c
> @@ -182,10 +182,10 @@ app_parse_flow_conf(const char *conf_str)
>  
>   pconf->rx_port = vals[0];
>   pconf->tx_port = vals[1];
> - pconf->rx_core = (uint8_t)vals[2];
> - pconf->wt_core = (uint8_t)vals[3];
> + pconf->rx_core = (uint16_t)vals[2];
> + pconf->wt_core = (uint16_t)vals[3];
>   if (ret == 5)
> - pconf->tx_core = (uint8_t)vals[4];
> + pconf->tx_core = (uint16_t)vals[4];
>   else
>   pconf->tx_core = pconf->wt_core;
>  
> -- 

Not sure why cast is even needed, assigning uint32_t to uint16_t
is not going to generate a warning with current compiler settings.

[PATCH] update Intel roadmap for 24.03

[Euan Bourke]

Signed-off-by: Euan Bourke 
---
 content/roadmap/_index.md | 8 
 1 file changed, 8 insertions(+)

diff --git a/content/roadmap/_index.md b/content/roadmap/_index.md
index 93e590e..66ea5c6 100644
--- a/content/roadmap/_index.md
+++ b/content/roadmap/_index.md
@@ -27,12 +27,20 @@ This list is obviously neither complete nor guaranteed.
 - cnxk mirroring
 - cnxk port representor
 - mlx5 flow actions for Geneve
+- i40e and ice PMD support for fec APIs
+- iavf PMD support for lldp Tx
+- iavf/ice/i40e PMD mdd debug
+- cpfl PMD flow offload with P4 flavour APIs
+- vfio cdev/iommufd support
+- idpf PMD support for avx2
 
 - virtio hash reporting
 
 - testpmd attach/detach on primary and secondary
 
 - PDCP control PDU
+- unified ipsec-mb API
+- refactor EC support for cryptodev
 
 
 
-- 
2.34.1

RE: [PATCH v2] net/ice: fix link update

[Yang, Qiming]

hi

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Thursday, December 14, 2023 4:41 PM
> To: Yang, Qiming 
> Cc: dev@dpdk.org; Zhang, Qi Z ; sta...@dpdk.org
> Subject: [PATCH v2] net/ice: fix link update
> 
> The ice_aq_get_link_info function is not thread-safe. However, it is possible
> to simultaneous invocations during both the dev_start and the LSC
> interrupt handler, potentially leading to unexpected adminq errors. This
> patch addresses the issue by introducing a thread-safe wrapper that utilizes
> a spinlock.
> 
> Fixes: cf911d90e366 ("net/ice: support link update")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Qi Zhang 
> ---
> v2:
> - fix coding style warning.
> 
>  drivers/net/ice/ice_ethdev.c | 26 --
> drivers/net/ice/ice_ethdev.h |  4 
>  2 files changed, 24 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index
> 3ccba4db80..1f8ab5158a 100644
> --- a/drivers/net/ice/ice_ethdev.c
> +++ b/drivers/net/ice/ice_ethdev.c
> @@ -1804,6 +1804,7 @@ ice_pf_setup(struct ice_pf *pf)
>   }
> 
>   pf->main_vsi = vsi;
> + rte_spinlock_init(&pf->link_lock);
> 
>   return 0;
>  }
> @@ -3621,17 +3622,31 @@ ice_rxq_intr_setup(struct rte_eth_dev *dev)
>   return 0;
>  }
> 
> +static enum ice_status
> +ice_get_link_info_safe(struct ice_pf *pf, bool ena_lse,
> +struct ice_link_status *link)
> +{
> + struct ice_hw *hw = ICE_PF_TO_HW(pf);
> + int ret;
> +
> + rte_spinlock_lock(&pf->link_lock);
> +
> + ret = ice_aq_get_link_info(hw->port_info, ena_lse, link, NULL);
> +
> + rte_spinlock_unlock(&pf->link_lock);
> +
> + return ret;
> +}
> +
>  static void
>  ice_get_init_link_status(struct rte_eth_dev *dev)  {
> - struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
>   struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data-
> >dev_private);
>   bool enable_lse = dev->data->dev_conf.intr_conf.lsc ? true : false;
>   struct ice_link_status link_status;
>   int ret;
> 
> - ret = ice_aq_get_link_info(hw->port_info, enable_lse,
> -&link_status, NULL);
> + ret = ice_get_link_info_safe(pf, enable_lse, &link_status);
>   if (ret != ICE_SUCCESS) {
>   PMD_DRV_LOG(ERR, "Failed to get link info");
>   pf->init_link_up = false;
> @@ -3996,7 +4011,7 @@ ice_link_update(struct rte_eth_dev *dev, int
> wait_to_complete)  {  #define CHECK_INTERVAL 50  /* 50ms */  #define
> MAX_REPEAT_TIME 40  /* 2s (40 * 50ms) in total */
> - struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> + struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data-
> >dev_private);
>   struct ice_link_status link_status;
>   struct rte_eth_link link, old;
>   int status;
> @@ -4010,8 +4025,7 @@ ice_link_update(struct rte_eth_dev *dev, int
> wait_to_complete)
> 
>   do {
>   /* Get link status information from hardware */
> - status = ice_aq_get_link_info(hw->port_info, enable_lse,
> -   &link_status, NULL);
> + status = ice_get_link_info_safe(pf, enable_lse, &link_status);
>   if (status != ICE_SUCCESS) {
>   link.link_speed = RTE_ETH_SPEED_NUM_100M;
>   link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX; diff -
> -git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index
> abe6dcdc23..d607f028e0 100644
> --- a/drivers/net/ice/ice_ethdev.h
> +++ b/drivers/net/ice/ice_ethdev.h
> @@ -548,6 +548,10 @@ struct ice_pf {
>   uint64_t rss_hf;
>   struct ice_tm_conf tm_conf;
>   uint16_t outer_ethertype;
> + /* lock prevent race condition between lsc interrupt handler
> +  * and link status update during dev_start.
> +  */
> + rte_spinlock_t link_lock;
>  };
> 
>  #define ICE_MAX_QUEUE_NUM  2048
> --
> 2.31.1


Acked-by: Qiming Yang 

RE: [PATCH v2] net/ice: fix link update

[Zhang, Qi Z]

> -Original Message-
> From: Yang, Qiming 
> Sent: Thursday, December 21, 2023 9:44 AM
> To: Zhang, Qi Z 
> Cc: dev@dpdk.org; sta...@dpdk.org
> Subject: RE: [PATCH v2] net/ice: fix link update
> 
> hi
> 
> > -Original Message-
> > From: Zhang, Qi Z 
> > Sent: Thursday, December 14, 2023 4:41 PM
> > To: Yang, Qiming 
> > Cc: dev@dpdk.org; Zhang, Qi Z ; sta...@dpdk.org
> > Subject: [PATCH v2] net/ice: fix link update
> >
> > The ice_aq_get_link_info function is not thread-safe. However, it is
> > possible to simultaneous invocations during both the dev_start and the
> > LSC interrupt handler, potentially leading to unexpected adminq
> > errors. This patch addresses the issue by introducing a thread-safe
> > wrapper that utilizes a spinlock.
> >
> > Fixes: cf911d90e366 ("net/ice: support link update")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Qi Zhang 
> > ---
> > v2:
> > - fix coding style warning.
> >
> >  drivers/net/ice/ice_ethdev.c | 26 --
> > drivers/net/ice/ice_ethdev.h |  4 
> >  2 files changed, 24 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/net/ice/ice_ethdev.c
> > b/drivers/net/ice/ice_ethdev.c index 3ccba4db80..1f8ab5158a 100644
> > --- a/drivers/net/ice/ice_ethdev.c
> > +++ b/drivers/net/ice/ice_ethdev.c
> > @@ -1804,6 +1804,7 @@ ice_pf_setup(struct ice_pf *pf)
> > }
> >
> > pf->main_vsi = vsi;
> > +   rte_spinlock_init(&pf->link_lock);
> >
> > return 0;
> >  }
> > @@ -3621,17 +3622,31 @@ ice_rxq_intr_setup(struct rte_eth_dev *dev)
> > return 0;
> >  }
> >
> > +static enum ice_status
> > +ice_get_link_info_safe(struct ice_pf *pf, bool ena_lse,
> > +  struct ice_link_status *link) {
> > +   struct ice_hw *hw = ICE_PF_TO_HW(pf);
> > +   int ret;
> > +
> > +   rte_spinlock_lock(&pf->link_lock);
> > +
> > +   ret = ice_aq_get_link_info(hw->port_info, ena_lse, link, NULL);
> > +
> > +   rte_spinlock_unlock(&pf->link_lock);
> > +
> > +   return ret;
> > +}
> > +
> >  static void
> >  ice_get_init_link_status(struct rte_eth_dev *dev)  {
> > -   struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data-
> > >dev_private);
> > struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data-
> > >dev_private);
> > bool enable_lse = dev->data->dev_conf.intr_conf.lsc ? true : false;
> > struct ice_link_status link_status;
> > int ret;
> >
> > -   ret = ice_aq_get_link_info(hw->port_info, enable_lse,
> > -  &link_status, NULL);
> > +   ret = ice_get_link_info_safe(pf, enable_lse, &link_status);
> > if (ret != ICE_SUCCESS) {
> > PMD_DRV_LOG(ERR, "Failed to get link info");
> > pf->init_link_up = false;
> > @@ -3996,7 +4011,7 @@ ice_link_update(struct rte_eth_dev *dev, int
> > wait_to_complete)  {  #define CHECK_INTERVAL 50  /* 50ms */  #define
> > MAX_REPEAT_TIME 40  /* 2s (40 * 50ms) in total */
> > -   struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data-
> > >dev_private);
> > +   struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data-
> > >dev_private);
> > struct ice_link_status link_status;
> > struct rte_eth_link link, old;
> > int status;
> > @@ -4010,8 +4025,7 @@ ice_link_update(struct rte_eth_dev *dev, int
> > wait_to_complete)
> >
> > do {
> > /* Get link status information from hardware */
> > -   status = ice_aq_get_link_info(hw->port_info, enable_lse,
> > - &link_status, NULL);
> > +   status = ice_get_link_info_safe(pf, enable_lse, &link_status);
> > if (status != ICE_SUCCESS) {
> > link.link_speed = RTE_ETH_SPEED_NUM_100M;
> > link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX; diff -
> -git
> > a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index
> > abe6dcdc23..d607f028e0 100644
> > --- a/drivers/net/ice/ice_ethdev.h
> > +++ b/drivers/net/ice/ice_ethdev.h
> > @@ -548,6 +548,10 @@ struct ice_pf {
> > uint64_t rss_hf;
> > struct ice_tm_conf tm_conf;
> > uint16_t outer_ethertype;
> > +   /* lock prevent race condition between lsc interrupt handler
> > +* and link status update during dev_start.
> > +*/
> > +   rte_spinlock_t link_lock;
> >  };
> >
> >  #define ICE_MAX_QUEUE_NUM  2048
> > --
> > 2.31.1
> 
> 
> Acked-by: Qiming Yang 

Applied to dpdk-next-net-intel.

Thanks
Qi

[PATCH] examples/ipsec-secgw: use bulk free

[Anoob Joseph]

Use rte_pktmbuf_free_bulk() API instead of looping through the packets
and freeing individually.

Signed-off-by: Anoob Joseph 
Suggested-by: Stephen Hemminger 
---
 examples/ipsec-secgw/ipsec-secgw.h | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/examples/ipsec-secgw/ipsec-secgw.h 
b/examples/ipsec-secgw/ipsec-secgw.h
index 53665adf03..8baab44ee7 100644
--- a/examples/ipsec-secgw/ipsec-secgw.h
+++ b/examples/ipsec-secgw/ipsec-secgw.h
@@ -232,10 +232,7 @@ free_reassembly_fail_pkt(struct rte_mbuf *mb)
 static inline void
 free_pkts(struct rte_mbuf *mb[], uint32_t n)
 {
-   uint32_t i;
-
-   for (i = 0; i != n; i++)
-   rte_pktmbuf_free(mb[i]);
+   rte_pktmbuf_free_bulk(mb, n);
 
core_stats_update_drop(n);
 }
-- 
2.25.1

[PATCH v2] config/x86: config support for AMD EPYC processors

[Sivaprasad Tummala]

On x86 platforms, max lcores are limited to 128 by default.

On AMD EPYC processors, this limit was adjusted for native
builds in the previous patch.
https://patches.dpdk.org/project/dpdk/patch/
20230925151027.558546-1-sivaprasad.tumm...@amd.com/

As agreed earlier in mailing list, this patch adjusts the limit
for specific AMD EPYC target/cross builds.

Signed-off-by: Sivaprasad Tummala 
Acked-by: Morten Brørup 
---
 config/x86/meson.build | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/config/x86/meson.build b/config/x86/meson.build
index 5355731cef..8087b9ae91 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -91,13 +91,21 @@ epyc_zen_cores = {
 '__znver1__':128
 }
 
-if get_option('platform') == 'native'
+cpu_instruction_set = get_option('cpu_instruction_set')
+if cpu_instruction_set == 'native'
 foreach m:epyc_zen_cores.keys()
 if cc.get_define(m, args: machine_args) != ''
 dpdk_conf.set('RTE_MAX_LCORE', epyc_zen_cores[m])
 break
 endif
 endforeach
+else
+foreach m:epyc_zen_cores.keys()
+if m.contains(cpu_instruction_set)
+dpdk_conf.set('RTE_MAX_LCORE', epyc_zen_cores[m])
+break
+endif
+endforeach
 endif
 
 dpdk_conf.set('RTE_MAX_NUMA_NODES', 32)
-- 
2.25.1

Re: [PATCH v5 01/13] hash: remove some dead code

[Ruifeng Wang]

On 2023/12/20 11:35 PM, David Marchand wrote:

This macro is not used.

Fixes: 769b2de7fb52 ("hash: implement RCU resources reclamation")
Cc: sta...@dpdk.org

Signed-off-by: David Marchand 
Reviewed-by: Stephen Hemminger 
Reviewed-by: Tyler Retzlaff 
---
  lib/hash/rte_cuckoo_hash.h | 11 ---
  1 file changed, 11 deletions(-)

diff --git a/lib/hash/rte_cuckoo_hash.h b/lib/hash/rte_cuckoo_hash.h
index f7afc4dd79..8ea793c66e 100644
--- a/lib/hash/rte_cuckoo_hash.h
+++ b/lib/hash/rte_cuckoo_hash.h
@@ -29,17 +29,6 @@
  #define RETURN_IF_TRUE(cond, retval)
  #endif

-#if defined(RTE_LIBRTE_HASH_DEBUG)
-#define ERR_IF_TRUE(cond, fmt, args...) do { \
- if (cond) { \
- RTE_LOG(ERR, HASH, fmt, ##args); \
- return; \
- } \
-} while (0)
-#else
-#define ERR_IF_TRUE(cond, fmt, args...)
-#endif
-
  #include 
  #include 


Reviewed-by: Ruifeng Wang 
IMPORTANT NOTICE: The contents of this email and any attachments are 
confidential and may also be privileged. If you are not the intended recipient, 
please notify the sender immediately and do not disclose the contents to any 
other person, use it for any purpose, or store or copy the information in any 
medium. Thank you.

Re: [PATCH v5 01/13] hash: remove some dead code

[Ruifeng Wang]

On 2023/12/20 11:35 PM, David Marchand wrote:

This macro is not used.

Fixes: 769b2de7fb52 ("hash: implement RCU resources reclamation")
Cc: sta...@dpdk.org

Signed-off-by: David Marchand 
Reviewed-by: Stephen Hemminger 
Reviewed-by: Tyler Retzlaff 
---
  lib/hash/rte_cuckoo_hash.h | 11 ---
  1 file changed, 11 deletions(-)

diff --git a/lib/hash/rte_cuckoo_hash.h b/lib/hash/rte_cuckoo_hash.h
index f7afc4dd79..8ea793c66e 100644
--- a/lib/hash/rte_cuckoo_hash.h
+++ b/lib/hash/rte_cuckoo_hash.h
@@ -29,17 +29,6 @@
  #define RETURN_IF_TRUE(cond, retval)
  #endif
  
-#if defined(RTE_LIBRTE_HASH_DEBUG)

-#define ERR_IF_TRUE(cond, fmt, args...) do { \
-   if (cond) { \
-   RTE_LOG(ERR, HASH, fmt, ##args); \
-   return; \
-   } \
-} while (0)
-#else
-#define ERR_IF_TRUE(cond, fmt, args...)
-#endif
-
  #include 
  #include 
  

To correct the disclaimer issue.

Reviewed-by: Ruifeng Wang 

[PATCH 1/2] common/cnxk: fix mbox region copy

[Harman Kalra]

Using proper API to perform copy to mbox device memory region

Fixes: 02719901d50f ("common/cnxk: send link status event to VF")
Cc: sta...@dpdk.org

Signed-off-by: Harman Kalra 
---
 drivers/common/cnxk/roc_dev.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/common/cnxk/roc_dev.c b/drivers/common/cnxk/roc_dev.c
index e7e89bf3d6..084343c3b4 100644
--- a/drivers/common/cnxk/roc_dev.c
+++ b/drivers/common/cnxk/roc_dev.c
@@ -198,9 +198,8 @@ af_pf_wait_msg(struct dev *dev, uint16_t vf, int num_msg)
vf_msg = mbox_alloc_msg(&dev->mbox_vfpf_up, vf, sz);
if (vf_msg) {
mbox_req_init(MBOX_MSG_CGX_LINK_EVENT, vf_msg);
-   memcpy((uint8_t *)vf_msg +
-  sizeof(struct mbox_msghdr), &linfo,
-  sizeof(struct cgx_link_user_info));
+   mbox_memcpy((uint8_t *)vf_msg + sizeof(struct 
mbox_msghdr), &linfo,
+   sizeof(struct cgx_link_user_info));
 
vf_msg->rc = msg->rc;
vf_msg->pcifunc = msg->pcifunc;
-- 
2.18.0

[PATCH 2/2] common/cnxk: fix VLAN check for inner header

[Harman Kalra]

Adding the has vlan check in inner headers i.e in LF layer. If
has_vlan is 0 it should be masked out while installing flow rule.

Fixes: c34ea71b878d ("common/cnxk: add NPC parsing API")
Cc: sta...@dpdk.org

Signed-off-by: Harman Kalra 
---
 drivers/common/cnxk/roc_npc_parse.c | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/common/cnxk/roc_npc_parse.c 
b/drivers/common/cnxk/roc_npc_parse.c
index 9ceb707ebb..571d6b8e5d 100644
--- a/drivers/common/cnxk/roc_npc_parse.c
+++ b/drivers/common/cnxk/roc_npc_parse.c
@@ -1097,6 +1097,7 @@ npc_parse_lf(struct npc_parse_state *pst)
 {
const struct roc_npc_item_info *pattern, *last_pattern;
char hw_mask[NPC_MAX_EXTRACT_HW_LEN];
+   const struct roc_npc_flow_item_eth *eth_item;
struct npc_parse_item_info info;
int lid, lt, lflags;
int nr_vlans = 0;
@@ -1113,10 +1114,12 @@ npc_parse_lf(struct npc_parse_state *pst)
lt = NPC_LT_LF_TU_ETHER;
lflags = 0;
 
+   eth_item = pst->pattern->spec;
+
/* No match support for vlan tags */
info.def_mask = NULL;
info.hw_mask = NULL;
-   info.len = pst->pattern->size;
+   info.len = sizeof(eth_item->hdr);
info.spec = NULL;
info.mask = NULL;
info.hw_hdr_len = 0;
@@ -1147,12 +1150,15 @@ npc_parse_lf(struct npc_parse_state *pst)
}
 
info.hw_mask = &hw_mask;
-   info.len = pst->pattern->size;
+   info.len = sizeof(eth_item->hdr);
info.hw_hdr_len = 0;
npc_get_hw_supp_mask(pst, &info, lid, lt);
info.spec = NULL;
info.mask = NULL;
 
+   if (eth_item && eth_item->has_vlan)
+   pst->set_vlan_ltype_mask = true;
+
rc = npc_parse_item_basic(pst->pattern, &info);
if (rc != 0)
return rc;
-- 
2.18.0

[PATCH v4 0/3] net/iavf: support Tx LLDP on scalar and AVX512

[Zhichao Zeng]

This patch set adds an IAVF testpmd command "set tx lldp on|off" which
will register an mbuf dynfield IAVF_TX_LLDP_DYNFIELD, currently only
supported turning on.

IAVF will fill the SWTCH_UPLINK bit in the Tx context descriptor based on
the mbuf dynfield to send the LLDP packet.

For avx512, need to close the Tx port first, then "set tx lldp on", and
reopen the port to select correct Tx path.

---
v4: fix compile error
v3: non-lldp packet do not use the context descriptor
v2: split into patch set, refine commit log

Zhichao Zeng (3):
  net/iavf: support Tx LLDP on scalar
  net/iavf: support Tx LLDP on AVX512
  net/iavf: add Tx LLDP command

 doc/guides/rel_notes/release_24_03.rst  |  3 +
 drivers/net/iavf/iavf_ethdev.c  |  1 +
 drivers/net/iavf/iavf_rxtx.c| 21 ++-
 drivers/net/iavf/iavf_rxtx.h|  6 ++
 drivers/net/iavf/iavf_rxtx_vec_avx512.c | 19 ++
 drivers/net/iavf/iavf_rxtx_vec_common.h |  5 ++
 drivers/net/iavf/iavf_testpmd.c | 82 +
 drivers/net/iavf/meson.build|  3 +
 8 files changed, 138 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/iavf/iavf_testpmd.c

-- 
2.34.1

[PATCH v4 1/3] net/iavf: support Tx LLDP on scalar

[Zhichao Zeng]

This patch adds an mbuf dynfield IAVF_TX_LLDP_DYNFIELD to determine
whether or not to fill the SWTCH_UPLINK bit in the Tx context descriptor
to send LLDP packet.

Signed-off-by: Zhichao Zeng 
---
 drivers/net/iavf/iavf_ethdev.c |  1 +
 drivers/net/iavf/iavf_rxtx.c   | 16 ++--
 drivers/net/iavf/iavf_rxtx.h   |  3 +++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index d1edb0dd5c..1be248926c 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -41,6 +41,7 @@
 #define IAVF_NO_POLL_ON_LINK_DOWN_ARG "no-poll-on-link-down"
 uint64_t iavf_timestamp_dynflag;
 int iavf_timestamp_dynfield_offset = -1;
+int iavf_tx_lldp_dynfield_offset = -1;
 
 static const char * const iavf_valid_args[] = {
IAVF_PROTO_XTR_ARG,
diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index f19aa14646..3107102911 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -2418,8 +2418,9 @@ iavf_xmit_cleanup(struct iavf_tx_queue *txq)
 
 /* Check if the context descriptor is needed for TX offloading */
 static inline uint16_t
-iavf_calc_context_desc(uint64_t flags, uint8_t vlan_flag)
+iavf_calc_context_desc(struct rte_mbuf *mb, uint8_t vlan_flag)
 {
+   uint64_t flags = mb->ol_flags;
if (flags & (RTE_MBUF_F_TX_TCP_SEG | RTE_MBUF_F_TX_UDP_SEG |
RTE_MBUF_F_TX_TUNNEL_MASK | RTE_MBUF_F_TX_OUTER_IP_CKSUM |
RTE_MBUF_F_TX_OUTER_UDP_CKSUM))
@@ -2427,6 +2428,12 @@ iavf_calc_context_desc(uint64_t flags, uint8_t vlan_flag)
if (flags & RTE_MBUF_F_TX_VLAN &&
vlan_flag & IAVF_TX_FLAGS_VLAN_TAG_LOC_L2TAG2)
return 1;
+
+   if (iavf_tx_lldp_dynfield_offset ==
+   rte_mbuf_dynfield_lookup(IAVF_TX_LLDP_DYNFIELD, NULL))
+   if (*RTE_MBUF_DYNFIELD(mb,
+   iavf_tx_lldp_dynfield_offset, uint8_t *) > 0)
+   return 1;
return 0;
 }
 
@@ -2446,6 +2453,11 @@ iavf_fill_ctx_desc_cmd_field(volatile uint64_t *field, 
struct rte_mbuf *m,
<< IAVF_TXD_CTX_QW1_CMD_SHIFT;
}
 
+   if (*RTE_MBUF_DYNFIELD(m,
+   iavf_tx_lldp_dynfield_offset, uint8_t *) > 0)
+   cmd |= IAVF_TX_CTX_DESC_SWTCH_UPLINK
+   << IAVF_TXD_CTX_QW1_CMD_SHIFT;
+
*field |= cmd;
 }
 
@@ -2826,7 +2838,7 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, 
uint16_t nb_pkts)
 
nb_desc_data = mb->nb_segs;
nb_desc_ctx =
-   iavf_calc_context_desc(mb->ol_flags, txq->vlan_flag);
+   iavf_calc_context_desc(mb, txq->vlan_flag);
nb_desc_ipsec = !!(mb->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD);
 
/**
diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h
index f432f9d956..f6954a83c2 100644
--- a/drivers/net/iavf/iavf_rxtx.h
+++ b/drivers/net/iavf/iavf_rxtx.h
@@ -107,8 +107,11 @@
 #define IAVF_MAX_DATA_PER_TXD \
(IAVF_TXD_QW1_TX_BUF_SZ_MASK >> IAVF_TXD_QW1_TX_BUF_SZ_SHIFT)
 
+#define IAVF_TX_LLDP_DYNFIELD "intel_pmd_dynfield_tx_lldp"
+
 extern uint64_t iavf_timestamp_dynflag;
 extern int iavf_timestamp_dynfield_offset;
+extern int iavf_tx_lldp_dynfield_offset;
 
 /**
  * Rx Flex Descriptors
-- 
2.34.1

[PATCH v4 2/3] net/iavf: support Tx LLDP on AVX512

[Zhichao Zeng]

This patch adds an avx512 ctx Tx path that supports context descriptor,
filling in the SWTCH_UPLINK bit based on mbuf
dynfield IAVF_TX_LLDP_DYNFIELD to support sending LLDP packet.

Signed-off-by: Zhichao Zeng 
---
 drivers/net/iavf/iavf_rxtx.c|  5 +
 drivers/net/iavf/iavf_rxtx.h|  3 +++
 drivers/net/iavf/iavf_rxtx_vec_avx512.c | 19 +++
 drivers/net/iavf/iavf_rxtx_vec_common.h |  5 +
 4 files changed, 32 insertions(+)

diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 3107102911..000449fe5c 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -4051,6 +4051,11 @@ iavf_set_tx_function(struct rte_eth_dev *dev)
dev->tx_pkt_prepare = iavf_prep_pkts;
PMD_DRV_LOG(DEBUG, "Using AVX512 OFFLOAD Vector 
Tx (port %d).",
dev->data->port_id);
+   } else if (check_ret == IAVF_VECTOR_CTX_PATH) {
+   dev->tx_pkt_burst = 
iavf_xmit_pkts_vec_avx512_ctx;
+   dev->tx_pkt_prepare = iavf_prep_pkts;
+   PMD_DRV_LOG(DEBUG, "Using AVX512 CONTEXT Vector 
Tx (port %d).",
+   dev->data->port_id);
} else {
dev->tx_pkt_burst = 
iavf_xmit_pkts_vec_avx512_ctx_offload;
dev->tx_pkt_prepare = iavf_prep_pkts;
diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h
index f6954a83c2..f0f928928c 100644
--- a/drivers/net/iavf/iavf_rxtx.h
+++ b/drivers/net/iavf/iavf_rxtx.h
@@ -66,6 +66,7 @@
 #define IAVF_VECTOR_PATH 0
 #define IAVF_VECTOR_OFFLOAD_PATH 1
 #define IAVF_VECTOR_CTX_OFFLOAD_PATH 2
+#define IAVF_VECTOR_CTX_PATH 3
 
 #define DEFAULT_TX_RS_THRESH 32
 #define DEFAULT_TX_FREE_THRESH   32
@@ -755,6 +756,8 @@ uint16_t iavf_xmit_pkts_vec_avx512_offload(void *tx_queue,
   uint16_t nb_pkts);
 uint16_t iavf_xmit_pkts_vec_avx512_ctx_offload(void *tx_queue, struct rte_mbuf 
**tx_pkts,
  uint16_t nb_pkts);
+uint16_t iavf_xmit_pkts_vec_avx512_ctx(void *tx_queue, struct rte_mbuf 
**tx_pkts,
+ uint16_t nb_pkts);
 int iavf_txq_vec_setup_avx512(struct iavf_tx_queue *txq);
 
 uint8_t iavf_proto_xtr_type_to_rxdid(uint8_t xtr_type);
diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx512.c 
b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
index 7a7df6d258..95fdb26a33 100644
--- a/drivers/net/iavf/iavf_rxtx_vec_avx512.c
+++ b/drivers/net/iavf/iavf_rxtx_vec_avx512.c
@@ -2206,6 +2206,10 @@ ctx_vtx1(volatile struct iavf_tx_desc *txdp, struct 
rte_mbuf *pkt,
low_ctx_qw |= (uint64_t)pkt->vlan_tci << 
IAVF_TXD_CTX_QW0_L2TAG2_PARAM;
}
}
+   if (*RTE_MBUF_DYNFIELD(pkt,
+   iavf_tx_lldp_dynfield_offset, uint8_t *) > 0)
+   high_ctx_qw |= IAVF_TX_CTX_DESC_SWTCH_UPLINK
+   << IAVF_TXD_CTX_QW1_CMD_SHIFT;
uint64_t high_data_qw = (IAVF_TX_DESC_DTYPE_DATA |
((uint64_t)flags  << IAVF_TXD_QW1_CMD_SHIFT) |
((uint64_t)pkt->data_len << 
IAVF_TXD_QW1_TX_BUF_SZ_SHIFT));
@@ -2258,6 +2262,10 @@ ctx_vtx(volatile struct iavf_tx_desc *txdp,
(uint64_t)pkt[1]->vlan_tci << 
IAVF_TXD_QW1_L2TAG1_SHIFT;
}
}
+   if (*RTE_MBUF_DYNFIELD(pkt[1],
+   iavf_tx_lldp_dynfield_offset, uint8_t *) > 0)
+   hi_ctx_qw1 |= IAVF_TX_CTX_DESC_SWTCH_UPLINK
+   << IAVF_TXD_CTX_QW1_CMD_SHIFT;
 
if (pkt[0]->ol_flags & RTE_MBUF_F_TX_VLAN) {
if (vlan_flag & IAVF_TX_FLAGS_VLAN_TAG_LOC_L2TAG2) {
@@ -2270,6 +2278,10 @@ ctx_vtx(volatile struct iavf_tx_desc *txdp,
(uint64_t)pkt[0]->vlan_tci << 
IAVF_TXD_QW1_L2TAG1_SHIFT;
}
}
+   if (*RTE_MBUF_DYNFIELD(pkt[0],
+   iavf_tx_lldp_dynfield_offset, uint8_t *) > 0)
+   hi_ctx_qw0 |= IAVF_TX_CTX_DESC_SWTCH_UPLINK
+   << IAVF_TXD_CTX_QW1_CMD_SHIFT;
 
if (offload) {
iavf_txd_enable_offload(pkt[1], &hi_data_qw1);
@@ -2520,3 +2532,10 @@ iavf_xmit_pkts_vec_avx512_ctx_offload(void *tx_queue, 
struct rte_mbuf **tx_pkts,
 {
return iavf_xmit_pkts_vec_avx512_ctx_cmn(tx_queue, tx_pkts, nb_pkts, 
true);
 }
+
+uint16_t
+iavf_xmit_pkts_vec_avx512_ctx(void *tx_queue, struct rte_mbuf **tx_pkts,
+ uint16_t nb_pkts)
+{
+   return iavf_xmit_pkts_vec_avx512_ctx_cmn(tx_queue, tx_pkts, nb_pkts, 
false);
+}
diff --git a/drivers/net/iavf/iavf_rxtx_ve

[PATCH v4 3/3] net/iavf: add Tx LLDP command

[Zhichao Zeng]

This patch adds an IAVF testpmd command "set tx lldp on|off" which
will register an mbuf dynfield IAVF_TX_LLDP_DYNFIELD to indicate
the need to send LLDP packet. Currently, it only supports turning on.

For avx512, need to close the Tx port first, then "set tx lldp on",
and reopen the port to select correct Tx path.

Signed-off-by: Zhichao Zeng 
---
 doc/guides/rel_notes/release_24_03.rst |  3 +
 drivers/net/iavf/iavf_testpmd.c| 82 ++
 drivers/net/iavf/meson.build   |  3 +
 3 files changed, 88 insertions(+)
 create mode 100644 drivers/net/iavf/iavf_testpmd.c

diff --git a/doc/guides/rel_notes/release_24_03.rst 
b/doc/guides/rel_notes/release_24_03.rst
index 6f8ad27808..f94e18c33a 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -55,6 +55,9 @@ New Features
  Also, make sure to start the actual text at the margin.
  ===
 
+* **Updated Intel iavf driver.**
+
+  * Added support for Tx LLDP packet on scalar and avx512.
 
 Removed Items
 -
diff --git a/drivers/net/iavf/iavf_testpmd.c b/drivers/net/iavf/iavf_testpmd.c
new file mode 100644
index 00..470b0ea49c
--- /dev/null
+++ b/drivers/net/iavf/iavf_testpmd.c
@@ -0,0 +1,82 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2016 Intel Corporation.
+ */
+
+#include 
+
+#include 
+
+#include 
+#include 
+
+#include "iavf.h"
+#include "testpmd.h"
+#include "iavf_rxtx.h"
+
+struct cmd_enable_tx_lldp_result {
+   cmdline_fixed_string_t set;
+   cmdline_fixed_string_t tx;
+   cmdline_fixed_string_t lldp;
+   cmdline_fixed_string_t what;
+};
+
+static cmdline_parse_token_string_t cmd_enable_tx_lldp_set =
+   TOKEN_STRING_INITIALIZER(struct cmd_enable_tx_lldp_result,
+   set, "set");
+static cmdline_parse_token_string_t cmd_enable_tx_lldp_tx =
+   TOKEN_STRING_INITIALIZER(struct cmd_enable_tx_lldp_result,
+   tx, "tx");
+static cmdline_parse_token_string_t cmd_enable_tx_lldp_lldp =
+   TOKEN_STRING_INITIALIZER(struct cmd_enable_tx_lldp_result,
+   lldp, "lldp");
+static cmdline_parse_token_string_t cmd_enable_tx_lldp_what =
+   TOKEN_STRING_INITIALIZER(struct cmd_enable_tx_lldp_result,
+   what, "on#off");
+
+static void
+cmd_enable_tx_lldp_parsed(void *parsed_result,
+   __rte_unused struct cmdline *cl, __rte_unused void *data)
+{
+   struct cmd_enable_tx_lldp_result *res = parsed_result;
+   const struct rte_mbuf_dynfield iavf_tx_lldp_dynfield = {
+   .name = IAVF_TX_LLDP_DYNFIELD,
+   .size = sizeof(uint8_t),
+   .align = __alignof__(uint8_t),
+   .flags = 0
+   };
+
+   if (strncmp(res->what, "on", 2) == 0) {
+   iavf_tx_lldp_dynfield_offset =
+   rte_mbuf_dynfield_register(&iavf_tx_lldp_dynfield);
+   printf("iavf_tx_lldp_dynfield_offset: %d",
+   iavf_tx_lldp_dynfield_offset);
+   if (iavf_tx_lldp_dynfield_offset < 0)
+   fprintf(stderr, "rte mbuf dynfield register failed, 
offset: %d",
+   iavf_tx_lldp_dynfield_offset);
+   }
+}
+
+static cmdline_parse_inst_t cmd_enable_tx_lldp = {
+   .f = cmd_enable_tx_lldp_parsed,
+   .data = NULL,
+   .help_str = "set iavf tx lldp on|off",
+   .tokens = {
+   (void *)&cmd_enable_tx_lldp_set,
+   (void *)&cmd_enable_tx_lldp_tx,
+   (void *)&cmd_enable_tx_lldp_lldp,
+   (void *)&cmd_enable_tx_lldp_what,
+   NULL,
+   },
+};
+
+static struct testpmd_driver_commands iavf_cmds = {
+   .commands = {
+   {
+   &cmd_enable_tx_lldp,
+   "set tx lldp (on|off)\n"
+   "Set iavf Tx lldp packet(currently only supported on)\n\n",
+   },
+   { NULL, NULL },
+   },
+};
+TESTPMD_ADD_DRIVER_COMMANDS(iavf_cmds)
diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build
index a6ce2725c3..83aebd5596 100644
--- a/drivers/net/iavf/meson.build
+++ b/drivers/net/iavf/meson.build
@@ -8,6 +8,9 @@ endif
 cflags += ['-Wno-strict-aliasing']
 
 includes += include_directories('../../common/iavf')
+
+testpmd_sources = files('iavf_testpmd.c')
+
 deps += ['common_iavf', 'security', 'cryptodev']
 
 sources = files(
-- 
2.34.1