Re: [dpdk-dev] [PATCH v1] examples/ip_pipeline: fix build issue with GCC 13

[David Marchand]

On Tue, May 2, 2023 at 3:51 PM  wrote:
>
> From: Jerin Jacob 
>
> Fix the following build issue by initializing req to NULL for
> the local variable.
>
> In function 'thread_msg_handle', inlined from 'thread_main' at
> ../examples/ip_pipeline/thread.c:3130:6:
> ../examples/ip_pipeline/thread.c:535:20: warning: 'req' may be used
> uninitialized [-Wmaybe-uninitialized]
>   535 | if (req == NULL)
>   |^
> ../examples/ip_pipeline/thread.c: In function 'thread_main':
> ../examples/ip_pipeline/thread.c:433:32: note: 'req' was declared here
>   433 | struct thread_msg_req *req;
>
> Bugzilla ID: 1220
> Fixes: a8bd581de397 ("examples/ip_pipeline: add thread runtime")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Jerin Jacob 
Acked-by: Cristian Dumitrescu 
Tested-by: Ali Alnubani 
Tested-by: Daxue Gao 

Applied, thanks.


-- 
David Marchand

Re: [dpdk-dev] [PATCH v2] examples/ntb: fix build issue with GCC 13

[David Marchand]

On Thu, May 4, 2023 at 10:54 AM  wrote:
>
> From: Jerin Jacob 
>
> Fix the following build issue by not allowing nb_ids to be zero.
> nb_ids can be zero based on rte_rawdev_xstats_get() API
> documentation but it is not valid for the case when second
> argument is NULL.
>
> examples/ntb/ntb_fwd.c: In function 'ntb_stats_display':
> examples/ntb/ntb_fwd.c:945:23: error: 'rte_rawdev_xstats_get'
> accessing 8 bytes in a region of size 0 [-Werror=stringop-overflow=]
>   945 | if (nb_ids != rte_rawdev_xstats_get(dev_id, ids, values, nb_ids)) {
>   |   ^~
>
> examples/ntb/ntb_fwd.c:945:23: note: referencing argument 3
> of type 'uint64_t[0]' {aka 'long unsigned int[]'}
> In file included from ../examples/ntb/ntb_fwd.c:17:
> lib/rawdev/rte_rawdev.h:504:1: note: in a call to function
> 'rte_rawdev_xstats_get'
>   504 | rte_rawdev_xstats_get(uint16_t dev_id,
>
> Fixes: 5194299d6ef5 ("examples/ntb: support more functions")
> Cc: sta...@dpdk.org

> Signed-off-by: Jerin Jacob 
> Tested-by: Ali Alnubani 
Acked-by: Junfeng Guo 
Tested-by: Daxue Gao 

Applied, thanks.


-- 
David Marchand

RE: [PATCH] eventdev: avoid non-burst shortcut for variable-size bursts

[Morten Brørup]

> From: Mattias Rönnblom [mailto:mattias.ronnb...@ericsson.com]
> Sent: Thursday, 11 May 2023 08.43
> 
> Use non-burst event enqueue and dequeue calls from burst enqueue and
> dequeue only when the burst size is compile-time constant (and equal
> to one).
> 
> Signed-off-by: Mattias Rönnblom 
> ---
>  lib/eventdev/rte_eventdev.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
> index a90e23ac8b..8af15816db 100644
> --- a/lib/eventdev/rte_eventdev.h
> +++ b/lib/eventdev/rte_eventdev.h
> @@ -1944,7 +1944,7 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t
> port_id,
>* Allow zero cost non burst mode routine invocation if application
>* requests nb_events as const one
>*/
> - if (nb_events == 1)
> + if (__builtin_constant_p(nb_events) && nb_events == 1)

In my experience using __builtin_constant_p(), you need 
__extension__(__builtin_constant_p(nb_events)) to avoid warnings about using 
this non-standard feature.

>   return (fp_ops->enqueue)(port, ev);
>   else
>   return fn(port, ev, nb_events);
> @@ -2200,7 +2200,7 @@ rte_event_dequeue_burst(uint8_t dev_id, uint8_t port_id,
> struct rte_event ev[],
>* Allow zero cost non burst mode routine invocation if application
>* requests nb_events as const one
>*/
> - if (nb_events == 1)
> + if (__builtin_constant_p(nb_events) && nb_events == 1)
>   return (fp_ops->dequeue)(port, ev, timeout_ticks);
>   else
>   return (fp_ops->dequeue_burst)(port, ev, nb_events,
> --
> 2.34.1

With __extension__() added,

Acked-by: Morten Brørup 

RE: 21.11.4 patches review and test

[Jiang, YuX]

> -Original Message-
> From: Kevin Traynor 
> Sent: Monday, May 8, 2023 11:24 PM
> To: Xu, HailinX ; sta...@dpdk.org
> Cc: Stokes, Ian ; Mcnamara, John
> ; Luca Boccassi ; Xu, Qian Q
> ; Thomas Monjalon ; Peng,
> Yuan ; Chen, Zhaoyan ;
> dev@dpdk.org
> Subject: Re: 21.11.4 patches review and test
> 
> On 05/05/2023 02:42, Xu, HailinX wrote:
> >> -Original Message-
> >> From: Kevin Traynor 
> >> Sent: Thursday, May 4, 2023 6:11 PM
> >> To: Xu, HailinX ; sta...@dpdk.org
> >> Cc: Stokes, Ian ; Mcnamara, John
> >> ; Luca Boccassi ; Xu,
> Qian
> >> Q ; Thomas Monjalon ;
> Peng,
> >> Yuan ; Chen, Zhaoyan
> ;
> >> dev@dpdk.org
> >> Subject: Re: 21.11.4 patches review and test
> >>
> >> On 04/05/2023 03:13, Xu, HailinX wrote:
>  -Original Message-
>  From: Kevin Traynor 
>  Sent: Tuesday, May 2, 2023 5:35 PM
>  To: Xu, HailinX ; sta...@dpdk.org
>  Cc: Stokes, Ian ; Mcnamara, John
>  ; Luca Boccassi ; Xu,
>  Qian Q ; Thomas Monjalon
>  ;
> >> Peng,
>  Yuan ; Chen, Zhaoyan
> ;
>  dev@dpdk.org
>  Subject: Re: 21.11.4 patches review and test
> 
>  On 20/04/2023 11:32, Kevin Traynor wrote:
> > On 20/04/2023 03:40, Xu, HailinX wrote:
> >>> -Original Message-
> >>> From: Xu, HailinX 
> >>> Sent: Thursday, April 13, 2023 2:13 PM
> >>> To: Kevin Traynor ; sta...@dpdk.org
> >>> Cc: dev@dpdk.org; Abhishek Marathe
>  ;
> >>> Ali Alnubani ; Walker, Benjamin
> >>> ; David Christensen
> >>> ; Hemant Agrawal
>  ;
> >>> Stokes, Ian ; Jerin Jacob
> >>> ; Mcnamara, John
> ;
> >>> Ju-Hyoung Lee ; Luca Boccassi
> >>> ; Pei Zhang ; Xu, Qian
> Q
> >>> ; Raslan Darawsheh ;
>  Thomas
> >>> Monjalon ; yangh...@redhat.com; Peng,
> Yuan
> >>> ; Chen, Zhaoyan
> 
> >>> Subject: RE: 21.11.4 patches review and test
> >>>
>  -Original Message-
>  From: Kevin Traynor 
>  Sent: Thursday, April 6, 2023 7:38 PM
>  To: sta...@dpdk.org
>  Cc: dev@dpdk.org; Abhishek Marathe
>  ; Ali Alnubani
>  ; Walker, Benjamin
>  ; David Christensen
>  ; Hemant Agrawal
>  ; Stokes, Ian
> ;
>  Jerin Jacob ; Mcnamara, John
>  ; Ju-Hyoung Lee
> >> ;
>  Kevin Traynor ; Luca Boccassi
>  ; Pei Zhang ; Xu,
> Qian Q
>  ; Raslan Darawsheh ;
> >>> Thomas
>  Monjalon ; yangh...@redhat.com; Peng,
> Yuan
>  ; Chen, Zhaoyan
> 
>  Subject: 21.11.4 patches review and test
> 
>  Hi all,
> 
>  Here is a list of patches targeted for stable release 21.11.4.
> 
>  The planned date for the final release is 25th April.
> 
>  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.4-rc1
> 
>  These patches are located at branch 21.11 of dpdk-stable repo:
>  https://dpdk.org/browse/dpdk-stable/
> 
>  Thanks.
> 
>  Kevin
> >>>
> >>> HI All,
> >>>
> >>> Update the test status for Intel part. Till now dpdk21.11.4-rc1
> >>> validation test rate is 85%. No critical issue is found.
> >>> 2 new bugs are found, 1 new issue is under confirming by Intel Dev.
> >>> New bugs:   --20.11.8-rc1 also has these two issues
> >>>   1.
> 
> pvp_qemu_multi_paths_port_restart:perf_pvp_qemu_vector_rx_mac:
> >>> performance drop about 23.5% when send small packets
> >>>   https://bugs.dpdk.org/show_bug.cgi?id=1212-- no fix yet
> >>>   2. some of the virtio tests are failing:-- Intel dev is 
> >>> under
>  investigating
> >>> # Basic Intel(R) NIC testing
> >>> * Build & CFLAG compile: cover the build test combination with
> >>> latest GCC/Clang version and the popular OS revision such as
> >>>   Ubuntu20.04, Ubuntu22.04, Fedora35, Fedora37, RHEL8.6,
> >>> RHEL8.4, FreeBSD13.1, SUSE15, CentOS7.9, etc.
> >>> - All test done. No new dpdk issue is found.
> >>> * PF(i40e, ixgbe): test scenarios including
> >>> RTE_FLOW/TSO/Jumboframe/checksum offload/VLAN/VXLAN, etc.
> >>> - All test done. No new dpdk issue is found.
> >>> * VF(i40e, ixgbe): test scenarios including
> >>> VF-RTE_FLOW/TSO/Jumboframe/checksum offload/VLAN/VXLAN,
> etc.
> >>> - All test done. No new dpdk issue is found.
> >>> * PF/VF(ice): test scenarios including Switch features/Package
> >>> Management/Flow Director/Advanced Tx/Advanced
> >> RSS/ACL/DCF/Flexible
> >>> Descriptor, etc.
> >>> - All test done. No new dpdk issue is foun

[PATCH v1 0/3] add support for infiniband BTH match

[Dong Zhou]

Add new rte item to match the infiniband BTH in RoCE packets.

Dong Zhou (3):
  ethdev: add flow item for RoCE infiniband BTH
  net/mlx5: add support for infiniband BTH match
  net/mlx5/hws: add support for infiniband BTH match

 app/test-pmd/cmdline_flow.c |  58 +++
 doc/guides/nics/features/default.ini|   1 +
 doc/guides/prog_guide/rte_flow.rst  |   7 ++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |   7 ++
 drivers/common/mlx5/mlx5_prm.h  |   5 +-
 drivers/net/mlx5/hws/mlx5dr_definer.c   |  76 ++-
 drivers/net/mlx5/hws/mlx5dr_definer.h   |   2 +
 drivers/net/mlx5/mlx5_flow.h|   6 ++
 drivers/net/mlx5/mlx5_flow_dv.c | 102 
 drivers/net/mlx5/mlx5_flow_hw.c |   1 +
 lib/ethdev/rte_flow.c   |   1 +
 lib/ethdev/rte_flow.h   |  27 ++
 lib/net/meson.build |   1 +
 lib/net/rte_ib.h|  68 +
 14 files changed, 359 insertions(+), 3 deletions(-)
 create mode 100644 lib/net/rte_ib.h

-- 
2.27.0

[PATCH v1 1/3] ethdev: add flow item for RoCE infiniband BTH

[Dong Zhou]

IB(InfiniBand) is one type of networking used in high-performance
computing with high throughput and low latency. Like Ethernet,
IB defines a layered protocol (Physical, Link, Network, Transport
Layers). IB provides native support for RDMA(Remote DMA), an
extension of the DMA that allows direct access to remote host
memory without CPU intervention. IB network requires NICs and
switches to support the IB protocol.

RoCE(RDMA over Converged Ethernet) is a network protocol that
allows RDMA to run on Ethernet. RoCE encapsulates IB packets on
ethernet and has two versions, RoCEv1 and RoCEv2. RoCEv1 is an
ethernet link layer protocol, IB packets are encapsulated in the
ethernet layer and use ethernet type 0x8915. RoCEv2 is an internet
layer protocol, IB packets are encapsulated in UDP payload and
use a destination port 4791, The format of the RoCEv2 packet is
as follows:
  ETH + IP + UDP(dport 4791) + IB(BTH + ExtHDR + PAYLOAD + CRC)

BTH(Base Transport Header) is the IB transport layer header, RoCEv1
and RoCEv2 both contain this header. This patch introduces a new
RTE item to match the IB BTH in RoCE packets. One use of this match
is that the user can monitor RoCEv2's CNP(Congestion Notification
Packet) by matching BTH opcode 0x81.

This patch also adds the testpmd command line to match the RoCEv2
BTH. Usage example:

  testpmd> flow create 0 group 1 ingress pattern
   eth / ipv4 / udp dst is 4791 / ib_bth opcode is 0x81
   dst_qp is 0xd3 / end actions queue index 0 / end

Signed-off-by: Dong Zhou 
---
 app/test-pmd/cmdline_flow.c | 58 ++
 doc/guides/nics/features/default.ini|  1 +
 doc/guides/prog_guide/rte_flow.rst  |  7 +++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  7 +++
 lib/ethdev/rte_flow.c   |  1 +
 lib/ethdev/rte_flow.h   | 27 
 lib/net/meson.build |  1 +
 lib/net/rte_ib.h| 68 +
 8 files changed, 170 insertions(+)
 create mode 100644 lib/net/rte_ib.h

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 58939ec321..3ade229ffc 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -496,6 +496,11 @@ enum index {
ITEM_QUOTA_STATE_NAME,
ITEM_AGGR_AFFINITY,
ITEM_AGGR_AFFINITY_VALUE,
+   ITEM_IB_BTH,
+   ITEM_IB_BTH_OPCODE,
+   ITEM_IB_BTH_PKEY,
+   ITEM_IB_BTH_DST_QPN,
+   ITEM_IB_BTH_PSN,
 
/* Validate/create actions. */
ACTIONS,
@@ -1452,6 +1457,7 @@ static const enum index next_item[] = {
ITEM_METER,
ITEM_QUOTA,
ITEM_AGGR_AFFINITY,
+   ITEM_IB_BTH,
END_SET,
ZERO,
 };
@@ -1953,6 +1959,15 @@ static const enum index item_aggr_affinity[] = {
ZERO,
 };
 
+static const enum index item_ib_bth[] = {
+   ITEM_IB_BTH_OPCODE,
+   ITEM_IB_BTH_PKEY,
+   ITEM_IB_BTH_DST_QPN,
+   ITEM_IB_BTH_PSN,
+   ITEM_NEXT,
+   ZERO,
+};
+
 static const enum index next_action[] = {
ACTION_END,
ACTION_VOID,
@@ -5523,6 +5538,46 @@ static const struct token token_list[] = {
.call = parse_quota_state_name,
.comp = comp_quota_state_name
},
+   [ITEM_IB_BTH] = {
+   .name = "ib_bth",
+   .help = "match ib bth fields",
+   .priv = PRIV_ITEM(IB_BTH,
+ sizeof(struct rte_flow_item_ib_bth)),
+   .next = NEXT(item_ib_bth),
+   .call = parse_vc,
+   },
+   [ITEM_IB_BTH_OPCODE] = {
+   .name = "opcode",
+   .help = "match ib bth opcode",
+   .next = NEXT(item_ib_bth, NEXT_ENTRY(COMMON_UNSIGNED),
+item_param),
+   .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ib_bth,
+hdr.opcode)),
+   },
+   [ITEM_IB_BTH_PKEY] = {
+   .name = "pkey",
+   .help = "partition key",
+   .next = NEXT(item_ib_bth, NEXT_ENTRY(COMMON_UNSIGNED),
+item_param),
+   .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ib_bth,
+hdr.pkey)),
+   },
+   [ITEM_IB_BTH_DST_QPN] = {
+   .name = "dst_qp",
+   .help = "destination qp",
+   .next = NEXT(item_ib_bth, NEXT_ENTRY(COMMON_UNSIGNED),
+item_param),
+   .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ib_bth,
+hdr.dst_qp)),
+   },
+   [ITEM_IB_BTH_PSN] = {
+   .name = "psn",
+   .help = "packet sequence number",
+   .next = NEXT(item_ib_bth, NEXT_ENTRY(COMMON_UNSIGNED),
+item_param),
+   .args = ARGS(ARGS_ENTRY_HTON(struct 

[PATCH v1 2/3] net/mlx5: add support for infiniband BTH match

[Dong Zhou]

This patch adds support to match opcode and dst_qp fields in
infiniband BTH. Currently, only the RoCEv2 packet is supported,
the input BTH match item is defaulted to match one RoCEv2 packet.

Signed-off-by: Dong Zhou 
---
 drivers/common/mlx5/mlx5_prm.h  |   5 +-
 drivers/net/mlx5/mlx5_flow.h|   6 ++
 drivers/net/mlx5/mlx5_flow_dv.c | 102 
 3 files changed, 111 insertions(+), 2 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index ed3d5efbb7..8f55fd59b3 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -932,7 +932,7 @@ struct mlx5_ifc_fte_match_set_misc_bits {
u8 gre_key_h[0x18];
u8 gre_key_l[0x8];
u8 vxlan_vni[0x18];
-   u8 reserved_at_b8[0x8];
+   u8 bth_opcode[0x8];
u8 geneve_vni[0x18];
u8 lag_rx_port_affinity[0x4];
u8 reserved_at_e8[0x2];
@@ -945,7 +945,8 @@ struct mlx5_ifc_fte_match_set_misc_bits {
u8 reserved_at_120[0xa];
u8 geneve_opt_len[0x6];
u8 geneve_protocol_type[0x10];
-   u8 reserved_at_140[0x20];
+   u8 reserved_at_140[0x8];
+   u8 bth_dst_qp[0x18];
u8 inner_esp_spi[0x20];
u8 outer_esp_spi[0x20];
u8 reserved_at_1a0[0x60];
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 1d116ea0f6..c1d6a71708 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -227,6 +227,9 @@ enum mlx5_feature_name {
 /* Aggregated affinity item */
 #define MLX5_FLOW_ITEM_AGGR_AFFINITY (UINT64_C(1) << 49)
 
+/* IB BTH ITEM. */
+#define MLX5_FLOW_ITEM_IB_BTH (1ull << 51)
+
 /* Outer Masks. */
 #define MLX5_FLOW_LAYER_OUTER_L3 \
(MLX5_FLOW_LAYER_OUTER_L3_IPV4 | MLX5_FLOW_LAYER_OUTER_L3_IPV6)
@@ -364,6 +367,9 @@ enum mlx5_feature_name {
 #define MLX5_UDP_PORT_VXLAN 4789
 #define MLX5_UDP_PORT_VXLAN_GPE 4790
 
+/* UDP port numbers for RoCEv2. */
+#define MLX5_UDP_PORT_ROCEv2 4791
+
 /* UDP port numbers for GENEVE. */
 #define MLX5_UDP_PORT_GENEVE 6081
 
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index f136f43b0a..b7dc8ecaf7 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -7193,6 +7193,65 @@ flow_dv_validate_item_flex(struct rte_eth_dev *dev,
return 0;
 }
 
+/**
+ * Validate IB BTH item.
+ *
+ * @param[in] dev
+ *   Pointer to the rte_eth_dev structure.
+ * @param[in] udp_dport
+ *   UDP destination port
+ * @param[in] item
+ *   Item specification.
+ * @param root
+ *   Whether action is on root table.
+ * @param[out] error
+ *   Pointer to the error structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+mlx5_flow_validate_item_ib_bth(struct rte_eth_dev *dev,
+  uint16_t udp_dport,
+  const struct rte_flow_item *item,
+  bool root,
+  struct rte_flow_error *error)
+{
+   const struct rte_flow_item_ib_bth *mask = item->mask;
+   struct mlx5_priv *priv = dev->data->dev_private;
+   const struct rte_flow_item_ib_bth *valid_mask;
+   int ret;
+
+   valid_mask = &rte_flow_item_ib_bth_mask;
+   if (udp_dport && udp_dport != MLX5_UDP_PORT_ROCEv2)
+   return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM, item,
+ "protocol filtering not compatible"
+ " with UDP layer");
+   if (mask && (mask->hdr.se || mask->hdr.m || mask->hdr.padcnt ||
+   mask->hdr.tver || mask->hdr.pkey || mask->hdr.f || mask->hdr.b 
||
+   mask->hdr.rsvd0 || mask->hdr.a || mask->hdr.rsvd1 ||
+   mask->hdr.psn[0] || mask->hdr.psn[1] || mask->hdr.psn[2]))
+   return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM, item,
+ "only opcode and dst_qp are 
supported");
+   if (root || priv->sh->steering_format_version ==
+   MLX5_STEERING_LOGIC_FORMAT_CONNECTX_5)
+   return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "IB BTH item is not supported");
+   if (!mask)
+   mask = &rte_flow_item_ib_bth_mask;
+   ret = mlx5_flow_item_acceptable(item, (const uint8_t *)mask,
+   (const uint8_t *)valid_mask,
+   sizeof(struct rte_flow_item_ib_bth),
+   MLX5_ITEM_RANGE_NOT_ACCEPTED, error);
+   if (ret < 0)
+   return ret;
+   return 0;
+}
+
 /**
  * Internal validation function. For validating both actions and it

[PATCH v1 3/3] net/mlx5/hws: add support for infiniband BTH match

[Dong Zhou]

This patch adds support to match opcode and dst_qp fields in
infiniband BTH. Currently, only the RoCEv2 packet is supported,
the input BTH match item is defaulted to match one RoCEv2 packet.

Signed-off-by: Dong Zhou 
---
 drivers/net/mlx5/hws/mlx5dr_definer.c | 76 ++-
 drivers/net/mlx5/hws/mlx5dr_definer.h |  2 +
 drivers/net/mlx5/mlx5_flow_hw.c   |  1 +
 3 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c 
b/drivers/net/mlx5/hws/mlx5dr_definer.c
index f92d3e8e1f..1a427c9b64 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -10,6 +10,7 @@
 #define ETH_TYPE_IPV6_VXLAN0x86DD
 #define ETH_VXLAN_DEFAULT_PORT 4789
 #define IP_UDP_PORT_MPLS   6635
+#define UDP_ROCEV2_PORT4791
 #define DR_FLOW_LAYER_TUNNEL_NO_MPLS (MLX5_FLOW_LAYER_TUNNEL & 
~MLX5_FLOW_LAYER_MPLS)
 
 #define STE_NO_VLAN0x0
@@ -171,7 +172,9 @@ struct mlx5dr_definer_conv_data {
X(SET_BE16, gre_opt_checksum,   v->checksum_rsvd.checksum,  
rte_flow_item_gre_opt) \
X(SET,  meter_color,rte_col_2_mlx5_col(v->color),   
rte_flow_item_meter_color) \
X(SET_BE32, ipsec_spi,  v->hdr.spi, 
rte_flow_item_esp) \
-   X(SET_BE32, ipsec_sequence_number,  v->hdr.seq, 
rte_flow_item_esp)
+   X(SET_BE32, ipsec_sequence_number,  v->hdr.seq, 
rte_flow_item_esp) \
+   X(SET,  ib_l4_udp_port, UDP_ROCEV2_PORT,
rte_flow_item_ib_bth) \
+   X(SET,  ib_l4_opcode,   v->hdr.opcode,  
rte_flow_item_ib_bth)
 
 /* Item set function format */
 #define X(set_type, func_name, value, item_type) \
@@ -583,6 +586,16 @@ mlx5dr_definer_mpls_label_set(struct mlx5dr_definer_fc *fc,
memcpy(tag + fc->byte_off + sizeof(v->label_tc_s), &v->ttl, 
sizeof(v->ttl));
 }
 
+static void
+mlx5dr_definer_ib_l4_qp_set(struct mlx5dr_definer_fc *fc,
+   const void *item_spec,
+   uint8_t *tag)
+{
+   const struct rte_flow_item_ib_bth *v = item_spec;
+
+   memcpy(tag + fc->byte_off, &v->hdr.dst_qp, sizeof(v->hdr.dst_qp));
+}
+
 static int
 mlx5dr_definer_conv_item_eth(struct mlx5dr_definer_conv_data *cd,
 struct rte_flow_item *item,
@@ -2041,6 +2054,63 @@ mlx5dr_definer_conv_item_flex_parser(struct 
mlx5dr_definer_conv_data *cd,
return 0;
 }
 
+static int
+mlx5dr_definer_conv_item_ib_l4(struct mlx5dr_definer_conv_data *cd,
+  struct rte_flow_item *item,
+  int item_idx)
+{
+   const struct rte_flow_item_ib_bth *m = item->mask;
+   struct mlx5dr_definer_fc *fc;
+   bool inner = cd->tunnel;
+
+   /* In order to match on RoCEv2(layer4 ib), we must match
+* on ip_protocol and l4_dport.
+*/
+   if (!cd->relaxed) {
+   fc = &cd->fc[DR_CALC_FNAME(IP_PROTOCOL, inner)];
+   if (!fc->tag_set) {
+   fc->item_idx = item_idx;
+   fc->tag_mask_set = &mlx5dr_definer_ones_set;
+   fc->tag_set = &mlx5dr_definer_udp_protocol_set;
+   DR_CALC_SET(fc, eth_l2, l4_type_bwc, inner);
+   }
+
+   fc = &cd->fc[DR_CALC_FNAME(L4_DPORT, inner)];
+   if (!fc->tag_set) {
+   fc->item_idx = item_idx;
+   fc->tag_mask_set = &mlx5dr_definer_ones_set;
+   fc->tag_set = &mlx5dr_definer_ib_l4_udp_port_set;
+   DR_CALC_SET(fc, eth_l4, destination_port, inner);
+   }
+   }
+
+   if (!m)
+   return 0;
+
+   if (m->hdr.se || m->hdr.m || m->hdr.padcnt || m->hdr.tver ||
+   m->hdr.pkey || m->hdr.f || m->hdr.b || m->hdr.rsvd0 ||
+   m->hdr.a || m->hdr.rsvd1 || !is_mem_zero(m->hdr.psn, 3)) {
+   rte_errno = ENOTSUP;
+   return rte_errno;
+   }
+
+   if (m->hdr.opcode) {
+   fc = &cd->fc[MLX5DR_DEFINER_FNAME_IB_L4_OPCODE];
+   fc->item_idx = item_idx;
+   fc->tag_set = &mlx5dr_definer_ib_l4_opcode_set;
+   DR_CALC_SET_HDR(fc, ib_l4, opcode);
+   }
+
+   if (!is_mem_zero(m->hdr.dst_qp, 3)) {
+   fc = &cd->fc[MLX5DR_DEFINER_FNAME_IB_L4_QPN];
+   fc->item_idx = item_idx;
+   fc->tag_set = &mlx5dr_definer_ib_l4_qp_set;
+   DR_CALC_SET_HDR(fc, ib_l4, qp);
+   }
+
+   return 0;
+}
+
 static int
 mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,
struct mlx5dr_match_template *mt,
@@ -2182,6 +2252,10 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context 
*ctx,
item_flags |= MLX5_FLOW_LAYER_MPLS;
cd.mpls_idx++;
break;
+ 

RE: [PATCH] vhost: avoid sleeping under mutex

[Xia, Chenbo]

Hi David,

> -Original Message-
> From: David Marchand 
> Sent: Thursday, March 23, 2023 1:05 AM
> To: dev@dpdk.org
> Cc: sta...@dpdk.org; Maxime Coquelin ; Xia,
> Chenbo ; Yuanhan Liu 
> Subject: [PATCH] vhost: avoid sleeping under mutex
> 
> Covscan reported:
> 
>  2. dpdk-21.11/lib/vhost/socket.c:852: lock_acquire: Calling function
>   "pthread_mutex_lock" acquires lock "vhost_user.mutex".
> 23. dpdk-21.11/lib/vhost/socket.c:955: sleep: Call to
>   "vhost_user_reconnect_init" might sleep while holding lock
>   "vhost_user.mutex".
>  #   953| vsocket->reconnect =
>   !(flags & RTE_VHOST_USER_NO_RECONNECT);
>  #   954| if (vsocket->reconnect && reconn_tid == 0) {
>  #   955|->   if (vhost_user_reconnect_init() != 0)
>  #   956| goto out_mutex;
>  #   957| }
> 
> The reason for this warning is that vhost_user_reconnect_init() creates a
> ctrl thread and calls nanosleep waiting for this thread to be ready,
> while vhost_user.mutex is taken.
> 
> Move the call to vhost_user_reconnect_init() out of this mutex.
> 
> While at it, a pthread_t value should be considered opaque.
> Instead of relying reconn_tid == 0, use an internal flag in
> vhost_user_reconnect_init().

Should we make reconn_tid not a global variable anymore then?
Maybe a static pthread_t in vhost_user_reconnect_init?

Thanks,
Chenbo

> 
> Coverity issue: 373686
> Bugzilla ID: 981
> Fixes: e623e0c6d8a5 ("vhost: add reconnect ability")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: David Marchand 
> ---
>  lib/vhost/socket.c | 17 -
>  1 file changed, 12 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c
> index 669c322e12..21002848e6 100644
> --- a/lib/vhost/socket.c
> +++ b/lib/vhost/socket.c
> @@ -498,8 +498,12 @@ vhost_user_client_reconnect(void *arg __rte_unused)
>  static int
>  vhost_user_reconnect_init(void)
>  {
> + static bool reconn_init_done;
>   int ret;
> 
> + if (reconn_init_done)
> + return 0;
> +
>   ret = pthread_mutex_init(&reconn_list.mutex, NULL);
>   if (ret < 0) {
>   VHOST_LOG_CONFIG("thread", ERR, "%s: failed to initialize
> mutex\n", __func__);
> @@ -515,6 +519,8 @@ vhost_user_reconnect_init(void)
>   VHOST_LOG_CONFIG("thread", ERR,
>   "%s: failed to destroy reconnect mutex\n",
>   __func__);
> + } else {
> + reconn_init_done = true;
>   }
> 
>   return ret;
> @@ -866,6 +872,11 @@ rte_vhost_driver_register(const char *path, uint64_t
> flags)
>   if (!path)
>   return -1;
> 
> + if ((flags & RTE_VHOST_USER_CLIENT) != 0 &&
> + (flags & RTE_VHOST_USER_NO_RECONNECT) == 0 &&
> + vhost_user_reconnect_init() != 0)
> + return -1;
> +
>   pthread_mutex_lock(&vhost_user.mutex);
> 
>   if (vhost_user.vsocket_cnt == MAX_VHOST_SOCKET) {
> @@ -961,11 +972,7 @@ rte_vhost_driver_register(const char *path, uint64_t
> flags)
>   }
> 
>   if ((flags & RTE_VHOST_USER_CLIENT) != 0) {
> - vsocket->reconnect = !(flags & RTE_VHOST_USER_NO_RECONNECT);
> - if (vsocket->reconnect && reconn_tid == 0) {
> - if (vhost_user_reconnect_init() != 0)
> - goto out_mutex;
> - }
> + vsocket->reconnect = (flags & RTE_VHOST_USER_NO_RECONNECT) ==
> 0;
>   } else {
>   vsocket->is_server = true;
>   }
> --
> 2.39.2

[Bug 1228] [dpdk-21.11.4]pvp_qemu_multi_paths_port_restart:perf_pvp_qemu_vector_rx_mac: performance drop about 23.5% when send small packets

[bugzilla]

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

Bug ID: 1228
   Summary: [dpdk-21.11.4]pvp_qemu_multi_paths_port_restart:perf_p
vp_qemu_vector_rx_mac: performance drop about 23.5%
when send small packets
   Product: DPDK
   Version: 21.11
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: vhost/virtio
  Assignee: dev@dpdk.org
  Reporter: weix.l...@intel.com
  Target Milestone: ---

[Environment]
DPDK version: 
Use make showversion or for a non-released version: git remote -v && git
show-ref --heads
 21.11.4-rc1
Other software versions: QEMU-7.0.0.
OS: Ubuntu 22.04.1 LTS/Linux 5.15.45-051545-generic
Compiler: gcc version 11.3.0 (Ubuntu 11.3.0-1ubuntu1~22.04)
Hardware platform: Intel(R) Xeon(R) Platinum 8280M CPU @ 2.70GHz
NIC hardware: Intel Ethernet Controller XL710 for 40GbE QSFP+ 1583
NIC firmware: i40e-2.22.18/9.20 0x8000d893 1.3353.0

[Test Setup]
Steps to reproduce

List the steps to reproduce the issue.

1.Bind 1 NIC port to vfio-pci

dpdk-devbind.py --force --bind=vfio-pci :18:00.0

2.View the numa node of the NIC port

root@dut220:~# cat /sys/bus/pci/devices/\:18\:00.0/numa_node
0

3.View the lcore of the server

root@dut220:~# /root/dpdk/usertools/cpu_layout.py
==
Core and Socket Information (as reported by '/sys/devices/system/cpu')
==cores = 
[0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 16, 17, 18, 19, 20, 21, 22, 24,
25, 26, 27, 28, 29, 30]
sockets =  [0, 1]        
Socket 0          Socket 1
                  
Core 0  [0, 56]           [28, 84]
Core 1  [1, 57]           [29, 85]
Core 2  [2, 58]           [30, 86]
Core 3  [3, 59]           [31, 87]
Core 4  [4, 60]           [32, 88]
Core 5  [5, 61]           [33, 89]
Core 6  [6, 62]           [34, 90]
Core 8  [7, 63]           [35, 91]
Core 9  [8, 64]           [36, 92]
Core 10 [9, 65]           [37, 93]
Core 11 [10, 66]          [38, 94]
Core 12 [11, 67]          [39, 95]
Core 13 [12, 68]          [40, 96]
Core 14 [13, 69]          [41, 97]
Core 16 [14, 70]          [42, 98]
Core 17 [15, 71]          [43, 99]
Core 18 [16, 72]          [44, 100]
Core 19 [17, 73]          [45, 101]
Core 20 [18, 74]          [46, 102]
Core 21 [19, 75]          [47, 103]
Core 22 [20, 76]          [48, 104]
Core 24 [21, 77]          [49, 105]
Core 25 [22, 78]          [50, 106]
Core 26 [23, 79]          [51, 107]
Core 27 [24, 80]          [52, 108]
Core 28 [25, 81]          [53, 109]
Core 29 [26, 82]          [54, 110]
Core 30 [27, 83]          [55, 111]


4.Start vhost-user with the lcores same numa with the NIC port(eg: on scoket
0):

x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 18,19 -n 4 -a :18:00.0 
--file-prefix=vhost_2352949_20230407162534  --vdev
'net_vhost0,iface=vhost-net,queues=1' -- -i --nb-cores=1 --txd=1024 --rxd=1024

testpmd>set fwd mac
testpmd>start

5.Start VM0 with QEMU-7.0.0 with the lcores different numa with the NIC
port(eg: on scoket 1):  

taskset -c 30,31,32,33,34,35,36,37 /home/QEMU/qemu-7.0.0/bin/qemu-system-x86_64
 -name vm0 -enable-kvm -pidfile /tmp/.vm0.pid -daemonize -monitor
unix:/tmp/vm0_monitor.sock,server,nowait -netdev
user,id=nttsip1,hostfwd=tcp:10.239.252.220:6000-:22 -device
e1000,netdev=nttsip1  -chardev socket,id=char0,path=./vhost-net -netdev
type=vhost-user,id=netdev0,chardev=char0,vhostforce -device
virtio-net-pci,netdev=netdev0,mac=52:54:00:00:00:01,disable-modern=true,mrg_rxbuf=off,rx_queue_size=1024,tx_queue_size=1024
-cpu host -smp 8 -m 16384 -object
memory-backend-file,id=mem,size=16384M,mem-path=/mnt/huge,share=on -numa
node,memdev=mem -mem-prealloc -chardev
socket,path=/tmp/vm0_qga0.sock,server,nowait,id=vm0_qga0 -device virtio-serial
-device virtserialport,chardev=vm0_qga0,name=org.qemu.guest_agent.0 -vnc :4
-drive file=/home/image/ubuntu2004.img

6.SSH VM0 and bind virtio-net to vfio-pci:

echo 0 > /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages
echo 1024 >
/sys/devices/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages
mkdir -p /mnt/huge
mount -t hugetlbfs nodev /mnt/huge
modprobe vfio-pci
echo 1 > /sys/module/vfio/parameters/enable_unsafe_noiommu_mode
dpdk-devbind.py --force --bind=vfio-pci :00:04.0

7.Start testpmd in VM0:

x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x3 -n 3 -a
:00:04.0,vectorized=1 -- -i --nb-cores=1 --txd=1024 --rxd=1024

testpmd>set fwd mac
testpmd>start

6.Use pktgen to send packets, and record the throughput.

Show the output from the previous commands.

+--+--+--+++
| FrameSize(B) |         Mode         | Throughput(Mpps) | % linerate |    
Cycle      |
+==+==+==++===

RE: [PATCH 2/2] net/virtio: fix device init to return negative errno

[Xia, Chenbo]

> -Original Message-
> From: Boleslav Stankevich 
> Sent: Wednesday, March 22, 2023 6:23 PM
> To: dev@dpdk.org
> Cc: Boleslav Stankevich ;
> sta...@dpdk.org; Andrew Rybchenko ; Maxime
> Coquelin ; Xia, Chenbo ;
> Jianfeng Tan ; Yuanhan Liu ;
> Tetsuya Mukawa ; Huawei Xie  inc.com>
> Subject: [PATCH 2/2] net/virtio: fix device init to return negative errno
> 
> virtio_init_device() and called helper functions sometimes return -1
> when return code should be negative errno. Fix all such cases to return
> correct negative errno instead.
> 
> Fixes: 26b683b4f7d0 ("net/virtio: setup Rx queue interrupts")
> Fixes: 0c9d66207054 ("net/virtio: support RSS")
> Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0")
> Fixes: 49d26d9e3f47 ("net/virtio: support MTU feature")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Boleslav Stankevich 
> Signed-off-by: Andrew Rybchenko 
> ---
>  drivers/net/virtio/virtio_ethdev.c | 33 +-
>  1 file changed, 19 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/net/virtio/virtio_ethdev.c
> b/drivers/net/virtio/virtio_ethdev.c
> index 5c8b7b95e9..ca4ade9ff2 100644
> --- a/drivers/net/virtio/virtio_ethdev.c
> +++ b/drivers/net/virtio/virtio_ethdev.c
> @@ -1397,9 +1397,10 @@ virtio_configure_intr(struct rte_eth_dev *dev)
>   return -ENOTSUP;
>   }
> 
> - if (rte_intr_efd_enable(dev->intr_handle, dev->data->nb_rx_queues))
> {
> + ret = rte_intr_efd_enable(dev->intr_handle, dev->data->nb_rx_queues);
> + if (ret < 0) {
>   PMD_INIT_LOG(ERR, "Fail to create eventfd");
> - return -1;
> + return ret;
>   }
> 
>   ret = rte_intr_vec_list_alloc(dev->intr_handle, "intr_vec",
> @@ -1428,12 +1429,13 @@ virtio_configure_intr(struct rte_eth_dev *dev)
>*/
>   if (virtio_intr_enable(dev) < 0) {
>   PMD_DRV_LOG(ERR, "interrupt enable failed");
> - return -1;
> + return -EINVAL;
>   }
> 
> - if (virtio_queues_bind_intr(dev) < 0) {
> + ret = virtio_queues_bind_intr(dev);
> + if (ret < 0) {
>   PMD_INIT_LOG(ERR, "Failed to bind queue/interrupt");
> - return -1;
> + return ret;
>   }
> 
>   return 0;
> @@ -1756,7 +1758,7 @@ virtio_dev_rss_init(struct rte_eth_dev *eth_dev)
>   eth_dev->device->numa_node);
>   if (!hw->rss_key) {
>   PMD_INIT_LOG(ERR, "Failed to allocate RSS key");
> - return -1;
> + return -ENOMEM;
>   }
>   }
> 
> @@ -1778,7 +1780,7 @@ virtio_dev_rss_init(struct rte_eth_dev *eth_dev)
>   eth_dev->device->numa_node);
>   if (!hw->rss_reta) {
>   PMD_INIT_LOG(ERR, "Failed to allocate RSS reta");
> - return -1;
> + return -ENOMEM;
>   }
> 
>   hw->rss_rx_queues = 0;
> @@ -1818,7 +1820,7 @@ virtio_init_device(struct rte_eth_dev *eth_dev,
> uint64_t req_features)
>   /* Tell the host we've known how to drive the device. */
>   virtio_set_status(hw, VIRTIO_CONFIG_STATUS_DRIVER);
>   if (virtio_ethdev_negotiate_features(hw, req_features) < 0)
> - return -1;
> + return -EINVAL;
> 
>   hw->weak_barriers = !virtio_with_feature(hw,
> VIRTIO_F_ORDER_PLATFORM);
> 
> @@ -1900,7 +1902,7 @@ virtio_init_device(struct rte_eth_dev *eth_dev,
> uint64_t req_features)
>   if (config->mtu < RTE_ETHER_MIN_MTU) {
>   PMD_INIT_LOG(ERR, "invalid max MTU value (%u)",
>   config->mtu);
> - return -1;
> + return -EINVAL;
>   }
> 
>   hw->max_mtu = config->mtu;
> @@ -1913,9 +1915,11 @@ virtio_init_device(struct rte_eth_dev *eth_dev,
> uint64_t req_features)
>   }
> 
>   hw->rss_hash_types = 0;
> - if (virtio_with_feature(hw, VIRTIO_NET_F_RSS))
> - if (virtio_dev_rss_init(eth_dev))
> - return -1;
> + if (virtio_with_feature(hw, VIRTIO_NET_F_RSS)) {
> + ret = virtio_dev_rss_init(eth_dev);
> + if (ret < 0)
> + return ret;
> + }
> 
>   PMD_INIT_LOG(DEBUG, "config->max_virtqueue_pairs=%d",
>   config->max_virtqueue_pairs);
> @@ -1937,10 +1941,11 @@ virtio_init_device(struct rte_eth_dev *eth_dev,
> uint64_t req_features)
>   return ret;
> 
>   if (eth_dev->data->dev_conf.intr_conf.rxq) {
> - if (virtio_configure_intr(eth_dev) < 0) {
> + ret = virtio_configure_intr(eth_dev);
> + if (ret < 0) {
>   PMD_INIT_LOG(ERR, "failed to configure interrupt");
>   

RE: [PATCH 1/2] net/virtio: propagate return value of called function

[Xia, Chenbo]

> -Original Message-
> From: Boleslav Stankevich 
> Sent: Wednesday, March 22, 2023 6:23 PM
> To: dev@dpdk.org
> Cc: Boleslav Stankevich ;
> sta...@dpdk.org; Andrew Rybchenko ; Maxime
> Coquelin ; Xia, Chenbo ;
> David Marchand ; Hyong Youb Kim
> ; Harman Kalra 
> Subject: [PATCH 1/2] net/virtio: propagate return value of called function
> 
> rte_intr_vec_list_alloc() may fail because of different reasons which
> are indicated by different negative errno values.
> 
> Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Boleslav Stankevich 
> Signed-off-by: Andrew Rybchenko 
> ---
>  drivers/net/virtio/virtio_ethdev.c | 8 +---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/virtio/virtio_ethdev.c
> b/drivers/net/virtio/virtio_ethdev.c
> index ae84d313be..5c8b7b95e9 100644
> --- a/drivers/net/virtio/virtio_ethdev.c
> +++ b/drivers/net/virtio/virtio_ethdev.c
> @@ -1390,6 +1390,7 @@ static int
>  virtio_configure_intr(struct rte_eth_dev *dev)
>  {
>   struct virtio_hw *hw = dev->data->dev_private;
> + int ret;
> 
>   if (!rte_intr_cap_multiple(dev->intr_handle)) {
>   PMD_INIT_LOG(ERR, "Multiple intr vector not supported");
> @@ -1401,11 +1402,12 @@ virtio_configure_intr(struct rte_eth_dev *dev)
>   return -1;
>   }
> 
> - if (rte_intr_vec_list_alloc(dev->intr_handle, "intr_vec",
> - hw->max_queue_pairs)) {
> + ret = rte_intr_vec_list_alloc(dev->intr_handle, "intr_vec",
> +   hw->max_queue_pairs);
> + if (ret < 0) {
>   PMD_INIT_LOG(ERR, "Failed to allocate %u rxq vectors",
>hw->max_queue_pairs);
> - return -ENOMEM;
> + return ret;
>   }
> 
>   if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) {
> --
> 2.30.2

I assume the mailmap warning should be fixed when merging. So:

Reviewed-by: Chenbo Xia  

[PATCH v2] eventdev: avoid non-burst shortcut for variable-size bursts

[Mattias Rönnblom]

Use non-burst event enqueue and dequeue calls from burst enqueue and
dequeue only when the burst size is compile-time constant (and equal
to one).

Signed-off-by: Mattias Rönnblom 

---

v2: Wrap builtin call in __extension__, to avoid compiler warnings if
application is compiled with -pedantic. (Morten Brørup)
---
 lib/eventdev/rte_eventdev.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
index a90e23ac8b..8af15816db 100644
--- a/lib/eventdev/rte_eventdev.h
+++ b/lib/eventdev/rte_eventdev.h
@@ -1944,7 +1944,7 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
 * Allow zero cost non burst mode routine invocation if application
 * requests nb_events as const one
 */
-   if (nb_events == 1)
+   if (__builtin_constant_p(nb_events) && nb_events == 1)
return (fp_ops->enqueue)(port, ev);
else
return fn(port, ev, nb_events);
@@ -2200,7 +2200,7 @@ rte_event_dequeue_burst(uint8_t dev_id, uint8_t port_id, 
struct rte_event ev[],
 * Allow zero cost non burst mode routine invocation if application
 * requests nb_events as const one
 */
-   if (nb_events == 1)
+   if (__builtin_constant_p(nb_events) && nb_events == 1)
return (fp_ops->dequeue)(port, ev, timeout_ticks);
else
return (fp_ops->dequeue_burst)(port, ev, nb_events,
-- 
2.34.1

RE: [PATCH v2] eventdev: avoid non-burst shortcut for variable-size bursts

[Morten Brørup]

> From: Mattias Rönnblom [mailto:mattias.ronnb...@ericsson.com]
> Sent: Thursday, 11 May 2023 10.17
> 
> Use non-burst event enqueue and dequeue calls from burst enqueue and
> dequeue only when the burst size is compile-time constant (and equal
> to one).
> 
> Signed-off-by: Mattias Rönnblom 

Acked-by: Morten Brørup 

[PATCH] examples/l3fwd: add hard code to collect empty poll and NIC counters

[Feifei Wang]

This patch is to collect empty poll of 'rte_eth_rx_burst' functions in
dpdk l3fwd application. Empty poll means Rx burst function receives no
pkts in one loop.

Furthermore, we also add 'nic_xstats_display' API to show NIC counters.

Usage:
With this patch, no special settings, just run l3fwd, and when you
stoping l3fwd, thread will print the info above.

Note:
This patch has just a slight impact on performance and can be ignored.

dpdk version:23.03

Suggested-by: Lijian Zhang 
Signed-off-by: Feifei Wang 
Reviewed-by: Ruifeng Wang 
Reviewed-by: Honnappa Nagarahalli 
---
 examples/l3fwd/l3fwd.h | 68 ++
 examples/l3fwd/l3fwd_lpm.c | 26 +--
 examples/l3fwd/main.c  | 22 
 3 files changed, 114 insertions(+), 2 deletions(-)

diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index b55855c932..2b3fca62f3 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -56,6 +56,17 @@
 #define L3FWD_HASH_ENTRIES (1024*1024*1)
 #endif
 
+struct lcore_stats {
+uint32_t nb_rx_pkts[16];
+uint32_t num_loop[16];
+uint32_t none_loop[16];
+uint32_t no_full_loop[16];
+float  none_loop_per[16];
+float no_full_loop_per[16];
+} __rte_cache_aligned;
+
+extern struct lcore_stats stats[RTE_MAX_LCORE];
+
 struct parm_cfg {
const char *rule_ipv4_name;
const char *rule_ipv6_name;
@@ -115,6 +126,63 @@ extern struct acl_algorithms acl_alg[];
 
 extern uint32_t max_pkt_len;
 
+static inline void
+nic_xstats_display(uint32_t port_id)
+{
+struct rte_eth_xstat *xstats;
+int cnt_xstats, idx_xstat;
+struct rte_eth_xstat_name *xstats_names;
+
+printf("## NIC extended statistics for port %-2d\n", port_id);
+if (!rte_eth_dev_is_valid_port(port_id)) {
+fprintf(stderr, "Error: Invalid port number %i\n", port_id);
+return;
+}
+
+/* Get count */
+cnt_xstats = rte_eth_xstats_get_names(port_id, NULL, 0);
+if (cnt_xstats  < 0) {
+fprintf(stderr, "Error: Cannot get count of xstats\n");
+return;
+}
+
+/* Get id-name lookup table */
+xstats_names = malloc(sizeof(struct rte_eth_xstat_name) * cnt_xstats);
+if (xstats_names == NULL) {
+fprintf(stderr, "Cannot allocate memory for xstats lookup\n");
+return;
+}
+if (cnt_xstats != rte_eth_xstats_get_names(
+port_id, xstats_names, cnt_xstats)) {
+fprintf(stderr, "Error: Cannot get xstats lookup\n");
+free(xstats_names);
+return;
+}
+
+/* Get stats themselves */
+xstats = malloc(sizeof(struct rte_eth_xstat) * cnt_xstats);
+if (xstats == NULL) {
+fprintf(stderr, "Cannot allocate memory for xstats\n");
+free(xstats_names);
+return;
+}
+if (cnt_xstats != rte_eth_xstats_get(port_id, xstats, cnt_xstats)) {
+fprintf(stderr, "Error: Unable to get xstats\n");
+free(xstats_names);
+free(xstats);
+return;
+}
+
+/* Display xstats */
+for (idx_xstat = 0; idx_xstat < cnt_xstats; idx_xstat++) {
+printf("%s: %"PRIu64"\n",
+xstats_names[idx_xstat].name,
+xstats[idx_xstat].value);
+}
+free(xstats_names);
+free(xstats);
+}
+
 /* Send burst of packets on an output interface */
 static inline int
 send_burst(struct lcore_conf *qconf, uint16_t n, uint16_t port)
diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index 4ac1925c84..9e27e954b9 100644
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -41,6 +41,8 @@
 static struct rte_lpm *ipv4_l3fwd_lpm_lookup_struct[NB_SOCKETS];
 static struct rte_lpm6 *ipv6_l3fwd_lpm_lookup_struct[NB_SOCKETS];
 
+extern struct lcore_stats stats[RTE_MAX_LCORE];
+
 /* Performing LPM-based lookups. 8< */
 static inline uint16_t
 lpm_get_ipv4_dst_port(const struct rte_ipv4_hdr *ipv4_hdr,
@@ -153,6 +155,7 @@ lpm_main_loop(__rte_unused void *dummy)
struct lcore_conf *qconf;
const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) /
US_PER_S * BURST_TX_DRAIN_US;
+   bool start_count = 0;
 
lcore_id = rte_lcore_id();
qconf = &lcore_conf[lcore_id];
@@ -207,8 +210,22 @@ lpm_main_loop(__rte_unused void *dummy)
queueid = qconf->rx_queue_list[i].queue_id;
nb_rx = rte_eth_rx_burst(portid, queueid, pkts_burst,
MAX_PKT_BURST);
-   if (nb_rx == 0)
-   continue;
+   if (start_count == 0) {
+   if (nb_rx != 0)
+   start_count = 1;
+   

RE: [PATCH] vhost: fix crash on vhost-user client port deletion

[Xia, Chenbo]

Hi Tianyuan,

> -Original Message-
> From: suntianyuan 
> Sent: Tuesday, March 21, 2023 2:24 PM
> To: maxime.coque...@redhat.com; Xia, Chenbo 
> Cc: dev@dpdk.org; suntianyuan 
> Subject: [PATCH] vhost: fix crash on vhost-user client port deletion
> 
> The rte_vhost_driver_unregister() and vhost_user_read_cb() can be
> called at the same time by 2 threads. reconn may be added back to
> reconn_list by vhost_user_read_cb() after rte_vhost_driver_unregister()
> removed from reconn_list. Then rte_vhost_driver_unregister free vsocket,
> cause vhost_user_client_reconnect access invalid vsocket memory.
> 
> Timeline is as below:
> rte_vhost_driver_unregister thread excute vhost_user_remove_reconnect
> vhost_user_read_cb thread excute vhost_user_start_client add reconn to
> reconn_list
> vhost_user_read_cb thread free conn
> rte_vhost_driver_unregister thread cannot find conn, then excute
> vhost_user_socket_mem_free
> vhost_user_client_reconnect access invalid mem, crash
> 
> Signed-off-by: suntianyuan 

There are several coding style issues. Please check and fix:

http://mails.dpdk.org/archives/test-report/2023-March/374602.html

Thanks,
Chenbo

> ---
>  lib/vhost/socket.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c
> index 669c322e12..72c776d15c 100644
> --- a/lib/vhost/socket.c
> +++ b/lib/vhost/socket.c
> @@ -1046,8 +1046,6 @@ rte_vhost_driver_unregister(const char *path)
>   pthread_mutex_unlock(&vhost_user.mutex);
>   goto again;
>   }
> - } else if (vsocket->reconnect) {
> - vhost_user_remove_reconnect(vsocket);
>   }
> 
>   pthread_mutex_lock(&vsocket->conn_mutex);
> @@ -1080,6 +1078,8 @@ rte_vhost_driver_unregister(const char *path)
>   if (vsocket->is_server) {
>   close(vsocket->socket_fd);
>   unlink(path);
> + } else if (vsocket->reconnect) {
> + vhost_user_remove_reconnect(vsocket);
>   }
> 
>   pthread_mutex_destroy(&vsocket->conn_mutex);
> --
> 2.32.0 (Apple Git-132)

Re: [PATCH] eventdev: avoid non-burst shortcut for variable-size bursts

[Mattias Rönnblom]

On 2023-05-11 09:09, Morten Brørup wrote:
>> From: Mattias Rönnblom [mailto:mattias.ronnb...@ericsson.com]
>> Sent: Thursday, 11 May 2023 08.43
>>
>> Use non-burst event enqueue and dequeue calls from burst enqueue and
>> dequeue only when the burst size is compile-time constant (and equal
>> to one).
>>
>> Signed-off-by: Mattias Rönnblom 
>> ---
>>   lib/eventdev/rte_eventdev.h | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
>> index a90e23ac8b..8af15816db 100644
>> --- a/lib/eventdev/rte_eventdev.h
>> +++ b/lib/eventdev/rte_eventdev.h
>> @@ -1944,7 +1944,7 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t
>> port_id,
>>   * Allow zero cost non burst mode routine invocation if application
>>   * requests nb_events as const one
>>   */
>> -if (nb_events == 1)
>> +if (__builtin_constant_p(nb_events) && nb_events == 1)
> 
> In my experience using __builtin_constant_p(), you need 
> __extension__(__builtin_constant_p(nb_events)) to avoid warnings about using 
> this non-standard feature.
> 

Yes, since it's a public header. Thanks.

>>  return (fp_ops->enqueue)(port, ev);
>>  else
>>  return fn(port, ev, nb_events);
>> @@ -2200,7 +2200,7 @@ rte_event_dequeue_burst(uint8_t dev_id, uint8_t 
>> port_id,
>> struct rte_event ev[],
>>   * Allow zero cost non burst mode routine invocation if application
>>   * requests nb_events as const one
>>   */
>> -if (nb_events == 1)
>> +if (__builtin_constant_p(nb_events) && nb_events == 1)
>>  return (fp_ops->dequeue)(port, ev, timeout_ticks);
>>  else
>>  return (fp_ops->dequeue_burst)(port, ev, nb_events,
>> --
>> 2.34.1
> 
> With __extension__() added,
> 
> Acked-by: Morten Brørup 
> 

[PATCH v3] eventdev: avoid non-burst shortcut for variable-size bursts

[Mattias Rönnblom]

Use non-burst event enqueue and dequeue calls from burst enqueue and
dequeue only when the burst size is compile-time constant (and equal
to one).

Signed-off-by: Mattias Rönnblom 

---

v3: Actually include the change v2 claimed to contain.
v2: Wrap builtin call in __extension__, to avoid compiler warnings if
application is compiled with -pedantic. (Morten Brørup)
---
 lib/eventdev/rte_eventdev.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
index a90e23ac8b..a471caeb6d 100644
--- a/lib/eventdev/rte_eventdev.h
+++ b/lib/eventdev/rte_eventdev.h
@@ -1944,7 +1944,7 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
 * Allow zero cost non burst mode routine invocation if application
 * requests nb_events as const one
 */
-   if (nb_events == 1)
+   if (__extension__(__builtin_constant_p(nb_events)) && nb_events == 1)
return (fp_ops->enqueue)(port, ev);
else
return fn(port, ev, nb_events);
@@ -2200,7 +2200,7 @@ rte_event_dequeue_burst(uint8_t dev_id, uint8_t port_id, 
struct rte_event ev[],
 * Allow zero cost non burst mode routine invocation if application
 * requests nb_events as const one
 */
-   if (nb_events == 1)
+   if (__extension__(__builtin_constant_p(nb_events)) && nb_events == 1)
return (fp_ops->dequeue)(port, ev, timeout_ticks);
else
return (fp_ops->dequeue_burst)(port, ev, nb_events,
-- 
2.34.1

Re: [PATCH] examples/l3fwd: add hard code to collect empty poll and NIC counters

[Jerin Jacob]

On Thu, May 11, 2023 at 1:55 PM Feifei Wang  wrote:
>
> This patch is to collect empty poll of 'rte_eth_rx_burst' functions in
> dpdk l3fwd application. Empty poll means Rx burst function receives no
> pkts in one loop.
>
> Furthermore, we also add 'nic_xstats_display' API to show NIC counters.
>
> Usage:
> With this patch, no special settings, just run l3fwd, and when you
> stoping l3fwd, thread will print the info above.
>
> Note:
> This patch has just a slight impact on performance and can be ignored.

IMO, We should not introduce regression as l3fwd kind of uses as
reference application.
I think, l3fwd should limit to stats exposed by ethdev(i.e directly
from NIC, without performance regression).



>
> dpdk version:23.03
>
> Suggested-by: Lijian Zhang 
> Signed-off-by: Feifei Wang 
> Reviewed-by: Ruifeng Wang 
> Reviewed-by: Honnappa Nagarahalli 
> ---
>  examples/l3fwd/l3fwd.h | 68 ++
>  examples/l3fwd/l3fwd_lpm.c | 26 +--
>  examples/l3fwd/main.c  | 22 
>  3 files changed, 114 insertions(+), 2 deletions(-)
>
> diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
> index b55855c932..2b3fca62f3 100644
> --- a/examples/l3fwd/l3fwd.h
> +++ b/examples/l3fwd/l3fwd.h
> @@ -56,6 +56,17 @@
>  #define L3FWD_HASH_ENTRIES (1024*1024*1)
>  #endif
>
> +struct lcore_stats {
> +uint32_t nb_rx_pkts[16];
> +uint32_t num_loop[16];
> +uint32_t none_loop[16];
> +uint32_t no_full_loop[16];
> +float  none_loop_per[16];
> +float no_full_loop_per[16];
> +} __rte_cache_aligned;
> +
> +extern struct lcore_stats stats[RTE_MAX_LCORE];
> +
>  struct parm_cfg {
> const char *rule_ipv4_name;
> const char *rule_ipv6_name;
> @@ -115,6 +126,63 @@ extern struct acl_algorithms acl_alg[];
>
>  extern uint32_t max_pkt_len;
>
> +static inline void
> +nic_xstats_display(uint32_t port_id)
> +{
> +struct rte_eth_xstat *xstats;
> +int cnt_xstats, idx_xstat;
> +struct rte_eth_xstat_name *xstats_names;
> +
> +printf("## NIC extended statistics for port %-2d\n", port_id);
> +if (!rte_eth_dev_is_valid_port(port_id)) {
> +fprintf(stderr, "Error: Invalid port number %i\n", port_id);
> +return;
> +}
> +
> +/* Get count */
> +cnt_xstats = rte_eth_xstats_get_names(port_id, NULL, 0);
> +if (cnt_xstats  < 0) {
> +fprintf(stderr, "Error: Cannot get count of xstats\n");
> +return;
> +}
> +
> +/* Get id-name lookup table */
> +xstats_names = malloc(sizeof(struct rte_eth_xstat_name) * 
> cnt_xstats);
> +if (xstats_names == NULL) {
> +fprintf(stderr, "Cannot allocate memory for xstats 
> lookup\n");
> +return;
> +}
> +if (cnt_xstats != rte_eth_xstats_get_names(
> +port_id, xstats_names, cnt_xstats)) {
> +fprintf(stderr, "Error: Cannot get xstats lookup\n");
> +free(xstats_names);
> +return;
> +}
> +
> +/* Get stats themselves */
> +xstats = malloc(sizeof(struct rte_eth_xstat) * cnt_xstats);
> +if (xstats == NULL) {
> +fprintf(stderr, "Cannot allocate memory for xstats\n");
> +free(xstats_names);
> +return;
> +}
> +if (cnt_xstats != rte_eth_xstats_get(port_id, xstats, cnt_xstats)) {
> +fprintf(stderr, "Error: Unable to get xstats\n");
> +free(xstats_names);
> +free(xstats);
> +return;
> +}
> +
> +/* Display xstats */
> +for (idx_xstat = 0; idx_xstat < cnt_xstats; idx_xstat++) {
> +printf("%s: %"PRIu64"\n",
> +xstats_names[idx_xstat].name,
> +xstats[idx_xstat].value);
> +}
> +free(xstats_names);
> +free(xstats);
> +}
> +
>  /* Send burst of packets on an output interface */
>  static inline int
>  send_burst(struct lcore_conf *qconf, uint16_t n, uint16_t port)
> diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
> index 4ac1925c84..9e27e954b9 100644
> --- a/examples/l3fwd/l3fwd_lpm.c
> +++ b/examples/l3fwd/l3fwd_lpm.c
> @@ -41,6 +41,8 @@
>  static struct rte_lpm *ipv4_l3fwd_lpm_lookup_struct[NB_SOCKETS];
>  static struct rte_lpm6 *ipv6_l3fwd_lpm_lookup_struct[NB_SOCKETS];
>
> +extern struct lcore_stats stats[RTE_MAX_LCORE];
> +
>  /* Performing LPM-based lookups. 8< */
>  static inline uint16_t
>  lpm_get_ipv4_dst_port(const struct rte_ipv4_hdr *ipv4_hdr,
> @@ -153,6 +155,7 @@ lpm_main_loop(__rte_unused void *dummy)
> struct lcore_conf *qconf;
> const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) /
> US_PER_S * BURST_TX_DRAIN_US;
> +   bool start_count = 0;
>
> lcore_id = rte_lcore_id();
> qconf = &lcore

Re: [RFC PATCH v2 0/4] dts: add dts api docs

[Juraj Linkeš]

On Fri, May 5, 2023 at 4:07 PM Bruce Richardson
 wrote:
>
> On Thu, May 04, 2023 at 02:37:45PM +0200, Juraj Linkeš wrote:
> > Augment the meson build system with dts api generation. The api docs are
> > generated from Python docstrings in DTS using Sphinx. The format of
> > choice is the Google format [0].
> >
> > The guide html sphinx configuration is used to preserve the same style.
> >
> > The build requires the same Python version and dependencies as DTS,
> > because Sphinx imports the Python modules. Dependencies are installed
> > using Poetry from the dts directory:
> >
> > poetry install --with docs
> >
> > After installing, enter the Poetry shell:
> >
> > poetry shell
> >
> > And then run the build:
> > ninja -C  dts/doc
> >
> > There's only one properly documented module that serves as a
> > demonstration of the style - framework.testbed_model.node.
> >
> > [0] 
> > https://google.github.io/styleguide/pyguide.html#s3.8.4-comments-in-classes
> >
> > Juraj Linkeš (4):
> >   dts: code adjustments for sphinx
> >   dts: add doc generation dependencies
> >   dts: add doc generation
> >   dts: format docstrigs to google format
> >
>
> I find the requirement to use poetry to build the docs, and the need to run
> specific commands in specific directories quite awkward. With this patchset
> there is no ability to just turn on the build option for the DTS doc and
> have the docs built on the next rebuild. [Also, with every build I've tried
> I can't get it to build without warnings about missing "warlock" module.]
>

I want to ask about the warnings. This suggests a problem with
dependencies, have you entered the Poetry shell? We may need to add
some steps to docs, which are currently:

poetry install --with docs
poetry shell

And then:
ninja -C build dts/doc

Maybe the problem is with Poetry version (1.4.2 and higher should
work), which is not specified in the docs yet. I need to update
http://patches.dpdk.org/project/dpdk/patch/20230331091355.1224059-1-juraj.lin...@pantheon.tech/
with it.

Which are your exact steps for building the docs?

Juraj

> From what I understand from the patchset, the doc building here using
> sphinx is primarily concerned with building the API docs. The rest of DPDK
> uses doxygen for this, and since doxygen supports python can the same
> tooling be used for the DTS docs?
>
> /Bruce

RE: [PATCH] examples/l3fwd: add hard code to collect empty poll and NIC counters

[Feifei Wang]

> -Original Message-
> From: Jerin Jacob 
> Sent: Thursday, May 11, 2023 4:51 PM
> To: Feifei Wang 
> Cc: dev@dpdk.org; nd ; Lijian Zhang
> ; Ruifeng Wang ;
> Honnappa Nagarahalli 
> Subject: Re: [PATCH] examples/l3fwd: add hard code to collect empty poll and
> NIC counters
> 
> On Thu, May 11, 2023 at 1:55 PM Feifei Wang 
> wrote:
> >
> > This patch is to collect empty poll of 'rte_eth_rx_burst' functions in
> > dpdk l3fwd application. Empty poll means Rx burst function receives no
> > pkts in one loop.
> >
> > Furthermore, we also add 'nic_xstats_display' API to show NIC counters.
> >
> > Usage:
> > With this patch, no special settings, just run l3fwd, and when you
> > stoping l3fwd, thread will print the info above.
> >
> > Note:
> > This patch has just a slight impact on performance and can be ignored.
> 
> IMO, We should not introduce regression as l3fwd kind of uses as reference
> application.
> I think, l3fwd should limit to stats exposed by ethdev(i.e directly from NIC,
> without performance regression).
> 

Ok, thanks very much for quick review and the comment. 
I think maybe we can add counter collect for testpmd. 
And this can help users to analyze the performance of dpdk.

> 
> 
> >
> > dpdk version:23.03
> >
> > Suggested-by: Lijian Zhang 
> > Signed-off-by: Feifei Wang 
> > Reviewed-by: Ruifeng Wang 
> > Reviewed-by: Honnappa Nagarahalli 
> > ---
> >  examples/l3fwd/l3fwd.h | 68
> ++
> >  examples/l3fwd/l3fwd_lpm.c | 26 +--
> >  examples/l3fwd/main.c  | 22 
> >  3 files changed, 114 insertions(+), 2 deletions(-)
> >
> > diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h index
> > b55855c932..2b3fca62f3 100644
> > --- a/examples/l3fwd/l3fwd.h
> > +++ b/examples/l3fwd/l3fwd.h
> > @@ -56,6 +56,17 @@
> >  #define L3FWD_HASH_ENTRIES (1024*1024*1)
> >  #endif
> >
> > +struct lcore_stats {
> > +uint32_t nb_rx_pkts[16];
> > +uint32_t num_loop[16];
> > +uint32_t none_loop[16];
> > +uint32_t no_full_loop[16];
> > +float  none_loop_per[16];
> > +float no_full_loop_per[16];
> > +} __rte_cache_aligned;
> > +
> > +extern struct lcore_stats stats[RTE_MAX_LCORE];
> > +
> >  struct parm_cfg {
> > const char *rule_ipv4_name;
> > const char *rule_ipv6_name;
> > @@ -115,6 +126,63 @@ extern struct acl_algorithms acl_alg[];
> >
> >  extern uint32_t max_pkt_len;
> >
> > +static inline void
> > +nic_xstats_display(uint32_t port_id)
> > +{
> > +struct rte_eth_xstat *xstats;
> > +int cnt_xstats, idx_xstat;
> > +struct rte_eth_xstat_name *xstats_names;
> > +
> > +printf("## NIC extended statistics for port %-2d\n", port_id);
> > +if (!rte_eth_dev_is_valid_port(port_id)) {
> > +fprintf(stderr, "Error: Invalid port number %i\n", 
> > port_id);
> > +return;
> > +}
> > +
> > +/* Get count */
> > +cnt_xstats = rte_eth_xstats_get_names(port_id, NULL, 0);
> > +if (cnt_xstats  < 0) {
> > +fprintf(stderr, "Error: Cannot get count of xstats\n");
> > +return;
> > +}
> > +
> > +/* Get id-name lookup table */
> > +xstats_names = malloc(sizeof(struct rte_eth_xstat_name) * 
> > cnt_xstats);
> > +if (xstats_names == NULL) {
> > +fprintf(stderr, "Cannot allocate memory for xstats 
> > lookup\n");
> > +return;
> > +}
> > +if (cnt_xstats != rte_eth_xstats_get_names(
> > +port_id, xstats_names, cnt_xstats)) {
> > +fprintf(stderr, "Error: Cannot get xstats lookup\n");
> > +free(xstats_names);
> > +return;
> > +}
> > +
> > +/* Get stats themselves */
> > +xstats = malloc(sizeof(struct rte_eth_xstat) * cnt_xstats);
> > +if (xstats == NULL) {
> > +fprintf(stderr, "Cannot allocate memory for xstats\n");
> > +free(xstats_names);
> > +return;
> > +}
> > +if (cnt_xstats != rte_eth_xstats_get(port_id, xstats, cnt_xstats)) 
> > {
> > +fprintf(stderr, "Error: Unable to get xstats\n");
> > +free(xstats_names);
> > +free(xstats);
> > +return;
> > +}
> > +
> > +/* Display xstats */
> > +for (idx_xstat = 0; idx_xstat < cnt_xstats; idx_xstat++) {
> > +printf("%s: %"PRIu64"\n",
> > +xstats_names[idx_xstat].name,
> > +xstats[idx_xstat].value);
> > +}
> > +free(xstats_names);
> > +free(xstats);
> > +}
> > +
> >  /* Send burst of packets on an output interface */  static inline int
> > send_burst(struct lcore_conf *qconf, uint16_t n, uint16_t port) diff
> > --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c index
> > 4ac1925c84..9e27e954b9 100644
> > --- 

RE: [PATCH 0/2] vhost: add port mirroring function in the vhost lib

[Xia, Chenbo]

> -Original Message-
> From: Jiang, Cheng1 
> Sent: Monday, May 8, 2023 8:23 PM
> To: Maxime Coquelin ; Xia, Chenbo
> 
> Cc: dev@dpdk.org; Hu, Jiayu ; Ding, Xuan
> ; Ma, WenwuX ; Wang, YuanX
> ; He, Xingguang ; David
> Marchand 
> Subject: RE: [PATCH 0/2] vhost: add port mirroring function in the vhost
> lib
> 
> Hi Maxime,
> 
> > -Original Message-
> > From: Maxime Coquelin 
> > Sent: Wednesday, May 3, 2023 5:37 PM
> > To: Jiang, Cheng1 ; Xia, Chenbo
> > 
> > Cc: dev@dpdk.org; Hu, Jiayu ; Ding, Xuan
> > ; Ma, WenwuX ; Wang, YuanX
> > ; He, Xingguang ; David
> > Marchand 
> > Subject: Re: [PATCH 0/2] vhost: add port mirroring function in the vhost
> lib
> >
> > Hi Cheng,
> >
> > On 4/21/23 03:09, Cheng Jiang wrote:
> > > Similar to the port mirroring function on the switch or router, this
> > > patch set implements such function on the Vhost lib. When data is sent
> > > to a front-end, it will also send the data to its mirror front-end.
> > > When data is received from a front-end, it will also send the data to
> > > its mirror front-end.
> >
> > Why not just keeping mirroring in the switch/router?
> > I am really not convinced this is the way to go:
> > 1. API is too complex
> > 2. It requires async support
> > 3. There is too much code duplication, it increases  virtio-net.c by
> > 30%, and it is without packed ring support.
> > 4. If mirror port is down for any reason, packets to/from the original
> > port are dropped.
> > 5. It seems to assume negotiated features of the two ports are
> > identical, e.g. Virtio-net header length? If so, that's not a
> > manageable solution.
> 
> Thank you for your feedback.
> I concur that placing the mirror function in the Vhost library is not
> ideal. We are currently considering implementing either a mirror Vhost PMD,
> or adding a function to TestPMD to handle this functionality.
> Would you please share your thoughts on this plan and let us know which
> option you prefer?

Based on current implementation, it seems that vhost lib could be ignorant
of the mirroring usage. Making these logic into APP like testpmd seems to make
more sense.

Thanks,
Chenbo

> 
> Thanks a lot,
> Cheng
> 
> 
> 
> >
> > Regards,
> > Maxime
> >
> > >
> > > Cheng Jiang (2):
> > >vhost: add ingress API for port mirroring datapath
> > >vhost: add egress API for port mirroring datapath
> > >
> > >   lib/vhost/rte_vhost_async.h |   17 +
> > >   lib/vhost/version.map   |3 +
> > >   lib/vhost/virtio_net.c  | 1266
> +++
> > >   3 files changed, 1286 insertions(+)
> > >
> > > --
> > > 2.35.1
> > >

RE: [PATCH v3] eventdev: avoid non-burst shortcut for variable-size bursts

[Morten Brørup]

> From: Mattias Rönnblom [mailto:mattias.ronnb...@ericsson.com]
> Sent: Thursday, 11 May 2023 10.24
> 
> Use non-burst event enqueue and dequeue calls from burst enqueue and
> dequeue only when the burst size is compile-time constant (and equal
> to one).
> 
> Signed-off-by: Mattias Rönnblom 

Acked-by: Morten Brørup 

RE: [PATCH] eventdev: avoid non-burst shortcut for variable-size bursts

[Morten Brørup]

> From: Mattias Rönnblom [mailto:mattias.ronnb...@ericsson.com]
> Sent: Thursday, 11 May 2023 10.30
> 
> On 2023-05-11 09:09, Morten Brørup wrote:

[...]

> > In my experience using __builtin_constant_p(), you need
> __extension__(__builtin_constant_p(nb_events)) to avoid warnings about using
> this non-standard feature.
> >
> 
> Yes, since it's a public header. Thanks.

If you run meson with -Dcheck_includes=true, ninja will catch it.

Unfortunately, the build time increases significantly when using this option.

[RFC PATCH v3 0/4] dts: add dts api docs

[Juraj Linkeš]

Augment the meson build system with dts api generation. The api docs are
generated from Python docstrings in DTS using Sphinx. The format of
choice is the Google format [0].

The guides html sphinx configuration is used to preserve the same style.

The build requires the same Python version and dependencies as DTS,
because Sphinx imports the Python modules. Dependencies are installed
using Poetry from the dts directory:

poetry install --with docs

After installing, enter the Poetry shell:

poetry shell

And then run the build:
ninja -C  dts/doc

There's only one properly documented module that serves as a
demonstration of the style - framework.testbed_model.node. When we agree
on the docstring format, all docstrings will be reformatted.

[0] https://google.github.io/styleguide/pyguide.html#s3.8.4-comments-in-classes

Juraj Linkeš (4):
  dts: code adjustments for sphinx
  dts: add doc generation dependencies
  dts: add doc generation
  dts: format docstrigs to google format

 buildtools/call-sphinx-build.py   |  29 +-
 doc/api/meson.build   |   1 +
 doc/guides/conf.py|  22 +-
 doc/guides/meson.build|   1 +
 doc/guides/tools/dts.rst  |  29 +
 dts/doc/doc-index.rst |  20 +
 dts/doc/meson.build   |  51 ++
 dts/framework/config/__init__.py  |  11 +
 .../{testbed_model/hw => config}/cpu.py   |  13 +
 dts/framework/dts.py  |   8 +-
 dts/framework/remote_session/__init__.py  |   3 +-
 dts/framework/remote_session/linux_session.py |   2 +-
 dts/framework/remote_session/os_session.py|  12 +-
 .../remote_session/remote/__init__.py |  16 -
 .../{remote => }/remote_session.py|   0
 .../{remote => }/ssh_session.py   |   0
 dts/framework/settings.py |  55 +-
 dts/framework/testbed_model/__init__.py   |  10 +-
 dts/framework/testbed_model/hw/__init__.py|  27 -
 dts/framework/testbed_model/node.py   | 164 ++--
 dts/framework/testbed_model/sut_node.py   |   9 +-
 .../testbed_model/{hw => }/virtual_device.py  |   0
 dts/main.py   |   3 +-
 dts/meson.build   |  16 +
 dts/poetry.lock   | 770 --
 dts/pyproject.toml|   7 +
 dts/tests/TestSuite_hello_world.py|   6 +-
 meson.build   |   1 +
 meson_options.txt |   2 +
 29 files changed, 1058 insertions(+), 230 deletions(-)
 create mode 100644 dts/doc/doc-index.rst
 create mode 100644 dts/doc/meson.build
 rename dts/framework/{testbed_model/hw => config}/cpu.py (95%)
 delete mode 100644 dts/framework/remote_session/remote/__init__.py
 rename dts/framework/remote_session/{remote => }/remote_session.py (100%)
 rename dts/framework/remote_session/{remote => }/ssh_session.py (100%)
 delete mode 100644 dts/framework/testbed_model/hw/__init__.py
 rename dts/framework/testbed_model/{hw => }/virtual_device.py (100%)
 create mode 100644 dts/meson.build

-- 
2.30.2

[RFC PATCH v3 1/4] dts: code adjustments for sphinx

[Juraj Linkeš]

sphinx-build only imports the Python modules when building the
documentation; it doesn't run DTS. This requires changes that make the
code importable without running it. This means:
* properly guarding argument parsing in the if __name__ == '__main__'
  block.
* the logger used by DTS runner underwent the same treatment so that it
  doesn't create unnecessary log files.
* however, DTS uses the arguments to construct an object holding global
  variables. The defaults for the global variables needed to be moved
  from argument parsing elsewhere.
* importing the remote_session module from framework resulted in
  circular imports because of one module trying to import another
  module. This is fixed by more granular imports.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/config/__init__.py  | 11 
 .../{testbed_model/hw => config}/cpu.py   | 13 +
 dts/framework/dts.py  |  8 ++-
 dts/framework/remote_session/__init__.py  |  3 +-
 dts/framework/remote_session/linux_session.py |  2 +-
 dts/framework/remote_session/os_session.py| 12 +++-
 .../remote_session/remote/__init__.py | 16 --
 .../{remote => }/remote_session.py|  0
 .../{remote => }/ssh_session.py   |  0
 dts/framework/settings.py | 55 ++-
 dts/framework/testbed_model/__init__.py   | 10 +---
 dts/framework/testbed_model/hw/__init__.py| 27 -
 dts/framework/testbed_model/node.py   | 12 ++--
 dts/framework/testbed_model/sut_node.py   |  9 ++-
 .../testbed_model/{hw => }/virtual_device.py  |  0
 dts/main.py   |  3 +-
 dts/tests/TestSuite_hello_world.py|  6 +-
 17 files changed, 88 insertions(+), 99 deletions(-)
 rename dts/framework/{testbed_model/hw => config}/cpu.py (95%)
 delete mode 100644 dts/framework/remote_session/remote/__init__.py
 rename dts/framework/remote_session/{remote => }/remote_session.py (100%)
 rename dts/framework/remote_session/{remote => }/ssh_session.py (100%)
 delete mode 100644 dts/framework/testbed_model/hw/__init__.py
 rename dts/framework/testbed_model/{hw => }/virtual_device.py (100%)

diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py
index ebb0823ff5..293c4cb15b 100644
--- a/dts/framework/config/__init__.py
+++ b/dts/framework/config/__init__.py
@@ -7,6 +7,8 @@
 Yaml config parsing methods
 """
 
+# pylama:ignore=W0611
+
 import json
 import os.path
 import pathlib
@@ -19,6 +21,15 @@
 
 from framework.settings import SETTINGS
 
+from .cpu import (
+LogicalCore,
+LogicalCoreCount,
+LogicalCoreCountFilter,
+LogicalCoreList,
+LogicalCoreListFilter,
+lcore_filter,
+)
+
 
 class StrEnum(Enum):
 @staticmethod
diff --git a/dts/framework/testbed_model/hw/cpu.py b/dts/framework/config/cpu.py
similarity index 95%
rename from dts/framework/testbed_model/hw/cpu.py
rename to dts/framework/config/cpu.py
index d1918a12dc..8fe785dfe4 100644
--- a/dts/framework/testbed_model/hw/cpu.py
+++ b/dts/framework/config/cpu.py
@@ -272,3 +272,16 @@ def filter(self) -> list[LogicalCore]:
 )
 
 return filtered_lcores
+
+
+def lcore_filter(
+core_list: list[LogicalCore],
+filter_specifier: LogicalCoreCount | LogicalCoreList,
+ascending: bool,
+) -> LogicalCoreFilter:
+if isinstance(filter_specifier, LogicalCoreList):
+return LogicalCoreListFilter(core_list, filter_specifier, ascending)
+elif isinstance(filter_specifier, LogicalCoreCount):
+return LogicalCoreCountFilter(core_list, filter_specifier, ascending)
+else:
+raise ValueError(f"Unsupported filter r{filter_specifier}")
diff --git a/dts/framework/dts.py b/dts/framework/dts.py
index 0502284580..22a09b7e34 100644
--- a/dts/framework/dts.py
+++ b/dts/framework/dts.py
@@ -3,6 +3,7 @@
 # Copyright(c) 2022-2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2022-2023 University of New Hampshire
 
+import logging
 import sys
 
 from .config import CONFIGURATION, BuildTargetConfiguration, 
ExecutionConfiguration
@@ -12,7 +13,8 @@
 from .testbed_model import SutNode
 from .utils import check_dts_python_version
 
-dts_logger: DTSLOG = getLogger("DTSRunner")
+# dummy defaults to satisfy linters
+dts_logger: DTSLOG | logging.Logger = logging.getLogger("DTSRunner")
 result: DTSResult = DTSResult(dts_logger)
 
 
@@ -24,6 +26,10 @@ def run_all() -> None:
 global dts_logger
 global result
 
+# create a regular DTS logger and create a new result with it
+dts_logger = getLogger("DTSRunner")
+result = DTSResult(dts_logger)
+
 # check the python version of the server that run dts
 check_dts_python_version()
 
diff --git a/dts/framework/remote_session/__init__.py 
b/dts/framework/remote_session/__init__.py
index ee221503df..17ca1459f7 100644
--- a/dts/framework/remote_session/__init__.py
+++ b/dts/framework/remote_session/__init__.py
@@ -17,7 +17,8 @@
 
 from .linux_session import Lin

[RFC PATCH v3 2/4] dts: add doc generation dependencies

[Juraj Linkeš]

Sphinx imports every Python module when generating documentation from
docstrings, meaning all dts dependencies, including Python version,
must be satisfied.
By adding Sphinx to dts dependencies we make sure that the proper
Python version and dependencies are used when Sphinx is executed.

Signed-off-by: Juraj Linkeš 
---
 dts/poetry.lock| 770 +
 dts/pyproject.toml |   7 +
 2 files changed, 710 insertions(+), 67 deletions(-)

diff --git a/dts/poetry.lock b/dts/poetry.lock
index 0b2a007d4d..500f89dac1 100644
--- a/dts/poetry.lock
+++ b/dts/poetry.lock
@@ -1,24 +1,69 @@
+# This file is automatically @generated by Poetry and should not be changed by 
hand.
+
+[[package]]
+name = "alabaster"
+version = "0.7.13"
+description = "A configurable sidebar-enabled Sphinx theme"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+files = [
+{file = "alabaster-0.7.13-py3-none-any.whl", hash = 
"sha256:1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3"},
+{file = "alabaster-0.7.13.tar.gz", hash = 
"sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"},
+]
+
 [[package]]
 name = "attrs"
-version = "22.1.0"
+version = "22.2.0"
 description = "Classes Without Boilerplate"
 category = "main"
 optional = false
-python-versions = ">=3.5"
+python-versions = ">=3.6"
+files = [
+{file = "attrs-22.2.0-py3-none-any.whl", hash = 
"sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836"},
+{file = "attrs-22.2.0.tar.gz", hash = 
"sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99"},
+]
 
 [package.extras]
-dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest 
(>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", 
"furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
-docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
-tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest 
(>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", 
"cloudpickle"]
-tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest 
(>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "cloudpickle"]
+cov = ["attrs[tests]", "coverage-enable-subprocess", "coverage[toml] (>=5.3)"]
+dev = ["attrs[docs,tests]"]
+docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", 
"sphinxcontrib-towncrier", "towncrier", "zope.interface"]
+tests = ["attrs[tests-no-zope]", "zope.interface"]
+tests-no-zope = ["cloudpickle", "cloudpickle", "hypothesis", "hypothesis", 
"mypy (>=0.971,<0.990)", "mypy (>=0.971,<0.990)", "pympler", "pympler", "pytest 
(>=4.3.0)", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-mypy-plugins", 
"pytest-xdist[psutil]", "pytest-xdist[psutil]"]
+
+[[package]]
+name = "babel"
+version = "2.12.1"
+description = "Internationalization utilities"
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+files = [
+{file = "Babel-2.12.1-py3-none-any.whl", hash = 
"sha256:b4246fb7677d3b98f501a39d43396d3cafdc8eadb045f4a31be01863f655c610"},
+{file = "Babel-2.12.1.tar.gz", hash = 
"sha256:cc2d9cd01d44420ae725a21c9e3711b3aadc7976d6147f622d8581963455"},
+]
 
 [[package]]
 name = "black"
-version = "22.10.0"
+version = "22.12.0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+{file = 
"black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", 
hash = 
"sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"},
+{file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = 
"sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"},
+{file = 
"black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", 
hash = 
"sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"},
+{file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = 
"sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"},
+{file = 
"black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash 
= "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"},
+{file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = 
"sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"},
+{file = 
"black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash 
= "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"},
+{file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = 
"sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"},
+{file = 
"black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash 
= "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"},
+{file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = 
"sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e

[RFC PATCH v3 3/4] dts: add doc generation

[Juraj Linkeš]

The tool used to generate developer docs is sphinx, which is already
used in DPDK. The configuration is kept the same to preserve the style.

Sphinx generates the documentation from Python docstrings. The docstring
format most suitable for DTS seems to be the Google format [0] which
requires the sphinx.ext.napoleon extension.

There are two requirements for building DTS docs:
* The same Python version as DTS or higher, because Sphinx import the
  code.
* Also the same Python packages as DTS, for the same reason.

[0] https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings

Signed-off-by: Juraj Linkeš 
---
 buildtools/call-sphinx-build.py | 29 ---
 doc/api/meson.build |  1 +
 doc/guides/conf.py  | 22 ++
 doc/guides/meson.build  |  1 +
 doc/guides/tools/dts.rst| 29 +++
 dts/doc/doc-index.rst   | 20 +
 dts/doc/meson.build | 51 +
 dts/meson.build | 16 +++
 meson.build |  1 +
 meson_options.txt   |  2 ++
 10 files changed, 157 insertions(+), 15 deletions(-)
 create mode 100644 dts/doc/doc-index.rst
 create mode 100644 dts/doc/meson.build
 create mode 100644 dts/meson.build

diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py
index 39a60d09fa..c2f3acfb1d 100755
--- a/buildtools/call-sphinx-build.py
+++ b/buildtools/call-sphinx-build.py
@@ -3,37 +3,46 @@
 # Copyright(c) 2019 Intel Corporation
 #
 
+import argparse
 import sys
 import os
 from os.path import join
 from subprocess import run, PIPE, STDOUT
 from packaging.version import Version
 
-# assign parameters to variables
-(sphinx, version, src, dst, *extra_args) = sys.argv[1:]
+parser = argparse.ArgumentParser()
+parser.add_argument('sphinx')
+parser.add_argument('version')
+parser.add_argument('src')
+parser.add_argument('dst')
+parser.add_argument('--dts-root', default='.')
+args, extra_args = parser.parse_known_args()
 
 # set the version in environment for sphinx to pick up
-os.environ['DPDK_VERSION'] = version
+os.environ['DPDK_VERSION'] = args.version
+os.environ['DTS_ROOT'] = args.dts_root
 
 # for sphinx version >= 1.7 add parallelism using "-j auto"
-ver = run([sphinx, '--version'], stdout=PIPE,
+ver = run([args.sphinx, '--version'], stdout=PIPE,
   stderr=STDOUT).stdout.decode().split()[-1]
-sphinx_cmd = [sphinx] + extra_args
+sphinx_cmd = [args.sphinx] + extra_args
 if Version(ver) >= Version('1.7'):
 sphinx_cmd += ['-j', 'auto']
 
 # find all the files sphinx will process so we can write them as dependencies
 srcfiles = []
-for root, dirs, files in os.walk(src):
+for root, dirs, files in os.walk(args.src):
 srcfiles.extend([join(root, f) for f in files])
 
 # run sphinx, putting the html output in a "html" directory
-with open(join(dst, 'sphinx_html.out'), 'w') as out:
-process = run(sphinx_cmd + ['-b', 'html', src, join(dst, 'html')],
-  stdout=out)
+with open(join(args.dst, 'sphinx_html.out'), 'w') as out:
+process = run(
+sphinx_cmd + ['-b', 'html', args.src, join(args.dst, 'html')],
+stdout=out
+)
 
 # create a gcc format .d file giving all the dependencies of this doc build
-with open(join(dst, '.html.d'), 'w') as d:
+with open(join(args.dst, '.html.d'), 'w') as d:
 d.write('html: ' + ' '.join(srcfiles) + '\n')
 
 sys.exit(process.returncode)
diff --git a/doc/api/meson.build b/doc/api/meson.build
index 2876a78a7e..1f0c725a94 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Luca Boccassi 
 
+doc_api_build_dir = meson.current_build_dir()
 doxygen = find_program('doxygen', required: get_option('enable_docs'))
 
 if not doxygen.found()
diff --git a/doc/guides/conf.py b/doc/guides/conf.py
index a55ce38800..3f11cbc8fc 100644
--- a/doc/guides/conf.py
+++ b/doc/guides/conf.py
@@ -7,10 +7,9 @@
 from sphinx import __version__ as sphinx_version
 from os import listdir
 from os import environ
-from os.path import basename
-from os.path import dirname
+from os.path import basename, dirname
 from os.path import join as path_join
-from sys import argv, stderr
+from sys import argv, stderr, path
 
 import configparser
 
@@ -24,6 +23,19 @@
   file=stderr)
 pass
 
+extensions = ['sphinx.ext.napoleon']
+
+# Python docstring options
+autodoc_member_order = 'bysource'
+autodoc_typehints = 'both'
+autodoc_typehints_format = 'short'
+napoleon_numpy_docstring = False
+napoleon_attr_annotations = True
+napoleon_use_ivar = True
+napoleon_use_rtype = False
+add_module_names = False
+toc_object_entries_show_parents = 'hide'
+
 stop_on_error = ('-W' in argv)
 
 project = 'Data Plane Development Kit'
@@ -35,8 +47,8 @@
 html_show_copyright = False
 highlight_language = 'none'
 
-release = environ.setdefault('DPDK_VERSION', "None")
-version = release
+path.append(e

[RFC PATCH v3 4/4] dts: format docstrigs to google format

[Juraj Linkeš]

WIP: only one module is reformatted to serve as a demonstration.

The google format is documented here [0].

[0]: https://google.github.io/styleguide/pyguide.html

Signed-off-by: Juraj Linkeš 
---
 dts/framework/testbed_model/node.py | 152 +++-
 1 file changed, 103 insertions(+), 49 deletions(-)

diff --git a/dts/framework/testbed_model/node.py 
b/dts/framework/testbed_model/node.py
index 90467981c3..ad8ef442af 100644
--- a/dts/framework/testbed_model/node.py
+++ b/dts/framework/testbed_model/node.py
@@ -3,8 +3,13 @@
 # Copyright(c) 2022-2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2022-2023 University of New Hampshire
 
-"""
-A node is a generic host that DTS connects to and manages.
+"""Common functionality for node management.
+
+There's a base class, Node, that's supposed to be extended by other classes
+with functionality specific to that node type.
+The only part that can be used standalone is the Node.skip_setup static method,
+which is a decorator used to skip method execution
+if skip_setup is passed by the user on the cmdline or in an env variable.
 """
 
 from typing import Any, Callable
@@ -26,10 +31,25 @@
 
 
 class Node(object):
-"""
-Basic class for node management. This class implements methods that
-manage a node, such as information gathering (of CPU/PCI/NIC) and
-environment setup.
+"""The base class for node management.
+
+It shouldn't be instantiated, but rather extended.
+It implements common methods to manage any node:
+
+   * connection to the node
+   * information gathering of CPU
+   * hugepages setup
+
+Arguments:
+node_config: The config from the input configuration file.
+
+Attributes:
+main_session: The primary OS-agnostic remote session used
+to communicate with the node.
+config: The configuration used to create the node.
+name: The name of the node.
+lcores: The list of logical cores that DTS can use on the node.
+It's derived from logical cores present on the node and user 
configuration.
 """
 
 main_session: OSSession
@@ -56,65 +76,89 @@ def __init__(self, node_config: NodeConfiguration):
 self._logger.info(f"Created node: {self.name}")
 
 def set_up_execution(self, execution_config: ExecutionConfiguration) -> 
None:
-"""
-Perform the execution setup that will be done for each execution
-this node is part of.
+"""Execution setup steps.
+
+Configure hugepages and call self._set_up_execution where
+the rest of the configuration steps (if any) are implemented.
+
+Args:
+execution_config: The execution configuration according to which
+the setup steps will be taken.
 """
 self._setup_hugepages()
 self._set_up_execution(execution_config)
 
 def _set_up_execution(self, execution_config: ExecutionConfiguration) -> 
None:
-"""
-This method exists to be optionally overwritten by derived classes and
-is not decorated so that the derived class doesn't have to use the 
decorator.
+"""Optional additional execution setup steps for derived classes.
+
+Derived classes should overwrite this
+if they want to add additional execution setup steps.
 """
 
 def tear_down_execution(self) -> None:
-"""
-Perform the execution teardown that will be done after each execution
-this node is part of concludes.
+"""Execution teardown steps.
+
+There are currently no common execution teardown steps
+common to all DTS node types.
 """
 self._tear_down_execution()
 
 def _tear_down_execution(self) -> None:
-"""
-This method exists to be optionally overwritten by derived classes and
-is not decorated so that the derived class doesn't have to use the 
decorator.
+"""Optional additional execution teardown steps for derived classes.
+
+Derived classes should overwrite this
+if they want to add additional execution teardown steps.
 """
 
 def set_up_build_target(
 self, build_target_config: BuildTargetConfiguration
 ) -> None:
-"""
-Perform the build target setup that will be done for each build target
-tested on this node.
+"""Build target setup steps.
+
+There are currently no common build target setup steps
+common to all DTS node types.
+
+Args:
+build_target_config: The build target configuration according to 
which
+the setup steps will be taken.
 """
 self._set_up_build_target(build_target_config)
 
 def _set_up_build_target(
 self, build_target_config: BuildTargetConfiguration
 ) -> None:
-"""
-This method exists to be optionally overwritten by derived classes and
-is not decorated so that the derived class

RE: [PATCH] examples/l3fwd: relax the RSS/Offload requirement

[Trevor Tao]

Hi Thomas, dev group:

After I sent out this patch, I can't find it at the patch site:
https://patches.dpdk.org/project/dpdk/list/?param=2&page=1
I would like to ask if there's anything I should do first here.

Thanks,

Best Regards,

Zijin Tao(Trevor Tao, 陶孜谨)
ARM Electronic Technology (Shanghai) Co., Ltd
安谋电子科技（上海）有限公司
Building 11, Shanghai Busininess ParkⅢ ,
No.1016 Tianlin Rd, Minhang District, Shanghai, 200233 China
上海市闵行区田林路1016号科技绿洲三期2号楼10楼，200233
Cell:  +86-153 7109 6192

-Original Message-
From: Trevor Tao 
Sent: Thursday, May 11, 2023 4:06 PM
To: tho...@monjalon.net
Cc: dev@dpdk.org; nd ; Trevor Tao ; 
sta...@dpdk.org
Subject: [PATCH] examples/l3fwd: relax the RSS/Offload requirement

Now the port Rx mq_mode had been set to RTE_ETH_MQ_RX_RSS, and offload mode set 
to RTE_ETH_RX_OFFLOAD_CHECKSUM by default, but some hardware and/or virtual 
interface does not support the RSS and offload mode presupposed, e.g., some 
virtio interfaces in the cloud don't support RSS and may only partly support 
RTE_ETH_RX_OFFLOAD_UDP_CKSUM/ RTE_ETH_RX_OFFLOAD_TCP_CKSUM, but not 
RTE_ETH_RX_OFFLOAD_IPV4_CKSUM, and the error msg here:

virtio_dev_configure(): RSS support requested but not supported by the device
Port0 dev_configure = -95

and:
Ethdev port_id=0 requested Rx offloads 0xe doesn't match Rx offloads 
capabilities 0x201d in rte_eth_dev_configure()

So to enable the l3fwd running in that environment, the Rx mode requirement can 
be relaxed to reflect the hardware feature reality here, and the l3fwd can run 
smoothly then.
A warning msg would be provided to user in case it happens here.

Fixes: af75078fece3 ("first public release")
Cc: sta...@dpdk.org

Signed-off-by: Trevor Tao 
Reviewed-by: Ruifeng Wang 
Reviewed-by: Feifei Wang 
---
 .mailmap  |  1 +
 examples/l3fwd/main.c | 18 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 0859104404..cf4a59fb41 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1380,6 +1380,7 @@ Tom Rix   Tone Zhang 
  Tonghao Zhang  
  Tony Nguyen 
+Trevor Tao 
 Tsotne Chakhvadze   Tudor Brindus 
  Tudor Cornea  
 diff --git a/examples/l3fwd/main.c 
b/examples/l3fwd/main.c index a4f061537e..2cdb6b7ae6 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -1233,8 +1233,12 @@ l3fwd_poll_resource_setup(void)
local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
dev_info.flow_type_rss_offloads;

-   if (dev_info.max_rx_queues == 1)
+   /* relax the rx rss requirement */
+   if (dev_info.max_rx_queues == 1 || 
!local_port_conf.rx_adv_conf.rss_conf.rss_hf) {
+   printf("warning: modified the rx mq_mode to 
RTE_ETH_MQ_RX_NONE base on"
+   " device capability\n");
local_port_conf.rxmode.mq_mode = RTE_ETH_MQ_RX_NONE;
+   }

if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
port_conf.rx_adv_conf.rss_conf.rss_hf) { @@ 
-1245,6 +1249,18 @@ l3fwd_poll_resource_setup(void)
local_port_conf.rx_adv_conf.rss_conf.rss_hf);
}

+   /* relax the rx offload requirement */
+   if ((local_port_conf.rxmode.offloads & 
dev_info.rx_offload_capa) !=
+   local_port_conf.rxmode.offloads) {
+   printf("Port %u requested Rx offloads 0x%"PRIx64" 
doesn't"
+   " match Rx offloads capabilities 0x%"PRIx64"\n",
+   portid, local_port_conf.rxmode.offloads,
+   dev_info.rx_offload_capa);
+   local_port_conf.rxmode.offloads &= 
dev_info.rx_offload_capa;
+   printf("warning: modified the rx offload to 0x%"PRIx64" 
based on device"
+   " capability\n", 
local_port_conf.rxmode.offloads);
+   }
+
ret = rte_eth_dev_configure(portid, nb_rx_queue,
(uint16_t)n_tx_queue, &local_port_conf);
if (ret < 0)
--
2.17.1

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 0/2] vhost: add port mirroring function in the vhost lib

[Maxime Coquelin]

On 5/11/23 10:59, Xia, Chenbo wrote:

-Original Message-
From: Jiang, Cheng1 
Sent: Monday, May 8, 2023 8:23 PM
To: Maxime Coquelin ; Xia, Chenbo

Cc: dev@dpdk.org; Hu, Jiayu ; Ding, Xuan
; Ma, WenwuX ; Wang, YuanX
; He, Xingguang ; David
Marchand 
Subject: RE: [PATCH 0/2] vhost: add port mirroring function in the vhost
lib

Hi Maxime,


-Original Message-
From: Maxime Coquelin 
Sent: Wednesday, May 3, 2023 5:37 PM
To: Jiang, Cheng1 ; Xia, Chenbo

Cc: dev@dpdk.org; Hu, Jiayu ; Ding, Xuan
; Ma, WenwuX ; Wang, YuanX
; He, Xingguang ; David
Marchand 
Subject: Re: [PATCH 0/2] vhost: add port mirroring function in the vhost

lib


Hi Cheng,

On 4/21/23 03:09, Cheng Jiang wrote:

Similar to the port mirroring function on the switch or router, this
patch set implements such function on the Vhost lib. When data is sent
to a front-end, it will also send the data to its mirror front-end.
When data is received from a front-end, it will also send the data to
its mirror front-end.


Why not just keeping mirroring in the switch/router?
I am really not convinced this is the way to go:
1. API is too complex
2. It requires async support
3. There is too much code duplication, it increases  virtio-net.c by
 30%, and it is without packed ring support.
4. If mirror port is down for any reason, packets to/from the original
 port are dropped.
5. It seems to assume negotiated features of the two ports are
 identical, e.g. Virtio-net header length? If so, that's not a
 manageable solution.


Thank you for your feedback.
I concur that placing the mirror function in the Vhost library is not
ideal. We are currently considering implementing either a mirror Vhost PMD,
or adding a function to TestPMD to handle this functionality.
Would you please share your thoughts on this plan and let us know which
option you prefer?


Based on current implementation, it seems that vhost lib could be ignorant
of the mirroring usage. Making these logic into APP like testpmd seems to make
more sense.


I agree with Chenbo, it should be done at the application level, which
would enable to also mirror non-Vhost ports.

Thanks,
Maxime


Thanks,
Chenbo



Thanks a lot,
Cheng





Regards,
Maxime



Cheng Jiang (2):
vhost: add ingress API for port mirroring datapath
vhost: add egress API for port mirroring datapath

   lib/vhost/rte_vhost_async.h |   17 +
   lib/vhost/version.map   |3 +
   lib/vhost/virtio_net.c  | 1266

+++

   3 files changed, 1286 insertions(+)

--
2.35.1

RE: [PATCH] examples/l3fwd: add hard code to collect empty poll and NIC counters

[Honnappa Nagarahalli]

> 
> On Thu, May 11, 2023 at 1:55 PM Feifei Wang 
> wrote:
> >
> > This patch is to collect empty poll of 'rte_eth_rx_burst' functions in
> > dpdk l3fwd application. Empty poll means Rx burst function receives no
> > pkts in one loop.
> >
> > Furthermore, we also add 'nic_xstats_display' API to show NIC counters.
> >
> > Usage:
> > With this patch, no special settings, just run l3fwd, and when you
> > stoping l3fwd, thread will print the info above.
> >
> > Note:
> > This patch has just a slight impact on performance and can be ignored.
How much is the regression?

> 
> IMO, We should not introduce regression as l3fwd kind of uses as reference
> application.
> I think, l3fwd should limit to stats exposed by ethdev(i.e directly from NIC,
> without performance regression).
Agree L3fwd is the reference app. Unfortunately, it is not in a state to debug 
any problems. May be many are just believing the numbers without understanding 
that there are problems.
Can we place these stats under a run time flag and reduce the impact further?

> 
> 
> 
> >
> > dpdk version:23.03
> >
> > Suggested-by: Lijian Zhang 
> > Signed-off-by: Feifei Wang 
> > Reviewed-by: Ruifeng Wang 
> > Reviewed-by: Honnappa Nagarahalli 
> > ---
> >  examples/l3fwd/l3fwd.h | 68
> ++
> >  examples/l3fwd/l3fwd_lpm.c | 26 +--
> >  examples/l3fwd/main.c  | 22 
> >  3 files changed, 114 insertions(+), 2 deletions(-)
> >
> > diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h index
> > b55855c932..2b3fca62f3 100644
> > --- a/examples/l3fwd/l3fwd.h
> > +++ b/examples/l3fwd/l3fwd.h
> > @@ -56,6 +56,17 @@
> >  #define L3FWD_HASH_ENTRIES (1024*1024*1)
> >  #endif
> >
> > +struct lcore_stats {
> > +uint32_t nb_rx_pkts[16];
> > +uint32_t num_loop[16];
> > +uint32_t none_loop[16];
> > +uint32_t no_full_loop[16];
> > +float  none_loop_per[16];
> > +float no_full_loop_per[16];
> > +} __rte_cache_aligned;
> > +
> > +extern struct lcore_stats stats[RTE_MAX_LCORE];
> > +
> >  struct parm_cfg {
> > const char *rule_ipv4_name;
> > const char *rule_ipv6_name;
> > @@ -115,6 +126,63 @@ extern struct acl_algorithms acl_alg[];
> >
> >  extern uint32_t max_pkt_len;
> >
> > +static inline void
> > +nic_xstats_display(uint32_t port_id)
> > +{
> > +struct rte_eth_xstat *xstats;
> > +int cnt_xstats, idx_xstat;
> > +struct rte_eth_xstat_name *xstats_names;
> > +
> > +printf("## NIC extended statistics for port %-2d\n", port_id);
> > +if (!rte_eth_dev_is_valid_port(port_id)) {
> > +fprintf(stderr, "Error: Invalid port number %i\n", 
> > port_id);
> > +return;
> > +}
> > +
> > +/* Get count */
> > +cnt_xstats = rte_eth_xstats_get_names(port_id, NULL, 0);
> > +if (cnt_xstats  < 0) {
> > +fprintf(stderr, "Error: Cannot get count of xstats\n");
> > +return;
> > +}
> > +
> > +/* Get id-name lookup table */
> > +xstats_names = malloc(sizeof(struct rte_eth_xstat_name) * 
> > cnt_xstats);
> > +if (xstats_names == NULL) {
> > +fprintf(stderr, "Cannot allocate memory for xstats 
> > lookup\n");
> > +return;
> > +}
> > +if (cnt_xstats != rte_eth_xstats_get_names(
> > +port_id, xstats_names, cnt_xstats)) {
> > +fprintf(stderr, "Error: Cannot get xstats lookup\n");
> > +free(xstats_names);
> > +return;
> > +}
> > +
> > +/* Get stats themselves */
> > +xstats = malloc(sizeof(struct rte_eth_xstat) * cnt_xstats);
> > +if (xstats == NULL) {
> > +fprintf(stderr, "Cannot allocate memory for xstats\n");
> > +free(xstats_names);
> > +return;
> > +}
> > +if (cnt_xstats != rte_eth_xstats_get(port_id, xstats, cnt_xstats)) 
> > {
> > +fprintf(stderr, "Error: Unable to get xstats\n");
> > +free(xstats_names);
> > +free(xstats);
> > +return;
> > +}
> > +
> > +/* Display xstats */
> > +for (idx_xstat = 0; idx_xstat < cnt_xstats; idx_xstat++) {
> > +printf("%s: %"PRIu64"\n",
> > +xstats_names[idx_xstat].name,
> > +xstats[idx_xstat].value);
> > +}
> > +free(xstats_names);
> > +free(xstats);
> > +}
> > +
> >  /* Send burst of packets on an output interface */  static inline int
> > send_burst(struct lcore_conf *qconf, uint16_t n, uint16_t port) diff
> > --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c index
> > 4ac1925c84..9e27e954b9 100644
> > --- a/examples/l3fwd/l3fwd_lpm.c
> > +++ b/examples/l3fwd/l3fwd_lpm.c
> > @@ -41,6 +41,8 @@
> >  static struct rte_lpm *ipv4_l3fwd_lpm_lookup_struct[NB_SOCKETS];
> >  

DPDK Release Status Meeting 2023-05-11

[Mcnamara, John]

Release status meeting minutes 2023-05-11
=

Agenda:
* Release Dates
* Subtrees
* Roadmaps
* LTS
* Defects
* Opens

Participants:
* AMD
* ARM
* Intel
* Marvell
* Nvidia
* Red Hat


Release Dates
-

The following are the proposed current dates for 23.07:

* V1:  22 April 2023
* RC1: 31   May 2023
* RC2: 21  June 2023
* RC3: 28  June 2023
* Release: 12  July 2023


Subtrees


* next-net
  * Under review.
  * ~120 patches in backlog.
  * GVE license updated from MIT to FreeBSD

* next-net-intel
  * Some patches are waiting for merge and some under review.
  * Seeking community input on adapting DPDK to P4 Runtime backend:
http://mails.dpdk.org/archives/dev/2023-May/267719.html

* next-net-mlx
  * No update

* next-net-mvl
  * Some patches merged.
  * ~30 patches remaining.

* next-eventdev
  * Some patches merged.
  * AMD patches under review

* next-baseband
  * No major patches in this release.

* next-virtio
  * Reviews ongoing
  * Intel series for port mirroring
* Some concerns on code duplication and API complexity
  * Report of performance degradation in vhost driver
  * New series on guest notifications in slow path
  * VDUSE - Vhost VDPA in userspace. https://lwn.net/Articles/841054/
* Under review

* next-crypto
  * 60-70 patches in backlog
  * Patches to add new algorithms
  * Reviewing PDCP patches
  * Reviews and merges ongoing

* main
  * Starting to merge patches to improve the Windows port
  * Reviewing ethdev patches
  * Patches from ARM for PMU
* Postponed from last release
* For tracing
* Awaiting feedback on comments
  * Power Management feature from AMD
  * Memarea feature
  * CDX bus patches from AMD
* Virtual PCI like bus
  * New checkpatch checks for atomic functions
  * Issues with Fedora 38 and GCC 13
* Fixes merged

  * Call for updates to the external Roadmap:
https://core.dpdk.org/roadmap/


* Static code analysis


Proposed Schedule for 2023
--

See also http://core.dpdk.org/roadmap/#dates

23.07
  * Proposal deadline (RFC/v1 patches): 22 April 2023
  * API freeze (-rc1): 31 May 2023
  * PMD features freeze (-rc2): 21 June 2023
  * Builtin applications features freeze (-rc3): 28 June 2023
  * Release: 12 July 2023

23.11
  * Proposal deadline (RFC/v1 patches): 12 August 2023
  * API freeze (-rc1): 29 September 2023
  * PMD features freeze (-rc2): 20 October 2023
  * Builtin applications features freeze (-rc3): 27 October 2023
  * Release: 15 November 2023


LTS
---

Next LTS releases will be:

* 22.11.1
  * Released on May 7
* 21.11.4
  * Some issues found in Intel testing - under investigation.
* 20.11.8
  * Released on April 27
* 19.11.15
  * Will be updated with CVE and critical fixes only.


* Distros
  * v20.11 in Debian 11
  * Ubuntu 22.04-LTS contains 21.11
  * Ubuntu 23.04 contains 22.11

Defects
---

* Bugzilla links, 'Bugs',  added for hosted projects
  * https://www.dpdk.org/hosted-projects/



DPDK Release Status Meetings


The DPDK Release Status Meeting is intended for DPDK Committers to discuss the
status of the master tree and sub-trees, and for project managers to track
progress or milestone dates.

The meeting occurs on every Thursday at 9:30 UTC over Jitsi on 
https://meet.jit.si/DPDK

You don't need an invite to join the meeting but if you want a calendar 
reminder just
send an email to "John McNamara john.mcnam...@intel.com" for the invite.

[PATCH] crypto/openssl: fix memory free issue

[Ciara Power]

From: Saoirse O'Donovan 

Allocated memory was being freed using 'free' when it should have been
freed using 'OPENSSL_free'. This has now been modified so that the
correct method is used to free allocated memory.

Coverity issue: 384415
Fixes: 4c7ae22f1f83 ("crypto/openssl: update DSA routine with 3.0 EVP API")
Cc: kai...@intel.com
Cc: sta...@dpdk.org

Signed-off-by: Saoirse O'Donovan 
Signed-off-by: Ciara Power 
---
 drivers/crypto/openssl/rte_openssl_pmd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c 
b/drivers/crypto/openssl/rte_openssl_pmd.c
index 384d262621..f65fbca300 100644
--- a/drivers/crypto/openssl/rte_openssl_pmd.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd.c
@@ -1927,7 +1927,7 @@ process_openssl_dsa_sign_op_evp(struct rte_crypto_op *cop,
 
if (EVP_PKEY_sign(dsa_ctx, dsa_sign_data, &outlen, op->message.data,
op->message.length) <= 0) {
-   free(dsa_sign_data);
+   OPENSSL_free(dsa_sign_data);
goto err_dsa_sign;
}
 
@@ -1935,7 +1935,7 @@ process_openssl_dsa_sign_op_evp(struct rte_crypto_op *cop,
DSA_SIG *sign = d2i_DSA_SIG(NULL, &dsa_sign_data_p, outlen);
if (!sign) {
OPENSSL_LOG(ERR, "%s:%d\n", __func__, __LINE__);
-   free(dsa_sign_data);
+   OPENSSL_free(dsa_sign_data);
goto err_dsa_sign;
} else {
const BIGNUM *r = NULL, *s = NULL;
@@ -1947,7 +1947,7 @@ process_openssl_dsa_sign_op_evp(struct rte_crypto_op *cop,
}
 
DSA_SIG_free(sign);
-   free(dsa_sign_data);
+   OPENSSL_free(dsa_sign_data);
return 0;
 
 err_dsa_sign:
-- 
2.25.1

[Bug 1229] rte_mempool_avail_count : returns bigger than mempool size

[bugzilla]

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

Bug ID: 1229
   Summary: rte_mempool_avail_count : returns bigger than mempool
size
   Product: DPDK
   Version: 22.11
  Hardware: x86
OS: Linux
Status: UNCONFIRMED
  Severity: minor
  Priority: Normal
 Component: core
  Assignee: dev@dpdk.org
  Reporter: yasinnca...@gmail.com
  Target Milestone: ---

Hello,

Sometimes rte_mempool_avail_count function returns bigger than mempool size
that cause mis-calculation/overflow/negative of in-use count  (
rte_mempool_in_use_count)


11:51:48 NOTI [UseCount_mpool:0065][avail_mpool:00010334]
11:51:48 NOTI [UseCount_mpool:4294967135][avail_mpool:00010560]


After adding a condition, it is fixed.

/* Return the number of entries in the mempool */
unsigned int
rte_mempool_avail_count(const struct rte_mempool *mp)
{
unsigned count;
unsigned lcore_id;

count = rte_mempool_ops_get_count(mp);

if (mp->cache_size == 0){
if (count > mp->size){
return mp->size;
}
return count;
}
for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++)
count += mp->local_cache[lcore_id].len;

/*
 * due to race condition (access to len is not locked), the
 * total can be greater than size... so fix the result
 */
if (count > mp->size){
return mp->size;
}
return count;
}

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

Re: [PATCH v2] vfio: do not coalesce DMA mappings

[Burakov, Anatoly]

On 5/10/2023 1:58 PM, Nipun Gupta wrote:



On 4/24/2023 8:52 PM, David Marchand wrote:


Hello Anatoly,

On Wed, Apr 5, 2023 at 4:17 PM Burakov, Anatoly
 wrote:

Could you please provide some steps to reproduce the hotplug issue
you're having? It would be great to have a test case for this patchset
to put it in context.


I am working on CDX bus
(http://patchwork.dpdk.org/project/dpdk/patch/20230124140746.594066-2-nipun.gu...@amd.com/)
 and trying out some cases for plug/unplug.

The test is as follows:
    # Run testpmd application
    ./dpdk-testpmd -c 0x3 -- -i --nb-cores=1

    # Bind to VFIO
    echo "vfio-cdx" >  /sys/bus/cdx/devices/cdx-00\:00/driver_override
    echo "cdx-00:00" > /sys/bus/cdx/drivers_probe

    # Plug a device
    testpmd> port attach cdx:cdx-00:00

    #quit testpmd
    testpmd> quit

This gave error at testpmd exit that memory cannot be freed. On
debugging I updated this code and seems it should be seen with any of
the device.

I see similar test case (without quit) mentioned
https://doc.dpdk.org/dts/test_plans/hotplug_test_plan.html, but the
difference is that it is with igb_uio and issue is being observed with
VFIO.

Please note the device/bus mentioned in the commands is not yet
upstreamed in DPDK, but patches would be sent out soon.

Thanks,
Nipun



Thanks, I can reproduce this issue with regular devices too (run testpmd
with no devices, bind a NIC to VFIO, attach it, then quit). You're
correct in that since the initial mapping was done with mapping large
contiguous zones (such as when mempools are created before attach), any
subsequent freeing of memory will cause these errors to happen.

I don't think this can be fixed by anything other than not doing the
contiguous mapping thing, so provisionally, I think this patch should be
accepted. I'll play around with it some more and get back to you :)


Can we conclude on this topic?
It is best we merge this kind of change the sooner possible for a 
release.


Hi Anatoly,
 Can you kindly update on this?



Hi all,

apologies for late reply.

Reviewed-by: Anatoly Burakov 

--
Thanks,
Anatoly

RE: [PATCH] crypto/openssl: fix memory free issue

[Ji, Kai]

Acked-by: Kai Ji 

> -Original Message-
> From: Power, Ciara 
> Sent: Thursday, May 11, 2023 3:00 PM
> To: Ji, Kai 
> Cc: dev@dpdk.org; O'Donovan, Saoirse ;
> sta...@dpdk.org; Power, Ciara 
> Subject: [PATCH] crypto/openssl: fix memory free issue
> 
> From: Saoirse O'Donovan 
> 
> Allocated memory was being freed using 'free' when it should have been
> freed using 'OPENSSL_free'. This has now been modified so that the correct
> method is used to free allocated memory.
> 
> Coverity issue: 384415
> Fixes: 4c7ae22f1f83 ("crypto/openssl: update DSA routine with 3.0 EVP API")
> Cc: kai...@intel.com
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Saoirse O'Donovan 
> Signed-off-by: Ciara Power 
> ---

Re: [PATCH 00/13] Sync the kernel driver logic

[Niklas Söderlund]

Hi all,

A gentle ping on this series.

It touches a lot of files when syncing the PMD with the kernel driver, 
and to avoid conflicts with future work, it would be kind if this could 
be looked at early in the release cycle.

On 2023-04-10 19:00:02 +0800, Chaoyong He wrote:
> The DPDK NFP PMD share the same underlying data structure and API with
> the NFP kernel driver, because they use the same firmware.
> 
> The DPDK NFP PMD only has a very initial version and not changed for a
> long time, but the NFP kernel driver keeps evolve at the same time, so
> the differece between them are keeping expand.
> 
> This patch series try to sync the needed logics to narrow the gap.
> 
> Chaoyong He (13):
>   net/nfp: define correct size for configuration BAR
>   net/nfp: move shared target logic to own source file
>   net/nfp: remove the redundant macro about CPP target
>   net/nfp: drop usage of return error helpers
>   net/nfp: use generic macros for array size and to set bits
>   net/nfp: remove dead code related to CPP
>   net/nfp: remove duplicated nffw defines
>   net/nfp: move NFD3 logic to own source file
>   net/nfp: adjust the coding style for NFD3
>   net/nfp: rename macro name of NFD3 Tx descriptor
>   net/nfp: move NFDk logic to own source file
>   net/nfp: adjust the coding style for NFDk
>   net/nfp: modify the logic of some NFDk function
> 
>  drivers/net/nfp/flower/nfp_flower.c   |   9 +-
>  drivers/net/nfp/flower/nfp_flower_ctrl.c  |   3 +-
>  .../net/nfp/flower/nfp_flower_representor.c   |   1 +
>  drivers/net/nfp/meson.build   |   3 +
>  drivers/net/nfp/nfd3/nfp_nfd3.h   | 161 +++
>  drivers/net/nfp/nfd3/nfp_nfd3_dp.c| 343 ++
>  drivers/net/nfp/nfdk/nfp_nfdk.h   | 239 +
>  drivers/net/nfp/nfdk/nfp_nfdk_dp.c| 437 
>  drivers/net/nfp/nfp_common.c  |   6 +-
>  drivers/net/nfp/nfp_cpp_bridge.c  |   5 +-
>  drivers/net/nfp/nfp_ctrl.h|   7 +-
>  drivers/net/nfp/nfp_ethdev.c  |   5 +-
>  drivers/net/nfp/nfp_ethdev_vf.c   |   2 +
>  drivers/net/nfp/nfp_rxtx.c| 844 +--
>  drivers/net/nfp/nfp_rxtx.h| 208 +---
>  .../net/nfp/nfpcore/nfp-common/nfp_cppat.h| 725 -
>  .../net/nfp/nfpcore/nfp-common/nfp_platform.h |  35 -
>  .../net/nfp/nfpcore/nfp-common/nfp_resid.h| 592 ---
>  drivers/net/nfp/nfpcore/nfp6000/nfp6000.h |  20 +
>  drivers/net/nfp/nfpcore/nfp_cpp.h | 155 ++-
>  drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c|   3 +-
>  drivers/net/nfp/nfpcore/nfp_cppcore.c |  47 +-
>  drivers/net/nfp/nfpcore/nfp_hwinfo.h  |   2 +-
>  drivers/net/nfp/nfpcore/nfp_mutex.c   |  39 +-
>  drivers/net/nfp/nfpcore/nfp_nffw.c|   8 +-
>  drivers/net/nfp/nfpcore/nfp_nffw.h|  10 -
>  drivers/net/nfp/nfpcore/nfp_nsp.c |   2 +-
>  drivers/net/nfp/nfpcore/nfp_nsp.h |  12 +-
>  drivers/net/nfp/nfpcore/nfp_nsp_cmds.c|   2 +-
>  drivers/net/nfp/nfpcore/nfp_nsp_eth.c |  34 +-
>  drivers/net/nfp/nfpcore/nfp_resource.c|   2 +-
>  drivers/net/nfp/nfpcore/nfp_target.c  | 994 ++
>  drivers/net/nfp/nfpcore/nfp_target.h  |   3 -
>  33 files changed, 2417 insertions(+), 2541 deletions(-)
>  create mode 100644 drivers/net/nfp/nfd3/nfp_nfd3.h
>  create mode 100644 drivers/net/nfp/nfd3/nfp_nfd3_dp.c
>  create mode 100644 drivers/net/nfp/nfdk/nfp_nfdk.h
>  create mode 100644 drivers/net/nfp/nfdk/nfp_nfdk_dp.c
>  delete mode 100644 drivers/net/nfp/nfpcore/nfp-common/nfp_cppat.h
>  delete mode 100644 drivers/net/nfp/nfpcore/nfp-common/nfp_platform.h
>  delete mode 100644 drivers/net/nfp/nfpcore/nfp-common/nfp_resid.h
>  create mode 100644 drivers/net/nfp/nfpcore/nfp_target.c
> 
> -- 
> 2.39.1
> 

-- 
Kind Regards,
Niklas Söderlund

[PATCH v2] vhost: fix crash on vhost-user client port deletion

[suntianyuan]

The rte_vhost_driver_unregister() and vhost_user_read_cb() can be
called at the same time by 2 threads. reconn may be added back to
reconn_list by vhost_user_read_cb() after rte_vhost_driver_unregister()
removed from reconn_list. Then rte_vhost_driver_unregister free vsocket,
cause vhost_user_client_reconnect access invalid vsocket memory.

Timeline is as below:
rte_vhost_driver_unregister thread execute vhost_user_remove_reconnect
vhost_user_read_cb thread execute vhost_user_start_client add reconn to
reconn_list
vhost_user_read_cb thread free conn
rte_vhost_driver_unregister thread cannot find conn, then execute
vhost_user_socket_mem_free
vhost_user_client_reconnect access invalid mem, crash

Signed-off-by: suntianyuan 
---
v2:
* Fixed coding style issues.

 lib/vhost/socket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c
index 669c322e12..72c776d15c 100644
--- a/lib/vhost/socket.c
+++ b/lib/vhost/socket.c
@@ -1046,8 +1046,6 @@ rte_vhost_driver_unregister(const char *path)
pthread_mutex_unlock(&vhost_user.mutex);
goto again;
}
-   } else if (vsocket->reconnect) {
-   vhost_user_remove_reconnect(vsocket);
}
 
pthread_mutex_lock(&vsocket->conn_mutex);
@@ -1080,6 +1078,8 @@ rte_vhost_driver_unregister(const char *path)
if (vsocket->is_server) {
close(vsocket->socket_fd);
unlink(path);
+   } else if (vsocket->reconnect) {
+   vhost_user_remove_reconnect(vsocket);
}
 
pthread_mutex_destroy(&vsocket->conn_mutex);
-- 
2.32.0 (Apple Git-132)

Re: [PATCH] examples/l3fwd: add hard code to collect empty poll and NIC counters

[Stephen Hemminger]

On Thu, 11 May 2023 16:25:19 +0800
Feifei Wang  wrote:

> This patch is to collect empty poll of 'rte_eth_rx_burst' functions in
> dpdk l3fwd application. Empty poll means Rx burst function receives no
> pkts in one loop.
> 
> Furthermore, we also add 'nic_xstats_display' API to show NIC counters.
> 
> Usage:
> With this patch, no special settings, just run l3fwd, and when you
> stoping l3fwd, thread will print the info above.
> 
> Note:
> This patch has just a slight impact on performance and can be ignored.

There was a set of other patches around telemetry.
Shouldn't this example use some of that rather than "roll your own"?

> 
> dpdk version:23.03
> 
> Suggested-by: Lijian Zhang 
> Signed-off-by: Feifei Wang 
> Reviewed-by: Ruifeng Wang 
> Reviewed-by: Honnappa Nagarahalli 
> ---
>  examples/l3fwd/l3fwd.h | 68 ++
>  examples/l3fwd/l3fwd_lpm.c | 26 +--
>  examples/l3fwd/main.c  | 22 
>  3 files changed, 114 insertions(+), 2 deletions(-)
> 
> diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
> index b55855c932..2b3fca62f3 100644
> --- a/examples/l3fwd/l3fwd.h
> +++ b/examples/l3fwd/l3fwd.h
> @@ -56,6 +56,17 @@
>  #define L3FWD_HASH_ENTRIES   (1024*1024*1)
>  #endif
>  
> +struct lcore_stats {
> +uint32_t nb_rx_pkts[16];
> +uint32_t num_loop[16];
> +uint32_t none_loop[16];
> +uint32_t no_full_loop[16];
> +float  none_loop_per[16];
> +float no_full_loop_per[16];
> +} __rte_cache_aligned;

What is the 16 magic value?

Use double instead of float to keep more accuracy?

There maybe holes in this structure?

You may want to allocate it at runtime based on number of actual
cores and get it on the right NUMA node.

> +
> +extern struct lcore_stats stats[RTE_MAX_LCORE];
> +
>  struct parm_cfg {
>   const char *rule_ipv4_name;
>   const char *rule_ipv6_name;
> @@ -115,6 +126,63 @@ extern struct acl_algorithms acl_alg[];
>  
>  extern uint32_t max_pkt_len;
>  
> +static inline void
> +nic_xstats_display(uint32_t port_id)
> +{
> +struct rte_eth_xstat *xstats;
> +int cnt_xstats, idx_xstat;
> +struct rte_eth_xstat_name *xstats_names;
> +
> +printf("## NIC extended statistics for port %-2d\n", port_id);
> +if (!rte_eth_dev_is_valid_port(port_id)) {
> +fprintf(stderr, "Error: Invalid port number %i\n", port_id);
> +return;
> +}
> +
> +/* Get count */
> +cnt_xstats = rte_eth_xstats_get_names(port_id, NULL, 0);
> +if (cnt_xstats  < 0) {
> +fprintf(stderr, "Error: Cannot get count of xstats\n");
> +return;
> +}
> +
> +/* Get id-name lookup table */
> +xstats_names = malloc(sizeof(struct rte_eth_xstat_name) * 
> cnt_xstats);
> +if (xstats_names == NULL) {
> +fprintf(stderr, "Cannot allocate memory for xstats 
> lookup\n");
> +return;
> +}
> +if (cnt_xstats != rte_eth_xstats_get_names(
> +port_id, xstats_names, cnt_xstats)) {
> +fprintf(stderr, "Error: Cannot get xstats lookup\n");
> +free(xstats_names);
> +return;
> +}
> +
> +/* Get stats themselves */
> +xstats = malloc(sizeof(struct rte_eth_xstat) * cnt_xstats);
> +if (xstats == NULL) {
> +fprintf(stderr, "Cannot allocate memory for xstats\n");
> +free(xstats_names);
> +return;
> +}
> +if (cnt_xstats != rte_eth_xstats_get(port_id, xstats, cnt_xstats)) {
> +fprintf(stderr, "Error: Unable to get xstats\n");
> +free(xstats_names);
> +free(xstats);
> +return;
> +}
> +
> +/* Display xstats */
> +for (idx_xstat = 0; idx_xstat < cnt_xstats; idx_xstat++) {
> +printf("%s: %"PRIu64"\n",
> +xstats_names[idx_xstat].name,
> +xstats[idx_xstat].value);
> +}
> +free(xstats_names);
> +free(xstats);
> +}
> +
>  /* Send burst of packets on an output interface */
>  static inline int
>  send_burst(struct lcore_conf *qconf, uint16_t n, uint16_t port)
> diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
> index 4ac1925c84..9e27e954b9 100644
> --- a/examples/l3fwd/l3fwd_lpm.c
> +++ b/examples/l3fwd/l3fwd_lpm.c
> @@ -41,6 +41,8 @@
>  static struct rte_lpm *ipv4_l3fwd_lpm_lookup_struct[NB_SOCKETS];
>  static struct rte_lpm6 *ipv6_l3fwd_lpm_lookup_struct[NB_SOCKETS];
>  
> +extern struct lcore_stats stats[RTE_MAX_LCORE];
> +
>  /* Performing LPM-based lookups. 8< */
>  static inline uint16_t
>  lpm_get_ipv4_dst_port(const struct rte_ipv4_hdr *ipv4_hdr,
> @@ -153,6 +155,7 @@ lpm_main_loop(__rte_unused void *dummy)
>   struct lcore_conf *qconf;
>   const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_

[PATCH v2] eal: add tracepoints to track lcores and services

[Arnaud Fiorini]

The tracepoints added are used to track lcore role and status,
as well as service mapping and service runstates. These
tracepoints are then used in analyses in Trace Compass.

Signed-off-by: Arnaud Fiorini 
---
 .mailmap |  1 +
 doc/guides/prog_guide/service_cores.rst  | 18 +++
 lib/eal/common/eal_common_thread.c   |  4 ++
 lib/eal/common/eal_common_trace_points.c | 21 +
 lib/eal/common/rte_service.c | 17 ++-
 lib/eal/include/eal_trace_internal.h | 60 
 6 files changed, 120 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 0859104404..6453cb2aa5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -120,6 +120,7 @@ Archana Muniganti  

 Archit Pandey 
 Arkadiusz Kubalewski 
 Arkadiusz Kusztal 
+Arnaud Fiorini 
 Arnon Warshavsky 
 Arshdeep Kaur 
 Artem V. Andreev 
diff --git a/doc/guides/prog_guide/service_cores.rst 
b/doc/guides/prog_guide/service_cores.rst
index 270b875783..9ef6580128 100644
--- a/doc/guides/prog_guide/service_cores.rst
+++ b/doc/guides/prog_guide/service_cores.rst
@@ -52,3 +52,21 @@ The service core library is capable of collecting runtime 
statistics like number
 of calls to a specific service, and number of cycles used by the service. The
 cycle count collection is dynamically configurable, allowing any application to
 profile the services running on the system at any time.
+
+Service Core Tracing
+
+
+The service core library is instrumented with tracepoints using the DPDK Trace
+Library. These tracepoints allow you to track the service and logical cores
+state. The tracepoints that are on the fast path are compiled out by default.
+To activate the fast path tracepoints, it is necessary to add the
+``enable_trace_fp`` option when building DPDK using meson.
+
+To activate tracing when launching a DPDK program it is necessary to use the
+``--trace`` option to specify a regular expression to select which tracepoints
+to enable. Here is an example if you want to only specify service core 
tracing::
+
+./dpdk/examples/service_cores/build/service_cores 
--trace="lib.eal.thread*" --trace="lib.eal.service*"
+
+See the `DPDK Trace Library 
`_
+for details.
diff --git a/lib/eal/common/eal_common_thread.c 
b/lib/eal/common/eal_common_thread.c
index 079a385630..25dbdd68e3 100644
--- a/lib/eal/common/eal_common_thread.c
+++ b/lib/eal/common/eal_common_thread.c
@@ -205,6 +205,8 @@ eal_thread_loop(void *arg)
__ATOMIC_ACQUIRE)) == NULL)
rte_pause();
 
+   rte_eal_trace_thread_lcore_running(lcore_id, f);
+
/* call the function and store the return value */
fct_arg = lcore_config[lcore_id].arg;
ret = f(fct_arg);
@@ -219,6 +221,8 @@ eal_thread_loop(void *arg)
 */
__atomic_store_n(&lcore_config[lcore_id].state, WAIT,
__ATOMIC_RELEASE);
+
+   rte_eal_trace_thread_lcore_stopped(lcore_id);
}
 
/* never reached */
diff --git a/lib/eal/common/eal_common_trace_points.c 
b/lib/eal/common/eal_common_trace_points.c
index 3f5bf5c55c..0f1240ea3a 100644
--- a/lib/eal/common/eal_common_trace_points.c
+++ b/lib/eal/common/eal_common_trace_points.c
@@ -70,6 +70,27 @@ RTE_TRACE_POINT_REGISTER(rte_eal_trace_thread_remote_launch,
lib.eal.thread.remote.launch)
 RTE_TRACE_POINT_REGISTER(rte_eal_trace_thread_lcore_ready,
lib.eal.thread.lcore.ready)
+RTE_TRACE_POINT_REGISTER(rte_eal_trace_thread_lcore_running,
+   lib.eal.thread.lcore.running)
+RTE_TRACE_POINT_REGISTER(rte_eal_trace_thread_lcore_stopped,
+   lib.eal.thread.lcore.stopped)
+
+RTE_TRACE_POINT_REGISTER(rte_eal_trace_service_map_lcore,
+   lib.eal.service.map.lcore)
+RTE_TRACE_POINT_REGISTER(rte_eal_trace_service_lcore_state_change,
+   lib.eal.service.lcore.state.change)
+RTE_TRACE_POINT_REGISTER(rte_eal_trace_service_lcore_start,
+   lib.eal.service.lcore.start)
+RTE_TRACE_POINT_REGISTER(rte_eal_trace_service_lcore_stop,
+   lib.eal.service.lcore.stop)
+RTE_TRACE_POINT_REGISTER(rte_eal_trace_service_run_begin,
+   lib.eal.service.run.begin)
+RTE_TRACE_POINT_REGISTER(rte_eal_trace_service_runstate_set,
+   lib.eal.service.run.state.set)
+RTE_TRACE_POINT_REGISTER(rte_eal_trace_service_run_end,
+   lib.eal.service.run.end)
+RTE_TRACE_POINT_REGISTER(rte_eal_trace_service_component_register,
+   lib.eal.service.component.register)
 
 RTE_TRACE_POINT_REGISTER(rte_eal_trace_intr_callback_register,
lib.eal.intr.register)
diff --git a/lib/eal/common/rte_service.c b/lib/eal/common/rte_service.c
index 7ab48f2be8..94e872a08a 100644
--- a/lib/eal/common/rte_service.c
+++ b/lib/eal/common/rte_service.c
@@ -9,6 +9,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -16,6 +17,7 @@
 #include 
 #include 
 #include 
+#include

Re: [PATCH v2] eal: add tracepoints to track lcores and services

[Stephen Hemminger]

On Thu, 11 May 2023 20:16:28 +
Arnaud Fiorini  wrote:

> +The service core library is instrumented with tracepoints using the DPDK 
> Trace
> +Library. These tracepoints allow you to track the service and logical cores
> +state. The tracepoints that are on the fast path are compiled out by default.
> +To activate the fast path tracepoints, it is necessary to add the
> +``enable_trace_fp`` option when building DPDK using meson.
> +
> +To activate tracing when launching a DPDK program it is necessary to use the
> +``--trace`` option to specify a regular expression to select which 
> tracepoints
> +to enable. Here is an example if you want to only specify service core 
> tracing::
> +
> +./dpdk/examples/service_cores/build/service_cores 
> --trace="lib.eal.thread*" --trace="lib.eal.service*"
> +

These state changes are not in the hot path. So they should always be available?

Re: [PATCH v2] eal: add tracepoints to track lcores and services

[Arnaud Fiorini]

On 2023-05-11 4:50 p.m., Stephen Hemminger wrote:

On Thu, 11 May 2023 20:16:28 +
Arnaud Fiorini  wrote:


+The service core library is instrumented with tracepoints using the DPDK Trace
+Library. These tracepoints allow you to track the service and logical cores
+state. The tracepoints that are on the fast path are compiled out by default.
+To activate the fast path tracepoints, it is necessary to add the
+``enable_trace_fp`` option when building DPDK using meson.
+
+To activate tracing when launching a DPDK program it is necessary to use the
+``--trace`` option to specify a regular expression to select which tracepoints
+to enable. Here is an example if you want to only specify service core 
tracing::
+
+./dpdk/examples/service_cores/build/service_cores --trace="lib.eal.thread*" 
--trace="lib.eal.service*"
+

These state changes are not in the hot path. So they should always be available?


Some of the tracepoints (rte_eal_trace_thread_lcore_running, 
rte_eal_trace_thread_lcore_stopped, rte_eal_trace_service_run_begin) are 
defined as fast path tracepoints. If these changes do not need to be in 
the fast path, I can change their definition.

Re: [PATCH v2] eal: add tracepoints to track lcores and services

[Stephen Hemminger]

On Thu, 11 May 2023 17:01:48 -0400
Arnaud Fiorini  wrote:

> On 2023-05-11 4:50 p.m., Stephen Hemminger wrote:
> > On Thu, 11 May 2023 20:16:28 +
> > Arnaud Fiorini  wrote:
> >  
> >> +The service core library is instrumented with tracepoints using the DPDK 
> >> Trace
> >> +Library. These tracepoints allow you to track the service and logical 
> >> cores
> >> +state. The tracepoints that are on the fast path are compiled out by 
> >> default.
> >> +To activate the fast path tracepoints, it is necessary to add the
> >> +``enable_trace_fp`` option when building DPDK using meson.
> >> +
> >> +To activate tracing when launching a DPDK program it is necessary to use 
> >> the
> >> +``--trace`` option to specify a regular expression to select which 
> >> tracepoints
> >> +to enable. Here is an example if you want to only specify service core 
> >> tracing::
> >> +
> >> +./dpdk/examples/service_cores/build/service_cores 
> >> --trace="lib.eal.thread*" --trace="lib.eal.service*"
> >> +  
> > These state changes are not in the hot path. So they should always be 
> > available?  
> 
> Some of the tracepoints (rte_eal_trace_thread_lcore_running, 
> rte_eal_trace_thread_lcore_stopped, rte_eal_trace_service_run_begin) are 
> defined as fast path tracepoints. If these changes do not need to be in 
> the fast path, I can change their definition.
> 

Only inside the loop itself, ie polling is really fast path.
State transitions are not.

RE: [PATCH v3 0/2] enhance bonding PMD to support the LACP negotiation

[Chaoyong He]

A gentle ping on this series.

There has a large patch series enhance the bonding PMD depends on this series 
is waiting for send out, it would be kind if this could be looked at early in 
this release cycle.

> -Original Message-
> From: Chaoyong He
> Sent: Wednesday, March 1, 2023 10:49 AM
> To: dev@dpdk.org
> Cc: oss-drivers ; Niklas Soderlund
> ; Chaoyong He
> 
> Subject: [PATCH v3 0/2] enhance bonding PMD to support the LACP
> negotiation
> 
> App may not support the LACP negotiation in some cases.
> This patch series solves this problem and add logics to testpmd app to support
> the forward of bonding port in mode 4 with the disabled dedicated queue.
> 
> ---
> v2:
> * Export symbol to solve the link problem.
> v3:
> * Add 'rte_experimental' flags to new add API.
> * Move '#ifdef RTE_NET_BOND' into function.
> * Replace 'slave' with 'member' in new add logic.
> ---
> 
> Long Wu (2):
>   net/bonding: add independent LACP sending function
>   app/testpmd: add support for bonding port's LACP negotiation
> 
>  app/test-pmd/config.c | 19 
>  app/test-pmd/parameters.c |  4 ++
>  app/test-pmd/testpmd.c| 37 +++
>  app/test-pmd/testpmd.h|  4 ++
>  doc/guides/testpmd_app_ug/run_app.rst |  4 ++
>  drivers/net/bonding/rte_eth_bond_8023ad.c | 58
> +++  drivers/net/bonding/rte_eth_bond_8023ad.h
> | 21 
>  drivers/net/bonding/version.map   |  8 
>  8 files changed, 155 insertions(+)
> 
> --
> 2.39.1

RE: [PATCH] examples/l3fwd: add hard code to collect empty poll and NIC counters

[Feifei Wang]

> -Original Message-
> From: Honnappa Nagarahalli 
> Sent: Thursday, May 11, 2023 9:32 PM
> To: Jerin Jacob ; Feifei Wang
> 
> Cc: dev@dpdk.org; nd ; Lijian Zhang
> ; Ruifeng Wang ; nd
> 
> Subject: RE: [PATCH] examples/l3fwd: add hard code to collect empty poll and
> NIC counters
> 
> 
> 
> >
> > On Thu, May 11, 2023 at 1:55 PM Feifei Wang 
> > wrote:
> > >
> > > This patch is to collect empty poll of 'rte_eth_rx_burst' functions
> > > in dpdk l3fwd application. Empty poll means Rx burst function
> > > receives no pkts in one loop.
> > >
> > > Furthermore, we also add 'nic_xstats_display' API to show NIC counters.
> > >
> > > Usage:
> > > With this patch, no special settings, just run l3fwd, and when you
> > > stoping l3fwd, thread will print the info above.
> > >
> > > Note:
> > > This patch has just a slight impact on performance and can be ignored.
> How much is the regression?

[Feifei] It is about 1% ~ 2%.

> 
> >
> > IMO, We should not introduce regression as l3fwd kind of uses as
> > reference application.
> > I think, l3fwd should limit to stats exposed by ethdev(i.e directly
> > from NIC, without performance regression).
> Agree L3fwd is the reference app. Unfortunately, it is not in a state to debug
> any problems. May be many are just believing the numbers without
> understanding that there are problems.
> Can we place these stats under a run time flag and reduce the impact further?
> 
> >
> >
> >
> > >
> > > dpdk version:23.03
> > >
> > > Suggested-by: Lijian Zhang 
> > > Signed-off-by: Feifei Wang 
> > > Reviewed-by: Ruifeng Wang 
> > > Reviewed-by: Honnappa Nagarahalli 
> > > ---
> > >  examples/l3fwd/l3fwd.h | 68
> > ++
> > >  examples/l3fwd/l3fwd_lpm.c | 26 +--
> > >  examples/l3fwd/main.c  | 22 
> > >  3 files changed, 114 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h index
> > > b55855c932..2b3fca62f3 100644
> > > --- a/examples/l3fwd/l3fwd.h
> > > +++ b/examples/l3fwd/l3fwd.h
> > > @@ -56,6 +56,17 @@
> > >  #define L3FWD_HASH_ENTRIES (1024*1024*1)
> > >  #endif
> > >
> > > +struct lcore_stats {
> > > +uint32_t nb_rx_pkts[16];
> > > +uint32_t num_loop[16];
> > > +uint32_t none_loop[16];
> > > +uint32_t no_full_loop[16];
> > > +float  none_loop_per[16];
> > > +float no_full_loop_per[16];
> > > +} __rte_cache_aligned;
> > > +
> > > +extern struct lcore_stats stats[RTE_MAX_LCORE];
> > > +
> > >  struct parm_cfg {
> > > const char *rule_ipv4_name;
> > > const char *rule_ipv6_name;
> > > @@ -115,6 +126,63 @@ extern struct acl_algorithms acl_alg[];
> > >
> > >  extern uint32_t max_pkt_len;
> > >
> > > +static inline void
> > > +nic_xstats_display(uint32_t port_id) {
> > > +struct rte_eth_xstat *xstats;
> > > +int cnt_xstats, idx_xstat;
> > > +struct rte_eth_xstat_name *xstats_names;
> > > +
> > > +printf("## NIC extended statistics for port %-2d\n", 
> > > port_id);
> > > +if (!rte_eth_dev_is_valid_port(port_id)) {
> > > +fprintf(stderr, "Error: Invalid port number %i\n", 
> > > port_id);
> > > +return;
> > > +}
> > > +
> > > +/* Get count */
> > > +cnt_xstats = rte_eth_xstats_get_names(port_id, NULL, 0);
> > > +if (cnt_xstats  < 0) {
> > > +fprintf(stderr, "Error: Cannot get count of xstats\n");
> > > +return;
> > > +}
> > > +
> > > +/* Get id-name lookup table */
> > > +xstats_names = malloc(sizeof(struct rte_eth_xstat_name) *
> cnt_xstats);
> > > +if (xstats_names == NULL) {
> > > +fprintf(stderr, "Cannot allocate memory for xstats 
> > > lookup\n");
> > > +return;
> > > +}
> > > +if (cnt_xstats != rte_eth_xstats_get_names(
> > > +port_id, xstats_names, cnt_xstats)) {
> > > +fprintf(stderr, "Error: Cannot get xstats lookup\n");
> > > +free(xstats_names);
> > > +return;
> > > +}
> > > +
> > > +/* Get stats themselves */
> > > +xstats = malloc(sizeof(struct rte_eth_xstat) * cnt_xstats);
> > > +if (xstats == NULL) {
> > > +fprintf(stderr, "Cannot allocate memory for xstats\n");
> > > +free(xstats_names);
> > > +return;
> > > +}
> > > +if (cnt_xstats != rte_eth_xstats_get(port_id, xstats, 
> > > cnt_xstats)) {
> > > +fprintf(stderr, "Error: Unable to get xstats\n");
> > > +free(xstats_names);
> > > +free(xstats);
> > > +return;
> > > +}
> > > +
> > > +/* Display xstats */
> > > +for (idx_xstat = 0; idx_xstat < cnt_xstats; idx_xstat++) {
> > > +printf("%s: %"PRIu64"\n",
> > > +xstats_names[idx_xsta

[PATCH] net/nfp: fix the VLAN push flow action

[Chaoyong He]

When process VLAN push flow action, the former logic perform the
mask and shift operations directly on the big endian data, which
cause both the pcp and VLAN id are not correct for offloaded packets.

Fix it by convert the data from big endian to CPU endian before
perform the mask and shift operations.

Fixes: eb9277cb2fd1 ("net/nfp: support VLAN push flow action")
Cc: sta...@dpdk.org

Signed-off-by: Chaoyong He 
Reviewed-by: Niklas Söderlund 
---
 drivers/net/nfp/nfp_flow.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index 41b722f4d8..fdf5c0f40e 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -2205,6 +2205,8 @@ static int
 nfp_flow_action_push_vlan(char *act_data,
const struct rte_flow_action *action)
 {
+   uint8_t pcp;
+   uint16_t vid;
size_t act_size;
struct nfp_fl_act_push_vlan *push_vlan;
const struct rte_flow_action_of_push_vlan *push_vlan_conf;
@@ -2227,9 +2229,11 @@ nfp_flow_action_push_vlan(char *act_data,
(action + 1)->conf;
vlan_vid_conf  = (const struct rte_flow_action_of_set_vlan_vid *)
(action + 2)->conf;
+
+   vid = rte_be_to_cpu_16(vlan_vid_conf->vlan_vid) & 0x0fff;
+   pcp = vlan_pcp_conf->vlan_pcp & 0x07;
push_vlan->vlan_tpid = push_vlan_conf->ethertype;
-   push_vlan->vlan_tci = ((vlan_pcp_conf->vlan_pcp & 0x07) << 13) |
-   (vlan_vid_conf->vlan_vid & 0x0fff);
+   push_vlan->vlan_tci = rte_cpu_to_be_16(vid | (pcp << 13));
 
return 0;
 }
-- 
2.39.1

[PATCH] net/nfp: fix the Tx descriptor free logic of nfd3

[Chaoyong He]

In the tx descriptor free logic of nfd3, the former logic might force
cast a negative number into a very big unsigned number, and which will
cause potential problem in the xmit loop.

The xmit loop will continue in the place where it should break, and will
overwrite the Tx descriptor which is not free to use by the PMD.

Fixes: 74a640dac864 ("net/nfp: avoid modulo operations for handling ring 
wrapping")
Cc: sta...@dpdk.org

Signed-off-by: Chaoyong He 
Reviewed-by: Niklas Söderlund 
---
 drivers/net/nfp/nfp_rxtx.h | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h
index 5e651518ed..e642bc970a 100644
--- a/drivers/net/nfp/nfp_rxtx.h
+++ b/drivers/net/nfp/nfp_rxtx.h
@@ -401,10 +401,14 @@ nfp_net_mbuf_alloc_failed(struct nfp_net_rxq *rxq)
 static inline uint32_t
 nfp_net_nfd3_free_tx_desc(struct nfp_net_txq *txq)
 {
+   uint32_t free_desc;
+
if (txq->wr_p >= txq->rd_p)
-   return txq->tx_count - (txq->wr_p - txq->rd_p) - 8;
+   free_desc = txq->tx_count - (txq->wr_p - txq->rd_p);
else
-   return txq->rd_p - txq->wr_p - 8;
+   free_desc = txq->rd_p - txq->wr_p;
+
+   return (free_desc > 8) ? (free_desc - 8) : 0;
 }
 
 /*
-- 
2.39.1

RE: [PATCH v2] gro : ipv6 changes to support GRO for TCP/ipv6

[Hu, Jiayu]

Hi Kumar,

For TCP/IPv4 and TCP/IPv6, the TCP layer is the same and the difference is
the IP layer. So the code used for TCP layer needs to be shared among gro_tcp6.c
and gro_tcp4.c. But there are  too much code duplication in gro_tcp4.c and 
gro_tcp6.c
in current implementation.

For example, struct tcp6_flow_key and struct tcp4_flow_key share most of 
fields, except
the IP address type. It's better to have a common TCP flow key structure in 
gro_tcp.h. In
gro_tcp4.h and gro_tcp6.h, we implement tcp4 and tcp6 flow key structures with 
using the
common structure.

Thanks,
Jiayu

> -Original Message-
> From: Kumara Parameshwaran 
> Sent: Friday, October 21, 2022 2:14 AM
> To: Hu, Jiayu 
> Cc: dev@dpdk.org; Kumara Parameshwaran
> 
> Subject: [PATCH v2] gro : ipv6 changes to support GRO for TCP/ipv6
> 
> From: Kumara Parameshwaran 
> 
> The patch adds GRO support for TCP/ipv6 packets. This does not include the
> support for vxlan, udp ipv6 packets.
> 
> Signed-off-by: Kumara Parameshwaran 
> ---
> v1:
>   * Changes to support GRO for TCP/ipv6 packets. This does not
> include
> vxlan changes.
>   * The GRO is performed only for ipv6 packets that does not contain
>extension headers.
>   * The logic for the TCP coalescing remains the same, in ipv6 header
> the source address, destination address, flow label, version fields
> are expected to be the same.
>   * Re-organised the code to reuse certain tcp functions for both ipv4
> and
> ipv6 flows.
> v2:
>   * Fix comments in gro_tcp6.h header file.
> 
>  lib/gro/gro_tcp.h| 155 
>  lib/gro/gro_tcp4.c   |   7 +-
>  lib/gro/gro_tcp4.h   | 152 +--
>  lib/gro/gro_tcp6.c   | 387
> +++
>  lib/gro/gro_tcp6.h   | 150 +++
>  lib/gro/gro_vxlan_tcp4.c |   3 +-
>  lib/gro/gro_vxlan_tcp4.h |   3 +-
>  lib/gro/meson.build  |   1 +
>  lib/gro/rte_gro.c|  83 +++--
>  lib/gro/rte_gro.h|   3 +
>  10 files changed, 774 insertions(+), 170 deletions(-)  create mode 100644
> lib/gro/gro_tcp.h  create mode 100644 lib/gro/gro_tcp6.c  create mode
> 100644 lib/gro/gro_tcp6.h
> 
> diff --git a/lib/gro/gro_tcp.h b/lib/gro/gro_tcp.h new file mode 100644 index
> 00..c5d248a022
> --- /dev/null
> +++ b/lib/gro/gro_tcp.h
> @@ -0,0 +1,155 @@
> +#ifndef _GRO_TCP_H_
> +#define _GRO_TCP_H_
> +
> +#include 
> +
> +/*
> + * The max length of a IPv4 packet, which includes the length of the L3
> + * header, the L4 header and the data payload.
> + */
> +#define MAX_IP_PKT_LENGTH UINT16_MAX
> +
> +/* The maximum TCP header length */
> +#define MAX_TCP_HLEN 60
> +#define INVALID_TCP_HDRLEN(len) \
> + (((len) < sizeof(struct rte_tcp_hdr)) || ((len) > MAX_TCP_HLEN))
> +
> +struct gro_tcp_item {
> + /*
> +  * The first MBUF segment of the packet. If the value
> +  * is NULL, it means the item is empty.
> +  */
> + struct rte_mbuf *firstseg;
> + /* The last MBUF segment of the packet */
> + struct rte_mbuf *lastseg;
> + /*
> +  * The time when the first packet is inserted into the table.
> +  * This value won't be updated, even if the packet is merged
> +  * with other packets.
> +  */
> + uint64_t start_time;
> + /*
> +  * next_pkt_idx is used to chain the packets that
> +  * are in the same flow but can't be merged together
> +  * (e.g. caused by packet reordering).
> +  */
> + uint32_t next_pkt_idx;
> + /* TCP sequence number of the packet */
> + uint32_t sent_seq;
> + /* IPv4 ID of the packet */
> + uint16_t ip_id;
> + /* the number of merged packets */
> + uint16_t nb_merged;
> + /* Indicate if IPv4 ID can be ignored */
> + uint8_t is_atomic;
> +};
> +
> +/*
> + * Merge two TCP packets without updating checksums.
> + * If cmp is larger than 0, append the new packet to the
> + * original packet. Otherwise, pre-pend the new packet to
> + * the original packet.
> + */
> +static inline int
> +merge_two_tcp_packets(struct gro_tcp_item *item,
> + struct rte_mbuf *pkt,
> + int cmp,
> + uint32_t sent_seq,
> + uint16_t ip_id,
> + uint16_t l2_offset)
> +{
> + struct rte_mbuf *pkt_head, *pkt_tail, *lastseg;
> + uint16_t hdr_len, l2_len;
> +
> + if (cmp > 0) {
> + pkt_head = item->firstseg;
> + pkt_tail = pkt;
> + } else {
> + pkt_head = pkt;
> + pkt_tail = item->firstseg;
> + }
> +
> + /* check if the IPv4 packet length is greater than the max value */
> + hdr_len = l2_offset + pkt_head->l2_len + pkt_head->l3_len +
> + pkt_head->l4_len;
> + l2_len = l2_offset > 0 ? pkt_head->outer_l2_len : pkt_head->l2_len;
> + if (unlikely(pkt_head->pkt_len - l2_len + pkt_tail->pkt_len -
> + hdr_len > MAX_IP_PKT_LENGTH))
> + return 0;
>

RE: [PATCH] examples/l3fwd: relax the RSS/Offload requirement

[Trevor Tao]

Hi Stephen:

Yes,  I think there is no point in doing RSS if only a single queue, but for 
the 2nd part:
"|| !local_port_conf.rx_adv_conf.rss_conf.rss_hf"
It's an "or" relationship with the dev_info.max_rx_queues==1, and in my case, 
the device(virtio) information showed that
the max_rx_queues is not 1 but the rss_hf is 0:
..
Initializing port 0 ... Creating queues: nb_rxq=1 nb_txq=1...
Trevor: dev_info.max_rx_queues=16, local_port_conf.rx_adv_conf.rss_conf.rss_hf 
= 0x0
..

So in this case, the mq_mode should also be set to RTE_ETH_MQ_RX_NONE to 
disable the RSS.

Thanks,

Best Regards,

Zijin Tao(Trevor Tao, 陶孜谨)
ARM Electronic Technology (Shanghai) Co., Ltd
安谋电子科技（上海）有限公司
Building 11, Shanghai Busininess ParkⅢ ,
No.1016 Tianlin Rd, Minhang District, Shanghai, 200233 China
上海市闵行区田林路1016号科技绿洲三期2号楼10楼，200233
Cell:  +86-153 7109 6192

-Original Message-
From: Stephen Hemminger 
Sent: Thursday, May 11, 2023 11:39 PM
To: Trevor Tao 
Cc: tho...@monjalon.net; dev@dpdk.org
Subject: Re: [PATCH] examples/l3fwd: relax the RSS/Offload requirement

On Thu, 11 May 2023 09:33:35 +
Trevor Tao  wrote:

> +   /* relax the rx rss requirement */
> +   if (dev_info.max_rx_queues == 1 || 
> !local_port_conf.rx_adv_conf.rss_conf.rss_hf) {
> +   printf("warning: modified the rx mq_mode to 
> RTE_ETH_MQ_RX_NONE base on"
> +   " device capability\n");
> local_port_conf.rxmode.mq_mode = RTE_ETH_MQ_RX_NONE;
> +   }

There is no point in doing RSS if only a single queue.
Therefore remove the !local_port.conf portion of the expression.

And since this is normal, no printf is needed.
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.

[PATCH 1/2] test/crypto: use separate keys for auth and cipher

[Anoob Joseph]

The mixed test cases can have keys with different key lengths. The
routine which prepares the session parameters uses same key length for
both cipher & auth keys. Instead allow the caller to use same keys as
required.

Signed-off-by: Anoob Joseph 
---
 app/test/test_cryptodev.c | 48 +++
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 31f4cb2cd5..5fdbe11094 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -2554,27 +2554,23 @@ create_wireless_algo_cipher_auth_session(uint8_t dev_id,
enum rte_crypto_auth_operation auth_op,
enum rte_crypto_auth_algorithm auth_algo,
enum rte_crypto_cipher_algorithm cipher_algo,
-   const uint8_t *key, uint8_t key_len,
+   const uint8_t *a_key, uint8_t a_key_len,
+   const uint8_t *c_key, uint8_t c_key_len,
uint8_t auth_iv_len, uint8_t auth_len,
uint8_t cipher_iv_len)
 
 {
-   uint8_t cipher_auth_key[key_len];
-
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
 
-   memcpy(cipher_auth_key, key, key_len);
-
/* Setup Authentication Parameters */
ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
ut_params->auth_xform.next = NULL;
 
ut_params->auth_xform.auth.op = auth_op;
ut_params->auth_xform.auth.algo = auth_algo;
-   ut_params->auth_xform.auth.key.length = key_len;
-   /* Hash key = cipher key */
-   ut_params->auth_xform.auth.key.data = cipher_auth_key;
+   ut_params->auth_xform.auth.key.length = a_key_len;
+   ut_params->auth_xform.auth.key.data = a_key;
ut_params->auth_xform.auth.digest_length = auth_len;
/* Auth IV will be after cipher IV */
ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
@@ -2586,12 +2582,13 @@ create_wireless_algo_cipher_auth_session(uint8_t dev_id,
 
ut_params->cipher_xform.cipher.algo = cipher_algo;
ut_params->cipher_xform.cipher.op = cipher_op;
-   ut_params->cipher_xform.cipher.key.data = cipher_auth_key;
-   ut_params->cipher_xform.cipher.key.length = key_len;
+   ut_params->cipher_xform.cipher.key.data = c_key;
+   ut_params->cipher_xform.cipher.key.length = c_key_len;
ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
 
-   debug_hexdump(stdout, "key:", key, key_len);
+   debug_hexdump(stdout, "Auth key:", a_key, c_key_len);
+   debug_hexdump(stdout, "Cipher key:", c_key, c_key_len);
 
/* Create Crypto session*/
ut_params->sess = rte_cryptodev_sym_session_create(dev_id,
@@ -2677,23 +2674,21 @@ create_wireless_algo_auth_cipher_session(uint8_t dev_id,
enum rte_crypto_auth_operation auth_op,
enum rte_crypto_auth_algorithm auth_algo,
enum rte_crypto_cipher_algorithm cipher_algo,
-   const uint8_t *key, const uint8_t key_len,
+   const uint8_t *a_key, const uint8_t a_key_len,
+   const uint8_t *c_key, const uint8_t c_key_len,
uint8_t auth_iv_len, uint8_t auth_len,
uint8_t cipher_iv_len)
 {
-   uint8_t auth_cipher_key[key_len];
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct crypto_unittest_params *ut_params = &unittest_params;
 
-   memcpy(auth_cipher_key, key, key_len);
-
/* Setup Authentication Parameters */
ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
ut_params->auth_xform.auth.op = auth_op;
ut_params->auth_xform.next = &ut_params->cipher_xform;
ut_params->auth_xform.auth.algo = auth_algo;
-   ut_params->auth_xform.auth.key.length = key_len;
-   ut_params->auth_xform.auth.key.data = auth_cipher_key;
+   ut_params->auth_xform.auth.key.length = a_key_len;
+   ut_params->auth_xform.auth.key.data = a_key;
ut_params->auth_xform.auth.digest_length = auth_len;
/* Auth IV will be after cipher IV */
ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
@@ -2704,12 +2699,13 @@ create_wireless_algo_auth_cipher_session(uint8_t dev_id,
ut_params->cipher_xform.next = NULL;
ut_params->cipher_xform.cipher.algo = cipher_algo;
ut_params->cipher_xform.cipher.op = cipher_op;
-   ut_params->cipher_xform.cipher.key.data = auth_cipher_key;
-   ut_params->cipher_xform.cipher.key.length = key_len;
+   ut_params->cipher_xform.cipher.key.data = c_key;
+   ut_params->cipher_xform.cipher.key.length = c_key_len;
ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
 
-   debug_hexdump(stdout, "key:", key, key_len);
+  

[PATCH 2/2] test/crypto: specify correct parameters with null algos

[Anoob Joseph]

Keys are not required for NULL algorithms. Same way IV, digest lengths
should also be set to 0. The values are invalid and any PMD which
validates such parameters would return "-ENOTSUP" for such cases which
would result in false skipping of tests.

Signed-off-by: Anoob Joseph 
---
 app/test/test_cryptodev_aes_test_vectors.h   | 114 ++-
 app/test/test_cryptodev_hash_test_vectors.h  |  19 +---
 app/test/test_cryptodev_mixed_test_vectors.h |  92 +--
 3 files changed, 71 insertions(+), 154 deletions(-)

diff --git a/app/test/test_cryptodev_aes_test_vectors.h 
b/app/test/test_cryptodev_aes_test_vectors.h
index f3686beeb5..7127156cc4 100644
--- a/app/test/test_cryptodev_aes_test_vectors.h
+++ b/app/test/test_cryptodev_aes_test_vectors.h
@@ -894,19 +894,13 @@ static const struct blockcipher_test_data 
aes_test_data_21 = {
 /* NULL cipher NULL auth 8-byte multiple test vector */
 static const struct blockcipher_test_data null_test_data_chain_x8_multiple = {
.crypto_algo = RTE_CRYPTO_CIPHER_NULL,
-   .cipher_key = { /* arbitrary data - shouldn't be used */
-   .data = {
-   0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
-   0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C
-   },
-   .len = 16
+   .cipher_key = {
+   .data = { 0x0 },
+   .len = 0
},
-   .iv = { /* arbitrary data - shouldn't be used */
-   .data = {
-   0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
-   0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
-   },
-   .len = 16
+   .iv = {
+   .data = { 0x0 },
+   .len = 0
},
.plaintext = {
.data = plaintext_aes_common,
@@ -917,41 +911,27 @@ static const struct blockcipher_test_data 
null_test_data_chain_x8_multiple = {
.len = 512
},
.auth_algo = RTE_CRYPTO_AUTH_NULL,
-   .auth_key = {   /* arbitrary data - shouldn't be used */
-   .data = {
-   0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
-   0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
-   0xDE, 0xF4, 0xDE, 0xAD
-   },
-   .len = 20
+   .auth_key = {
+   .data = { 0x0 },
+   .len = 0
},
.digest = {
-   .data = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00
-   },
-   .len = 20,
-   .truncated_len = 12
+   .data = { 0x0 },
+   .len = 0,
+   .truncated_len = 0
}
 };
 
 /* NULL cipher NULL auth 4-byte multiple test vector */
 static const struct blockcipher_test_data null_test_data_chain_x4_multiple = {
.crypto_algo = RTE_CRYPTO_CIPHER_NULL,
-   .cipher_key = { /* arbitrary data - shouldn't be used */
-   .data = {
-   0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
-   0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C
-   },
-   .len = 16
+   .cipher_key = {
+   .data = { 0x0 },
+   .len = 0
},
-   .iv = { /* arbitrary data - shouldn't be used */
-   .data = {
-   0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
-   0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
-   },
-   .len = 16
+   .iv = {
+   .data = { 0x0 },
+   .len = 0
},
.plaintext = {
.data = plaintext_aes128ctr,
@@ -962,41 +942,27 @@ static const struct blockcipher_test_data 
null_test_data_chain_x4_multiple = {
.len = 20
},
.auth_algo = RTE_CRYPTO_AUTH_NULL,
-   .auth_key = {   /* arbitrary data - shouldn't be used */
-   .data = {
-   0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
-   0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
-   0xDE, 0xF4, 0xDE, 0xAD
-   },
-   .len = 20
+   .auth_key = {
+   .data = { 0x0 },
+   .len = 0
},
.digest = {
-   .data = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00
-   },
-   .len = 20,
-   .truncated_len = 12
+   .data = { 0x0 },
+   .len = 0,
+   .truncated_len = 0
}
 };
 
 /* NULL cipher NULL auth 1-byte multiple test vector */
 static const stru