[dpdk-dev] [PATCH v2 0/2] fix default RSS field for IP fragment packets

[Wenjun Wu]

This patch set removes redundant default RSS field for both IPv4 and
IPv6 fragment packets. Only src and dst address are needed.

v2:
* Rework commit log

Wenjun Wu (2):
  net/iavf: fix default RSS field for IP fragment packets
  net/ice: fix default RSS field for IP fragment packets

 drivers/net/iavf/iavf_hash.c | 26 ++
 drivers/net/ice/ice_ethdev.c |  4 ++--
 2 files changed, 4 insertions(+), 26 deletions(-)

-- 

[dpdk-dev] [PATCH v2 1/2] net/iavf: fix default RSS field for IP fragment packets

[Wenjun Wu]

Previously IP ID field is supported in default RSS for IP fragment
packets. Actually it is not expected.

This patch removes redundant default RSS field for IP fragment packets.
The default RSS only needs to support the src and dst IP fields.

Fixes: 9e29a278bc0c ("net/iavf: support default RSS for IP fragment")

Signed-off-by: Wenjun Wu 
---
 drivers/net/iavf/iavf_hash.c | 26 ++
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index 2b03dad858..eba55ecea5 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -624,34 +624,12 @@ iavf_rss_hash_set(struct iavf_adapter *ad, uint64_t 
rss_hf, bool add)
}
 
if (rss_hf & ETH_RSS_FRAG_IPV4) {
-   struct virtchnl_proto_hdrs hdr = {
-   .tunnel_level = TUNNEL_LEVEL_OUTER,
-   .count = 3,
-   .proto_hdr = {
-   proto_hdr_eth,
-   proto_hdr_ipv4,
-   {
-   VIRTCHNL_PROTO_HDR_IPV4_FRAG,
-   
FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_FRAG_PKID),
-   {BUFF_NOUSED},
-   },
-   },
-   };
-   rss_cfg.proto_hdrs = hdr;
+   rss_cfg.proto_hdrs = outer_ipv4_tmplt;
iavf_add_del_rss_cfg(ad, &rss_cfg, add);
}
 
if (rss_hf & ETH_RSS_FRAG_IPV6) {
-   struct virtchnl_proto_hdrs hdr = {
-   .tunnel_level = TUNNEL_LEVEL_OUTER,
-   .count = 3,
-   .proto_hdr = {
-   proto_hdr_eth,
-   proto_hdr_ipv6,
-   proto_hdr_ipv6_frag,
-   },
-   };
-   rss_cfg.proto_hdrs = hdr;
+   rss_cfg.proto_hdrs = outer_ipv6_tmplt;
iavf_add_del_rss_cfg(ad, &rss_cfg, add);
}
 
-- 
2.25.1

[dpdk-dev] [PATCH v2 2/2] net/ice: fix default RSS field for IP fragment packets

[Wenjun Wu]

Previously IP ID field is supported in default RSS for IP fragment packets.
Actually it is not expected.

This patch removes redundant default RSS field for IP fragment packets.
The default RSS only needs to support the src and dst IP fields.

Fixes: 4027fffe86f4 ("net/ice: support default RSS for IP fragment packet")

Signed-off-by: Wenjun Wu 
---
 drivers/net/ice/ice_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index a4cd39c954..64ee569525 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2975,7 +2975,7 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
 
if (rss_hf & ETH_RSS_FRAG_IPV4) {
cfg.addl_hdrs = ICE_FLOW_SEG_HDR_IPV4 | 
ICE_FLOW_SEG_HDR_IPV_FRAG;
-   cfg.hash_flds = ICE_FLOW_HASH_IPV4 | 
BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_ID);
+   cfg.hash_flds = ICE_FLOW_HASH_IPV4;
ret = ice_add_rss_cfg_wrap(pf, vsi->idx, &cfg);
if (ret)
PMD_DRV_LOG(ERR, "%s IPV4_FRAG rss flow fail %d",
@@ -2984,7 +2984,7 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
 
if (rss_hf & ETH_RSS_FRAG_IPV6) {
cfg.addl_hdrs = ICE_FLOW_SEG_HDR_IPV6 | 
ICE_FLOW_SEG_HDR_IPV_FRAG;
-   cfg.hash_flds = ICE_FLOW_HASH_IPV6 | 
BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_ID);
+   cfg.hash_flds = ICE_FLOW_HASH_IPV6;
ret = ice_add_rss_cfg_wrap(pf, vsi->idx, &cfg);
if (ret)
PMD_DRV_LOG(ERR, "%s IPV6_FRAG rss flow fail %d",
-- 
2.25.1

[dpdk-dev] [PATCH v2] net/iavf: fix wrong FDIR L3 field set for IPv4 fragment packets

[Wenjun Wu]

Originally, the value of field_selector for IPV4_FRAG header hdr1 is
the same as the previous header hdr2. For IPv4 packets, field_selector
for hdr2 can be any value between 0 and 4, depending on the selected
field. Actually, this value for IPV4_FRAG should be constant 0,
which denotes the field packet ID.

This patch adds an assignment to hdr1->field_selector to make sure that
it is always 0.

Fixes: 3334513ef484 ("net/iavf: support flow director for IP fragment")

Signed-off-by: Wenjun Wu 

---
v2: reword commit log
---
 drivers/net/iavf/iavf_fdir.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/iavf/iavf_fdir.c b/drivers/net/iavf/iavf_fdir.c
index 2869a8b424..32b06044f2 100644
--- a/drivers/net/iavf/iavf_fdir.c
+++ b/drivers/net/iavf/iavf_fdir.c
@@ -664,6 +664,7 @@ iavf_fdir_add_fragment_hdr(struct virtchnl_proto_hdrs 
*hdrs, int layer)
/* adding dummy fragment header */
hdr1 = &hdrs->proto_hdr[layer];
VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, IPV4_FRAG);
+   hdr1->field_selector = 0;
hdrs->count = ++layer;
 }
 
-- 
2.25.1

[dpdk-dev] [PATCH v2] net/iavf: support FDIR L3 fields for IPv6 fragment packets

[Wenjun Wu]

This patch adds L3 fields FDIR support for IPv6 fragment packets.

Signed-off-by: Wenjun Wu 

---
v2: reword commit log
---
 drivers/net/iavf/iavf_fdir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/iavf/iavf_fdir.c b/drivers/net/iavf/iavf_fdir.c
index da3eec8b59..2869a8b424 100644
--- a/drivers/net/iavf/iavf_fdir.c
+++ b/drivers/net/iavf/iavf_fdir.c
@@ -57,7 +57,7 @@
IAVF_INSET_IPV6_HOP_LIMIT)
 
 #define IAVF_FDIR_INSET_ETH_IPV6_FRAG_EXT (\
-   IAVF_INSET_IPV6_ID)
+   IAVF_FDIR_INSET_ETH_IPV6 | IAVF_INSET_IPV6_ID)
 
 #define IAVF_FDIR_INSET_ETH_IPV6_UDP (\
IAVF_INSET_IPV6_SRC | IAVF_INSET_IPV6_DST | \
-- 
2.25.1

[dpdk-dev] [PATCH v2 0/2] fix default RSS field for IP fragment packets

[Wenjun Wu]

This patch set removes redundant default RSS field for both IPv4 and
IPv6 fragment packets. Only src and dst address are needed.

v2:
* Rework commit log

Wenjun Wu (2):
  net/iavf: fix default RSS field for IP fragment packets
  net/ice: fix default RSS field for IP fragment packets

 drivers/net/iavf/iavf_hash.c | 26 ++
 drivers/net/ice/ice_ethdev.c |  4 ++--
 2 files changed, 4 insertions(+), 26 deletions(-)

-- 

[dpdk-dev] [PATCH v2 1/2] net/iavf: fix default RSS field for IP fragment packets

[Wenjun Wu]

Previously IP ID field is supported in default RSS for IP fragment
packets. Actually it is not expected.

This patch removes redundant default RSS field for IP fragment packets.
The default RSS only needs to support the src and dst IP fields.

Fixes: 9e29a278bc0c ("net/iavf: support default RSS for IP fragment")

Signed-off-by: Wenjun Wu 
---
 drivers/net/iavf/iavf_hash.c | 26 ++
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index 2b03dad858..eba55ecea5 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -624,34 +624,12 @@ iavf_rss_hash_set(struct iavf_adapter *ad, uint64_t 
rss_hf, bool add)
}
 
if (rss_hf & ETH_RSS_FRAG_IPV4) {
-   struct virtchnl_proto_hdrs hdr = {
-   .tunnel_level = TUNNEL_LEVEL_OUTER,
-   .count = 3,
-   .proto_hdr = {
-   proto_hdr_eth,
-   proto_hdr_ipv4,
-   {
-   VIRTCHNL_PROTO_HDR_IPV4_FRAG,
-   
FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_FRAG_PKID),
-   {BUFF_NOUSED},
-   },
-   },
-   };
-   rss_cfg.proto_hdrs = hdr;
+   rss_cfg.proto_hdrs = outer_ipv4_tmplt;
iavf_add_del_rss_cfg(ad, &rss_cfg, add);
}
 
if (rss_hf & ETH_RSS_FRAG_IPV6) {
-   struct virtchnl_proto_hdrs hdr = {
-   .tunnel_level = TUNNEL_LEVEL_OUTER,
-   .count = 3,
-   .proto_hdr = {
-   proto_hdr_eth,
-   proto_hdr_ipv6,
-   proto_hdr_ipv6_frag,
-   },
-   };
-   rss_cfg.proto_hdrs = hdr;
+   rss_cfg.proto_hdrs = outer_ipv6_tmplt;
iavf_add_del_rss_cfg(ad, &rss_cfg, add);
}
 
-- 
2.25.1

[dpdk-dev] [PATCH v2 2/2] net/ice: fix default RSS field for IP fragment packets

[Wenjun Wu]

Previously IP ID field is supported in default RSS for IP fragment packets.
Actually it is not expected.

This patch removes redundant default RSS field for IP fragment packets.
The default RSS only needs to support the src and dst IP fields.

Fixes: 4027fffe86f4 ("net/ice: support default RSS for IP fragment packet")

Signed-off-by: Wenjun Wu 
---
 drivers/net/ice/ice_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index a4cd39c954..64ee569525 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2975,7 +2975,7 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
 
if (rss_hf & ETH_RSS_FRAG_IPV4) {
cfg.addl_hdrs = ICE_FLOW_SEG_HDR_IPV4 | 
ICE_FLOW_SEG_HDR_IPV_FRAG;
-   cfg.hash_flds = ICE_FLOW_HASH_IPV4 | 
BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_ID);
+   cfg.hash_flds = ICE_FLOW_HASH_IPV4;
ret = ice_add_rss_cfg_wrap(pf, vsi->idx, &cfg);
if (ret)
PMD_DRV_LOG(ERR, "%s IPV4_FRAG rss flow fail %d",
@@ -2984,7 +2984,7 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
 
if (rss_hf & ETH_RSS_FRAG_IPV6) {
cfg.addl_hdrs = ICE_FLOW_SEG_HDR_IPV6 | 
ICE_FLOW_SEG_HDR_IPV_FRAG;
-   cfg.hash_flds = ICE_FLOW_HASH_IPV6 | 
BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_ID);
+   cfg.hash_flds = ICE_FLOW_HASH_IPV6;
ret = ice_add_rss_cfg_wrap(pf, vsi->idx, &cfg);
if (ret)
PMD_DRV_LOG(ERR, "%s IPV6_FRAG rss flow fail %d",
-- 
2.25.1

Re: [dpdk-dev] [PATCH] examples/vhost: fix memory leak on forwarding packets.

[Hu, Jiayu]

Reviewed-by: Jiayu Hu 

> -Original Message-
> From: Jiang, Cheng1 
> Sent: Tuesday, August 17, 2021 1:26 PM
> To: Ma, WenwuX ; dev@dpdk.org
> Cc: maxime.coque...@redhat.com; Xia, Chenbo ; Hu,
> Jiayu ; sta...@dpdk.org
> Subject: RE: [PATCH] examples/vhost: fix memory leak on forwarding packets.
> 
> Acked-by: Cheng Jiang 
> 
> 
> 
> 
> > -Original Message-
> > From: Ma, WenwuX 
> > Sent: Wednesday, August 18, 2021 1:13 AM
> > To: dev@dpdk.org
> > Cc: maxime.coque...@redhat.com; Xia, Chenbo ;
> > Jiang, Cheng1 ; Hu, Jiayu
> > ; Ma, WenwuX ;
> > sta...@dpdk.org
> > Subject: [PATCH] examples/vhost: fix memory leak on forwarding packets.
> >
> > In function virtio_tx_local(), when the device receiving the packet is
> > the same as the device to which the packet is forwarded, or the device
> > is removed, we return but not free the packet, it will cause a memory leak.
> >
> > Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost
> > application")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Wenwu Ma 
> > ---
> >  examples/vhost/main.c | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/examples/vhost/main.c b/examples/vhost/main.c index
> > bc3d71c898..07fd90ec64 100644
> > --- a/examples/vhost/main.c
> > +++ b/examples/vhost/main.c
> > @@ -965,6 +965,7 @@ virtio_tx_local(struct vhost_dev *vdev, struct
> > rte_mbuf *m)
> > return -1;
> >
> > if (vdev->vid == dst_vdev->vid) {
> > +   rte_pktmbuf_free(m);
> > RTE_LOG_DP(DEBUG, VHOST_DATA,
> > "(%d) TX: src and dst MAC is same. Dropping
> packet.\n",
> > vdev->vid);
> > @@ -975,6 +976,7 @@ virtio_tx_local(struct vhost_dev *vdev, struct
> > rte_mbuf *m)
> > "(%d) TX: MAC address is local\n", dst_vdev->vid);
> >
> > if (unlikely(dst_vdev->remove)) {
> > +   rte_pktmbuf_free(m);
> > RTE_LOG_DP(DEBUG, VHOST_DATA,
> > "(%d) device is marked for removal\n", dst_vdev-
> > >vid);
> > return 0;
> > --
> > 2.25.1
> 

Re: [dpdk-dev] [PATCH v2 1/6] eal: introduce oops handling API

[Jerin Jacob]

On Tue, Aug 17, 2021 at 9:23 AM Stephen Hemminger
 wrote:
>
> On Tue, 17 Aug 2021 08:57:18 +0530
>  wrote:
>
> > From: Jerin Jacob 
> >
> > Introducing oops handling API with following specification
> > and enable stub implementation for Linux and FreeBSD.
> >
> > On rte_eal_init() invocation, the EAL library installs the
> > oops handler for the essential signals.
> > The rte_oops_signals_enabled() API provides the list
> > of signals the library installed by the EAL.
>
> This is a big change, and many applications already handle these
> signals themselves. Therefore adding this needs to be opt-in
> and not enabled by default.

In order to avoid every application explicitly register this
sighandler and to cater to the
co-existing application-specific signal-hander usage.
The following design has been chosen. (It is mentioned in the commit log,
I will describe here for more clarity)

Case 1:
a) The application installs the signal handler prior to rte_eal_init().
b) Implementation stores the application-specific signal and replace a
signal handler as oops eal handler
c) when application/DPDK get the segfault, the default EAL oops
handler gets invoked
d) Then it dumps the EAL specific message, it calls the
application-specific signal handler
installed in step 1 by application. This avoids breaking any contract
with the application.
i.e Behavior is the same current EAL now.
That is the reason for not using SA_RESETHAND(which call SIG_DFL after
eal oops handler instead
application-specific handler)

Case 2:
a) The application install the signal handler after rte_eal_init(),
b) EAL hander get replaced with application handle then the application can call
rte_oops_decode() to decode.

In order to cater the above use case, rte_oops_signals_enabled() and
rte_oops_decode()
provided.

Here we are not breaking any contract with the application.
Do you have concerns about this design?

[dpdk-dev] [PATCH v1 1/4] common/iavf: add QFI fields for GTPU UL and DL

[Haiyue Wang]

From: Junfeng Guo 

Add virtchnl fields QFI of GTPU UL/DL for AVF FDIR.

Signed-off-by: Junfeng Guo 
Signed-off-by: Haiyue Wang 
---
 drivers/common/iavf/virtchnl.h | 5 +
 1 file changed, 5 insertions(+)

diff --git a/drivers/common/iavf/virtchnl.h b/drivers/common/iavf/virtchnl.h
index 1cf0866124..9fa5e3e891 100644
--- a/drivers/common/iavf/virtchnl.h
+++ b/drivers/common/iavf/virtchnl.h
@@ -1642,6 +1642,11 @@ enum virtchnl_proto_hdr_field {
/* IPv6 Extension Fragment */
VIRTCHNL_PROTO_HDR_IPV6_EH_FRAG_PKID =
PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_IPV6_EH_FRAG),
+   /* GTPU_DWN/UP */
+   VIRTCHNL_PROTO_HDR_GTPU_DWN_QFI =
+   PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_GTPU_EH_PDU_DWN),
+   VIRTCHNL_PROTO_HDR_GTPU_UP_QFI =
+   PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_GTPU_EH_PDU_UP),
 };
 
 struct virtchnl_proto_hdr {
-- 
2.33.0

[dpdk-dev] [PATCH v1 2/4] common/iavf: add proto hdr field support for L4 checksum

[Haiyue Wang]

From: Alvin Zhang 

Add TCP/UDP/SCTP header checksum field selectors.

Signed-off-by: Alvin Zhang 
Signed-off-by: Haiyue Wang 
---
 drivers/common/iavf/virtchnl.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/common/iavf/virtchnl.h b/drivers/common/iavf/virtchnl.h
index 9fa5e3e891..c56c668cff 100644
--- a/drivers/common/iavf/virtchnl.h
+++ b/drivers/common/iavf/virtchnl.h
@@ -1598,14 +1598,17 @@ enum virtchnl_proto_hdr_field {
VIRTCHNL_PROTO_HDR_TCP_SRC_PORT =
PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_TCP),
VIRTCHNL_PROTO_HDR_TCP_DST_PORT,
+   VIRTCHNL_PROTO_HDR_TCP_CHKSUM,
/* UDP */
VIRTCHNL_PROTO_HDR_UDP_SRC_PORT =
PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_UDP),
VIRTCHNL_PROTO_HDR_UDP_DST_PORT,
+   VIRTCHNL_PROTO_HDR_UDP_CHKSUM,
/* SCTP */
VIRTCHNL_PROTO_HDR_SCTP_SRC_PORT =
PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_SCTP),
VIRTCHNL_PROTO_HDR_SCTP_DST_PORT,
+   VIRTCHNL_PROTO_HDR_SCTP_CHKSUM,
/* GTPU_IP */
VIRTCHNL_PROTO_HDR_GTPU_IP_TEID =
PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_GTPU_IP),
-- 
2.33.0

[dpdk-dev] [PATCH v1 3/4] common/iavf: remove the FDIR query opcode

[Haiyue Wang]

The VIRTCHNL_OP_QUERY_FDIR_FILTER opcode is not used, so remove it.

Signed-off-by: Haiyue Wang 
---
 drivers/common/iavf/virtchnl.h | 38 --
 1 file changed, 38 deletions(-)

diff --git a/drivers/common/iavf/virtchnl.h b/drivers/common/iavf/virtchnl.h
index c56c668cff..83f51d889f 100644
--- a/drivers/common/iavf/virtchnl.h
+++ b/drivers/common/iavf/virtchnl.h
@@ -146,7 +146,6 @@ enum virtchnl_ops {
VIRTCHNL_OP_DEL_RSS_CFG = 46,
VIRTCHNL_OP_ADD_FDIR_FILTER = 47,
VIRTCHNL_OP_DEL_FDIR_FILTER = 48,
-   VIRTCHNL_OP_QUERY_FDIR_FILTER = 49,
VIRTCHNL_OP_GET_MAX_RSS_QREGION = 50,
VIRTCHNL_OP_GET_OFFLOAD_VLAN_V2_CAPS = 51,
VIRTCHNL_OP_ADD_VLAN_V2 = 52,
@@ -244,8 +243,6 @@ static inline const char *virtchnl_op_str(enum virtchnl_ops 
v_opcode)
return "VIRTCHNL_OP_ADD_FDIR_FILTER";
case VIRTCHNL_OP_DEL_FDIR_FILTER:
return "VIRTCHNL_OP_DEL_FDIR_FILTER";
-   case VIRTCHNL_OP_QUERY_FDIR_FILTER:
-   return "VIRTCHNL_OP_QUERY_FDIR_FILTER";
case VIRTCHNL_OP_GET_MAX_RSS_QREGION:
return "VIRTCHNL_OP_GET_MAX_RSS_QREGION";
case VIRTCHNL_OP_ENABLE_QUEUES_V2:
@@ -1733,20 +1730,6 @@ struct virtchnl_fdir_rule {
 
 VIRTCHNL_CHECK_STRUCT_LEN(2604, virtchnl_fdir_rule);
 
-/* query information to retrieve fdir rule counters.
- * PF will fill out this structure to reset counter.
- */
-struct virtchnl_fdir_query_info {
-   u32 match_packets_valid:1;
-   u32 match_bytes_valid:1;
-   u32 reserved:30;  /* Reserved, must be zero. */
-   u32 pad;
-   u64 matched_packets; /* Number of packets for this rule. */
-   u64 matched_bytes;   /* Number of bytes through this rule. */
-};
-
-VIRTCHNL_CHECK_STRUCT_LEN(24, virtchnl_fdir_query_info);
-
 /* Status returned to VF after VF requests FDIR commands
  * VIRTCHNL_FDIR_SUCCESS
  * VF FDIR related request is successfully done by PF
@@ -1879,24 +1862,6 @@ struct virtchnl_queue_tc_mapping {
 
 VIRTCHNL_CHECK_STRUCT_LEN(12, virtchnl_queue_tc_mapping);
 
-/* VIRTCHNL_OP_QUERY_FDIR_FILTER
- * VF sends this request to PF by filling out vsi_id,
- * flow_id and reset_counter. PF will return query_info
- * and query_status to VF.
- */
-struct virtchnl_fdir_query {
-   u16 vsi_id;   /* INPUT */
-   u16 pad1[3];
-   u32 flow_id;  /* INPUT */
-   u32 reset_counter:1; /* INPUT */
-   struct virtchnl_fdir_query_info query_info; /* OUTPUT */
-
-   /* see enum virtchnl_fdir_prgm_status; OUTPUT */
-   s32 status;
-   u32 pad2;
-};
-
-VIRTCHNL_CHECK_STRUCT_LEN(48, virtchnl_fdir_query);
 
 /* TX and RX queue types are valid in legacy as well as split queue models.
  * With Split Queue model, 2 additional types are introduced - TX_COMPLETION
@@ -2254,9 +2219,6 @@ virtchnl_vc_validate_vf_msg(struct virtchnl_version_info 
*ver, u32 v_opcode,
case VIRTCHNL_OP_DEL_FDIR_FILTER:
valid_len = sizeof(struct virtchnl_fdir_del);
break;
-   case VIRTCHNL_OP_QUERY_FDIR_FILTER:
-   valid_len = sizeof(struct virtchnl_fdir_query);
-   break;
case VIRTCHNL_OP_GET_QOS_CAPS:
break;
case VIRTCHNL_OP_CONFIG_QUEUE_TC_MAP:
-- 
2.33.0

[dpdk-dev] [PATCH v1 4/4] common/iavf: update the driver version

[Haiyue Wang]

Update the driver version to trace the change.

Signed-off-by: Haiyue Wang 
---
 drivers/common/iavf/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/common/iavf/README b/drivers/common/iavf/README
index 611fdcea94..89bdbc827e 100644
--- a/drivers/common/iavf/README
+++ b/drivers/common/iavf/README
@@ -6,7 +6,7 @@ Intel® IAVF driver
 =
 
 This directory contains source code of FreeBSD IAVF driver of version
-cid-avf.2021.04.29.tar.gz released by the team which develops
+cid-avf.2021.08.16.tar.gz released by the team which develops
 basic drivers for any IAVF NIC. The directory of base/ contains the
 original source package.
 
-- 
2.33.0

Re: [dpdk-dev] [PATCH RFC] net/virtio: Add virtio support for Windows.

[David Marchand]

On Sun, Aug 15, 2021 at 9:50 PM Dmitry Kozlyuk  wrote:
> > diff --git a/drivers/net/virtio/virtio_pci_ethdev.c 
> > b/drivers/net/virtio/virtio_pci_ethdev.c
> > index 4083853c48..03e9dfab71 100644
> > --- a/drivers/net/virtio/virtio_pci_ethdev.c
> > +++ b/drivers/net/virtio/virtio_pci_ethdev.c
> > @@ -220,7 +220,9 @@ static struct rte_pci_driver rte_virtio_net_pci_pmd = {
> >
> >  RTE_INIT(rte_virtio_net_pci_pmd_init)
> >  {
> > +#if !(defined(_WIN32) || defined(_WIN64))
> >   rte_eal_iopl_init();
> > +#endif
>
> I think rte_eal_iopl_init() should not be called from this PMD at all,
> because it is allready called by PCI bus driver before probing.

This call to iopl() must be kept in a pmd constructor (at least on
Linux) so that, for example, the interrupt thread inherits the IO
priviledge level.

>
> Also, DPDK code should use #ifdef RTE_EXEC_ENV_WINDOWS, etc. to test
> if it is building for a specific execution environment.
>
> >   rte_pci_register(&rte_virtio_net_pci_pmd);
> >  }
> >


-- 
David Marchand

Re: [dpdk-dev] [PATCH] net/ice: fix wrong rxdid

[Huang, ZhiminX]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Tuesday, August 17, 2021 11:41 AM
> To: Yang, Qiming 
> Cc: Huang, ZhiminX ; dev@dpdk.org; Zhang,
> Qi Z ; sta...@dpdk.org
> Subject: [PATCH] net/ice: fix wrong rxdid
> 
> Since DPDK 20.11 the default rxdid is changed from 16 to 22, but the DCF
> data path didn't change, the patch fix the gap.
> 
> Fixes: 12443386a0b0 ("net/ice: support flex Rx descriptor RxDID22")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Qi Zhang 
> ---

Tested-by: Zhimin Huang 

Re: [dpdk-dev] [PATCH v4 2/2] net: added macro to extract MAC address bytes

[Ferruh Yigit]

On 8/17/2021 12:03 AM, Stephen Hemminger wrote:
> On Mon, 16 Aug 2021 15:27:28 +0530
> Aman Singh  wrote:
> 
>> Added macros to simplify print of MAC address.
>> The six bytes of a MAC address are extracted in
>> a macro here, to improve code readablity.
>>
>> Signed-off-by: Aman Singh 
>> Reviewed-by: Ferruh Yigit 
>> ---
>> The change in the document will be done in seperate patch.
>> To ensure document has direct reference of the code as shown in
>> commit 413c75c33c40 ("doc: show how to include code in guides").
> 
> NAK
> The DPDK already has rte_ether_format_addr()
> why does so much code not use it?
> 

'rte_ether_format_addr()' formats string to a buffer, but most of the times the
need is just to log and having a buffer for it is unnecessary.

Both macros look useful to me.

Re: [dpdk-dev] [PATCH v2] test/func_reentrancy: free memzones after creating test case

[David Marchand]

On Sat, Jul 31, 2021 at 2:04 PM Joyce Kong  wrote:
>
> Function reentrancy test limits maximum number of iterations
> simultaneously, however it doesn't free the 'fr_test_once'
> memzones after the fact, so introduce freeing 'fr_test_once'
> in ring/mempool/hash/fbk/lpm_clean.
>
> Meanwhile, add the missing free for test case on main thread.
>
> Fixes: 104a92bd026f ("app: add reentrancy tests")
> Fixes: 995eec619024 ("test: clean up memory for function reentrancy test")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Joyce Kong 
> Reviewed-by: Ruifeng Wang 
> Reviewed-by: Feifei Wang 

This patch actually breaks the test (we are lucky, the failure happens
often ;)).

28/94 DPDK:fast-tests / func_reentrancy_autotest   FAIL
0.22s (exit status 255 or signal 127 SIGinvalid)

--- command ---
16:13:45 DPDK_TEST='func_reentrancy_autotest'
/home-local/jenkins-local/jenkins-agent/workspace/Generic-Unit-Test-DPDK/dpdk/build/app/test/dpdk-test
-l 0-15 --file-prefix=func_reentrancy_autotest
--- stdout ---
RTE>>func_reentrancy_autotest
Func-ReEnt CASE 0: eal init once PASS
ring create/lookup: common object allocated 2 times (should be 1)
Func-ReEnt CASE 1: ring create/lookup FAIL
Test Failed
RTE>>
--- stderr ---


I guess, this is what happens:

main lcore  worker lcore 1  ...
worker lcore X
enters ring_create_lookup()

enters ring_create_lookup()
rte_eal_wait_lcore(worker lcore 1);
leaves ring_create_lookup()
ring_clean(worker lcore 1);

leaves ring_create_lookup()

There is no synchronisation point for the main lcore to know the
worker lcores are finished invoking the func callback.
With this patch, the "common" object is freed by the main lcore
*potentially* before some workers start trying to create it.
And we end up with multiple workers successfully creating this object,
hence the obj_count being incremented.


-- 
David Marchand

Re: [dpdk-dev] EAL: failed to parse device "XX:XX.X" on CentOS 7

[Thao Hull]

Thank you!  Will try that when I get back from vacation.  Thao

On Mon, Aug 16, 2021, 4:48 AM Mikulicz, Szymon (Nokia - PL/Krakow) <
szymon.mikul...@nokia.com> wrote:

> Hi Thao,
>
> the original issue was resolved by updating pkg-config. I compiled a new
> version of it on our centos 7 setup. We are currently using pkg-config 0.29.2
> and it works.
>
> BR,
> SM
>
> On 8/13/21 12:32 AM, Thao Hull wrote:
>
> Hi.
>
> This looks similar to the problem I am having.
> https://lore.kernel.org/dpdk-dev/bug-68...@http.bugs.dpdk.org%2F/T/
>
> I can't figure out how this issue was resolved on Centos7 per the thread.
> Can someone please explain how to get past this failure error?  Just like
> this user, testpmd works fine for me.  My device is in slot b3:00.0.   I am
> using arkville on a bittware FPGA card.  My error is slightly different as
> shown below:
>
> EAL: Detected 24 lcore(s)
> EAL: Detected 2 NUMA nodes
> EAL: Detected static linkage of DPDK
> EAL: failed to parse device "b3:00.0"
> EAL: Unable to parse device 'b3:00.0, Pkt_dir=0xF, Pkt_gen=./pg.conf'
>
> EAL: Error - exiting with EAL initialization
>
> I'm using dpdk version 21.08.0
>
> Any thoughts on how to debug, if not fix this?  I am new to dpdk.
>
> Thank you!
> Thao
>
>

Re: [dpdk-dev] [PATCH 21.11 v2 0/3] octeontx build only on 64-bit Linux

[David Marchand]

On Thu, Mar 25, 2021 at 3:52 PM Thomas Monjalon  wrote:
>
> This is a reorg of the patches from Pavan.
> It has been discussed that it should wait for DPDK 21.11
> for ABI compatibility reason.
>
> Pavan Nikhilesh (3):
>   net/thunderx: enable build only on 64-bit Linux
>   common/octeontx: enable build only on 64-bit Linux
>   common/octeontx2: enable build only on 64-bit Linux
>
>  drivers/common/octeontx/meson.build   |  6 ++
>  drivers/common/octeontx2/meson.build  |  4 ++--
>  drivers/compress/octeontx/meson.build |  6 ++
>  drivers/crypto/octeontx/meson.build   |  7 +--
>  drivers/event/octeontx/meson.build|  6 ++
>  drivers/event/octeontx2/meson.build   |  4 ++--
>  drivers/mempool/octeontx/meson.build  |  5 +++--
>  drivers/mempool/octeontx2/meson.build |  9 ++---
>  drivers/net/octeontx/meson.build  |  4 ++--
>  drivers/net/octeontx2/meson.build | 10 ++
>  drivers/net/thunderx/meson.build  |  4 ++--
>  drivers/raw/octeontx2_dma/meson.build | 10 ++
>  12 files changed, 44 insertions(+), 31 deletions(-)

There were a couple of cleanups (indent etc..) and changes in meson files.
This series does not apply cleanly on the main branch.
Could you rebase it?

I noticed that the net/cnxk driver does not have this check, but it is
disabled anyway since it depends on common/cnxk.
Is it worth adding the check for consistency?


-- 
David Marchand

[dpdk-dev] [PATCH v3 0/2] fix default RSS field for IP fragment packets

[Wenjun Wu]

This patch set removes redundant default RSS field for both IPv4 and
IPv6 fragment packets. Only src and dst address are needed.

v3:
* Rework commit log
v2:
* Rework commit log

Wenjun Wu (2):
  net/iavf: fix default RSS field for IP fragment packets
  net/ice: fix default RSS field for IP fragment packets

 drivers/net/iavf/iavf_hash.c | 26 ++
 drivers/net/ice/ice_ethdev.c |  4 ++--
 2 files changed, 4 insertions(+), 26 deletions(-)

-- 
2.25.1

[dpdk-dev] [PATCH v3 1/2] net/iavf: fix default RSS field for IP fragment packets

[Wenjun Wu]

Previously, hash value is calculated by src IP address, dst IP address
and IP ID. However, default RSS field only needs src and dst IP address.

This patch removes IP ID from default RSS field for IP fragment packets to
improve default RSS configuration.

Fixes: 9e29a278bc0c ("net/iavf: support default RSS for IP fragment")

Signed-off-by: Wenjun Wu 
---
 drivers/net/iavf/iavf_hash.c | 26 ++
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index 2b03dad858..eba55ecea5 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -624,34 +624,12 @@ iavf_rss_hash_set(struct iavf_adapter *ad, uint64_t 
rss_hf, bool add)
}
 
if (rss_hf & ETH_RSS_FRAG_IPV4) {
-   struct virtchnl_proto_hdrs hdr = {
-   .tunnel_level = TUNNEL_LEVEL_OUTER,
-   .count = 3,
-   .proto_hdr = {
-   proto_hdr_eth,
-   proto_hdr_ipv4,
-   {
-   VIRTCHNL_PROTO_HDR_IPV4_FRAG,
-   
FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_FRAG_PKID),
-   {BUFF_NOUSED},
-   },
-   },
-   };
-   rss_cfg.proto_hdrs = hdr;
+   rss_cfg.proto_hdrs = outer_ipv4_tmplt;
iavf_add_del_rss_cfg(ad, &rss_cfg, add);
}
 
if (rss_hf & ETH_RSS_FRAG_IPV6) {
-   struct virtchnl_proto_hdrs hdr = {
-   .tunnel_level = TUNNEL_LEVEL_OUTER,
-   .count = 3,
-   .proto_hdr = {
-   proto_hdr_eth,
-   proto_hdr_ipv6,
-   proto_hdr_ipv6_frag,
-   },
-   };
-   rss_cfg.proto_hdrs = hdr;
+   rss_cfg.proto_hdrs = outer_ipv6_tmplt;
iavf_add_del_rss_cfg(ad, &rss_cfg, add);
}
 
-- 
2.25.1

[dpdk-dev] [PATCH v3 2/2] net/ice: fix default RSS field for IP fragment packets

[Wenjun Wu]

Previously, hash value is calculated by src IP address, dst IP address
and IP ID. However, default RSS field only needs src and dst IP address.

This patch removes IP ID from default RSS field for IP fragment packets to
improve default RSS configuration.

Fixes: 4027fffe86f4 ("net/ice: support default RSS for IP fragment packet")

Signed-off-by: Wenjun Wu 
---
 drivers/net/ice/ice_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index a4cd39c954..64ee569525 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2975,7 +2975,7 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
 
if (rss_hf & ETH_RSS_FRAG_IPV4) {
cfg.addl_hdrs = ICE_FLOW_SEG_HDR_IPV4 | 
ICE_FLOW_SEG_HDR_IPV_FRAG;
-   cfg.hash_flds = ICE_FLOW_HASH_IPV4 | 
BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_ID);
+   cfg.hash_flds = ICE_FLOW_HASH_IPV4;
ret = ice_add_rss_cfg_wrap(pf, vsi->idx, &cfg);
if (ret)
PMD_DRV_LOG(ERR, "%s IPV4_FRAG rss flow fail %d",
@@ -2984,7 +2984,7 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
 
if (rss_hf & ETH_RSS_FRAG_IPV6) {
cfg.addl_hdrs = ICE_FLOW_SEG_HDR_IPV6 | 
ICE_FLOW_SEG_HDR_IPV_FRAG;
-   cfg.hash_flds = ICE_FLOW_HASH_IPV6 | 
BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_ID);
+   cfg.hash_flds = ICE_FLOW_HASH_IPV6;
ret = ice_add_rss_cfg_wrap(pf, vsi->idx, &cfg);
if (ret)
PMD_DRV_LOG(ERR, "%s IPV6_FRAG rss flow fail %d",
-- 
2.25.1

Re: [dpdk-dev] [PATCH v1] net/ice: fix memzone leak when device init failed

[David Marchand]

On Fri, Aug 13, 2021 at 8:45 AM Haiyue Wang  wrote:
>
> When flow engine initialization or FXP resource reset failed, it needs
> to free the memory zone and unregister the interrupt callback.
>
> Bugzilla ID: 752
> Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine")
> Fixes: 7615a6895009 ("net/ice: rework for generic flow enabling")
> Fixes: 7edc7158d771 ("net/ice: cleanup RSS/FDIR profile on device init")
> Cc: sta...@dpdk.org
>
> Reported-by: David Marchand 
> Signed-off-by: Haiyue Wang 
> ---
>  drivers/net/ice/ice_ethdev.c  | 10 --
>  drivers/net/ice/ice_fdir_filter.c |  2 ++
>  2 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
> index 64ee569525..8d62b84805 100644
> --- a/drivers/net/ice/ice_ethdev.c
> +++ b/drivers/net/ice/ice_ethdev.c
> @@ -2139,20 +2139,26 @@ ice_dev_init(struct rte_eth_dev *dev)
> ret = ice_flow_init(ad);
> if (ret) {
> PMD_INIT_LOG(ERR, "Failed to initialize flow");
> -   return ret;
> +   goto err_flow_init;

Is it safe to call flow engine uninit callbacks when ice_flow_init() fails?


> }
> }
>
> ret = ice_reset_fxp_resource(hw);
> if (ret) {
> PMD_INIT_LOG(ERR, "Failed to reset fxp resource");
> -   return ret;
> +   goto err_flow_init;
> }
>
> pf->supported_rxdid = ice_get_supported_rxdid(hw);
>
> return 0;
>
> +err_flow_init:
> +   ice_flow_uninit(ad);
> +   rte_intr_disable(intr_handle);
> +   ice_pf_disable_irq0(hw);
> +   rte_intr_callback_unregister(intr_handle,
> +ice_interrupt_handler, dev);
>  err_pf_setup:
> ice_res_pool_destroy(&pf->msix_pool);
>  err_msix_pool_init:


-- 
David Marchand

Re: [dpdk-dev] [PATCH v2 01/15] ethdev: introduce shared Rx queue

[Jerin Jacob]

On Wed, Aug 11, 2021 at 7:34 PM Xueming Li  wrote:
>
> In current DPDK framework, each RX queue is pre-loaded with mbufs for
> incoming packets. When number of representors scale out in a switch
> domain, the memory consumption became significant. Most important,
> polling all ports leads to high cache miss, high latency and low
> throughput.
>
> This patch introduces shared RX queue. Ports with same configuration in
> a switch domain could share RX queue set by specifying sharing group.
> Polling any queue using same shared RX queue receives packets from all
> member ports. Source port is identified by mbuf->port.
>
> Port queue number in a shared group should be identical. Queue index is
> 1:1 mapped in shared group.
>
> Share RX queue must be polled on single thread or core.
>
> Multiple groups is supported by group ID.
>
> Signed-off-by: Xueming Li 
> Cc: Jerin Jacob 
> ---
> Rx queue object could be used as shared Rx queue object, it's important
> to clear all queue control callback api that using queue object:
>   https://mails.dpdk.org/archives/dev/2021-July/215574.html

>  #undef RTE_RX_OFFLOAD_BIT2STR
> diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
> index d2b27c351f..a578c9db9d 100644
> --- a/lib/ethdev/rte_ethdev.h
> +++ b/lib/ethdev/rte_ethdev.h
> @@ -1047,6 +1047,7 @@ struct rte_eth_rxconf {
> uint8_t rx_drop_en; /**< Drop packets if no descriptors are 
> available. */
> uint8_t rx_deferred_start; /**< Do not start queue with 
> rte_eth_dev_start(). */
> uint16_t rx_nseg; /**< Number of descriptions in rx_seg array. */
> +   uint32_t shared_group; /**< Shared port group index in switch domain. 
> */

Not to able to see anyone setting/creating this group ID test application.
How this group is created?


> /**
>  * Per-queue Rx offloads to be set using DEV_RX_OFFLOAD_* flags.
>  * Only offloads set on rx_queue_offload_capa or rx_offload_capa
> @@ -1373,6 +1374,12 @@ struct rte_eth_conf {
>  #define DEV_RX_OFFLOAD_OUTER_UDP_CKSUM  0x0004
>  #define DEV_RX_OFFLOAD_RSS_HASH0x0008
>  #define RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT 0x0010
> +/**
> + * Rx queue is shared among ports in same switch domain to save memory,
> + * avoid polling each port. Any port in group can be used to receive packets.
> + * Real source port number saved in mbuf->port field.
> + */
> +#define RTE_ETH_RX_OFFLOAD_SHARED_RXQ   0x0020
>
>  #define DEV_RX_OFFLOAD_CHECKSUM (DEV_RX_OFFLOAD_IPV4_CKSUM | \
>  DEV_RX_OFFLOAD_UDP_CKSUM | \
> --
> 2.25.1
>

Re: [dpdk-dev] [PATCH v2 06/15] app/testpmd: add common fwd wrapper function

[Jerin Jacob]

On Wed, Aug 11, 2021 at 7:35 PM Xueming Li  wrote:
>
> From: Xiaoyu Min 
>
> Added an inline common wrapper function for all fwd engines
> which do the following in common:
>
> 1. get_start_cycles
> 2. rte_eth_rx_burst(...,nb_pkt_per_burst)
> 3. if rxq_share do forward_shared_rxq(), otherwise do fwd directly
> 4. get_end_cycle
>
> Signed-off-by: Xiaoyu Min 
> ---
>  app/test-pmd/testpmd.h | 24 
>  1 file changed, 24 insertions(+)
>
> diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
> index 13141dfed9..b685ac48d6 100644
> --- a/app/test-pmd/testpmd.h
> +++ b/app/test-pmd/testpmd.h
> @@ -1022,6 +1022,30 @@ void add_tx_dynf_callback(portid_t portid);
>  void remove_tx_dynf_callback(portid_t portid);
>  int update_jumbo_frame_offload(portid_t portid);
>
> +static inline void
> +do_burst_fwd(struct fwd_stream *fs, packet_fwd_cb fwd)
> +{
> +   struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
> +   uint16_t nb_rx;
> +   uint64_t start_tsc = 0;
> +
> +   get_start_cycles(&start_tsc);
> +
> +   /*
> +* Receive a burst of packets and forward them.
> +*/
> +   nb_rx = rte_eth_rx_burst(fs->rx_port, fs->rx_queue,
> +   pkts_burst, nb_pkt_per_burst);
> +   inc_rx_burst_stats(fs, nb_rx);
> +   if (unlikely(nb_rx == 0))
> +   return;
> +   if (unlikely(rxq_share > 0))

See below. It reads a global memory.

> +   forward_shared_rxq(fs, nb_rx, pkts_burst, fwd);
> +   else
> +   (*fwd)(fs, nb_rx, pkts_burst);

New function pointer in fastpath.

IMO, We should not create performance regression for the existing
forward engine.
Can we have a new forward engine just for shared memory testing?

> +   get_end_cycles(fs, start_tsc);
> +}
> +
>  /*
>   * Work-around of a compilation error with ICC on invocations of the
>   * rte_be_to_cpu_16() function.
> --
> 2.25.1
>

[dpdk-dev] [PATCH v5] app/testpmd: fix testpmd doesn't show RSS hash offload

[Jie Wang]

The driver may change offloads info into dev->data->dev_conf
in dev_configure which may cause port->dev_conf and port->rx_conf
contain outdated values.

This patch updates the offloads info if it changes to fix this issue.

It adds a new API "rte_eth_dev_conf_info_get()" to help testpmd get
device configuration info.

Fixes: ce8d561418d4 ("app/testpmd: add port configuration settings")
Cc: sta...@dpdk.org

Signed-off-by: Jie Wang 
---
 app/test-pmd/testpmd.c  | 33 +
 app/test-pmd/testpmd.h  |  2 ++
 app/test-pmd/util.c | 15 +++
 lib/ethdev/rte_ethdev.c | 27 +++
 lib/ethdev/rte_ethdev.h | 26 ++
 5 files changed, 103 insertions(+)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 6cbe9ba3c8..9a78805673 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2461,6 +2461,9 @@ start_port(portid_t pid)
}
 
if (port->need_reconfig > 0) {
+   struct rte_eth_dev_conf_info dev_conf_info;
+   int k;
+
port->need_reconfig = 0;
 
if (flow_isolate_all) {
@@ -2498,6 +2501,36 @@ start_port(portid_t pid)
port->need_reconfig = 1;
return -1;
}
+   /* get offloads */
+   if (0 !=
+   eth_dev_conf_info_get_print_err(pi,
+   &dev_conf_info)) {
+   rte_exit(EXIT_FAILURE,
+   "rte_eth_dev_conf_info_get() failed\n");
+   return -1;
+   }
+   /* Apply Rx offloads configuration */
+   if (dev_conf_info.rx_offloads !=
+   port->dev_conf.rxmode.offloads) {
+   port->dev_conf.rxmode.offloads =
+   dev_conf_info.rx_offloads;
+   for (k = 0;
+k < port->dev_info.max_rx_queues;
+k++)
+   port->rx_conf[k].offloads =
+   dev_conf_info.rx_offloads;
+   }
+   /* Apply Tx offloads configuration */
+   if (dev_conf_info.tx_offloads !=
+   port->dev_conf.txmode.offloads) {
+   port->dev_conf.txmode.offloads =
+   dev_conf_info.tx_offloads;
+   for (k = 0;
+k < port->dev_info.max_tx_queues;
+k++)
+   port->tx_conf[k].offloads =
+   dev_conf_info.tx_offloads;
+   }
}
if (port->need_reconfig_queues > 0) {
port->need_reconfig_queues = 0;
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 16a3598e48..4cf69a17a3 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -950,6 +950,8 @@ void show_gro(portid_t port_id);
 void setup_gso(const char *mode, portid_t port_id);
 int eth_dev_info_get_print_err(uint16_t port_id,
struct rte_eth_dev_info *dev_info);
+int eth_dev_conf_info_get_print_err(uint16_t port_id,
+   struct rte_eth_dev_conf_info *dev_info);
 void eth_set_promisc_mode(uint16_t port_id, int enable);
 void eth_set_allmulticast_mode(uint16_t port, int enable);
 int eth_link_get_nowait_print_err(uint16_t port_id, struct rte_eth_link *link);
diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c
index 5dd7157947..c6992fba7a 100644
--- a/app/test-pmd/util.c
+++ b/app/test-pmd/util.c
@@ -440,6 +440,21 @@ eth_dev_info_get_print_err(uint16_t port_id,
return ret;
 }
 
+int
+eth_dev_conf_info_get_print_err(uint16_t port_id,
+   struct rte_eth_dev_conf_info *dev_conf_info)
+{
+   int ret;
+
+   ret = rte_eth_dev_conf_info_get(port_id, dev_conf_info);
+   if (ret != 0)
+   fprintf(stderr,
+   "Error during getting device config (port %u) info: 
%s\n",
+   port_id, strerror(-ret));
+
+   return ret;
+}
+
 void
 eth_set_promisc_mode(uint16_t port, int enable)
 {
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 9d95cd11e1..74184099a1 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -3458,6 +3458,33 @@ rte_eth_dev_info_get(uint16_t port_id, struct 
rte_eth_dev_info *dev_info)
return 0;
 }
 
+int
+rte_eth_dev_conf_info_get(uint16_t port_id,
+   struct rt

Re: [dpdk-dev] [PATCH v2 2/6] eal: oops handling API implementation

[Jerin Jacob]

On Tue, Aug 17, 2021 at 9:22 AM Stephen Hemminger
 wrote:
>
> On Tue, 17 Aug 2021 08:57:19 +0530
>  wrote:
>
> > +#define oops_print(...) rte_log(RTE_LOG_ERR, RTE_LOGTYPE_EAL, __VA_ARGS__)
>
> It is problematic to call rte_log from a signal handler.
> The malloc pool maybe corrupted and rte_log can call functions that
> use malloc.

OK. What to use instead, fprint(stderr, ...)?

>
> Even rte_dump_stack() is unsafe from these signals.

OK

>
> > +
> > +static int oops_signals[] = {SIGSEGV, SIGBUS, SIGILL, SIGABRT, SIGFPE, 
> > SIGSYS};
>
> Should be constant.

Ack

>
> > +
> > +struct oops_signal {
> > + int sig;
>
> Redundant, you defined the oops_signals above.

Ack.

>
> > + bool enabled;
>
> Redundant, you can just compare with action.

Anyway, we need to database to hold the sigactions. This makes clean
to implement rte_oops_signals_enabled().
Also != SIG_DFL is not enabled.

>
> > + struct sigaction sa;
> > +};
> > +
> > +static struct oops_signal signals_db[RTE_DIM(oops_signals)];
> > +
> > +static void
> > +back_trace_dump(ucontext_t *context)
> > +{
> > + RTE_SET_USED(context);
> > +
> > + rte_dump_stack();
> > +}
>
> rte_dump_stack() is not safe in signal handler:
>
> Recommend backtrace_symbols_fd ??
>
> Better yet use libunwind

libunwind is an optional dependency. You can see in the next patch,
back_trace_dump() will be implemented with libunwind based stack unwind,
if the dependency is met.


>
> > +static void
> > +siginfo_dump(int sig, siginfo_t *info)
> > +{
> > + oops_print("PID:   %" PRIdMAX "\n", (intmax_t)getpid());
> > +
> > + if (info == NULL)
> > + return;
> > + if (sig != info->si_signo)
> > + oops_print("Invalid signal info\n");
> > +
> > + oops_print("Signal number: %d\n", info->si_signo);
> > + oops_print("Fault address: %p\n", info->si_addr);
> > +}
> > +
> > +static void
> > +mem32_dump(void *ptr)
>
> Should be const

Ack.

>
> > +{
> > + uint32_t *p = ptr;
> > + int i;
> > +
> > + for (i = 0; i < 16; i++)
> > + oops_print("%p: 0x%x\n", p + i, rte_be_to_cpu_32(p[i]));
> > +}
 >
> Why reinvent hexdump?

Make sense. I can change to hexdump, But, it will use rte_log. Shouldn't we use
fprint(stderr,..) variant.

>
> > +
> > +static void
> > +stack_dump_header(void)
> > +{
> > + oops_print("Stack dump:\n");
> > + oops_print("--\n");
> > +}
> > +
> > +static void
> > +code_dump_header(void)
> > +{
> > + oops_print("Code dump:\n");
> > + oops_print("--\n");
> > +}
> > +
> > +static void
> > +stack_code_dump(void *stack, void *code)
> > +{
> > + if (stack == NULL || code == NULL)
> > + return;
> > +
> > + oops_print("\n");
> > + stack_dump_header();
> > + mem32_dump(stack);
> > + oops_print("\n");
> > +
> > + code_dump_header();
> > + mem32_dump(code);
> > + oops_print("\n");
> > +}
> > +static void
> > +archinfo_dump(ucontext_t *uc)
> >  {
> > - RTE_SET_USED(sig);
> > - RTE_SET_USED(info);
> >   RTE_SET_USED(uc);
> >
> > + stack_code_dump(NULL, NULL);
> > +}
> > +
> > +static void
> > +default_signal_handler_invoke(int sig)
> > +{
> > + unsigned int idx;
> > +
> > + for (idx = 0; idx < RTE_DIM(oops_signals); idx++) {
> > + /* Skip disabled signals */
> > + if (signals_db[idx].sig != sig)
> > + continue;
> > + if (!signals_db[idx].enabled)
> > + continue;
> > + /* Replace with stored handler */
> > + sigaction(sig, &signals_db[idx].sa, NULL);
> > + kill(getpid(), sig);
>
> If you use SA_RESETHAND, you don't need this stuff.

As mentioned in other 1/6 email reply, This is NOT the case where
SIG_DFL handler
called from eal oops handler, instead, it will be calling the signal
handler which
is registered prior to rte_eal_init() which is stored local database.



>
> > + }
> > +}
> > +
> > +void
> > +rte_oops_decode(int sig, siginfo_t *info, ucontext_t *uc)
> > +{
> > + oops_print("Signal info:\n");
> > + oops_print("\n");
> > + siginfo_dump(sig, info);
> > + oops_print("\n");
> > +
> > + oops_print("Backtrace:\n");
> > + oops_print("--\n");
> > + back_trace_dump(uc);
> > + oops_print("\n");
> > +
> > + oops_print("Arch info:\n");
> > + oops_print("--\n");
> > + if (uc)
> > + archinfo_dump(uc);
> > +}
> > +
> > +static void
> > +eal_oops_handler(int sig, siginfo_t *info, void *ctx)
> > +{
> > + ucontext_t *uc = ctx;
> > +
> > + rte_oops_decode(sig, info, uc);
> > + default_signal_handler_invoke(sig);
>
> If you use SA_RESETHAND, then just doing raise(sig) here.
> >  }
> >
> >  int
> >  rte_oops_signals_enabled(int *signals)
>
> Why is this necessary and exported?

Explained in 1/6 email reply.

[dpdk-dev] [PATCH v6] build: optional NUMA and cpu counts detection

[Juraj Linkeš]

Add an option to automatically discover the host's numa and cpu counts
and use those values for a non cross-build.
Give users the option to override the per-arch default values or values
from cross files by specifying them on the command line with -Dmax_lcores
and -Dmax_numa_nodes.

Signed-off-by: Juraj Linkeš 
Reviewed-by: Honnappa Nagarahalli 
Reviewed-by: David Christensen 
Acked-by: Bruce Richardson 
---
v6: rebase
---
 MAINTAINERS  |  2 ++
 buildtools/get-cpu-count.py  |  7 ++
 buildtools/get-numa-count.py | 24 ++
 buildtools/meson.build   |  2 ++
 config/meson.build   | 47 ++--
 config/x86/meson.build   |  2 ++
 meson_options.txt|  8 +++---
 7 files changed, 86 insertions(+), 6 deletions(-)
 create mode 100644 buildtools/get-cpu-count.py
 create mode 100644 buildtools/get-numa-count.py

diff --git a/MAINTAINERS b/MAINTAINERS
index 266f5ac1da..629d5c40cc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -102,6 +102,8 @@ F: meson_options.txt
 F: config/
 F: buildtools/chkincs/
 F: buildtools/call-sphinx-build.py
+F: buildtools/get-cpu-count.py
+F: buildtools/get-numa-count.py
 F: buildtools/list-dir-globs.py
 F: buildtools/pkg-config/
 F: buildtools/symlink-drivers-solibs.sh
diff --git a/buildtools/get-cpu-count.py b/buildtools/get-cpu-count.py
new file mode 100644
index 00..317b32088f
--- /dev/null
+++ b/buildtools/get-cpu-count.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2021 PANTHEON.tech s.r.o.
+
+import os
+
+print(os.cpu_count())
diff --git a/buildtools/get-numa-count.py b/buildtools/get-numa-count.py
new file mode 100644
index 00..1b7787787f
--- /dev/null
+++ b/buildtools/get-numa-count.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2021 PANTHEON.tech s.r.o.
+
+import ctypes
+import glob
+import os
+import subprocess
+
+if os.name == 'posix':
+if os.path.isdir('/sys/devices/system/node'):
+numa_nodes = glob.glob('/sys/devices/system/node/node*')
+numa_nodes.sort()
+print(int(os.path.basename(numa_nodes[-1])[4:]) + 1)
+else:
+subprocess.run(['sysctl', '-n', 'vm.ndomains'], check=False)
+
+elif os.name == 'nt':
+libkernel32 = ctypes.windll.kernel32
+
+numa_count = ctypes.c_ulong()
+
+libkernel32.GetNumaHighestNodeNumber(ctypes.pointer(numa_count))
+print(numa_count.value + 1)
diff --git a/buildtools/meson.build b/buildtools/meson.build
index bd460e3e00..f776316da1 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -16,6 +16,8 @@ echo = py3 + ['-c', 'import sys; print(*sys.argv[1:])']
 list_dir_globs = py3 + files('list-dir-globs.py')
 map_to_win_cmd = py3 + files('map_to_win.py')
 sphinx_wrapper = py3 + files('call-sphinx-build.py')
+get_cpu_count_cmd = py3 + files('get-cpu-count.py')
+get_numa_count_cmd = py3 + files('get-numa-count.py')
 
 # select library and object file format
 pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()]
diff --git a/config/meson.build b/config/meson.build
index e80421003b..364788c32d 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -286,8 +286,6 @@ foreach arg: warning_flags
 endforeach
 
 # set other values pulled from the build options
-dpdk_conf.set('RTE_MAX_LCORE', get_option('max_lcores'))
-dpdk_conf.set('RTE_MAX_NUMA_NODES', get_option('max_numa_nodes'))
 dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports'))
 dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
 dpdk_conf.set('RTE_ENABLE_TRACE_FP', get_option('enable_trace_fp'))
@@ -321,6 +319,51 @@ if meson.is_cross_build()
 endif
 endif
 
+max_lcores = get_option('max_lcores')
+if max_lcores == 'detect'
+   # Discovery makes sense only for non-cross builds
+   if meson.is_cross_build()
+   error('Discovery of max_lcores is not supported for 
cross-compilation.')
+   endif
+   # Overwrite the default value with discovered values
+   max_lcores = run_command(get_cpu_count_cmd).stdout().to_int()
+   min_lcores = 2
+   # DPDK must be build for at least 2 cores
+   if max_lcores < min_lcores
+   message('Found less than @0@ cores, building for @0@ 
cores'.format(min_lcores))
+   max_lcores = min_lcores
+   else
+   message('Found @0@ cores'.format(max_lcores))
+   endif
+   dpdk_conf.set('RTE_MAX_LCORE', max_lcores)
+elif max_lcores != 'default'
+   # Overwrite the default value from arch_subdir with user input
+   dpdk_conf.set('RTE_MAX_LCORE', max_lcores.to_int())
+endif
+
+max_numa_nodes = get_option('max_numa_nodes')
+if max_numa_nodes == 'detect'
+   # Discovery makes sense only for non-cross builds
+   if meson.is_cross_build()
+   error('Discovery of max_numa_nodes not supported for 
cross-compilation.')
+   endif
+   # Overwrite the default

[dpdk-dev] [PATCH v4 1/2] config/arm: split march cfg into arch and features

[Juraj Linkeš]

Older compilers may not support all arch versions and all features that
the target SoC supports, in which case it's better to figure out the
highest arch version and features that the compiler supports. Implement
a way to achieve this:
1. Find the highest arch version that the compiler supports, keeping in
mind the SoC arch version we're building. For example, if the SoC arch
version is arm8.2-a, but the compiler only supports arm8.1-a, use
arm8.1-a. On the other hand, if the compiler supports arm8.3-a (or
higher), use armv8.2-a.
2. With the architecture version locked, iterate over SoC features and
use all that are supported.

In all cases, emit a warning if there's something unsupported by the
compiler.

Signed-off-by: Juraj Linkeš 
---
v4: rebase
---
 config/arm/meson.build | 124 -
 1 file changed, 99 insertions(+), 25 deletions(-)

diff --git a/config/arm/meson.build b/config/arm/meson.build
index 14987c634a..c11efa1583 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -38,7 +38,9 @@ implementer_generic = {
 ],
 'part_number_config': {
 'generic': {
-'machine_args': ['-march=armv8-a+crc', '-moutline-atomics']
+'march': 'armv8-a',
+'march_features': ['crc'],
+'compiler_options': ['-moutline-atomics']
 },
 'generic_aarch32': {
 'machine_args': ['-march=armv8-a', '-mfpu=neon'],
@@ -53,15 +55,17 @@ implementer_generic = {
 }
 
 part_number_config_arm = {
-'0xd03': {'machine_args':  ['-mcpu=cortex-a53']},
-'0xd04': {'machine_args':  ['-mcpu=cortex-a35']},
-'0xd07': {'machine_args':  ['-mcpu=cortex-a57']},
-'0xd08': {'machine_args':  ['-mcpu=cortex-a72']},
-'0xd09': {'machine_args':  ['-mcpu=cortex-a73']},
-'0xd0a': {'machine_args':  ['-mcpu=cortex-a75']},
-'0xd0b': {'machine_args':  ['-mcpu=cortex-a76']},
+'0xd03': {'compiler_options':  ['-mcpu=cortex-a53']},
+'0xd04': {'compiler_options':  ['-mcpu=cortex-a35']},
+'0xd07': {'compiler_options':  ['-mcpu=cortex-a57']},
+'0xd08': {'compiler_options':  ['-mcpu=cortex-a72']},
+'0xd09': {'compiler_options':  ['-mcpu=cortex-a73']},
+'0xd0a': {'compiler_options':  ['-mcpu=cortex-a75']},
+'0xd0b': {'compiler_options':  ['-mcpu=cortex-a76']},
 '0xd0c': {
-'machine_args':  ['-march=armv8.2-a+crypto', '-mcpu=neoverse-n1'],
+'march': 'armv8.2-a',
+'march_features': ['crypto'],
+'compiler_options':  ['-mcpu=neoverse-n1'],
 'flags': [
 ['RTE_MACHINE', '"neoverse-n1"'],
 ['RTE_ARM_FEATURE_ATOMICS', true],
@@ -71,7 +75,8 @@ part_number_config_arm = {
 ]
 },
 '0xd49': {
-'machine_args':  ['-march=armv8.5-a+crypto+sve2'],
+'march': 'armv8.5-a',
+'march_features': ['crypto', 'sve2'],
 'flags': [
 ['RTE_MACHINE', '"neoverse-n2"'],
 ['RTE_ARM_FEATURE_ATOMICS', true],
@@ -105,19 +110,21 @@ implementer_cavium = {
 ],
 'part_number_config': {
 '0xa1': {
-'machine_args': ['-mcpu=thunderxt88'],
+'compiler_options': ['-mcpu=thunderxt88'],
 'flags': flags_part_number_thunderx
 },
 '0xa2': {
-'machine_args': ['-mcpu=thunderxt81'],
+'compiler_options': ['-mcpu=thunderxt81'],
 'flags': flags_part_number_thunderx
 },
 '0xa3': {
-'machine_args': ['-mcpu=thunderxt83'],
+'compiler_options': ['-mcpu=thunderxt83'],
 'flags': flags_part_number_thunderx
 },
 '0xaf': {
-'machine_args': ['-march=armv8.1-a+crc+crypto', 
'-mcpu=thunderx2t99'],
+'march': 'armv8.1-a',
+'march_features': ['crc', 'crypto'],
+'compiler_options': ['-mcpu=thunderx2t99'],
 'flags': [
 ['RTE_MACHINE', '"thunderx2"'],
 ['RTE_ARM_FEATURE_ATOMICS', true],
@@ -127,7 +134,9 @@ implementer_cavium = {
 ]
 },
 '0xb2': {
-'machine_args': ['-march=armv8.2-a+crc+crypto+lse', 
'-mcpu=octeontx2'],
+'march': 'armv8.2-a',
+'march_features': ['crc', 'crypto', 'lse'],
+'compiler_options': ['-mcpu=octeontx2'],
 'flags': [
 ['RTE_MACHINE', '"octeontx2"'],
 ['RTE_ARM_FEATURE_ATOMICS', true],
@@ -148,7 +157,11 @@ implementer_ampere = {
 ['RTE_MAX_NUMA_NODES', 1]
 ],
 'part_number_config': {
-'0x0': {'machine_args':  ['-march=armv8-a+crc+crypto', '-mtune=emag']}
+'0x0': {
+'march': 'armv8-a',
+'march_features': ['crc', 'crypto'],
+'compiler_options':  ['-mtune=emag']
+}
 }
 }
 
@@ -160,7 +173,9 @@ implementer_hisilicon = {
 ],
 'part_number_config': {
 '0xd01': {
-'machine_args': ['-march=armv8.2-a+crypto', '-mtune=tsv110'],

[dpdk-dev] [PATCH v4 2/2] config/arm: make n2 'crypto' an optional feature

[Juraj Linkeš]

Not all Neoverse-N2 cpus must support the crypto feature/extension which
makes it an optional feature. Only enable the feature for SoCs which
support it.

Signed-off-by: Juraj Linkeš 
---
v4: rebase
---
 config/arm/meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/arm/meson.build b/config/arm/meson.build
index c11efa1583..c9bcd089df 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -76,7 +76,7 @@ part_number_config_arm = {
 },
 '0xd49': {
 'march': 'armv8.5-a',
-'march_features': ['crypto', 'sve2'],
+'march_features': ['sve2'],
 'flags': [
 ['RTE_MACHINE', '"neoverse-n2"'],
 ['RTE_ARM_FEATURE_ATOMICS', true],
@@ -278,6 +278,7 @@ soc_cn10k = {
 ['RTE_MAX_NUMA_NODES', 1]
 ],
 'part_number': '0xd49',
+'extra_march_features': ['crypto'],
 'numa': false
 }
 
-- 
2.20.1

Re: [dpdk-dev] [PATCH 1/2] app/testpmd: fix csumonly mode when run without outer chksum

[Nithin Dabilpuram]

On Tue, Aug 17, 2021 at 01:43:27AM +, Li, Xiaoyun wrote:
> 
> 
> > -Original Message-
> > From: Nithin Dabilpuram 
> > Sent: Monday, August 16, 2021 18:56
> > To: Li, Xiaoyun 
> > Cc: jer...@marvell.com; dev@dpdk.org; jia@intel.com; sta...@dpdk.org
> > Subject: Re: [dpdk-dev] [PATCH 1/2] app/testpmd: fix csumonly mode when run
> > without outer chksum
> > 
> > On Mon, Aug 16, 2021 at 08:48:20AM +, Li, Xiaoyun wrote:
> > > Hi
> > >
> > > > -Original Message-
> > > > From: Nithin Dabilpuram 
> > > > Sent: Monday, August 16, 2021 15:10
> > > > To: Li, Xiaoyun 
> > > > Cc: jer...@marvell.com; dev@dpdk.org; Nithin Dabilpuram
> > > > ; jia@intel.com; sta...@dpdk.org
> > > > Subject: [PATCH 1/2] app/testpmd: fix csumonly mode when run without
> > > > outer chksum
> > > >
> > > > Donot use outer metadata when neither outer ip checksum nor outer
> > > > udp checksum is enabled. PMD's will ignore the outer_l2_len and
> > > > outer_l3_len in cases where none of the outer checksum is enabled
> > > > and hence only l2_len and l3_len will be used to calculate the offsets 
> > > > for L2
> > or L3 header.
> > >
> > > I don't understand.
> > > In process_outer_chksum, only PKT_TX_OUTER_IPV6 Will be set if it's ipv6
> > packets.
> > > So PKT_TX_OUTER_IPV6 means this packet is tunnel ipv6 packet. So it 
> > > actually
> > needs outer l2 len and outer l3 len put them to hw.
> > > At least i40e needs outer l2 len and outer l3 len as far as I know.
> > 
> > Ok, do you mean m->outer_l2_len and m->outer_l3_len will be referred in i40e
> > driver even when both DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM and
> > DEV_TX_OFFLOAD_OUTER_UDP_CKSUM are not enabled in ethdev Tx offloads ?
> > 
> > I thought as per spec, those fields will only be used when the Outer 
> > offloads are
> > enabled.
> 
> Checked again. You're right. Tx offloads are enough.

Ack, thanks.
> 
> > 
> > >
> > > >
> > > > Fixes: 3c32113a1aac ("app/testpmd: fix IPv6 tunnel checksum")
> > > > Cc: jia@intel.com
> > > > Cc: sta...@dpdk.org
> > > >
> > > > Signed-off-by: Nithin Dabilpuram 
> > > > ---
> > > >  app/test-pmd/csumonly.c | 3 +--
> > > >  1 file changed, 1 insertion(+), 2 deletions(-)
> > > >
> > > > diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index
> > > > 607c889..38cc256 100644
> > > > --- a/app/test-pmd/csumonly.c
> > > > +++ b/app/test-pmd/csumonly.c
> > > > @@ -961,8 +961,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
> > > > (tx_offloads &
> > > >  DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) ||
> > > > (tx_offloads &
> > > > -DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) ||
> > > > -   (tx_ol_flags & PKT_TX_OUTER_IPV6)) {
> > > > +DEV_TX_OFFLOAD_OUTER_UDP_CKSUM)) {
> > > > m->outer_l2_len = info.outer_l2_len;
> > > > m->outer_l3_len = info.outer_l3_len;
> > > > m->l2_len = info.l2_len;
> > > > --
> > > > 2.8.4
> > >

Re: [dpdk-dev] [PATCH v4 1/2] config/arm: split march cfg into arch and features

[Juraj Linkeš]

Resending, since there was an error when sending to Chengwen.

> -Original Message-
> From: Juraj Linkeš 
> Sent: Tuesday, August 17, 2021 12:57 PM
> To: tho...@monjalon.net; david.march...@redhat.com;
> bruce.richard...@intel.com; honnappa.nagaraha...@arm.com;
> ruifeng.w...@arm.com; fengcheng...@huawei.com;
> ferruh.yi...@intel.com; jerinjac...@gmail.com; jer...@marvell.com;
> pbhagavat...@marvell.com
> Cc: dev@dpdk.org; Juraj Linkeš 
> Subject: [PATCH v4 1/2] config/arm: split march cfg into arch and features
> 
> Older compilers may not support all arch versions and all features that the 
> target
> SoC supports, in which case it's better to figure out the highest arch 
> version and
> features that the compiler supports. Implement a way to achieve this:
> 1. Find the highest arch version that the compiler supports, keeping in mind 
> the
> SoC arch version we're building. For example, if the SoC arch version is 
> arm8.2-
> a, but the compiler only supports arm8.1-a, use arm8.1-a. On the other hand, 
> if
> the compiler supports arm8.3-a (or higher), use armv8.2-a.
> 2. With the architecture version locked, iterate over SoC features and use all
> that are supported.
> 
> In all cases, emit a warning if there's something unsupported by the compiler.
> 
> Signed-off-by: Juraj Linkeš 
> ---
> v4: rebase
> ---
>  config/arm/meson.build | 124 -
>  1 file changed, 99 insertions(+), 25 deletions(-)
> 
> diff --git a/config/arm/meson.build b/config/arm/meson.build index
> 14987c634a..c11efa1583 100644
> --- a/config/arm/meson.build
> +++ b/config/arm/meson.build
> @@ -38,7 +38,9 @@ implementer_generic = {
>  ],
>  'part_number_config': {
>  'generic': {
> -'machine_args': ['-march=armv8-a+crc', '-moutline-atomics']
> +'march': 'armv8-a',
> +'march_features': ['crc'],
> +'compiler_options': ['-moutline-atomics']
>  },
>  'generic_aarch32': {
>  'machine_args': ['-march=armv8-a', '-mfpu=neon'], @@ -53,15 
> +55,17
> @@ implementer_generic = {  }
> 
>  part_number_config_arm = {
> -'0xd03': {'machine_args':  ['-mcpu=cortex-a53']},
> -'0xd04': {'machine_args':  ['-mcpu=cortex-a35']},
> -'0xd07': {'machine_args':  ['-mcpu=cortex-a57']},
> -'0xd08': {'machine_args':  ['-mcpu=cortex-a72']},
> -'0xd09': {'machine_args':  ['-mcpu=cortex-a73']},
> -'0xd0a': {'machine_args':  ['-mcpu=cortex-a75']},
> -'0xd0b': {'machine_args':  ['-mcpu=cortex-a76']},
> +'0xd03': {'compiler_options':  ['-mcpu=cortex-a53']},
> +'0xd04': {'compiler_options':  ['-mcpu=cortex-a35']},
> +'0xd07': {'compiler_options':  ['-mcpu=cortex-a57']},
> +'0xd08': {'compiler_options':  ['-mcpu=cortex-a72']},
> +'0xd09': {'compiler_options':  ['-mcpu=cortex-a73']},
> +'0xd0a': {'compiler_options':  ['-mcpu=cortex-a75']},
> +'0xd0b': {'compiler_options':  ['-mcpu=cortex-a76']},
>  '0xd0c': {
> -'machine_args':  ['-march=armv8.2-a+crypto', '-mcpu=neoverse-n1'],
> +'march': 'armv8.2-a',
> +'march_features': ['crypto'],
> +'compiler_options':  ['-mcpu=neoverse-n1'],
>  'flags': [
>  ['RTE_MACHINE', '"neoverse-n1"'],
>  ['RTE_ARM_FEATURE_ATOMICS', true], @@ -71,7 +75,8 @@
> part_number_config_arm = {
>  ]
>  },
>  '0xd49': {
> -'machine_args':  ['-march=armv8.5-a+crypto+sve2'],
> +'march': 'armv8.5-a',
> +'march_features': ['crypto', 'sve2'],
>  'flags': [
>  ['RTE_MACHINE', '"neoverse-n2"'],
>  ['RTE_ARM_FEATURE_ATOMICS', true], @@ -105,19 +110,21 @@
> implementer_cavium = {
>  ],
>  'part_number_config': {
>  '0xa1': {
> -'machine_args': ['-mcpu=thunderxt88'],
> +'compiler_options': ['-mcpu=thunderxt88'],
>  'flags': flags_part_number_thunderx
>  },
>  '0xa2': {
> -'machine_args': ['-mcpu=thunderxt81'],
> +'compiler_options': ['-mcpu=thunderxt81'],
>  'flags': flags_part_number_thunderx
>  },
>  '0xa3': {
> -'machine_args': ['-mcpu=thunderxt83'],
> +'compiler_options': ['-mcpu=thunderxt83'],
>  'flags': flags_part_number_thunderx
>  },
>  '0xaf': {
> -'machine_args': ['-march=armv8.1-a+crc+crypto', '-
> mcpu=thunderx2t99'],
> +'march': 'armv8.1-a',
> +'march_features': ['crc', 'crypto'],
> +'compiler_options': ['-mcpu=thunderx2t99'],
>  'flags': [
>  ['RTE_MACHINE', '"thunderx2"'],
>  ['RTE_ARM_FEATURE_ATOMICS', true], @@ -127,7 +134,9 @@
> implementer_cavium = {
>  ]
>  },
>  '0xb2': {
> -'machine_args': ['-march=armv8.2-a+crc+crypto+lse', '-
> mcpu=octeontx2'],
> +'march': 'armv8.2-a',
> +'march_features'

Re: [dpdk-dev] [PATCH v1 0/2] Features for hns3 PMD

[Ferruh Yigit]

On 7/26/2021 11:59 AM, Min Hu (Connor) wrote:
> This patch set contains two features:
> add start/stop Tx datapath request for MP
> support set link up/down for PF
> 
> Huisong Li (2):
>   net/hns3: add start/stop Tx datapath request for MP
>   net/hns3: support set link up/down for PF
> 

Series applied to dpdk-next-net/main, thanks.

Re: [dpdk-dev] [PATCH 1/2] Hooks to allow the setting of filters on tcp flags

[Iremonger, Bernard]

Hi Sowmini,

> -Original Message-
> From: Sowmini Varadhan 
> Sent: Thursday, August 12, 2021 9:18 PM
> To: sowmin...@gmail.com; Iremonger, Bernard
> ; dev@dpdk.org;
> sovar...@linux.microsoft.com
> Cc: tho...@monjalon.net
> Subject: [PATCH 1/2] Hooks to allow the setting of filters on tcp flags

~/dpdk_21_08/devtools# ./check-git-log.sh -1
Wrong headline format:
Hooks to allow the setting of filters on tcp flags

The subject line should be prefixed with examples/flow_classify:
examples/flow_classify: Hooks to allow the setting of filters on tcp flags
> 
> The rte_eth_ntuple_filter allows tcp_flags which can check for things like
> #define RTE_TCP_CWR_FLAG 0x80 /**< Congestion Window Reduced */
> #define RTE_TCP_ECE_FLAG 0x40 /**< ECN-Echo */
> #define RTE_TCP_URG_FLAG 0x20 /**< Urgent Pointer field significant */
> #define RTE_TCP_ACK_FLAG 0x10 /**< Acknowledgment field significant
> */
> #define RTE_TCP_PSH_FLAG 0x08 /**< Push Function */
> #define RTE_TCP_RST_FLAG 0x04 /**< Reset the connection */
> #define RTE_TCP_SYN_FLAG 0x02 /**< Synchronize sequence numbers */
> #define RTE_TCP_FIN_FLAG 0x01 /**< No more data from sender */ but
> there are no existing examples that demonstrate how to use this feature.
> 
> This patch extends the exisiting classification support to allow an optional

Typo: " exisiting"  should be "existing"

> flags in the input file. The flags string can be any concatenation of 
> characters
> from {C, E, U, A, P, R, S, F} and "*" indicates "dont care". These flags are 
> set in
> the ntuple_filter and are used to construct the tcp_spec and tcp_mask sent
> to the driver
> 
> The rte_acl_field_def is updated to use the (u8) tcp flag as lookup key.
> Note that, as per
>   https://doc.dpdk.org/guides/prog_guide/packet_classif_access_ctrl.html
> this field MUST be allocated fo4 4 bytes, thus it has sizeof(uint32_t).

Typo:  "fo4" should be "for"
 
> 
> However, also note the XXX in this commit: additional updates are needed to
> the rte_flow_classify_table_entry_add() so that it does not ignore any key
> fields other than the 5-tuple.
> 
> Signed-off-by: Sowmini Varadhan 
> ---
>  examples/flow_classify/flow_classify.c | 87 --
>  examples/flow_classify/ipv4_rules_file.txt | 22 +++---
>  2 files changed, 91 insertions(+), 18 deletions(-)
> 
> diff --git a/examples/flow_classify/flow_classify.c
> b/examples/flow_classify/flow_classify.c
> index db71f5aa04..772b15adf2 100644
> --- a/examples/flow_classify/flow_classify.c
> +++ b/examples/flow_classify/flow_classify.c
> @@ -51,6 +51,7 @@ enum {
>   CB_FLD_DST_PORT_MASK,
>   CB_FLD_PROTO,
>   CB_FLD_PRIORITY,
> + CB_FLD_TCP_FLAGS,
>   CB_FLD_NUM,
>  };
> 
> @@ -86,6 +87,7 @@ enum {
>   DST_FIELD_IPV4,
>   SRCP_FIELD_IPV4,
>   DSTP_FIELD_IPV4,
> + TCP_FLAGS_FIELD,
>   NUM_FIELDS_IPV4
>  };
> 
> @@ -93,7 +95,8 @@ enum {
>   PROTO_INPUT_IPV4,
>   SRC_INPUT_IPV4,
>   DST_INPUT_IPV4,
> - SRCP_DESTP_INPUT_IPV4
> + SRCP_DESTP_INPUT_IPV4,
> + TCP_FLAGS_INDEX,
>  };
> 
>  static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = { @@ -150,6
> +153,17 @@ static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {
>   sizeof(struct rte_ipv4_hdr) +
>   offsetof(struct rte_tcp_hdr, dst_port),
>   },
> + /* next field must be 4 bytes, even though flags is only 1 byte */
> + {
> + /* rte_flags */
> + .type = RTE_ACL_FIELD_TYPE_BITMASK,
> + .size = sizeof(uint32_t),
> + .field_index = TCP_FLAGS_FIELD,
> + .input_index = TCP_FLAGS_INDEX,
> + .offset = sizeof(struct rte_ether_hdr) +
> + sizeof(struct rte_ipv4_hdr) +
> + offsetof(struct rte_tcp_hdr, tcp_flags),
> + },
>  };
>  /* >8 End of creation of ACL table. */
> 
> @@ -285,12 +299,14 @@ lcore_main(struct flow_classifier *cls_app)
>   int ret;
>   int i = 0;
> 
> - ret = rte_flow_classify_table_entry_delete(cls_app->cls,
> - rules[7]);
> - if (ret)
> - printf("table_entry_delete failed [7] %d\n\n", ret);
> - else
> - printf("table_entry_delete succeeded [7]\n\n");
> + if (rules[7]) {
> + ret = rte_flow_classify_table_entry_delete(cls_app->cls,
> + rules[7]);
> + if (ret)
> + printf("table_entry_delete failed [7] %d\n\n", ret);
> + else
> + printf("table_entry_delete succeeded [7]\n\n");
> + }
> 
>   /*
>* Check that the port is on the same NUMA node as the polling
> thread @@ -410,6 +426,53 @@ parse_ipv4_net(char *in, uint32_t *addr,
> uint32_t *mask_len)
>   return 0;
>  }
> 
> +static int
> +get_tcp_flags(char *in, struct rte_eth_ntuple_filter *ntuple_filter) {
> + int len = strlen(in);
> + int i;
> +  

Re: [dpdk-dev] [PATCH 2/2] app/testpmd: fix verbose mode dump for Tx

[Raslan Darawsheh]

Hi,

> -Original Message-
> From: Li, Xiaoyun 
> Sent: Tuesday, August 17, 2021 4:54 AM
> To: Nithin Dabilpuram 
> Cc: jer...@marvell.com; dev@dpdk.org; Raslan Darawsheh
> ; sta...@dpdk.org
> Subject: RE: [PATCH 2/2] app/testpmd: fix verbose mode dump for Tx
> 
> 
> 
> > -Original Message-
> > From: Nithin Dabilpuram 
> > Sent: Monday, August 16, 2021 15:10
> > To: Li, Xiaoyun 
> > Cc: jer...@marvell.com; dev@dpdk.org; Nithin Dabilpuram
> > ; rasl...@mellanox.com; sta...@dpdk.org
> > Subject: [PATCH 2/2] app/testpmd: fix verbose mode dump for Tx
> >
> > Fix verbose mode dump for Tx to dump tx offload flags instead of Rx
> offload
> > flags.
> >
> > Fixes: d862c45b5955 ("app/testpmd: move dumping packets to a separate
> > function")
> > Cc: rasl...@mellanox.com
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Nithin Dabilpuram 
> > ---
> >  app/test-pmd/util.c | 6 +-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c index
> 5dd7157..14a9a25
> > 100644
> > --- a/app/test-pmd/util.c
> > +++ b/app/test-pmd/util.c
> > @@ -275,7 +275,11 @@ dump_pkt_burst(uint16_t port_id, uint16_t
> queue,
> > struct rte_mbuf *pkts[],
> >   " - %s queue=0x%x", is_rx ? "Receive" : "Send",
> >   (unsigned int) queue);
> > MKDUMPSTR(print_buf, buf_size, cur_len, "\n");
> > -   rte_get_rx_ol_flag_list(mb->ol_flags, buf, sizeof(buf));
> > +   if (is_rx)
> > +   rte_get_rx_ol_flag_list(mb->ol_flags, buf,
> sizeof(buf));
> > +   else
> > +   rte_get_tx_ol_flag_list(mb->ol_flags, buf,
> sizeof(buf));
> > +
> > MKDUMPSTR(print_buf, buf_size, cur_len,
> >   "  ol_flags: %s\n", buf);
> > if (rte_mbuf_check(mb, 1, &reason) < 0)
> > --
> > 2.8.4
> 
> Acked-by: Xiaoyun Li 
Acked-by: Raslan Darawsheh 

Kindest regards,
Raslan Darawsheh

Re: [dpdk-dev] [dpdk-ci] [PATCH] version: 21.11-rc0

[Lincoln Lavoie]

Hi David,

ABI testing was disable / stopped on Friday in the Community CI lab.
Patches from before that for 21.11 would have still had the test run and
could have failures listed. I'm not sure if there is a way to "remove"
those failure marks from patchworks.  But, for all new patches since then,
ABI hasn't been run.

Cheers,
Lincoln

On Tue, Aug 17, 2021 at 2:34 AM David Marchand 
wrote:

> On Sun, Aug 8, 2021 at 9:27 PM Thomas Monjalon 
> wrote:
> > diff --git a/doc/guides/rel_notes/release_21_11.rst
> b/doc/guides/rel_notes/release_21_11.rst
> > new file mode 100644
> > index 00..d707a554ef
> > --- /dev/null
> > +++ b/doc/guides/rel_notes/release_21_11.rst
> > @@ -0,0 +1,136 @@
>
> [snip]
>
> > +Known Issues
> > +
> > +
> > +.. This section should contain new known issues in this release. Sample
> format:
> > +
> > +   * **Add title in present tense with full stop.**
> > +
> > + Add a short 1-2 sentence description of the known issue
> > + in the present tense. Add information on any known workarounds.
> > +
> > +   This section is a comment. Do not overwrite or remove it.
> > +   Also, make sure to start the actual text at the margin.
> > +   ===
> > +
> > +
>
> The known issue "**Last mbuf segment not implicitly reset.**" added in
> 21.08 release notes still applies to 21.11.
> But this can be fixed later, patches are starting to accumulate and
> some CI failures are due to patches being applied to 21.08.
>
> The rest lgtm, so:
> Acked-by: David Marchand 
>
> Applied, thanks.
>
>
> On this last subject, this mail is a ping to CI labs owners.
> 21.11 release won't preserve ABI compat with previous releases, so
> please disable ABI checks until 22.02.
>
>
> --
> David Marchand
>
>

-- 
*Lincoln Lavoie*
Principal Engineer, Broadband Technologies
21 Madbury Rd., Ste. 100, Durham, NH 03824
lylav...@iol.unh.edu
https://www.iol.unh.edu
+1-603-674-2755 (m)

Re: [dpdk-dev] [PATCH 2/2] Allow the flow_classify example to add an ACL table for tcp.

[Iremonger, Bernard]

Hi Sowmini,

> -Original Message-
> From: Sowmini Varadhan 
> Sent: Thursday, August 12, 2021 9:18 PM
> To: sowmin...@gmail.com; Iremonger, Bernard
> ; dev@dpdk.org; sowmi...@gmail.com;
> sovar...@linux.microsoft.com
> Cc: tho...@monjalon.net
> Subject: [PATCH 2/2] Allow the flow_classify example to add an ACL table for
> tcp.

./check-git-log.sh -1
Wrong headline format:
Allow the flow_classify example to add an ACL table for tcp.

The subject line should be prefixed with examples/flow_classify:
flow_classify: Allow the flow_classify example to add an ACL table for tcp

> 
> The struct rte_flow_classifier can have upto
> RTE_FLOW_CLASSIFY_TABLE_MAX
> (32) classifier tables, but the existing flow_classify examples only adds a
> single table for the L4 5-tuple.
> 
> When dealing with tcp flows, we frequently want to add add ACLs and filters
> to filter based on the state of the TCP connection, e.g., by looking at the 
> tcp
> flags field.
> 
> So we enhance flow_classify to add an additional acl table for tcp 5-typles. 
> If
> the input-file-parser detects a filter for a tcp flow with a non-wildcard
> argument for tcp_flags, the IP4_TCP_5TUPLE table is used by flow_classify.
> 
> Signed-off-by: Sowmini Varadhan 
> ---
>  examples/flow_classify/flow_classify.c  | 41 +++---
>  lib/flow_classify/rte_flow_classify.c   | 87 +
>  lib/flow_classify/rte_flow_classify.h   | 19 +
>  lib/flow_classify/rte_flow_classify_parse.c |  8 +-
>  4 files changed, 142 insertions(+), 13 deletions(-)
> 
> diff --git a/examples/flow_classify/flow_classify.c
> b/examples/flow_classify/flow_classify.c
> index 772b15adf2..b42d0df5c3 100644
> --- a/examples/flow_classify/flow_classify.c
> +++ b/examples/flow_classify/flow_classify.c
> @@ -723,11 +723,6 @@ add_classify_rule(struct rte_eth_ntuple_filter
> *ntuple_filter,
>   return ret;
>   }
> 
> - /* XXX but this only adds table_type of
> -  * RTE_FLOW_CLASSIFY_TABLE_ACL_IP4_5TUPLE
> -  * i.e., it only ever does allocate_acl_ipv4_5tuple_rule()
> -  * so the tcp_flags is ignored!
> -  */
>   rule = rte_flow_classify_table_entry_add(
>   cls_app->cls, &attr, pattern_ipv4_5tuple,
>   actions, &key_found, &error);
> @@ -856,7 +851,8 @@ main(int argc, char *argv[])
>   int ret;
>   int socket_id;
>   struct rte_table_acl_params table_acl_params;
> - struct rte_flow_classify_table_params cls_table_params;
> + struct rte_table_acl_params table_acl_tcp_params;
> + struct rte_flow_classify_table_params cls_table_params[2];
>   struct flow_classifier *cls_app;
>   struct rte_flow_classifier_params cls_params;
>   uint32_t size;
> @@ -923,21 +919,42 @@ main(int argc, char *argv[])
>   memcpy(table_acl_params.field_format, ipv4_defs,
> sizeof(ipv4_defs));
> 
>   /* initialise table create params */
> - cls_table_params.ops = &rte_table_acl_ops;
> - cls_table_params.arg_create = &table_acl_params;
> - cls_table_params.type =
> RTE_FLOW_CLASSIFY_TABLE_ACL_IP4_5TUPLE;
> + cls_table_params[0].ops = &rte_table_acl_ops;
> + cls_table_params[0].arg_create = &table_acl_params;
> + cls_table_params[0].type =
> RTE_FLOW_CLASSIFY_TABLE_ACL_IP4_5TUPLE;
> +
> + /* initialise ACL table params */
> + table_acl_tcp_params.name = "table_acl_ipv4_tcp_5tuple";
> + table_acl_tcp_params.n_rules = FLOW_CLASSIFY_MAX_RULE_NUM;
> + table_acl_tcp_params.n_rule_fields = RTE_DIM(ipv4_defs);
> + memcpy(table_acl_tcp_params.field_format, ipv4_defs,
> +sizeof(ipv4_defs));
> +
> + /* initialise table create params */
> + cls_table_params[1].ops = &rte_table_acl_ops;
> + cls_table_params[1].arg_create = &table_acl_tcp_params;
> + cls_table_params[1].type =
> RTE_FLOW_CLASSIFY_TABLE_ACL_IP4_TCP_5TUPLE;
> 
> - ret = rte_flow_classify_table_create(cls_app->cls,
> &cls_table_params);
> + ret = rte_flow_classify_table_create(cls_app->cls,
> +  &cls_table_params[0]);
>   if (ret) {
>   rte_flow_classifier_free(cls_app->cls);
>   rte_free(cls_app);
>   rte_exit(EXIT_FAILURE, "Failed to create classifier table\n");
>   }
> + ret = rte_flow_classify_table_create(cls_app->cls,
> +  &cls_table_params[1]);
> + if (ret) {
> + rte_flow_classifier_free(cls_app->cls);
> + rte_free(cls_app);
> + rte_exit(EXIT_FAILURE,
> +  "Failed to create classifier table\n");
> + }
> +
>   /* >8 End of initialization of table create params. */
> 
>   /* read file of IPv4 5 tuple rules and initialize parameters
> -  * for rte_flow_classify_validate and
> rte_flow_classify_table_entry_add
> -  * API's.
> +  * for rte_flow_classify_validate and
> +  * rte_flow_classify_table_entry_add  API's.
>*/
> 

Re: [dpdk-dev] [PATCH v2] drivers: remove warning with meson 0.59.0

[Bruce Richardson]

On Fri, Jul 30, 2021 at 01:05:48PM +0530, jer...@marvell.com wrote:
> From: Jerin Jacob 
> 
> Since meson 0.59.0 version, the extract_all_objects() API
> need to pass explicit boolean value.
> 
> To remove the following warning[1], added explicit `true` for
> extract_all_objects() use in codebase whever there is
> no argument.
> 
> [1]
> WARNING: extract_all_objects called without setting recursive
> keyword argument. Meson currently defaults to
> non-recursive to maintain backward compatibility but
> the default will be changed in the future.
> 

Technically this is changing the default behaviour since it previously
defaulted to "false". However, since there should be no recursion involved
here anyway, I don't think it matters, correct?

> Signed-off-by: Jerin Jacob 
> ---
> v2..v1
> - Corrrect the meson version number in git commit log(0.46.0 to 0.59.0)
> 
>  drivers/common/sfc_efx/base/meson.build | 2 +-
>  drivers/meson.build | 2 +-
>  drivers/net/e1000/base/meson.build  | 2 +-
>  drivers/net/fm10k/base/meson.build  | 2 +-
>  drivers/net/hinic/base/meson.build  | 2 +-
>  drivers/net/i40e/base/meson.build   | 2 +-
>  drivers/net/ice/base/meson.build| 2 +-
>  drivers/net/igc/base/meson.build| 2 +-
>  drivers/net/ixgbe/base/meson.build  | 2 +-
>  drivers/net/ngbe/base/meson.build   | 2 +-
>  drivers/net/octeontx/base/meson.build   | 2 +-
>  drivers/net/qede/base/meson.build   | 2 +-
>  drivers/net/thunderx/base/meson.build   | 2 +-
>  drivers/net/txgbe/base/meson.build  | 2 +-
>  drivers/raw/ifpga/base/meson.build  | 2 +-
>  15 files changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/common/sfc_efx/base/meson.build 
> b/drivers/common/sfc_efx/base/meson.build
> index 9fba47b1cc..ff7f33fb44 100644
> --- a/drivers/common/sfc_efx/base/meson.build
> +++ b/drivers/common/sfc_efx/base/meson.build
> @@ -86,7 +86,7 @@ if build
>  dependencies: static_rte_eal,
>  c_args: c_args)
> 
> -base_objs = base_lib.extract_all_objects()
> +base_objs = base_lib.extract_all_objects(recursive: true)
>  else
>  base_objs = []
>  endif
> diff --git a/drivers/meson.build b/drivers/meson.build
> index bc6f4f567f..d9e331ec85 100644
> --- a/drivers/meson.build
> +++ b/drivers/meson.build
> @@ -160,7 +160,7 @@ foreach subpath:subdirs
>  include_directories: includes,
>  dependencies: static_deps,
>  c_args: cflags)
> -objs += tmp_lib.extract_all_objects()
> +objs += tmp_lib.extract_all_objects(recursive: true)
>  sources = custom_target(out_filename,
>  command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', 
> pmdinfogen],
>  output: out_filename,
> diff --git a/drivers/net/e1000/base/meson.build 
> b/drivers/net/e1000/base/meson.build
> index 317692dfab..528a33f958 100644
> --- a/drivers/net/e1000/base/meson.build
> +++ b/drivers/net/e1000/base/meson.build
> @@ -35,4 +35,4 @@ endforeach
>  base_lib = static_library('e1000_base', sources,
>  dependencies: static_rte_eal,
>  c_args: c_args)
> -base_objs = base_lib.extract_all_objects()
> +base_objs = base_lib.extract_all_objects(recursive: true)
> diff --git a/drivers/net/fm10k/base/meson.build 
> b/drivers/net/fm10k/base/meson.build
> index ca98d34d4e..bd19df27f7 100644
> --- a/drivers/net/fm10k/base/meson.build
> +++ b/drivers/net/fm10k/base/meson.build
> @@ -25,4 +25,4 @@ endforeach
>  base_lib = static_library('fm10k_base', sources,
>  dependencies: static_rte_eal,
>  c_args: c_args)
> -base_objs = base_lib.extract_all_objects()
> +base_objs = base_lib.extract_all_objects(recursive: true)
> diff --git a/drivers/net/hinic/base/meson.build 
> b/drivers/net/hinic/base/meson.build
> index a00c90c14e..3aa53df881 100644
> --- a/drivers/net/hinic/base/meson.build
> +++ b/drivers/net/hinic/base/meson.build
> @@ -34,4 +34,4 @@ c_args = cflags
>  base_lib = static_library('hinic_base', sources,
>  dependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci, 
> static_rte_hash],
>  c_args: c_args)
> -base_objs = base_lib.extract_all_objects()
> +base_objs = base_lib.extract_all_objects(recursive: true)
> diff --git a/drivers/net/i40e/base/meson.build 
> b/drivers/net/i40e/base/meson.build
> index 79a887a297..d94108629b 100644
> --- a/drivers/net/i40e/base/meson.build
> +++ b/drivers/net/i40e/base/meson.build
> @@ -27,4 +27,4 @@ endforeach
>  base_lib = static_library('i40e_base', sources,
>  dependencies: static_rte_eal,
>  c_args: c_args)
> -base_objs = base_lib.extract_all_objects()
> +base_objs = base_lib.extract_all_objects(recursive: true)
> diff --git a/drivers/net/ice/base/meson.build 
> b/drivers/net/ice/base/meson.build
> index 3305e5dd18..30e251876d 100644
> --- a/drivers/net/ice/base/meson.build
> +++ b/drivers/net/ice/base/meson.build
> @@ -43,4 +43,4 @@ endforeach
>  base_lib = static_library('ice_base', sources,
> 

Re: [dpdk-dev] [PATCH v2] drivers: remove warning with meson 0.59.0

[Jerin Jacob]

On Tue, Aug 17, 2021 at 5:59 PM Bruce Richardson
 wrote:
>
> On Fri, Jul 30, 2021 at 01:05:48PM +0530, jer...@marvell.com wrote:
> > From: Jerin Jacob 
> >
> > Since meson 0.59.0 version, the extract_all_objects() API
> > need to pass explicit boolean value.
> >
> > To remove the following warning[1], added explicit `true` for
> > extract_all_objects() use in codebase whever there is
> > no argument.
> >
> > [1]
> > WARNING: extract_all_objects called without setting recursive
> > keyword argument. Meson currently defaults to
> > non-recursive to maintain backward compatibility but
> > the default will be changed in the future.
> >
>
> Technically this is changing the default behaviour since it previously
> defaulted to "false". However, since there should be no recursion involved
> here anyway, I don't think it matters, correct?

Yes. To be on the safer side, I just put "true" in case some drivers
using for a recursive way.


>
> > Signed-off-by: Jerin Jacob 
> > ---
> > v2..v1
> > - Corrrect the meson version number in git commit log(0.46.0 to 0.59.0)
> >
> >  drivers/common/sfc_efx/base/meson.build | 2 +-
> >  drivers/meson.build | 2 +-
> >  drivers/net/e1000/base/meson.build  | 2 +-
> >  drivers/net/fm10k/base/meson.build  | 2 +-
> >  drivers/net/hinic/base/meson.build  | 2 +-
> >  drivers/net/i40e/base/meson.build   | 2 +-
> >  drivers/net/ice/base/meson.build| 2 +-
> >  drivers/net/igc/base/meson.build| 2 +-
> >  drivers/net/ixgbe/base/meson.build  | 2 +-
> >  drivers/net/ngbe/base/meson.build   | 2 +-
> >  drivers/net/octeontx/base/meson.build   | 2 +-
> >  drivers/net/qede/base/meson.build   | 2 +-
> >  drivers/net/thunderx/base/meson.build   | 2 +-
> >  drivers/net/txgbe/base/meson.build  | 2 +-
> >  drivers/raw/ifpga/base/meson.build  | 2 +-
> >  15 files changed, 15 insertions(+), 15 deletions(-)
> >
> > diff --git a/drivers/common/sfc_efx/base/meson.build 
> > b/drivers/common/sfc_efx/base/meson.build
> > index 9fba47b1cc..ff7f33fb44 100644
> > --- a/drivers/common/sfc_efx/base/meson.build
> > +++ b/drivers/common/sfc_efx/base/meson.build
> > @@ -86,7 +86,7 @@ if build
> >  dependencies: static_rte_eal,
> >  c_args: c_args)
> >
> > -base_objs = base_lib.extract_all_objects()
> > +base_objs = base_lib.extract_all_objects(recursive: true)
> >  else
> >  base_objs = []
> >  endif
> > diff --git a/drivers/meson.build b/drivers/meson.build
> > index bc6f4f567f..d9e331ec85 100644
> > --- a/drivers/meson.build
> > +++ b/drivers/meson.build
> > @@ -160,7 +160,7 @@ foreach subpath:subdirs
> >  include_directories: includes,
> >  dependencies: static_deps,
> >  c_args: cflags)
> > -objs += tmp_lib.extract_all_objects()
> > +objs += tmp_lib.extract_all_objects(recursive: true)
> >  sources = custom_target(out_filename,
> >  command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', 
> > pmdinfogen],
> >  output: out_filename,
> > diff --git a/drivers/net/e1000/base/meson.build 
> > b/drivers/net/e1000/base/meson.build
> > index 317692dfab..528a33f958 100644
> > --- a/drivers/net/e1000/base/meson.build
> > +++ b/drivers/net/e1000/base/meson.build
> > @@ -35,4 +35,4 @@ endforeach
> >  base_lib = static_library('e1000_base', sources,
> >  dependencies: static_rte_eal,
> >  c_args: c_args)
> > -base_objs = base_lib.extract_all_objects()
> > +base_objs = base_lib.extract_all_objects(recursive: true)
> > diff --git a/drivers/net/fm10k/base/meson.build 
> > b/drivers/net/fm10k/base/meson.build
> > index ca98d34d4e..bd19df27f7 100644
> > --- a/drivers/net/fm10k/base/meson.build
> > +++ b/drivers/net/fm10k/base/meson.build
> > @@ -25,4 +25,4 @@ endforeach
> >  base_lib = static_library('fm10k_base', sources,
> >  dependencies: static_rte_eal,
> >  c_args: c_args)
> > -base_objs = base_lib.extract_all_objects()
> > +base_objs = base_lib.extract_all_objects(recursive: true)
> > diff --git a/drivers/net/hinic/base/meson.build 
> > b/drivers/net/hinic/base/meson.build
> > index a00c90c14e..3aa53df881 100644
> > --- a/drivers/net/hinic/base/meson.build
> > +++ b/drivers/net/hinic/base/meson.build
> > @@ -34,4 +34,4 @@ c_args = cflags
> >  base_lib = static_library('hinic_base', sources,
> >  dependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci, 
> > static_rte_hash],
> >  c_args: c_args)
> > -base_objs = base_lib.extract_all_objects()
> > +base_objs = base_lib.extract_all_objects(recursive: true)
> > diff --git a/drivers/net/i40e/base/meson.build 
> > b/drivers/net/i40e/base/meson.build
> > index 79a887a297..d94108629b 100644
> > --- a/drivers/net/i40e/base/meson.build
> > +++ b/drivers/net/i40e/base/meson.build
> > @@ -27,4 +27,4 @@ endforeach
> >  base_lib = static_library('i40e_base', sources,
> >  dependencies: static_rte_eal,
> >  c_args: c_args)
> > -base_objs = base_lib.e

[dpdk-dev] [PATCH 0/5] Add SA lifetime in security

[Anoob Joseph]

Add SA lifetime configuration in security. SA lifetime tracking can be
offloaded on supported PMDs.

SA lifetime would cover soft & hard expiry in units of number of packets and
bytes. When SA soft expiry happens, the packet is successfuly processed but
with additional expiry notification. Crypto op structure, ``rte_crypto_op``
is updated to cover such notifications with lookaside protocol offloads.

SA hard expiration would cause IPsec processing to return an error.

PMDs crypto_cn10k and crypto_octeontx2 are updated with their respective
lifetime tracking capabilities. Unit tests are added for soft and hard expiry
with number of packets.

Depends on
1. http://patches.dpdk.org/project/dpdk/list/?series=18253
2. http://patches.dpdk.org/project/dpdk/list/?series=18292

Anoob Joseph (5):
  security: add SA lifetime configuration
  common/cnxk: support lifetime configuration
  crypto/octeontx2: add checks for life configuration
  test/crypto: add packets soft expiry tests
  test/crypto: add packets hard expiry tests

 app/test/test_cryptodev.c  | 38 +++-
 app/test/test_cryptodev_security_ipsec.c   | 40 +++--
 app/test/test_cryptodev_security_ipsec.h   |  5 +-
 .../test_cryptodev_security_ipsec_test_vectors.h   |  3 -
 drivers/common/cnxk/cnxk_security.c| 70 ++
 drivers/crypto/cnxk/cn10k_cryptodev_ops.c  | 48 +++
 drivers/crypto/octeontx2/otx2_ipsec_po.h   |  6 ++
 examples/ipsec-secgw/ipsec.c   |  2 +-
 examples/ipsec-secgw/ipsec.h   |  2 +-
 lib/cryptodev/rte_crypto.h | 18 +-
 lib/security/rte_security.h| 28 -
 11 files changed, 233 insertions(+), 27 deletions(-)

-- 
2.7.4

[dpdk-dev] [PATCH 1/5] security: add SA lifetime configuration

[Anoob Joseph]

Add SA lifetime configuration to register soft and hard expiry limits.
Expiry can be in units of number of packets or bytes. Crypto op
status is also updated to include new field, aux_flags, which can be
used to indicate cases such as soft expiry in case of lookaside
protocol operations.

In case of soft expiry, the packets are successfully IPsec processed but
the soft expiry would indicate that SA needs to be reconfigured. For
inline protocol capable ethdev, this would result in an eth event while
for lookaside protocol capable cryptodev, this can be communicated via
`rte_crypto_op.aux_flags` field.

In case of hard expiry, the packets will not be IPsec processed and
would result in error.

Signed-off-by: Anoob Joseph 

---
 .../test_cryptodev_security_ipsec_test_vectors.h   |  3 ---
 examples/ipsec-secgw/ipsec.c   |  2 +-
 examples/ipsec-secgw/ipsec.h   |  2 +-
 lib/cryptodev/rte_crypto.h | 18 +-
 lib/security/rte_security.h| 28 --
 5 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/app/test/test_cryptodev_security_ipsec_test_vectors.h 
b/app/test/test_cryptodev_security_ipsec_test_vectors.h
index ae9cd24..38ea43d 100644
--- a/app/test/test_cryptodev_security_ipsec_test_vectors.h
+++ b/app/test/test_cryptodev_security_ipsec_test_vectors.h
@@ -98,7 +98,6 @@ struct ipsec_test_data pkt_aes_128_gcm = {
.proto = RTE_SECURITY_IPSEC_SA_PROTO_ESP,
.mode = RTE_SECURITY_IPSEC_SA_MODE_TUNNEL,
.tunnel.type = RTE_SECURITY_IPSEC_TUNNEL_IPV4,
-   .esn_soft_limit = 0,
.replay_win_sz = 0,
},
 
@@ -195,7 +194,6 @@ struct ipsec_test_data pkt_aes_192_gcm = {
.proto = RTE_SECURITY_IPSEC_SA_PROTO_ESP,
.mode = RTE_SECURITY_IPSEC_SA_MODE_TUNNEL,
.tunnel.type = RTE_SECURITY_IPSEC_TUNNEL_IPV4,
-   .esn_soft_limit = 0,
.replay_win_sz = 0,
},
 
@@ -295,7 +293,6 @@ struct ipsec_test_data pkt_aes_256_gcm = {
.proto = RTE_SECURITY_IPSEC_SA_PROTO_ESP,
.mode = RTE_SECURITY_IPSEC_SA_MODE_TUNNEL,
.tunnel.type = RTE_SECURITY_IPSEC_TUNNEL_IPV4,
-   .esn_soft_limit = 0,
.replay_win_sz = 0,
},
 
diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c
index 5b032fe..4868294 100644
--- a/examples/ipsec-secgw/ipsec.c
+++ b/examples/ipsec-secgw/ipsec.c
@@ -49,7 +49,7 @@ set_ipsec_conf(struct ipsec_sa *sa, struct 
rte_security_ipsec_xform *ipsec)
}
/* TODO support for Transport */
}
-   ipsec->esn_soft_limit = IPSEC_OFFLOAD_ESN_SOFTLIMIT;
+   ipsec->life.packets_soft_limit = IPSEC_OFFLOAD_PKTS_SOFTLIMIT;
ipsec->replay_win_sz = app_sa_prm.window_size;
ipsec->options.esn = app_sa_prm.enable_esn;
ipsec->options.udp_encap = sa->udp_encap;
diff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h
index ae5058d..90c81c1 100644
--- a/examples/ipsec-secgw/ipsec.h
+++ b/examples/ipsec-secgw/ipsec.h
@@ -23,7 +23,7 @@
 
 #define MAX_DIGEST_SIZE 32 /* Bytes -- 256 bits */
 
-#define IPSEC_OFFLOAD_ESN_SOFTLIMIT 0xff00
+#define IPSEC_OFFLOAD_PKTS_SOFTLIMIT 0xff00
 
 #define IV_OFFSET  (sizeof(struct rte_crypto_op) + \
sizeof(struct rte_crypto_sym_op))
diff --git a/lib/cryptodev/rte_crypto.h b/lib/cryptodev/rte_crypto.h
index fd5ef3a..d602183 100644
--- a/lib/cryptodev/rte_crypto.h
+++ b/lib/cryptodev/rte_crypto.h
@@ -66,6 +66,17 @@ enum rte_crypto_op_sess_type {
 };
 
 /**
+ * Auxiliary flags to indicate additional info from the operation
+ */
+
+/**
+ * Auxiliary flags related to IPsec offload with RTE_SECURITY
+ */
+
+#define RTE_CRYPTO_OP_AUX_FLAGS_IPSEC_SOFT_EXPIRY (1 << 0)
+/**< SA soft expiry limit has been reached */
+
+/**
  * Cryptographic Operation.
  *
  * This structure contains data relating to performing cryptographic
@@ -93,7 +104,12 @@ struct rte_crypto_op {
 */
uint8_t sess_type;
/**< operation session type */
-   uint8_t reserved[3];
+   uint8_t aux_flags;
+   /**< Operation specific auxiliary/additional flags.
+* These flags carry additional information from the
+* operation. Processing of the same is optional.
+*/
+   uint8_t reserved[2];
/**< Reserved bytes to fill 64 bits for
 * future additions
 */
diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h
index b4b6776..95c169d 100644
--- a/lib/security/rte_security.h
+++ b/lib/security/rte_security.h
@@ -206,6 +206,30 @@ enum rte_security_ipsec_sa_direct

[dpdk-dev] [PATCH 2/5] common/cnxk: support lifetime configuration

[Anoob Joseph]

Add support for SA lifetime configuration. Expiry can
be either in units of octets or packets.

Also, updated cryptodev dequeue path to update crypto op result to
indicate soft expiry.

Signed-off-by: Anoob Joseph 
---
 drivers/common/cnxk/cnxk_security.c   | 70 +++
 drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 48 -
 2 files changed, 107 insertions(+), 11 deletions(-)

diff --git a/drivers/common/cnxk/cnxk_security.c 
b/drivers/common/cnxk/cnxk_security.c
index 6c6728f..d9d4283 100644
--- a/drivers/common/cnxk/cnxk_security.c
+++ b/drivers/common/cnxk/cnxk_security.c
@@ -99,6 +99,26 @@ ot_ipsec_sa_common_param_fill(union roc_ot_ipsec_sa_word2 
*w2,
return -EINVAL;
}
 
+   if (ipsec_xfrm->life.packets_soft_limit != 0 ||
+   ipsec_xfrm->life.packets_hard_limit != 0) {
+   if (ipsec_xfrm->life.bytes_soft_limit != 0 ||
+   ipsec_xfrm->life.bytes_hard_limit != 0) {
+   plt_err("Expiry tracking with both packets & bytes is 
not supported");
+   return -EINVAL;
+   }
+   w2->s.life_unit = ROC_IE_OT_SA_LIFE_UNIT_PKTS;
+   }
+
+   if (ipsec_xfrm->life.bytes_soft_limit != 0 ||
+   ipsec_xfrm->life.bytes_hard_limit != 0) {
+   if (ipsec_xfrm->life.packets_soft_limit != 0 ||
+   ipsec_xfrm->life.packets_hard_limit != 0) {
+   plt_err("Expiry tracking with both packets & bytes is 
not supported");
+   return -EINVAL;
+   }
+   w2->s.life_unit = ROC_IE_OT_SA_LIFE_UNIT_OCTETS;
+   }
+
return 0;
 }
 
@@ -173,6 +193,31 @@ cnxk_ot_ipsec_inb_sa_fill(struct roc_ot_ipsec_inb_sa *sa,
 ROC_CTX_UNIT_128B) -
1;
 
+   /**
+* CPT MC triggers expiry when counter value changes from 2 to 1. To
+* mitigate this behaviour add 1 to the life counter values provided.
+*/
+
+   if (ipsec_xfrm->life.bytes_soft_limit) {
+   sa->ctx.soft_life = ipsec_xfrm->life.bytes_soft_limit + 1;
+   sa->w0.s.soft_life_dec = 1;
+   }
+
+   if (ipsec_xfrm->life.packets_soft_limit) {
+   sa->ctx.soft_life = ipsec_xfrm->life.packets_soft_limit + 1;
+   sa->w0.s.soft_life_dec = 1;
+   }
+
+   if (ipsec_xfrm->life.bytes_hard_limit) {
+   sa->ctx.hard_life = ipsec_xfrm->life.bytes_hard_limit + 1;
+   sa->w0.s.hard_life_dec = 1;
+   }
+
+   if (ipsec_xfrm->life.packets_hard_limit) {
+   sa->ctx.hard_life = ipsec_xfrm->life.packets_hard_limit + 1;
+   sa->w0.s.hard_life_dec = 1;
+   }
+
/* There are two words of CPT_CTX_HW_S for ucode to skip */
sa->w0.s.ctx_hdr_size = 1;
sa->w0.s.aop_valid = 1;
@@ -296,6 +341,31 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa,
/* IPID gen */
sa->w2.s.ipid_gen = 1;
 
+   /**
+* CPT MC triggers expiry when counter value changes from 2 to 1. To
+* mitigate this behaviour add 1 to the life counter values provided.
+*/
+
+   if (ipsec_xfrm->life.bytes_soft_limit) {
+   sa->ctx.soft_life = ipsec_xfrm->life.bytes_soft_limit + 1;
+   sa->w0.s.soft_life_dec = 1;
+   }
+
+   if (ipsec_xfrm->life.packets_soft_limit) {
+   sa->ctx.soft_life = ipsec_xfrm->life.packets_soft_limit + 1;
+   sa->w0.s.soft_life_dec = 1;
+   }
+
+   if (ipsec_xfrm->life.bytes_hard_limit) {
+   sa->ctx.hard_life = ipsec_xfrm->life.bytes_hard_limit + 1;
+   sa->w0.s.hard_life_dec = 1;
+   }
+
+   if (ipsec_xfrm->life.packets_hard_limit) {
+   sa->ctx.hard_life = ipsec_xfrm->life.packets_hard_limit + 1;
+   sa->w0.s.hard_life_dec = 1;
+   }
+
/* There are two words of CPT_CTX_HW_S for ucode to skip */
sa->w0.s.ctx_hdr_size = 1;
sa->w0.s.aop_valid = 1;
diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c 
b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
index 2e1a739..ac8179b 100644
--- a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
+++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
@@ -291,12 +291,44 @@ cn10k_cpt_dequeue_post_process(struct cnxk_cpt_qp *qp,
   struct cpt_inflight_req *infl_req)
 {
struct cpt_cn10k_res_s *res = (struct cpt_cn10k_res_s *)&infl_req->res;
+   const uint8_t uc_compcode = res->uc_compcode;
+   const uint8_t compcode = res->compcode;
unsigned int sz;
 
-   if (likely(res->compcode == CPT_COMP_GOOD ||
-  res->compcode == CPT_COMP_WARN)) {
-   if (unlikely(res->uc_compcode)) {
-   if (res->uc_compcode == ROC_SE_ERR_GC_ICV_MISCOMPARE)
+   cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+
+   if (cop->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC &&
+ 

[dpdk-dev] [PATCH 3/5] crypto/octeontx2: add checks for life configuration

[Anoob Joseph]

Lifetime tracking is not supported by hardware and is not implemented in
software either. Return failure when lifetime is configured.

Signed-off-by: Anoob Joseph 
---
 drivers/crypto/octeontx2/otx2_ipsec_po.h | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/drivers/crypto/octeontx2/otx2_ipsec_po.h 
b/drivers/crypto/octeontx2/otx2_ipsec_po.h
index b3e7456..b61c5e0 100644
--- a/drivers/crypto/octeontx2/otx2_ipsec_po.h
+++ b/drivers/crypto/octeontx2/otx2_ipsec_po.h
@@ -293,6 +293,12 @@ ipsec_po_xform_verify(struct rte_security_ipsec_xform 
*ipsec,
struct rte_crypto_sym_xform *auth_xform, *cipher_xform;
int ret;
 
+   if (ipsec->life.bytes_hard_limit != 0 ||
+   ipsec->life.bytes_soft_limit != 0 ||
+   ipsec->life.packets_hard_limit != 0 ||
+   ipsec->life.packets_soft_limit != 0)
+   return -ENOTSUP;
+
if (xform->type == RTE_CRYPTO_SYM_XFORM_AEAD)
return ipsec_po_xform_aead_verify(ipsec, xform);
 
-- 
2.7.4

[dpdk-dev] [PATCH 4/5] test/crypto: add packets soft expiry tests

[Anoob Joseph]

Add tests to validate packets soft expiry handling.

Signed-off-by: Anoob Joseph 
---
 app/test/test_cryptodev.c| 21 +++--
 app/test/test_cryptodev_security_ipsec.c | 18 --
 app/test/test_cryptodev_security_ipsec.h |  4 +++-
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index dfc49e0..2baa569 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -8994,7 +8994,7 @@ test_ipsec_proto_process(const struct ipsec_test_data 
td[],
/* Process crypto operation */
process_crypto_request(dev_id, ut_params->op);
 
-   ret = test_ipsec_status_check(ut_params->op, flags, dir);
+   ret = test_ipsec_status_check(ut_params->op, flags, dir, i + 1);
if (ret != TEST_SUCCESS)
goto crypto_op_free;
 
@@ -9064,7 +9064,8 @@ test_ipsec_proto_all(const struct ipsec_test_flags *flags)
unsigned int i, nb_pkts = 1, pass_cnt = 0;
int ret;
 
-   if (flags->iv_gen)
+   if (flags->iv_gen ||
+   flags->sa_expiry_pkts_soft)
nb_pkts = IPSEC_TEST_PACKETS_MAX;
 
for (i = 0; i < RTE_DIM(aead_list); i++) {
@@ -9129,6 +9130,18 @@ test_ipsec_proto_iv_gen(const void *data __rte_unused)
 }
 
 static int
+test_ipsec_proto_sa_exp_pkts_soft(const void *data __rte_unused)
+{
+   struct ipsec_test_flags flags;
+
+   memset(&flags, 0, sizeof(flags));
+
+   flags.sa_expiry_pkts_soft = true;
+
+   return test_ipsec_proto_all(&flags);
+}
+
+static int
 test_ipsec_proto_err_icv_corrupt(const void *data __rte_unused)
 {
struct ipsec_test_flags flags;
@@ -14067,6 +14080,10 @@ static struct unit_test_suite ipsec_proto_testsuite  = 
{
ut_setup_security, ut_teardown,
test_ipsec_proto_iv_gen),
TEST_CASE_NAMED_ST(
+   "SA expiry packets soft",
+   ut_setup_security, ut_teardown,
+   test_ipsec_proto_sa_exp_pkts_soft),
+   TEST_CASE_NAMED_ST(
"Negative test: ICV corruption",
ut_setup_security, ut_teardown,
test_ipsec_proto_err_icv_corrupt),
diff --git a/app/test/test_cryptodev_security_ipsec.c 
b/app/test/test_cryptodev_security_ipsec.c
index a0b37e7..9eb610c 100644
--- a/app/test/test_cryptodev_security_ipsec.c
+++ b/app/test/test_cryptodev_security_ipsec.c
@@ -172,6 +172,10 @@ test_ipsec_td_prepare(const struct crypto_param *param1,
 
if (flags->iv_gen)
td->ipsec_xform.options.iv_gen_disable = 0;
+
+   if (flags->sa_expiry_pkts_soft)
+   td->ipsec_xform.life.packets_soft_limit =
+   IPSEC_TEST_PACKETS_MAX - 1;
}
 
RTE_SET_USED(param2);
@@ -367,7 +371,8 @@ test_ipsec_post_process(struct rte_mbuf *m, const struct 
ipsec_test_data *td,
 int
 test_ipsec_status_check(struct rte_crypto_op *op,
const struct ipsec_test_flags *flags,
-   enum rte_security_ipsec_sa_direction dir)
+   enum rte_security_ipsec_sa_direction dir,
+   int pkt_num)
 {
int ret = TEST_SUCCESS;
 
@@ -378,7 +383,16 @@ test_ipsec_status_check(struct rte_crypto_op *op,
}
} else {
if (op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
-   printf("Security op processing failed\n");
+   printf("Security op processing failed [pkt_num: %d]\n",
+  pkt_num);
+   ret = TEST_FAILED;
+   }
+   }
+
+   if (flags->sa_expiry_pkts_soft && pkt_num == IPSEC_TEST_PACKETS_MAX) {
+   if (!(op->aux_flags &
+ RTE_CRYPTO_OP_AUX_FLAGS_IPSEC_SOFT_EXPIRY)) {
+   printf("SA soft expiry (pkts) test failed\n");
ret = TEST_FAILED;
}
}
diff --git a/app/test/test_cryptodev_security_ipsec.h 
b/app/test/test_cryptodev_security_ipsec.h
index d2ec63f..921c58d 100644
--- a/app/test/test_cryptodev_security_ipsec.h
+++ b/app/test/test_cryptodev_security_ipsec.h
@@ -49,6 +49,7 @@ struct ipsec_test_data {
 
 struct ipsec_test_flags {
bool display_alg;
+   bool sa_expiry_pkts_soft;
bool icv_corrupt;
bool iv_gen;
 };
@@ -113,6 +114,7 @@ int test_ipsec_post_process(struct rte_mbuf *m,
 
 int test_ipsec_status_check(struct rte_crypto_op *op,
const struct ipsec_test_flags *flags,
-   enum rte_security_ipsec_sa_direction dir);
+   enum rte_security_ipsec_sa_direction dir,
+   int pkt_num);
 
 #endif
-- 
2.7.4

[dpdk-dev] [PATCH 5/5] test/crypto: add packets hard expiry tests

[Anoob Joseph]

Add tests to validate packets hard expiry handling.

Signed-off-by: Anoob Joseph 
---
 app/test/test_cryptodev.c| 19 ++-
 app/test/test_cryptodev_security_ipsec.c | 22 +++---
 app/test/test_cryptodev_security_ipsec.h |  1 +
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 2baa569..a7374bf 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -9065,7 +9065,8 @@ test_ipsec_proto_all(const struct ipsec_test_flags *flags)
int ret;
 
if (flags->iv_gen ||
-   flags->sa_expiry_pkts_soft)
+   flags->sa_expiry_pkts_soft ||
+   flags->sa_expiry_pkts_hard)
nb_pkts = IPSEC_TEST_PACKETS_MAX;
 
for (i = 0; i < RTE_DIM(aead_list); i++) {
@@ -9142,6 +9143,18 @@ test_ipsec_proto_sa_exp_pkts_soft(const void *data 
__rte_unused)
 }
 
 static int
+test_ipsec_proto_sa_exp_pkts_hard(const void *data __rte_unused)
+{
+   struct ipsec_test_flags flags;
+
+   memset(&flags, 0, sizeof(flags));
+
+   flags.sa_expiry_pkts_hard = true;
+
+   return test_ipsec_proto_all(&flags);
+}
+
+static int
 test_ipsec_proto_err_icv_corrupt(const void *data __rte_unused)
 {
struct ipsec_test_flags flags;
@@ -14084,6 +14097,10 @@ static struct unit_test_suite ipsec_proto_testsuite  = 
{
ut_setup_security, ut_teardown,
test_ipsec_proto_sa_exp_pkts_soft),
TEST_CASE_NAMED_ST(
+   "SA expiry packets hard",
+   ut_setup_security, ut_teardown,
+   test_ipsec_proto_sa_exp_pkts_hard),
+   TEST_CASE_NAMED_ST(
"Negative test: ICV corruption",
ut_setup_security, ut_teardown,
test_ipsec_proto_err_icv_corrupt),
diff --git a/app/test/test_cryptodev_security_ipsec.c 
b/app/test/test_cryptodev_security_ipsec.c
index 9eb610c..efb4c7e 100644
--- a/app/test/test_cryptodev_security_ipsec.c
+++ b/app/test/test_cryptodev_security_ipsec.c
@@ -199,6 +199,10 @@ test_ipsec_td_update(struct ipsec_test_data td_inb[],
td_inb[i].input_text.data[icv_pos] += 1;
}
 
+   if (flags->sa_expiry_pkts_hard)
+   td_inb[i].ipsec_xform.life.packets_hard_limit =
+   IPSEC_TEST_PACKETS_MAX - 1;
+
/* Clear outbound specific flags */
td_inb[i].ipsec_xform.options.iv_gen_disable = 0;
}
@@ -281,9 +285,10 @@ test_ipsec_td_verify(struct rte_mbuf *m, const struct 
ipsec_test_data *td,
uint8_t *output_text = rte_pktmbuf_mtod(m, uint8_t *);
uint32_t skip, len = rte_pktmbuf_pkt_len(m);
 
-   /* For negative tests, no need to do verification */
-   if (flags->icv_corrupt &&
-   td->ipsec_xform.direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS)
+   /* For tests with status as error for test success, skip verification */
+   if (td->ipsec_xform.direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS &&
+   (flags->icv_corrupt ||
+flags->sa_expiry_pkts_hard))
return TEST_SUCCESS;
 
if (len != td->output_text.len) {
@@ -376,6 +381,17 @@ test_ipsec_status_check(struct rte_crypto_op *op,
 {
int ret = TEST_SUCCESS;
 
+   if (dir == RTE_SECURITY_IPSEC_SA_DIR_INGRESS &&
+   flags->sa_expiry_pkts_hard &&
+   pkt_num == IPSEC_TEST_PACKETS_MAX) {
+   if (op->status != RTE_CRYPTO_OP_STATUS_ERROR) {
+   printf("SA hard expiry (pkts) test failed\n");
+   return TEST_FAILED;
+   } else {
+   return TEST_SUCCESS;
+   }
+   }
+
if (dir == RTE_SECURITY_IPSEC_SA_DIR_INGRESS && flags->icv_corrupt) {
if (op->status != RTE_CRYPTO_OP_STATUS_ERROR) {
printf("ICV corruption test case failed\n");
diff --git a/app/test/test_cryptodev_security_ipsec.h 
b/app/test/test_cryptodev_security_ipsec.h
index 921c58d..2d3dd59 100644
--- a/app/test/test_cryptodev_security_ipsec.h
+++ b/app/test/test_cryptodev_security_ipsec.h
@@ -50,6 +50,7 @@ struct ipsec_test_data {
 struct ipsec_test_flags {
bool display_alg;
bool sa_expiry_pkts_soft;
+   bool sa_expiry_pkts_hard;
bool icv_corrupt;
bool iv_gen;
 };
-- 
2.7.4

Re: [dpdk-dev] [PATCH v1] net/mlx5: fix RSS expansion for inner tunnel VLAN

[Raslan Darawsheh]

Hi,

> -Original Message-
> From: dev  On Behalf Of Lior Margalit
> Sent: Tuesday, August 3, 2021 9:13 PM
> To: Matan Azrad 
> Cc: dev@dpdk.org; Lior Margalit ; sta...@dpdk.org
> Subject: [dpdk-dev] [PATCH v1] net/mlx5: fix RSS expansion for inner tunnel
> VLAN
> 
> The RSS expansion alg is using a graph to find the possible expansion
> paths. The VLAN item in the flow pattern requires special treatment,
> because it should not be added implicitly by the expansion alg.
> If the flow pattern ends with ETH item, the pattern will be expanded
> with IPv4 and IPv6. For example:
> testpmd> flow create ... eth / end actions rss / end
> ETH END
> ETH IPV4 END
> ETH IPV6 END
> If a VLAN item follows the ETH item in the flow pattern, the pattern
> will be expanded with IPv4 and IPv6 following the VLAN item.
> For example:
> testpmd> flow create ... eth / vlan / end actions rss level 1 / end
> ETH VLAN END
> ETH VLAN IPV4 END
> ETH VLAN IPV6 END
> 
> The case of inner tunnel VLAN item was not taken care of so the flow
> pattern did not expand with IPv6 and IPv4 as expected.
> Example with inner VLAN:
> testpmd> flow create ... / vxlan / eth / vlan / end actions rss level 2
> / end
> The current result of the expansion alg:
> ETH IPV6 UDP VXLAN ETH VLAN END
> The expected result of the expansion alg:
> ETH IPV6 UDP VXLAN ETH VLAN END
> ETH IPV6 UDP VXLAN ETH VLAN IPV4 END
> ETH IPV6 UDP VXLAN ETH VLAN IPV6 END
> 
> The fix is to introduce a new flag to set on a graph expansion node
> to apply the 'explicit' behavior, meaning the node is not added to
> the expanded pattern, if it is not found in the flow pattern, but the
> expansion alg can go deeper to its next nodes.
> 
> Fixes: c7870bfe09dc ("ethdev: move RSS expansion code to mlx5 driver")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Lior Margalit 
> Acked-by: Matan Azrad 

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh

Re: [dpdk-dev] [PATCH] net/mlx5: fix mbufs replenishment check for zipped CQEs

[Raslan Darawsheh]

Hi,
> -Original Message-
> From: Alexander Kozyrev 
> Sent: Wednesday, August 4, 2021 9:23 AM
> To: dev@dpdk.org
> Cc: sta...@dpdk.org; Raslan Darawsheh ; Slava
> Ovsiienko ; Matan Azrad 
> Subject: [PATCH] net/mlx5: fix mbufs replenishment check for zipped CQEs
> 
> A core dump is being generated with the following call stack:
> 0 _mm256_storeu_si256 (__A=..., __P=0x80)
> 1 rte_mov32 (src=0x2299c9140 "", dst=0x80)
> 2 rte_memcpy_aligned (n=60, src=0x2299c9140, dst=0x80)
> 3 rte_memcpy (n=60, src=0x2299c9140, dst=0x80)
> 4 mprq_buf_to_pkt (strd_cnt=1, strd_idx=0, buf=0x2299c8a00, len=60,
> pkt=0x18345f0c0, rxq=0x18345ef40)
> 5 rxq_copy_mprq_mbuf_v (rxq=0x18345ef40, pkts=0x7f76e0ff6d18,
> pkts_n=5)
> 6 rxq_burst_mprq_v (rxq=0x18345ef40, pkts=0x7f76e0ff6d18, pkts_n=46,
> err=0x7f76e0ff6a28, no_cq=0x7f76e0ff6a27)
> 7 mlx5_rx_burst_mprq_vec (dpdk_rxq=0x18345ef40, pkts=0x7f76e0ff6a88,
> pkts_n=128)
> 8 rte_eth_rx_burst (nb_pkts=128, rx_pkts=0x7f76e0ff6a88,
> queue_id=, port_id=)
> 
> This crash is caused by an attempt to copy previously uncompressed CQEs
> into non-allocated mbufs. There is a check to make sure we only use
> allocated mbufs in the rxq_burst_mprq_v() function, but it is done only
> before the main processing loop. Leftovers of compressed CQEs session are
> handled before that loop and may lead to the mbufs overflow as seen.
> 
> Move the check for replenished mbufs up to protect uncompressed CQEs
> session leftovers from accessing non-allocated mbufs after the
> mlx5_rx_mprq_replenish_bulk_mbuf() function is invoked.
> 
> Bugzilla ID: 746
> Fixes: 0f20acbf5e ("net/mlx5: implement vectorized MPRQ burst")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Alexander Kozyrev 
> Acked-by: Viacheslav Ovsiienko 
> ---

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh

Re: [dpdk-dev] [PATCH] net/mlx5: fix matching on eCPRI

[Raslan Darawsheh]

Hi,

> -Original Message-
> From: dev  On Behalf Of Dmitry Kozlyuk
> Sent: Monday, August 9, 2021 5:27 PM
> To: dev@dpdk.org
> Cc: Bing Zhao ; sta...@dpdk.org; Matan Azrad
> ; Shahaf Shuler ; Slava
> Ovsiienko 
> Subject: [dpdk-dev] [PATCH] net/mlx5: fix matching on eCPRI
> 
> When an ETH or VLAN flow item directly preceding ECPRI (i. e. a pattern for
> eCPRI over Ethernet) did not specify the eCPRI protocol, matches were not
> restricted to eCPRI traffic. For example, "eth / ecpri / end"
> pattern behaved as "eth / end". Implicitly add Ethernet type condition, so
> that "eth / ecpri / end" behaves as "eth type is 0xAEFE / end".
> 
> Fixes: daa38a8924a0 ("net/mlx5: add flow translation of eCPRI header")
> Cc: bi...@nvidia.com
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Dmitry Kozlyuk 

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh

Re: [dpdk-dev] Windows community call: MoM 2021-08-04

[Bruce Richardson]

On Fri, Aug 06, 2021 at 04:17:32PM -0700, William Tu wrote:
> On Thu, Aug 5, 2021 at 12:15 PM Dmitry Kozlyuk  
> wrote:
> >
> snip
> 
> > # Porting OvS build system to meson (William Tu)
> >
> > Status: OvS compiles with some features disabled, with a lot of warnings.
> > Issues:
> >
> > * vhost-user is Linux-specific.
> >   [Omar] Microsoft is working on functional equivalent.
> > * rte_version* not exported.
> >   AI William to send patches.
> > * rte_open_logstream() implementation relies on Linux-specific 
> > fopencookie().
> >   We need a more generic facility to redirect logs.
> >   AI William and DmitryK to discuss.
> > * meson not finding DPDK with pkg-config, maybe meson bug.
> 
> To give more details about this for people who are interested.
> At OVS side, we tried to link the DPDK library, by doing below at
> meson.build file
> libdpdk = dependency('libdpdk', method: 'pkg-config')" , or give
> it a specific path
> libdpdk = cc.find_library('dpdk', dirs: ['C:\\temp\\dpdk\\lib'])
> 
> However, it doesn't work, with error below
> Run-time dependency libdpdk found: NO (tried pkgconfig)
> meson.build:45:4: ERROR: Dependency "libdpdk" not found, tried pkgconfig
> 

Can you share the meson log file snippet where it tries the pkg-config
call? Does PKG_CONFIG_PATH have to be set to a special value to get the .pc
files found?

For the "find_library" calls, that would not be expected to work since
there is no single "libdpdk.so" file.

By any chance are you looking to investigate meson subproject support in
future? [1] It should provide an easy way to provide DPDK with OVS for
systems without it already installed, but may require some small changes to
DPDK meson files to work neatly. I've always meant to investigate how to
use it for applications using DPDK but never actually got around to it.

/Bruce

[1] https://mesonbuild.com/Subprojects.html

Re: [dpdk-dev] [PATCH] build: fix install from arbitrary directory for meson 0.55

[Bruce Richardson]

On Wed, Aug 11, 2021 at 02:03:22AM +0300, Dmitry Kozlyuk wrote:
> Install command for meson >= 0.55.0 referenced the script by a plain
> string, assuming the build directory to be directly under the source
> tree root. This resulted in an error when the assumption did not hold:
> 
> c:\python\python.exe: can't open file
> '../buildtools/symlink-drivers-solibs.py':
> [Errno 2] No such file or directory
> 
> Use files() to make a valid script path for any build directory.
> 
> Fixes: cd27047dbee1 ("build: support drivers symlink on Windows")
> Cc: nick.conno...@mayadata.io
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Dmitry Kozlyuk 
> ---
> Note: this is not limited to Windows, it just happens that Windows
> requires newer meson and the error example is from Windows build.
> 
>  config/meson.build | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/config/meson.build b/config/meson.build
> index e80421003b..3b5966ec2f 100644
> --- a/config/meson.build
> +++ b/config/meson.build
> @@ -61,7 +61,8 @@ if not is_windows
>  get_option('libdir'), pmd_subdir_opt)
>  elif meson.version().version_compare('>=0.55.0')
>  # 0.55.0 is required to use external program with add_install_script
> -meson.add_install_script(py3, '../buildtools/symlink-drivers-solibs.py',
> +meson.add_install_script(py3,
> +files('../buildtools/symlink-drivers-solibs.py'),
>  get_option('libdir'), pmd_subdir_opt, get_option('bindir'))
>  endif
>  

Rather than using a relative path, we could also use "files()" in the
buildtools directory and store it in a variable to re-use either. Most
other python scripts in the buildtools directory, use that pattern to have
a single (array) variable with the python and script calls together.

Either way as here, or with buildtools change:

Acked-by: Bruce Richardson 

Re: [dpdk-dev] [PATCH v3 4/7] net/nfp: prototype common functions in header file

[Ferruh Yigit]

On 7/29/2021 2:47 PM, Heinrich Kuhn wrote:
> The majority of "ethdev" type functions are used for both PF devices and
> VF devices. Prototype these functions in the nfp_net_pmd header file in
> preparation of splitting PF and VF specific functions.
> 
> Signed-off-by: Heinrich Kuhn 
> Signed-off-by: Simon Horman 
> ---
>  drivers/net/nfp/nfp_net.c | 87 +--
>  drivers/net/nfp/nfp_net_pmd.h | 49 
>  2 files changed, 81 insertions(+), 55 deletions(-)
> 

<...>


Following functions seems only used in this file, and you may want to keep them
'static':
nfp_net_dev_link_status_print
nfp_net_irq_unmask
nfp_net_dev_interrupt_delayed_handler
nfp_net_rss_reta_write
nfp_net_rss_hash_write

(I may be missed some, you may want to double check all.)

Rest of the set looks good to me.

Thanks,
ferruh

Re: [dpdk-dev] EAL: failed to parse device "XX:XX.X" on CentOS 7

[Bruce Richardson]

On Mon, Aug 16, 2021 at 07:13:54AM -0600, Thao Hull wrote:
> Thank you!  Will try that when I get back from vacation.  Thao
> 
> On Mon, Aug 16, 2021, 4:48 AM Mikulicz, Szymon (Nokia - PL/Krakow) <
> szymon.mikul...@nokia.com> wrote:
> 
> > Hi Thao,
> >
> > the original issue was resolved by updating pkg-config. I compiled a new
> > version of it on our centos 7 setup. We are currently using pkg-config 
> > 0.29.2
> > and it works.
> >
> > BR,
> > SM
> >

The likely cause of the inability to parse the address is the PCI driver
not being linked into the binary for a static build. This could indeed be
caused by incorrect output from pkg-config, and the default pkg-config on
centos 7 is known to have such an issue. Updating pkg-config, or use
pkgconf instead, is recommended to fix this, as suggested above.

/Bruce

> > On 8/13/21 12:32 AM, Thao Hull wrote:
> >
> > Hi.
> >
> > This looks similar to the problem I am having.
> > https://lore.kernel.org/dpdk-dev/bug-68...@http.bugs.dpdk.org%2F/T/
> >
> > I can't figure out how this issue was resolved on Centos7 per the thread.
> > Can someone please explain how to get past this failure error?  Just like
> > this user, testpmd works fine for me.  My device is in slot b3:00.0.   I am
> > using arkville on a bittware FPGA card.  My error is slightly different as
> > shown below:
> >
> > EAL: Detected 24 lcore(s)
> > EAL: Detected 2 NUMA nodes
> > EAL: Detected static linkage of DPDK
> > EAL: failed to parse device "b3:00.0"
> > EAL: Unable to parse device 'b3:00.0, Pkt_dir=0xF, Pkt_gen=./pg.conf'
> >
> > EAL: Error - exiting with EAL initialization
> >
> > I'm using dpdk version 21.08.0
> >
> > Any thoughts on how to debug, if not fix this?  I am new to dpdk.
> >
> > Thank you!
> > Thao
> >
> >

Re: [dpdk-dev] [PATCH v2 1/6] eal: introduce oops handling API

[Stephen Hemminger]

On Tue, 17 Aug 2021 13:08:46 +0530
Jerin Jacob  wrote:

> On Tue, Aug 17, 2021 at 9:23 AM Stephen Hemminger
>  wrote:
> >
> > On Tue, 17 Aug 2021 08:57:18 +0530
> >  wrote:
> >  
> > > From: Jerin Jacob 
> > >
> > > Introducing oops handling API with following specification
> > > and enable stub implementation for Linux and FreeBSD.
> > >
> > > On rte_eal_init() invocation, the EAL library installs the
> > > oops handler for the essential signals.
> > > The rte_oops_signals_enabled() API provides the list
> > > of signals the library installed by the EAL.  
> >
> > This is a big change, and many applications already handle these
> > signals themselves. Therefore adding this needs to be opt-in
> > and not enabled by default.  
> 
> In order to avoid every application explicitly register this
> sighandler and to cater to the
> co-existing application-specific signal-hander usage.
> The following design has been chosen. (It is mentioned in the commit log,
> I will describe here for more clarity)
> 
> Case 1:
> a) The application installs the signal handler prior to rte_eal_init().
> b) Implementation stores the application-specific signal and replace a
> signal handler as oops eal handler
> c) when application/DPDK get the segfault, the default EAL oops
> handler gets invoked
> d) Then it dumps the EAL specific message, it calls the
> application-specific signal handler
> installed in step 1 by application. This avoids breaking any contract
> with the application.
> i.e Behavior is the same current EAL now.
> That is the reason for not using SA_RESETHAND(which call SIG_DFL after
> eal oops handler instead
> application-specific handler)
> 
> Case 2:
> a) The application install the signal handler after rte_eal_init(),
> b) EAL hander get replaced with application handle then the application can 
> call
> rte_oops_decode() to decode.
> 
> In order to cater the above use case, rte_oops_signals_enabled() and
> rte_oops_decode()
> provided.
> 
> Here we are not breaking any contract with the application.
> Do you have concerns about this design?

In our application as a service it is important not to do any backtrace
in production. We rely on other infrastructure to process coredumps.

This should be controlled enabled by a command line argument.

Re: [dpdk-dev] [PATCH v2 01/15] ethdev: introduce shared Rx queue

[Jerin Jacob]

On Tue, Aug 17, 2021 at 5:01 PM Xueming(Steven) Li  wrote:
>
>
>
> > -Original Message-
> > From: Jerin Jacob 
> > Sent: Tuesday, August 17, 2021 5:33 PM
> > To: Xueming(Steven) Li 
> > Cc: dpdk-dev ; Ferruh Yigit ; 
> > NBU-Contact-Thomas Monjalon ;
> > Andrew Rybchenko 
> > Subject: Re: [PATCH v2 01/15] ethdev: introduce shared Rx queue
> >
> > On Wed, Aug 11, 2021 at 7:34 PM Xueming Li  wrote:
> > >
> > > In current DPDK framework, each RX queue is pre-loaded with mbufs for
> > > incoming packets. When number of representors scale out in a switch
> > > domain, the memory consumption became significant. Most important,
> > > polling all ports leads to high cache miss, high latency and low
> > > throughput.
> > >
> > > This patch introduces shared RX queue. Ports with same configuration
> > > in a switch domain could share RX queue set by specifying sharing group.
> > > Polling any queue using same shared RX queue receives packets from all
> > > member ports. Source port is identified by mbuf->port.
> > >
> > > Port queue number in a shared group should be identical. Queue index
> > > is
> > > 1:1 mapped in shared group.
> > >
> > > Share RX queue must be polled on single thread or core.
> > >
> > > Multiple groups is supported by group ID.
> > >
> > > Signed-off-by: Xueming Li 
> > > Cc: Jerin Jacob 
> > > ---
> > > Rx queue object could be used as shared Rx queue object, it's
> > > important to clear all queue control callback api that using queue object:
> > >   https://mails.dpdk.org/archives/dev/2021-July/215574.html
> >
> > >  #undef RTE_RX_OFFLOAD_BIT2STR
> > > diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index
> > > d2b27c351f..a578c9db9d 100644
> > > --- a/lib/ethdev/rte_ethdev.h
> > > +++ b/lib/ethdev/rte_ethdev.h
> > > @@ -1047,6 +1047,7 @@ struct rte_eth_rxconf {
> > > uint8_t rx_drop_en; /**< Drop packets if no descriptors are 
> > > available. */
> > > uint8_t rx_deferred_start; /**< Do not start queue with 
> > > rte_eth_dev_start(). */
> > > uint16_t rx_nseg; /**< Number of descriptions in rx_seg array.
> > > */
> > > +   uint32_t shared_group; /**< Shared port group index in switch
> > > + domain. */
> >
> > Not to able to see anyone setting/creating this group ID test application.
> > How this group is created?
>
> Nice catch, the initial testpmd version only support one default group(0).
> All ports that supports shared-rxq assigned in same group.
>
> We should be able to change "--rxq-shared" to "--rxq-shared-group" to support
> group other than default.
>
> To support more groups simultaneously, need to consider testpmd forwarding 
> stream
> core assignment, all streams in same group need to stay on same core.
> It's possible to specify how many ports to increase group number, but user 
> must
> schedule stream affinity carefully - error prone.
>
> On the other hand, one group should be sufficient for most customer, the 
> doubt is
> whether it valuable to support multiple groups test.

Ack. One group is enough in testpmd.

My question was more about who and how this group is created, Should n't we need
API to create shared_group? If we do the following, at least, I can
think, how it
can be implemented in SW or other HW.

- Create aggregation queue group
- Attach multiple  Rx queues to the aggregation queue group
- Pull the packets from the queue group(which internally fetch from
the Rx queues _attached_)

Does the above kind of sequence, break your representor use case?


>
> >
> >
> > > /**
> > >  * Per-queue Rx offloads to be set using DEV_RX_OFFLOAD_* flags.
> > >  * Only offloads set on rx_queue_offload_capa or
> > > rx_offload_capa @@ -1373,6 +1374,12 @@ struct rte_eth_conf {  #define
> > > DEV_RX_OFFLOAD_OUTER_UDP_CKSUM  0x0004
> > >  #define DEV_RX_OFFLOAD_RSS_HASH0x0008
> > >  #define RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT 0x0010
> > > +/**
> > > + * Rx queue is shared among ports in same switch domain to save
> > > +memory,
> > > + * avoid polling each port. Any port in group can be used to receive 
> > > packets.
> > > + * Real source port number saved in mbuf->port field.
> > > + */
> > > +#define RTE_ETH_RX_OFFLOAD_SHARED_RXQ   0x0020
> > >
> > >  #define DEV_RX_OFFLOAD_CHECKSUM (DEV_RX_OFFLOAD_IPV4_CKSUM | \
> > >  DEV_RX_OFFLOAD_UDP_CKSUM | \
> > > --
> > > 2.25.1
> > >

Re: [dpdk-dev] [dpdk-ci] [PATCH] version: 21.11-rc0

[David Marchand]

On Tue, Aug 17, 2021 at 2:04 PM Lincoln Lavoie  wrote:
>
> Hi David,
>
> ABI testing was disable / stopped on Friday in the Community CI lab.  Patches 
> from before that for 21.11 would have still had the test run and could have 
> failures listed. I'm not sure if there is a way to "remove" those failure 
> marks from patchworks.  But, for all new patches since then, ABI hasn't been 
> run.

I don't think we can easily clean those reports in patchwork.
Copying Ali, in case he has an idea but otherwise we can live with this.

Thanks Lincoln.


-- 
David Marchand

Re: [dpdk-dev] [PATCH v4 2/2] net: added macro to extract MAC address bytes

[Stephen Hemminger]

On Tue, 17 Aug 2021 09:11:17 +0100
Ferruh Yigit  wrote:

> On 8/17/2021 12:03 AM, Stephen Hemminger wrote:
> > On Mon, 16 Aug 2021 15:27:28 +0530
> > Aman Singh  wrote:
> >   
> >> Added macros to simplify print of MAC address.
> >> The six bytes of a MAC address are extracted in
> >> a macro here, to improve code readablity.
> >>
> >> Signed-off-by: Aman Singh 
> >> Reviewed-by: Ferruh Yigit 
> >> ---
> >> The change in the document will be done in seperate patch.
> >> To ensure document has direct reference of the code as shown in
> >> commit 413c75c33c40 ("doc: show how to include code in guides").  
> > 
> > NAK
> > The DPDK already has rte_ether_format_addr()
> > why does so much code not use it?
> >   
> 
> 'rte_ether_format_addr()' formats string to a buffer, but most of the times 
> the
> need is just to log and having a buffer for it is unnecessary.
> 
> Both macros look useful to me.

Yes, but it would be good if same format was used everywhere.

Re: [dpdk-dev] [PATCH v2 1/6] eal: introduce oops handling API

[Jerin Jacob]

On Tue, Aug 17, 2021 at 8:39 PM Stephen Hemminger
 wrote:
>
> On Tue, 17 Aug 2021 13:08:46 +0530
> Jerin Jacob  wrote:
>
> > On Tue, Aug 17, 2021 at 9:23 AM Stephen Hemminger
> >  wrote:
> > >
> > > On Tue, 17 Aug 2021 08:57:18 +0530
> > >  wrote:
> > >
> > > > From: Jerin Jacob 
> > > >
> > > > Introducing oops handling API with following specification
> > > > and enable stub implementation for Linux and FreeBSD.
> > > >
> > > > On rte_eal_init() invocation, the EAL library installs the
> > > > oops handler for the essential signals.
> > > > The rte_oops_signals_enabled() API provides the list
> > > > of signals the library installed by the EAL.
> > >
> > > This is a big change, and many applications already handle these
> > > signals themselves. Therefore adding this needs to be opt-in
> > > and not enabled by default.
> >
> > In order to avoid every application explicitly register this
> > sighandler and to cater to the
> > co-existing application-specific signal-hander usage.
> > The following design has been chosen. (It is mentioned in the commit log,
> > I will describe here for more clarity)
> >
> > Case 1:
> > a) The application installs the signal handler prior to rte_eal_init().
> > b) Implementation stores the application-specific signal and replace a
> > signal handler as oops eal handler
> > c) when application/DPDK get the segfault, the default EAL oops
> > handler gets invoked
> > d) Then it dumps the EAL specific message, it calls the
> > application-specific signal handler
> > installed in step 1 by application. This avoids breaking any contract
> > with the application.
> > i.e Behavior is the same current EAL now.
> > That is the reason for not using SA_RESETHAND(which call SIG_DFL after
> > eal oops handler instead
> > application-specific handler)
> >
> > Case 2:
> > a) The application install the signal handler after rte_eal_init(),
> > b) EAL hander get replaced with application handle then the application can 
> > call
> > rte_oops_decode() to decode.
> >
> > In order to cater the above use case, rte_oops_signals_enabled() and
> > rte_oops_decode()
> > provided.
> >
> > Here we are not breaking any contract with the application.
> > Do you have concerns about this design?
>
> In our application as a service it is important not to do any backtrace
> in production. We rely on other infrastructure to process coredumps.

Other infrastructure will work. For example, If we are using standard coredump
using linux infra. In Current implementation,
- EAL handler dump the DPDK OOPS like kernel on stderr
- Implementation calls SIG_DFL in eal oops handler
- The above step creates the coredump or re-directs any other
infrastructure you are using for coredump.

>
> This should be controlled enabled by a command line argument.

If we allow other infrastructure coredump to work as-is, why
enable/disable required from eal?

Re: [dpdk-dev] [PATCH v2 01/15] ethdev: introduce shared Rx queue

[Xueming(Steven) Li]

> -Original Message-
> From: Jerin Jacob 
> Sent: Tuesday, August 17, 2021 5:33 PM
> To: Xueming(Steven) Li 
> Cc: dpdk-dev ; Ferruh Yigit ; 
> NBU-Contact-Thomas Monjalon ;
> Andrew Rybchenko 
> Subject: Re: [PATCH v2 01/15] ethdev: introduce shared Rx queue
> 
> On Wed, Aug 11, 2021 at 7:34 PM Xueming Li  wrote:
> >
> > In current DPDK framework, each RX queue is pre-loaded with mbufs for
> > incoming packets. When number of representors scale out in a switch
> > domain, the memory consumption became significant. Most important,
> > polling all ports leads to high cache miss, high latency and low
> > throughput.
> >
> > This patch introduces shared RX queue. Ports with same configuration
> > in a switch domain could share RX queue set by specifying sharing group.
> > Polling any queue using same shared RX queue receives packets from all
> > member ports. Source port is identified by mbuf->port.
> >
> > Port queue number in a shared group should be identical. Queue index
> > is
> > 1:1 mapped in shared group.
> >
> > Share RX queue must be polled on single thread or core.
> >
> > Multiple groups is supported by group ID.
> >
> > Signed-off-by: Xueming Li 
> > Cc: Jerin Jacob 
> > ---
> > Rx queue object could be used as shared Rx queue object, it's
> > important to clear all queue control callback api that using queue object:
> >   https://mails.dpdk.org/archives/dev/2021-July/215574.html
> 
> >  #undef RTE_RX_OFFLOAD_BIT2STR
> > diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index
> > d2b27c351f..a578c9db9d 100644
> > --- a/lib/ethdev/rte_ethdev.h
> > +++ b/lib/ethdev/rte_ethdev.h
> > @@ -1047,6 +1047,7 @@ struct rte_eth_rxconf {
> > uint8_t rx_drop_en; /**< Drop packets if no descriptors are 
> > available. */
> > uint8_t rx_deferred_start; /**< Do not start queue with 
> > rte_eth_dev_start(). */
> > uint16_t rx_nseg; /**< Number of descriptions in rx_seg array.
> > */
> > +   uint32_t shared_group; /**< Shared port group index in switch
> > + domain. */
> 
> Not to able to see anyone setting/creating this group ID test application.
> How this group is created?

Nice catch, the initial testpmd version only support one default group(0).
All ports that supports shared-rxq assigned in same group.

We should be able to change "--rxq-shared" to "--rxq-shared-group" to support
group other than default.

To support more groups simultaneously, need to consider testpmd forwarding 
stream
core assignment, all streams in same group need to stay on same core. 
It's possible to specify how many ports to increase group number, but user must
schedule stream affinity carefully - error prone.
 
On the other hand, one group should be sufficient for most customer, the doubt 
is
whether it valuable to support multiple groups test.

> 
> 
> > /**
> >  * Per-queue Rx offloads to be set using DEV_RX_OFFLOAD_* flags.
> >  * Only offloads set on rx_queue_offload_capa or
> > rx_offload_capa @@ -1373,6 +1374,12 @@ struct rte_eth_conf {  #define
> > DEV_RX_OFFLOAD_OUTER_UDP_CKSUM  0x0004
> >  #define DEV_RX_OFFLOAD_RSS_HASH0x0008
> >  #define RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT 0x0010
> > +/**
> > + * Rx queue is shared among ports in same switch domain to save
> > +memory,
> > + * avoid polling each port. Any port in group can be used to receive 
> > packets.
> > + * Real source port number saved in mbuf->port field.
> > + */
> > +#define RTE_ETH_RX_OFFLOAD_SHARED_RXQ   0x0020
> >
> >  #define DEV_RX_OFFLOAD_CHECKSUM (DEV_RX_OFFLOAD_IPV4_CKSUM | \
> >  DEV_RX_OFFLOAD_UDP_CKSUM | \
> > --
> > 2.25.1
> >

Re: [dpdk-dev] [PATCH v2 1/6] eal: introduce oops handling API

[Stephen Hemminger]

On Tue, 17 Aug 2021 20:57:50 +0530
Jerin Jacob  wrote:

> On Tue, Aug 17, 2021 at 8:39 PM Stephen Hemminger
>  wrote:
> >
> > On Tue, 17 Aug 2021 13:08:46 +0530
> > Jerin Jacob  wrote:
> >  
> > > On Tue, Aug 17, 2021 at 9:23 AM Stephen Hemminger
> > >  wrote:  
> > > >
> > > > On Tue, 17 Aug 2021 08:57:18 +0530
> > > >  wrote:
> > > >  
> > > > > From: Jerin Jacob 
> > > > >
> > > > > Introducing oops handling API with following specification
> > > > > and enable stub implementation for Linux and FreeBSD.
> > > > >
> > > > > On rte_eal_init() invocation, the EAL library installs the
> > > > > oops handler for the essential signals.
> > > > > The rte_oops_signals_enabled() API provides the list
> > > > > of signals the library installed by the EAL.  
> > > >
> > > > This is a big change, and many applications already handle these
> > > > signals themselves. Therefore adding this needs to be opt-in
> > > > and not enabled by default.  
> > >
> > > In order to avoid every application explicitly register this
> > > sighandler and to cater to the
> > > co-existing application-specific signal-hander usage.
> > > The following design has been chosen. (It is mentioned in the commit log,
> > > I will describe here for more clarity)
> > >
> > > Case 1:
> > > a) The application installs the signal handler prior to rte_eal_init().
> > > b) Implementation stores the application-specific signal and replace a
> > > signal handler as oops eal handler
> > > c) when application/DPDK get the segfault, the default EAL oops
> > > handler gets invoked
> > > d) Then it dumps the EAL specific message, it calls the
> > > application-specific signal handler
> > > installed in step 1 by application. This avoids breaking any contract
> > > with the application.
> > > i.e Behavior is the same current EAL now.
> > > That is the reason for not using SA_RESETHAND(which call SIG_DFL after
> > > eal oops handler instead
> > > application-specific handler)
> > >
> > > Case 2:
> > > a) The application install the signal handler after rte_eal_init(),
> > > b) EAL hander get replaced with application handle then the application 
> > > can call
> > > rte_oops_decode() to decode.
> > >
> > > In order to cater the above use case, rte_oops_signals_enabled() and
> > > rte_oops_decode()
> > > provided.
> > >
> > > Here we are not breaking any contract with the application.
> > > Do you have concerns about this design?  
> >
> > In our application as a service it is important not to do any backtrace
> > in production. We rely on other infrastructure to process coredumps.  
> 
> Other infrastructure will work. For example, If we are using standard coredump
> using linux infra. In Current implementation,
> - EAL handler dump the DPDK OOPS like kernel on stderr
> - Implementation calls SIG_DFL in eal oops handler
> - The above step creates the coredump or re-directs any other
> infrastructure you are using for coredump.
> 
> >
> > This should be controlled enabled by a command line argument.  
> 
> If we allow other infrastructure coredump to work as-is, why
> enable/disable required from eal?

The addition of DPDK OOPS adds additional steps which make all
faults be identified as the oops code.

Re: [dpdk-dev] [dpdk-ci] [PATCH] version: 21.11-rc0

[Ali Alnubani]

Hi,

> -Original Message-
> From: David Marchand 
> Sent: Tuesday, August 17, 2021 6:20 PM
> To: Lincoln Lavoie 
> Cc: NBU-Contact-Thomas Monjalon ; c...@dpdk.org;
> dev ; Ray Kinsella ; Ali Alnubani
> 
> Subject: Re: [dpdk-ci] [PATCH] version: 21.11-rc0
> 
> On Tue, Aug 17, 2021 at 2:04 PM Lincoln Lavoie 
> wrote:
> >
> > Hi David,
> >
> > ABI testing was disable / stopped on Friday in the Community CI lab.
> Patches from before that for 21.11 would have still had the test run and could
> have failures listed. I'm not sure if there is a way to "remove" those failure
> marks from patchworks.  But, for all new patches since then, ABI hasn't been
> run.
> 
> I don't think we can easily clean those reports in patchwork.
> Copying Ali, in case he has an idea but otherwise we can live with this.
> 

We can override each check by another one with "success" as the status and 
"skipped" as the description maybe?

> Thanks Lincoln.
> 
> 
> --
> David Marchand

Re: [dpdk-dev] [PATCH v3 4/7] net/nfp: prototype common functions in header file

[Ferruh Yigit]

On 8/17/2021 3:44 PM, Ferruh Yigit wrote:
> On 7/29/2021 2:47 PM, Heinrich Kuhn wrote:
>> The majority of "ethdev" type functions are used for both PF devices and
>> VF devices. Prototype these functions in the nfp_net_pmd header file in
>> preparation of splitting PF and VF specific functions.
>>
>> Signed-off-by: Heinrich Kuhn 
>> Signed-off-by: Simon Horman 
>> ---
>>  drivers/net/nfp/nfp_net.c | 87 +--
>>  drivers/net/nfp/nfp_net_pmd.h | 49 
>>  2 files changed, 81 insertions(+), 55 deletions(-)
>>
> 
> <...>
> 
> 
> Following functions seems only used in this file, and you may want to keep 
> them
> 'static':
> nfp_net_dev_link_status_print
> nfp_net_irq_unmask
> nfp_net_dev_interrupt_delayed_handler
> nfp_net_rss_reta_write
> nfp_net_rss_hash_write
> 
> (I may be missed some, you may want to double check all.)
> 
> Rest of the set looks good to me.
> 

Since rest is OK, I will make above functions static while merging, if they
needs to be used by other files they can always be updated again.

Re: [dpdk-dev] [PATCH v3 0/7] Refactor the NFP PMD

[Ferruh Yigit]

On 7/29/2021 2:47 PM, Heinrich Kuhn wrote:
> This patch set restructures the NFP PMD, aligning it more with the
> common layout adopted by most other PMD's. Although the changes look
> fairly large, functionally nothing is added or removed from the driver
> and the existing code is mostly just reorganized into the familiar
> structure seen in other PMD's. Apart form adopting the common PMD layout
> this change should also aid in future feature development to the NFP
> PMD. The previous layout where most of the logic resided in a single
> file (nfp_net.c) would have become tedious to support going forward.
> 
> v3:
> * Avoid squashing the new firmware loader helper added in: 
>   https://git.dpdk.org/dpdk/commit/?id=40edb9c0d36b781
> * Add dependency to patch-93299
> 
> v2:
> * Added missing sign-off's
> 
> ---
> Depends-on: patch-93299 ("net/nfp: remove compile time log")
> 
> Heinrich Kuhn (7):
>   net/nfp: split rxtx headers into separate file
>   net/nfp: move rxtx functions to their own file
>   net/nfp: move CPP bridge to a separate file
>   net/nfp: prototype common functions in header file
>   net/nfp: move VF functions into new file
>   net/nfp: move PF functions into new file
>   net/nfp: batch file rename for consistency
> 

Series applied to dpdk-next-net/main, thanks.

Re: [dpdk-dev] [PATCH v4 2/2] net: added macro to extract MAC address bytes

[Ferruh Yigit]

On 8/17/2021 4:25 PM, Stephen Hemminger wrote:
> On Tue, 17 Aug 2021 09:11:17 +0100
> Ferruh Yigit  wrote:
> 
>> On 8/17/2021 12:03 AM, Stephen Hemminger wrote:
>>> On Mon, 16 Aug 2021 15:27:28 +0530
>>> Aman Singh  wrote:
>>>   
 Added macros to simplify print of MAC address.
 The six bytes of a MAC address are extracted in
 a macro here, to improve code readablity.

 Signed-off-by: Aman Singh 
 Reviewed-by: Ferruh Yigit 
 ---
 The change in the document will be done in seperate patch.
 To ensure document has direct reference of the code as shown in
 commit 413c75c33c40 ("doc: show how to include code in guides").  
>>>
>>> NAK
>>> The DPDK already has rte_ether_format_addr()
>>> why does so much code not use it?
>>>   
>>
>> 'rte_ether_format_addr()' formats string to a buffer, but most of the times 
>> the
>> need is just to log and having a buffer for it is unnecessary.
>>
>> Both macros look useful to me.
> 
> Yes, but it would be good if same format was used everywhere.
> 

Agree, and 'RTE_ETHER_ADDR_PRT_FMT' macro helps to unify the format without
forcing to create the buffer.

We can use 'RTE_ETHER_ADDR_PRT_FMT' in the 'rte_ether_format_addr()' to unify
all output, the downside is it may change the output of the API, which may cause
trouble for some customers.
Other option is define 'RTE_ETHER_ADDR_PRT_FMT' as whatever
'rte_ether_format_addr()' has, to not cause a change in the API, what do you 
think?

Re: [dpdk-dev] [PATCH v4 2/2] net: added macro to extract MAC address bytes

[Stephen Hemminger]

On Tue, 17 Aug 2021 17:44:51 +0100
Ferruh Yigit  wrote:

> On 8/17/2021 4:25 PM, Stephen Hemminger wrote:
> > On Tue, 17 Aug 2021 09:11:17 +0100
> > Ferruh Yigit  wrote:
> >   
> >> On 8/17/2021 12:03 AM, Stephen Hemminger wrote:  
> >>> On Mon, 16 Aug 2021 15:27:28 +0530
> >>> Aman Singh  wrote:
> >>> 
>  Added macros to simplify print of MAC address.
>  The six bytes of a MAC address are extracted in
>  a macro here, to improve code readablity.
> 
>  Signed-off-by: Aman Singh 
>  Reviewed-by: Ferruh Yigit 
>  ---
>  The change in the document will be done in seperate patch.
>  To ensure document has direct reference of the code as shown in
>  commit 413c75c33c40 ("doc: show how to include code in guides").
> >>>
> >>> NAK
> >>> The DPDK already has rte_ether_format_addr()
> >>> why does so much code not use it?
> >>> 
> >>
> >> 'rte_ether_format_addr()' formats string to a buffer, but most of the 
> >> times the
> >> need is just to log and having a buffer for it is unnecessary.
> >>
> >> Both macros look useful to me.  
> > 
> > Yes, but it would be good if same format was used everywhere.
> >   
> 
> Agree, and 'RTE_ETHER_ADDR_PRT_FMT' macro helps to unify the format without
> forcing to create the buffer.
> 
> We can use 'RTE_ETHER_ADDR_PRT_FMT' in the 'rte_ether_format_addr()' to unify
> all output, the downside is it may change the output of the API, which may 
> cause
> trouble for some customers.
> Other option is define 'RTE_ETHER_ADDR_PRT_FMT' as whatever
> 'rte_ether_format_addr()' has, to not cause a change in the API, what do you 
> think?


Why change the format using spaces between parts is not standard.
The standard ways of printing ether addresses on Linux is  00:01:02:03:04:05
(and on Windows 00-01-02-03-04-05).

[dpdk-dev] [RFC 01/21] net/mlx5: fix shared device context creation error flow

[Michael Baum]

In shared device context creation, there are two validations after MR
btree memory allocation.

When one of them fails, the MR btree memory was not freed what caused a
memory leak.

Free it.

Fixes: 632f0f19056f ("net/mlx5: manage shared counters in three-level table")
Cc: sta...@dpdk.org

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/mlx5.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index f84e061fe7..f0ec2d1279 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1254,6 +1254,8 @@ mlx5_alloc_shared_dev_ctx(const struct 
mlx5_dev_spawn_data *spawn,
MLX5_ASSERT(sh);
if (sh->cnt_id_tbl)
mlx5_l3t_destroy(sh->cnt_id_tbl);
+   if (sh->share_cache.cache.table)
+   mlx5_mr_btree_free(&sh->share_cache.cache);
if (sh->tis)
claim_zero(mlx5_devx_cmd_destroy(sh->tis));
if (sh->td)
-- 
2.25.1

[dpdk-dev] [RFC 00/21] mlx5: sharing global MR cache between drivers

[Michael Baum]

There are 5 classes of mlx5 drivers (net\eth, RegEx, vDPA, compress and
crypto). The various drivers are registered under the common mlx5 driver
and are managed by it.
The common driver probing calls in a loop to the probe function of each
driver registered to it.
Each driver creates for itself all the objects required for
communication with the hardware and a global MR cache that manages
memory mappings.
The management of the caches separately by the different drivers is not
very efficient. In fact, the same memory is mapped multiple times to the
HW when more than 1 class use the device.
This feature will move management to the common driver in two phases.

Phase 1: sharing HW objects between drivers on the same device
The communication with the hardware - for any MR handle - is conducted
by the Protection Domain, so we are motivated to share it between the
drivers. However, to create it, we need to give the context of the
device, so the context must also be shared between the drivers.
At this point, we will share the next trio between the drivers (CTX, PD,
pdn) to create an infrastructure that will allow sharing of dependent
objects, particularly the global MR cache.
The common driver itself will create this trio individually for all
drivers before calling their probe function. Then, as a parameter to the
probe function, it will give them a pointer to the structure containing
the trio.

Phase 2: sharing global MR cache between drivers on the same device
The common driver will add to the structure containing the trio and the
structure that manages the global MR cache and keep a list of such
structures for memory management. In each driver, each queue will manage
its own local MR cache. If the queue does not find its cache, it will
search the global MR cache shared by all. Caching access will be through
the pointer that the driver received as a parameter in probing.


Michael Baum (21):
  net/mlx5: fix shared device context creation error flow
  net/mlx5: fix PCI probing error flow
  common/mlx5: add context device structure
  compress/mlx5: use context device structure
  crypto/mlx5: use context device structure
  regex/mlx5: use context device structure
  net/mlx5: improve probe function on Windows
  net/mlx5: improve probe function on Linux
  net/mlx5: improve spawn function
  net/mlx5: use context device structure
  net/mlx5: move NUMA node field to context device
  common/mlx5: add ROCE disable in context device creation
  vdpa/mlx5: use context device structure
  mlx5: update device sent to probing
  mlx5: share context device structure between drivers
  common/mlx5: add HCA attributes to context device structure
  regex/mlx5: use HCA attributes from context device
  vdpa/mlx5: use HCA attributes from context device
  compress/mlx5: use HCA attributes from context device
  crypto/mlx5: use HCA attributes from context device
  net/mlx5: use HCA attributes from context device

 drivers/common/mlx5/linux/mlx5_common_os.c   | 268 -
 drivers/common/mlx5/mlx5_common.c| 273 +-
 drivers/common/mlx5/mlx5_common.h|  35 +-
 drivers/common/mlx5/mlx5_common_private.h|   6 -
 drivers/common/mlx5/version.map  |   2 +
 drivers/common/mlx5/windows/mlx5_common_os.c | 207 ++-
 drivers/compress/mlx5/mlx5_compress.c| 112 +---
 drivers/crypto/mlx5/mlx5_crypto.c| 111 +---
 drivers/crypto/mlx5/mlx5_crypto.h|   4 +-
 drivers/crypto/mlx5/mlx5_crypto_dek.c|   5 +-
 drivers/net/mlx5/linux/mlx5_ethdev_os.c  |   8 +-
 drivers/net/mlx5/linux/mlx5_mp_os.c  |   9 +-
 drivers/net/mlx5/linux/mlx5_os.c | 543 +--
 drivers/net/mlx5/linux/mlx5_verbs.c  |  55 +-
 drivers/net/mlx5/mlx5.c  |  85 ++-
 drivers/net/mlx5/mlx5.h  |  17 +-
 drivers/net/mlx5/mlx5_devx.c |  35 +-
 drivers/net/mlx5/mlx5_flow.c |   6 +-
 drivers/net/mlx5/mlx5_flow_aso.c |  24 +-
 drivers/net/mlx5/mlx5_flow_dv.c  |  51 +-
 drivers/net/mlx5/mlx5_flow_verbs.c   |   4 +-
 drivers/net/mlx5/mlx5_mr.c   |  14 +-
 drivers/net/mlx5/mlx5_txpp.c |  27 +-
 drivers/net/mlx5/windows/mlx5_ethdev_os.c|  14 +-
 drivers/net/mlx5/windows/mlx5_os.c   | 285 ++
 drivers/regex/mlx5/mlx5_regex.c  |  74 +--
 drivers/regex/mlx5/mlx5_regex.h  |  23 +-
 drivers/regex/mlx5/mlx5_regex_control.c  |  12 +-
 drivers/regex/mlx5/mlx5_regex_fastpath.c |  18 +-
 drivers/regex/mlx5/mlx5_rxp.c|  64 ++-
 drivers/vdpa/mlx5/mlx5_vdpa.c| 210 +--
 drivers/vdpa/mlx5/mlx5_vdpa.h|   4 +-
 drivers/vdpa/mlx5/mlx5_vdpa_event.c  |  19 +-
 drivers/vdpa/mlx5/mlx5_vdpa_lm.c |   6 +-
 drivers/vdpa/mlx5/mlx5_vdpa_mem.c|  13 +-
 drivers/vdpa/mlx5/mlx5_vdpa_steer.c  |  10 +-
 drivers/vdpa/mlx5/mlx5_vdpa_v

[dpdk-dev] [PATCH] crypto/octeontx2: update min headroom and tailroom

[Akhil Goyal]

The driver consume 208B of tailroom but has min requirement
as 8B and headroom needed is 48B, but minimum requirement
is set as 24B. This patch correct minimum requirements
which application should honour.

Signed-off-by: Akhil Goyal 
---
 drivers/crypto/octeontx2/otx2_cryptodev_ops.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h 
b/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
index 1970187f88..043bda5a94 100644
--- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
@@ -7,8 +7,8 @@
 
 #include 
 
-#define OTX2_CPT_MIN_HEADROOM_REQ  24
-#define OTX2_CPT_MIN_TAILROOM_REQ  8
+#define OTX2_CPT_MIN_HEADROOM_REQ  48
+#define OTX2_CPT_MIN_TAILROOM_REQ  208
 
 extern struct rte_cryptodev_ops otx2_cpt_ops;
 
-- 
2.25.1

[dpdk-dev] [RFC 04/21] compress/mlx5: use context device structure

[Michael Baum]

Use common context device structure as a priv field.

Signed-off-by: Michael Baum 
---
 drivers/compress/mlx5/mlx5_compress.c | 110 ++
 1 file changed, 42 insertions(+), 68 deletions(-)

diff --git a/drivers/compress/mlx5/mlx5_compress.c 
b/drivers/compress/mlx5/mlx5_compress.c
index 883e720ec1..e906ddb066 100644
--- a/drivers/compress/mlx5/mlx5_compress.c
+++ b/drivers/compress/mlx5/mlx5_compress.c
@@ -35,14 +35,12 @@ struct mlx5_compress_xform {
 
 struct mlx5_compress_priv {
TAILQ_ENTRY(mlx5_compress_priv) next;
-   struct ibv_context *ctx; /* Device context. */
+   struct mlx5_dev_ctx *dev_ctx; /* Device context. */
struct rte_compressdev *cdev;
void *uar;
-   uint32_t pdn; /* Protection Domain number. */
uint8_t min_block_size;
uint8_t sq_ts_format; /* Whether SQ supports timestamp formats. */
/* Minimum huffman block size supported by the device. */
-   struct ibv_pd *pd;
struct rte_compressdev_config dev_config;
LIST_HEAD(xform_list, mlx5_compress_xform) xform_list;
rte_spinlock_t xform_sl;
@@ -185,7 +183,7 @@ mlx5_compress_qp_setup(struct rte_compressdev *dev, 
uint16_t qp_id,
struct mlx5_devx_create_sq_attr sq_attr = {
.user_index = qp_id,
.wq_attr = (struct mlx5_devx_wq_attr){
-   .pd = priv->pdn,
+   .pd = priv->dev_ctx->pdn,
.uar_page = mlx5_os_get_devx_uar_page_id(priv->uar),
},
};
@@ -228,24 +226,24 @@ mlx5_compress_qp_setup(struct rte_compressdev *dev, 
uint16_t qp_id,
qp->priv = priv;
qp->ops = (struct rte_comp_op **)RTE_ALIGN((uintptr_t)(qp + 1),
   RTE_CACHE_LINE_SIZE);
-   if (mlx5_common_verbs_reg_mr(priv->pd, opaq_buf, qp->entries_n *
-   sizeof(struct mlx5_gga_compress_opaque),
+   if (mlx5_common_verbs_reg_mr(priv->dev_ctx->pd, opaq_buf,
+   qp->entries_n * sizeof(struct mlx5_gga_compress_opaque),
 &qp->opaque_mr) != 0) {
rte_free(opaq_buf);
DRV_LOG(ERR, "Failed to register opaque MR.");
rte_errno = ENOMEM;
goto err;
}
-   ret = mlx5_devx_cq_create(priv->ctx, &qp->cq, log_ops_n, &cq_attr,
- socket_id);
+   ret = mlx5_devx_cq_create(priv->dev_ctx->ctx, &qp->cq, log_ops_n,
+ &cq_attr, socket_id);
if (ret != 0) {
DRV_LOG(ERR, "Failed to create CQ.");
goto err;
}
sq_attr.cqn = qp->cq.cq->id;
sq_attr.ts_format = mlx5_ts_format_conv(priv->sq_ts_format);
-   ret = mlx5_devx_sq_create(priv->ctx, &qp->sq, log_ops_n, &sq_attr,
- socket_id);
+   ret = mlx5_devx_sq_create(priv->dev_ctx->ctx, &qp->sq, log_ops_n,
+ &sq_attr, socket_id);
if (ret != 0) {
DRV_LOG(ERR, "Failed to create SQ.");
goto err;
@@ -465,7 +463,8 @@ mlx5_compress_addr2mr(struct mlx5_compress_priv *priv, 
uintptr_t addr,
if (likely(lkey != UINT32_MAX))
return lkey;
/* Take slower bottom-half on miss. */
-   return mlx5_mr_addr2mr_bh(priv->pd, 0, &priv->mr_scache, mr_ctrl, addr,
+   return mlx5_mr_addr2mr_bh(priv->dev_ctx->pd, 0, &priv->mr_scache,
+ mr_ctrl, addr,
  !!(ol_flags & EXT_ATTACHED_MBUF));
 }
 
@@ -689,57 +688,19 @@ mlx5_compress_dequeue_burst(void *queue_pair, struct 
rte_comp_op **ops,
 static void
 mlx5_compress_hw_global_release(struct mlx5_compress_priv *priv)
 {
-   if (priv->pd != NULL) {
-   claim_zero(mlx5_glue->dealloc_pd(priv->pd));
-   priv->pd = NULL;
-   }
if (priv->uar != NULL) {
mlx5_glue->devx_free_uar(priv->uar);
priv->uar = NULL;
}
 }
 
-static int
-mlx5_compress_pd_create(struct mlx5_compress_priv *priv)
-{
-#ifdef HAVE_IBV_FLOW_DV_SUPPORT
-   struct mlx5dv_obj obj;
-   struct mlx5dv_pd pd_info;
-   int ret;
-
-   priv->pd = mlx5_glue->alloc_pd(priv->ctx);
-   if (priv->pd == NULL) {
-   DRV_LOG(ERR, "Failed to allocate PD.");
-   return errno ? -errno : -ENOMEM;
-   }
-   obj.pd.in = priv->pd;
-   obj.pd.out = &pd_info;
-   ret = mlx5_glue->dv_init_obj(&obj, MLX5DV_OBJ_PD);
-   if (ret != 0) {
-   DRV_LOG(ERR, "Fail to get PD object info.");
-   mlx5_glue->dealloc_pd(priv->pd);
-   priv->pd = NULL;
-   return -errno;
-   }
-   priv->pdn = pd_info.pdn;
-   return 0;
-#else
-   (void)priv;
-   DRV_LOG(ERR, "Cannot get pdn - no DV support.");
-   return -ENO

[dpdk-dev] [RFC 05/21] crypto/mlx5: use context device structure

[Michael Baum]

Use common context device structure as a priv field.

Signed-off-by: Michael Baum 
---
 drivers/crypto/mlx5/mlx5_crypto.c | 114 ++
 drivers/crypto/mlx5/mlx5_crypto.h |   4 +-
 drivers/crypto/mlx5/mlx5_crypto_dek.c |   5 +-
 3 files changed, 49 insertions(+), 74 deletions(-)

diff --git a/drivers/crypto/mlx5/mlx5_crypto.c 
b/drivers/crypto/mlx5/mlx5_crypto.c
index b3d5200ca3..7cb5bb5445 100644
--- a/drivers/crypto/mlx5/mlx5_crypto.c
+++ b/drivers/crypto/mlx5/mlx5_crypto.c
@@ -347,7 +347,8 @@ mlx5_crypto_addr2mr(struct mlx5_crypto_priv *priv, 
uintptr_t addr,
if (likely(lkey != UINT32_MAX))
return lkey;
/* Take slower bottom-half on miss. */
-   return mlx5_mr_addr2mr_bh(priv->pd, 0, &priv->mr_scache, mr_ctrl, addr,
+   return mlx5_mr_addr2mr_bh(priv->dev_ctx->pd, 0, &priv->mr_scache,
+ mr_ctrl, addr,
  !!(ol_flags & EXT_ATTACHED_MBUF));
 }
 
@@ -621,7 +622,7 @@ mlx5_crypto_indirect_mkeys_prepare(struct mlx5_crypto_priv 
*priv,
struct mlx5_umr_wqe *umr;
uint32_t i;
struct mlx5_devx_mkey_attr attr = {
-   .pd = priv->pdn,
+   .pd = priv->dev_ctx->pdn,
.umr_en = 1,
.crypto_en = 1,
.set_remote_rw = 1,
@@ -631,7 +632,8 @@ mlx5_crypto_indirect_mkeys_prepare(struct mlx5_crypto_priv 
*priv,
for (umr = (struct mlx5_umr_wqe *)qp->umem_buf, i = 0;
   i < qp->entries_n; i++, umr = RTE_PTR_ADD(umr, priv->wqe_set_size)) {
attr.klm_array = (struct mlx5_klm *)&umr->kseg[0];
-   qp->mkey[i] = mlx5_devx_cmd_mkey_create(priv->ctx, &attr);
+   qp->mkey[i] = mlx5_devx_cmd_mkey_create(priv->dev_ctx->ctx,
+   &attr);
if (!qp->mkey[i]) {
DRV_LOG(ERR, "Failed to allocate indirect mkey.");
return -1;
@@ -670,7 +672,7 @@ mlx5_crypto_queue_pair_setup(struct rte_cryptodev *dev, 
uint16_t qp_id,
rte_errno = ENOMEM;
return -rte_errno;
}
-   if (mlx5_devx_cq_create(priv->ctx, &qp->cq_obj, log_nb_desc,
+   if (mlx5_devx_cq_create(priv->dev_ctx->ctx, &qp->cq_obj, log_nb_desc,
&cq_attr, socket_id) != 0) {
DRV_LOG(ERR, "Failed to create CQ.");
goto error;
@@ -681,7 +683,7 @@ mlx5_crypto_queue_pair_setup(struct rte_cryptodev *dev, 
uint16_t qp_id,
rte_errno = ENOMEM;
goto error;
}
-   qp->umem_obj = mlx5_glue->devx_umem_reg(priv->ctx,
+   qp->umem_obj = mlx5_glue->devx_umem_reg(priv->dev_ctx->ctx,
   (void *)(uintptr_t)qp->umem_buf,
   umem_size,
   IBV_ACCESS_LOCAL_WRITE);
@@ -697,7 +699,7 @@ mlx5_crypto_queue_pair_setup(struct rte_cryptodev *dev, 
uint16_t qp_id,
goto error;
}
qp->mr_ctrl.dev_gen_ptr = &priv->mr_scache.dev_gen;
-   attr.pd = priv->pdn;
+   attr.pd = priv->dev_ctx->pdn;
attr.uar_index = mlx5_os_get_devx_uar_page_id(priv->uar);
attr.cqn = qp->cq_obj.cq->id;
attr.log_page_size = rte_log2_u32(sysconf(_SC_PAGESIZE));
@@ -708,7 +710,7 @@ mlx5_crypto_queue_pair_setup(struct rte_cryptodev *dev, 
uint16_t qp_id,
attr.wq_umem_offset = 0;
attr.dbr_umem_id = qp->umem_obj->umem_id;
attr.dbr_address = RTE_BIT64(log_nb_desc) * priv->wqe_set_size;
-   qp->qp_obj = mlx5_devx_cmd_create_qp(priv->ctx, &attr);
+   qp->qp_obj = mlx5_devx_cmd_create_qp(priv->dev_ctx->ctx, &attr);
if (qp->qp_obj == NULL) {
DRV_LOG(ERR, "Failed to create QP(%u).", rte_errno);
goto error;
@@ -782,58 +784,20 @@ static struct rte_cryptodev_ops mlx5_crypto_ops = {
 static void
 mlx5_crypto_hw_global_release(struct mlx5_crypto_priv *priv)
 {
-   if (priv->pd != NULL) {
-   claim_zero(mlx5_glue->dealloc_pd(priv->pd));
-   priv->pd = NULL;
-   }
if (priv->uar != NULL) {
mlx5_glue->devx_free_uar(priv->uar);
priv->uar = NULL;
}
 }
 
-static int
-mlx5_crypto_pd_create(struct mlx5_crypto_priv *priv)
-{
-#ifdef HAVE_IBV_FLOW_DV_SUPPORT
-   struct mlx5dv_obj obj;
-   struct mlx5dv_pd pd_info;
-   int ret;
-
-   priv->pd = mlx5_glue->alloc_pd(priv->ctx);
-   if (priv->pd == NULL) {
-   DRV_LOG(ERR, "Failed to allocate PD.");
-   return errno ? -errno : -ENOMEM;
-   }
-   obj.pd.in = priv->pd;
-   obj.pd.out = &pd_info;
-   ret = mlx5_glue->dv_init_obj(&obj, MLX5DV_OBJ_PD);
-   if (ret != 0) {
-   DRV_LOG(ERR, "Fail to get PD object info.");
-   mlx5_glue->dealloc_pd(priv->pd);
-   priv-

[dpdk-dev] [RFC 03/21] common/mlx5: add context device structure

[Michael Baum]

Add context device structure which contains ctx and pd of dievice.
In addition, provides prepare and release functions for this structure.

Signed-off-by: Michael Baum 
---
 drivers/common/mlx5/linux/mlx5_common_os.c   | 144 -
 drivers/common/mlx5/mlx5_common.c| 166 +++
 drivers/common/mlx5/mlx5_common.h|  48 +
 drivers/common/mlx5/version.map  |   3 +
 drivers/common/mlx5/windows/mlx5_common_os.c | 207 ++-
 5 files changed, 562 insertions(+), 6 deletions(-)

diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c 
b/drivers/common/mlx5/linux/mlx5_common_os.c
index 9e0c823c97..6f78897390 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.c
+++ b/drivers/common/mlx5/linux/mlx5_common_os.c
@@ -23,6 +23,22 @@
 const struct mlx5_glue *mlx5_glue;
 #endif
 
+/* Environment variable to control the doorbell register mapping. */
+#define MLX5_SHUT_UP_BF "MLX5_SHUT_UP_BF"
+#if defined(RTE_ARCH_ARM64)
+#define MLX5_SHUT_UP_BF_DEFAULT "0"
+#else
+#define MLX5_SHUT_UP_BF_DEFAULT "1"
+#endif
+
+/* Default PMD specific parameter value. */
+#define MLX5_TXDB_UNSET (-1)
+
+/* MLX5_TX_DB_NC supported values. */
+#define MLX5_TXDB_CACHED 0
+#define MLX5_TXDB_NCACHED 1
+#define MLX5_TXDB_HEURISTIC 2
+
 int
 mlx5_get_pci_addr(const char *dev_path, struct rte_pci_addr *pci_addr)
 {
@@ -401,6 +417,127 @@ mlx5_glue_constructor(void)
mlx5_glue = NULL;
 }
 
+static int
+mlx5_config_doorbell_mapping_env(int dbnc)
+{
+   char *env;
+   int value;
+
+   MLX5_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY);
+   /* Get environment variable to store. */
+   env = getenv(MLX5_SHUT_UP_BF);
+   value = env ? !!strcmp(env, "0") : MLX5_TXDB_UNSET;
+   if (dbnc == MLX5_TXDB_UNSET)
+   setenv(MLX5_SHUT_UP_BF, MLX5_SHUT_UP_BF_DEFAULT, 1);
+   else
+   setenv(MLX5_SHUT_UP_BF,
+  dbnc == MLX5_TXDB_NCACHED ? "1" : "0", 1);
+   return value;
+}
+
+static void
+mlx5_restore_doorbell_mapping_env(int value)
+{
+   MLX5_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY);
+   /* Restore the original environment variable state. */
+   if (value == MLX5_TXDB_UNSET)
+   unsetenv(MLX5_SHUT_UP_BF);
+   else
+   setenv(MLX5_SHUT_UP_BF, value ? "1" : "0", 1);
+}
+
+/**
+ * Function API to open IB device using DevX.
+ *
+ * This function calls the Linux glue APIs to open a device.
+ *
+ * @param dev_ctx
+ *   Pointer to the context device data structure.
+ * @param dev
+ *   Pointer to the generic device.
+ * @param dbnc
+ *   Device argument help configure the environment variable.
+ * @param classes
+ *   Chosen classes come from device arguments.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+int
+mlx5_os_devx_open_device(struct mlx5_dev_ctx *dev_ctx, struct rte_device *dev,
+int dbnc, uint32_t classes)
+{
+   struct ibv_device *ibv;
+   struct ibv_context *ctx = NULL;
+   int dbmap_env;
+
+   ibv = mlx5_os_get_ibv_dev(dev);
+   if (!ibv)
+   return -rte_errno;
+   DRV_LOG(INFO, "Dev information matches for device \"%s\".", ibv->name);
+   /*
+* Configure environment variable "MLX5_BF_SHUT_UP" before the device
+* creation. The rdma_core library checks the variable at device
+* creation and stores the result internally.
+*/
+   dbmap_env = mlx5_config_doorbell_mapping_env(dbnc);
+   /* Try to open IB device with DV. */
+   errno = 0;
+   ctx = mlx5_glue->dv_open_device(ibv);
+   /*
+* The environment variable is not needed anymore, all device creation
+* attempts are completed.
+*/
+   mlx5_restore_doorbell_mapping_env(dbmap_env);
+   if (ctx == NULL && classes != MLX5_CLASS_ETH) {
+   DRV_LOG(ERR, "Failed to open IB device \"%s\".", ibv->name);
+   rte_errno = errno ? errno : ENODEV;
+   return -rte_errno;
+   }
+   dev_ctx->ctx = ctx;
+   return 0;
+}
+
+/**
+ * Allocate Protection Domain object and extract its pdn using DV API.
+ *
+ * @param[out] dev_ctx
+ *   Pointer to the context device data structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+int
+mlx5_os_pd_create(struct mlx5_dev_ctx *dev_ctx)
+{
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+   struct mlx5dv_obj obj;
+   struct mlx5dv_pd pd_info;
+   int ret;
+
+   dev_ctx->pd = mlx5_glue->alloc_pd(dev_ctx->ctx);
+   if (dev_ctx->pd == NULL) {
+   DRV_LOG(ERR, "Failed to allocate PD.");
+   return errno ? -errno : -ENOMEM;
+   }
+   obj.pd.in = dev_ctx->pd;
+   obj.pd.out = &pd_info;
+   ret = mlx5_glue->dv_init_obj(&obj, MLX5DV_OBJ_PD);
+   if (ret != 0) {
+   DRV_LOG(ERR, "Fail to get PD object info.");
+   mlx5_glue->

[dpdk-dev] [RFC 02/21] net/mlx5: fix PCI probing error flow

[Michael Baum]

In PCI probing, there is internal probe function that is called several
times for several PFs.

When one of them fails, the previous PFs are not destroyed what nay
cause a memory leak.

Destroy them.

Fixes: 08c2772fc747 ("net/mlx5: support list of representor PF")
Cc: sta...@dpdk.org

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/linux/mlx5_os.c | 13 -
 drivers/net/mlx5/mlx5.c  |  2 +-
 drivers/net/mlx5/mlx5.h  |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 5f8766aa48..3d204f99f7 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -2700,9 +2700,20 @@ mlx5_os_pci_probe(struct rte_pci_device *pci_dev)
 
if (eth_da.nb_ports > 0) {
/* Iterate all port if devargs pf is range: "pf[0-1]vf[...]". */
-   for (p = 0; p < eth_da.nb_ports; p++)
+   for (p = 0; p < eth_da.nb_ports; p++) {
ret = mlx5_os_pci_probe_pf(pci_dev, ð_da,
   eth_da.ports[p]);
+   if (ret)
+   break;
+   }
+   if (ret) {
+   DRV_LOG(ERR, "Probe of PCI device " PCI_PRI_FMT " "
+   "aborted due to proding failure of PF %u",
+   pci_dev->addr.domain, pci_dev->addr.bus,
+   pci_dev->addr.devid, pci_dev->addr.function,
+   eth_da.ports[p]);
+   mlx5_net_remove(&pci_dev->device);
+   }
} else {
ret = mlx5_os_pci_probe_pf(pci_dev, ð_da, 0);
}
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index f0ec2d1279..02ea2e781e 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -2386,7 +2386,7 @@ mlx5_eth_find_next(uint16_t port_id, struct rte_device 
*odev)
  * @return
  *   0 on success, the function cannot fail.
  */
-static int
+int
 mlx5_net_remove(struct rte_device *dev)
 {
uint16_t port_id;
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index e02714e231..3581414b78 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1483,6 +1483,7 @@ int mlx5_udp_tunnel_port_add(struct rte_eth_dev *dev,
  struct rte_eth_udp_tunnel *udp_tunnel);
 uint16_t mlx5_eth_find_next(uint16_t port_id, struct rte_device *odev);
 int mlx5_dev_close(struct rte_eth_dev *dev);
+int mlx5_net_remove(struct rte_device *dev);
 bool mlx5_is_hpf(struct rte_eth_dev *dev);
 bool mlx5_is_sf_repr(struct rte_eth_dev *dev);
 void mlx5_age_event_prepare(struct mlx5_dev_ctx_shared *sh);
-- 
2.25.1

[dpdk-dev] [RFC 12/21] common/mlx5: add ROCE disable in context device creation

[Michael Baum]

Add option to get IB device after disabling RoCE. It is relevant if
there is vDPA class in device arguments list.

Signed-off-by: Michael Baum 
---
 drivers/common/mlx5/linux/mlx5_common_os.c | 126 -
 1 file changed, 125 insertions(+), 1 deletion(-)

diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c 
b/drivers/common/mlx5/linux/mlx5_common_os.c
index 6f78897390..4a94865241 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.c
+++ b/drivers/common/mlx5/linux/mlx5_common_os.c
@@ -15,6 +15,7 @@
 #include 
 
 #include "mlx5_common.h"
+#include "mlx5_nl.h"
 #include "mlx5_common_log.h"
 #include "mlx5_common_os.h"
 #include "mlx5_glue.h"
@@ -39,6 +40,9 @@ const struct mlx5_glue *mlx5_glue;
 #define MLX5_TXDB_NCACHED 1
 #define MLX5_TXDB_HEURISTIC 2
 
+#define MLX5_VDPA_MAX_RETRIES 20
+#define MLX5_VDPA_USEC 1000
+
 int
 mlx5_get_pci_addr(const char *dev_path, struct rte_pci_addr *pci_addr)
 {
@@ -417,6 +421,123 @@ mlx5_glue_constructor(void)
mlx5_glue = NULL;
 }
 
+/* Try to disable ROCE by Netlink\Devlink. */
+static int
+mlx5_nl_roce_disable(const char *addr)
+{
+   int nlsk_fd = mlx5_nl_init(NETLINK_GENERIC);
+   int devlink_id;
+   int enable;
+   int ret;
+
+   if (nlsk_fd < 0)
+   return nlsk_fd;
+   devlink_id = mlx5_nl_devlink_family_id_get(nlsk_fd);
+   if (devlink_id < 0) {
+   ret = devlink_id;
+   DRV_LOG(DEBUG,
+   "Failed to get devlink id for ROCE operations by 
Netlink.");
+   goto close;
+   }
+   ret = mlx5_nl_enable_roce_get(nlsk_fd, devlink_id, addr, &enable);
+   if (ret) {
+   DRV_LOG(DEBUG, "Failed to get ROCE enable by Netlink: %d.",
+   ret);
+   goto close;
+   } else if (!enable) {
+   DRV_LOG(INFO, "ROCE has already disabled(Netlink).");
+   goto close;
+   }
+   ret = mlx5_nl_enable_roce_set(nlsk_fd, devlink_id, addr, 0);
+   if (ret)
+   DRV_LOG(DEBUG, "Failed to disable ROCE by Netlink: %d.", ret);
+   else
+   DRV_LOG(INFO, "ROCE is disabled by Netlink successfully.");
+close:
+   close(nlsk_fd);
+   return ret;
+}
+
+/* Try to disable ROCE by sysfs. */
+static int
+mlx5_sys_roce_disable(const char *addr)
+{
+   FILE *file_o;
+   int enable;
+   int ret;
+
+   MKSTR(file_p, "/sys/bus/pci/devices/%s/roce_enable", addr);
+   file_o = fopen(file_p, "rb");
+   if (!file_o) {
+   rte_errno = ENOTSUP;
+   return -ENOTSUP;
+   }
+   ret = fscanf(file_o, "%d", &enable);
+   if (ret != 1) {
+   rte_errno = EINVAL;
+   ret = EINVAL;
+   goto close;
+   } else if (!enable) {
+   ret = 0;
+   DRV_LOG(INFO, "ROCE has already disabled(sysfs).");
+   goto close;
+   }
+   fclose(file_o);
+   file_o = fopen(file_p, "wb");
+   if (!file_o) {
+   rte_errno = ENOTSUP;
+   return -ENOTSUP;
+   }
+   fprintf(file_o, "0\n");
+   ret = 0;
+close:
+   if (ret)
+   DRV_LOG(DEBUG, "Failed to disable ROCE by sysfs: %d.", ret);
+   else
+   DRV_LOG(INFO, "ROCE is disabled by sysfs successfully.");
+   fclose(file_o);
+   return ret;
+}
+
+static int
+mlx5_roce_disable(struct rte_device *dev)
+{
+   char pci_addr[PCI_PRI_STR_SIZE] = { 0 };
+
+   if (mlx5_dev_to_pci_str(dev, pci_addr, sizeof(pci_addr)) < 0)
+   return -rte_errno;
+   /* Firstly try to disable ROCE by Netlink and fallback to sysfs. */
+   if (mlx5_nl_roce_disable(pci_addr) != 0 &&
+   mlx5_sys_roce_disable(pci_addr) != 0)
+   return -rte_errno;
+   return 0;
+}
+
+static struct ibv_device *
+mlx5_vdpa_get_ibv_dev(struct rte_device *dev)
+{
+   struct ibv_device *ibv;
+   int retry;
+
+   if (mlx5_roce_disable(dev) != 0) {
+   DRV_LOG(WARNING, "Failed to disable ROCE for \"%s\".",
+   dev->name);
+   return NULL;
+   }
+   /* Wait for the IB device to appear again after reload. */
+   for (retry = MLX5_VDPA_MAX_RETRIES; retry > 0; --retry) {
+   ibv = mlx5_os_get_ibv_dev(dev);
+   if (ibv != NULL)
+   return ibv;
+   usleep(MLX5_VDPA_USEC);
+   }
+   DRV_LOG(ERR,
+   "Cannot get IB device after disabling RoCE for \"%s\", retries 
exceed %d.",
+   dev->name, MLX5_VDPA_MAX_RETRIES);
+   rte_errno = EAGAIN;
+   return NULL;
+}
+
 static int
 mlx5_config_doorbell_mapping_env(int dbnc)
 {
@@ -471,7 +592,10 @@ mlx5_os_devx_open_device(struct mlx5_dev_ctx *dev_ctx, 
struct rte_device *dev,
struct ibv_context *ctx = NULL;
int dbmap_env;
 
-   ibv = mlx5_os_get_ibv_dev(dev);
+   if (classes & MLX5_CLASS_VDPA)
+   ibv = mlx5

[dpdk-dev] [RFC 08/21] net/mlx5: improve probe function on Linux

[Michael Baum]

some improvements:
- Update parameters for mlx5_device_bond_pci_match function.
- Fix spelling and typos in comments.
- Prevent breaking lines on drv logs.

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/linux/mlx5_os.c | 96 ++--
 1 file changed, 42 insertions(+), 54 deletions(-)

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 3d204f99f7..375bc55e79 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -1984,14 +1984,14 @@ mlx5_dev_spawn_data_cmp(const void *a, const void *b)
 /**
  * Match PCI information for possible slaves of bonding device.
  *
- * @param[in] ibv_dev
- *   Pointer to Infiniband device structure.
+ * @param[in] ibdev_name
+ *   Name of Infiniband device.
  * @param[in] pci_dev
  *   Pointer to primary PCI address structure to match.
  * @param[in] nl_rdma
  *   Netlink RDMA group socket handle.
  * @param[in] owner
- *   Rerepsentor owner PF index.
+ *   Representor owner PF index.
  * @param[out] bond_info
  *   Pointer to bonding information.
  *
@@ -2000,7 +2000,7 @@ mlx5_dev_spawn_data_cmp(const void *a, const void *b)
  *   positive index of slave PF in bonding.
  */
 static int
-mlx5_device_bond_pci_match(const struct ibv_device *ibv_dev,
+mlx5_device_bond_pci_match(const char *ibdev_name,
   const struct rte_pci_addr *pci_dev,
   int nl_rdma, uint16_t owner,
   struct mlx5_bond_info *bond_info)
@@ -2013,27 +2013,25 @@ mlx5_device_bond_pci_match(const struct ibv_device 
*ibv_dev,
int ret;
 
/*
-* Try to get master device name. If something goes
-* wrong suppose the lack of kernel support and no
-* bonding devices.
+* Try to get master device name. If something goes wrong suppose
+* the lack of kernel support and no bonding devices.
 */
memset(bond_info, 0, sizeof(*bond_info));
if (nl_rdma < 0)
return -1;
-   if (!strstr(ibv_dev->name, "bond"))
+   if (!strstr(ibdev_name, "bond"))
return -1;
-   np = mlx5_nl_portnum(nl_rdma, ibv_dev->name);
+   np = mlx5_nl_portnum(nl_rdma, ibdev_name);
if (!np)
return -1;
/*
-* The Master device might not be on the predefined
-* port (not on port index 1, it is not garanted),
-* we have to scan all Infiniband device port and
-* find master.
+* The master device might not be on the predefined port(not on port
+* index 1, it is not guaranteed), we have to scan all Infiniband
+* device ports and find master.
 */
for (i = 1; i <= np; ++i) {
/* Check whether Infiniband port is populated. */
-   ifindex = mlx5_nl_ifindex(nl_rdma, ibv_dev->name, i);
+   ifindex = mlx5_nl_ifindex(nl_rdma, ibdev_name, i);
if (!ifindex)
continue;
if (!if_indextoname(ifindex, ifname))
@@ -2058,8 +2056,9 @@ mlx5_device_bond_pci_match(const struct ibv_device 
*ibv_dev,
snprintf(tmp_str, sizeof(tmp_str),
 "/sys/class/net/%s", ifname);
if (mlx5_get_pci_addr(tmp_str, &pci_addr)) {
-   DRV_LOG(WARNING, "can not get PCI address"
-" for netdev \"%s\"", ifname);
+   DRV_LOG(WARNING,
+   "Cannot get PCI address for netdev \"%s\".",
+   ifname);
continue;
}
/* Slave interface PCI address match found. */
@@ -2218,9 +2217,8 @@ mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev,
struct rte_pci_addr pci_addr;
 
DRV_LOG(DEBUG, "checking device \"%s\"", ibv_list[ret]->name);
-   bd = mlx5_device_bond_pci_match
-   (ibv_list[ret], &owner_pci, nl_rdma, owner_id,
-&bond_info);
+   bd = mlx5_device_bond_pci_match(ibv_list[ret]->name, &owner_pci,
+   nl_rdma, owner_id, &bond_info);
if (bd >= 0) {
/*
 * Bonding device detected. Only one match is allowed,
@@ -2240,9 +2238,9 @@ mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev,
/* Amend owner pci address if owner PF ID specified. */
if (eth_da.nb_representor_ports)
owner_pci.function += owner_id;
-   DRV_LOG(INFO, "PCI information matches for"
- " slave %d bonding device \"%s\"",
- bd, ibv_list[ret]->name);
+   DRV_LOG(INFO,
+   "PCI information matches for slave %d bondi

[dpdk-dev] [RFC 06/21] regex/mlx5: use context device structure

[Michael Baum]

Use common context device structure as a priv field.

Signed-off-by: Michael Baum 
---
 drivers/regex/mlx5/mlx5_regex.c  | 59 +++---
 drivers/regex/mlx5/mlx5_regex.h  | 23 +
 drivers/regex/mlx5/mlx5_regex_control.c  | 12 ++---
 drivers/regex/mlx5/mlx5_regex_fastpath.c | 18 +++
 drivers/regex/mlx5/mlx5_rxp.c| 64 
 5 files changed, 72 insertions(+), 104 deletions(-)

diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c
index f17b6df47f..11b24cde39 100644
--- a/drivers/regex/mlx5/mlx5_regex.c
+++ b/drivers/regex/mlx5/mlx5_regex.c
@@ -110,7 +110,8 @@ mlx5_regex_mr_mem_event_cb(enum rte_mem_event event_type, 
const void *addr,
/* Iterate all the existing mlx5 devices. */
TAILQ_FOREACH(priv, &mlx5_mem_event_list, mem_event_cb)
mlx5_free_mr_by_addr(&priv->mr_scache,
-priv->ctx->device->name,
+mlx5_os_get_ctx_device_name
+  (priv->dev_ctx->ctx),
 addr, len);
pthread_mutex_unlock(&mem_event_list_lock);
break;
@@ -123,25 +124,31 @@ mlx5_regex_mr_mem_event_cb(enum rte_mem_event event_type, 
const void *addr,
 static int
 mlx5_regex_dev_probe(struct rte_device *rte_dev)
 {
-   struct ibv_device *ibv;
struct mlx5_regex_priv *priv = NULL;
-   struct ibv_context *ctx = NULL;
+   struct mlx5_dev_ctx *dev_ctx = NULL;
struct mlx5_hca_attr attr;
char name[RTE_REGEXDEV_NAME_MAX_LEN];
+   const char *ibdev_name;
int ret;
uint32_t val;
 
-   ibv = mlx5_os_get_ibv_dev(rte_dev);
-   if (ibv == NULL)
+   dev_ctx = rte_zmalloc("mlx5 context device", sizeof(*dev_ctx),
+ RTE_CACHE_LINE_SIZE);
+   if (dev_ctx == NULL) {
+   DRV_LOG(ERR, "Device context allocation failure.");
+   rte_errno = ENOMEM;
return -rte_errno;
-   DRV_LOG(INFO, "Probe device \"%s\".", ibv->name);
-   ctx = mlx5_glue->dv_open_device(ibv);
-   if (!ctx) {
-   DRV_LOG(ERR, "Failed to open IB device \"%s\".", ibv->name);
+   }
+   ret = mlx5_dev_ctx_prepare(dev_ctx, rte_dev, MLX5_CLASS_REGEX);
+   if (ret < 0) {
+   DRV_LOG(ERR, "Failed to create device context.");
+   rte_free(dev_ctx);
rte_errno = ENODEV;
return -rte_errno;
}
-   ret = mlx5_devx_cmd_query_hca_attr(ctx, &attr);
+   ibdev_name = mlx5_os_get_ctx_device_name(dev_ctx->ctx);
+   DRV_LOG(INFO, "Probe device \"%s\".", ibdev_name);
+   ret = mlx5_devx_cmd_query_hca_attr(dev_ctx->ctx, &attr);
if (ret) {
DRV_LOG(ERR, "Unable to read HCA capabilities.");
rte_errno = ENOTSUP;
@@ -152,7 +159,7 @@ mlx5_regex_dev_probe(struct rte_device *rte_dev)
rte_errno = ENOTSUP;
goto dev_error;
}
-   if (mlx5_regex_engines_status(ctx, 2)) {
+   if (mlx5_regex_engines_status(dev_ctx->ctx, 2)) {
DRV_LOG(ERR, "RegEx engine error.");
rte_errno = ENOMEM;
goto dev_error;
@@ -165,13 +172,13 @@ mlx5_regex_dev_probe(struct rte_device *rte_dev)
goto dev_error;
}
priv->sq_ts_format = attr.sq_ts_format;
-   priv->ctx = ctx;
+   priv->dev_ctx = dev_ctx;
priv->nb_engines = 2; /* attr.regexp_num_of_engines */
-   ret = mlx5_devx_regex_register_read(priv->ctx, 0,
+   ret = mlx5_devx_regex_register_read(priv->dev_ctx->ctx, 0,
MLX5_RXP_CSR_IDENTIFIER, &val);
if (ret) {
DRV_LOG(ERR, "CSR read failed!");
-   return -1;
+   goto dev_error;
}
if (val == MLX5_RXP_BF2_IDENTIFIER)
priv->is_bf2 = 1;
@@ -189,18 +196,12 @@ mlx5_regex_dev_probe(struct rte_device *rte_dev)
 * registers writings, it is safe to allocate UAR with any
 * memory mapping type.
 */
-   priv->uar = mlx5_devx_alloc_uar(ctx, -1);
+   priv->uar = mlx5_devx_alloc_uar(dev_ctx->ctx, -1);
if (!priv->uar) {
DRV_LOG(ERR, "can't allocate uar.");
rte_errno = ENOMEM;
goto error;
}
-   priv->pd = mlx5_glue->alloc_pd(ctx);
-   if (!priv->pd) {
-   DRV_LOG(ERR, "can't allocate pd.");
-   rte_errno = ENOMEM;
-   goto error;
-   }
priv->regexdev->dev_ops = &mlx5_regexdev_ops;
priv->regexdev->enqueue = mlx5_regexdev_enqueue;
 #ifdef HAVE_MLX5_UMR_IMKEY
@@ -238,15 +239,15 @@ mlx5_regex_dev_probe(struct rte_device *rte_dev)
return 0;
 
 error:
-   if (priv->pd)
-   mlx5_glue->deall

[dpdk-dev] [RFC 09/21] net/mlx5: improve spawn function

[Michael Baum]

Add name as a parameter to spawn structure.

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/linux/mlx5_os.c   | 24 ++--
 drivers/net/mlx5/mlx5.c|  5 ++---
 drivers/net/mlx5/mlx5.h|  1 +
 drivers/net/mlx5/windows/mlx5_os.c |  1 +
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 375bc55e79..b4670fad6e 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -938,7 +938,7 @@ mlx5_representor_match(struct mlx5_dev_spawn_data *spawn,
  *   Verbs device parameters (name, port, switch_info) to spawn.
  * @param config
  *   Device configuration parameters.
- * @param config
+ * @param eth_da
  *   Device arguments.
  *
  * @return
@@ -997,12 +997,11 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
/* Bonding device. */
if (!switch_info->representor) {
err = snprintf(name, sizeof(name), "%s_%s",
-dpdk_dev->name,
-mlx5_os_get_dev_device_name(spawn->phys_dev));
+  dpdk_dev->name, spawn->phys_dev_name);
} else {
err = snprintf(name, sizeof(name), 
"%s_%s_representor_c%dpf%d%s%u",
dpdk_dev->name,
-   mlx5_os_get_dev_device_name(spawn->phys_dev),
+   spawn->phys_dev_name,
switch_info->ctrl_num,
switch_info->pf_num,
switch_info->name_type ==
@@ -1227,8 +1226,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
if (err) {
DRV_LOG(WARNING,
"can't query devx port %d on device %s",
-   spawn->phys_port,
-   mlx5_os_get_dev_device_name(spawn->phys_dev));
+   spawn->phys_port, spawn->phys_dev_name);
vport_info.query_flags = 0;
}
}
@@ -1238,18 +1236,14 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
if (!priv->vport_meta_mask) {
DRV_LOG(ERR, "vport zero mask for port %d"
 " on bonding device %s",
-spawn->phys_port,
-mlx5_os_get_dev_device_name
-   (spawn->phys_dev));
+spawn->phys_port, spawn->phys_dev_name);
err = ENOTSUP;
goto error;
}
if (priv->vport_meta_tag & ~priv->vport_meta_mask) {
DRV_LOG(ERR, "invalid vport tag for port %d"
 " on bonding device %s",
-spawn->phys_port,
-mlx5_os_get_dev_device_name
-   (spawn->phys_dev));
+spawn->phys_port, spawn->phys_dev_name);
err = ENOTSUP;
goto error;
}
@@ -1260,8 +1254,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
   (switch_info->representor || switch_info->master)) {
DRV_LOG(ERR, "can't deduce vport index for port %d"
 " on bonding device %s",
-spawn->phys_port,
-mlx5_os_get_dev_device_name(spawn->phys_dev));
+spawn->phys_port, spawn->phys_dev_name);
err = ENOTSUP;
goto error;
} else {
@@ -2314,6 +2307,7 @@ mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev,
list[ns].max_port = np;
list[ns].phys_port = i;
list[ns].phys_dev = ibv_match[0];
+   list[ns].phys_dev_name = ibv_match[0]->name;
list[ns].eth_dev = NULL;
list[ns].pci_dev = pci_dev;
list[ns].pf_bond = bd;
@@ -2410,6 +2404,7 @@ mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev,
list[ns].max_port = 1;
list[ns].phys_port = 1;
list[ns].phys_dev = ibv_match[i];
+   list[ns].phys_dev_name = ibv_match[i]->name;
list[ns].eth_dev = NULL;
list[ns].pci_dev = pci_dev;
list[ns].pf_bond = -1;
@@ -2732,6 +2727,7 @@ mlx5_os_auxiliary_probe(struct rte_device *dev)
spawn.phys_dev = mlx5_os_get_ibv_dev(dev);
if (spawn.phys_dev == NULL)
return -rte_errno;
+   spawn.phys_dev_name

[dpdk-dev] [RFC 07/21] net/mlx5: improve probe function on Windows

[Michael Baum]

some improvements:
- use aux function to find match device.
- use spawn a local variable instead of pointing to a list with a single
member.

Signed-off-by: Michael Baum 
---
 drivers/common/mlx5/mlx5_common.h|   2 +
 drivers/common/mlx5/version.map  |   1 +
 drivers/common/mlx5/windows/mlx5_common_os.c |   2 +-
 drivers/net/mlx5/windows/mlx5_os.c   | 196 +++
 4 files changed, 26 insertions(+), 175 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_common.h 
b/drivers/common/mlx5/mlx5_common.h
index 609953b70e..10061f364f 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -465,6 +465,8 @@ int mlx5_os_devx_open_device(struct mlx5_dev_ctx *dev_ctx,
 struct rte_device *dev, int dbnc,
 uint32_t classes);
 int mlx5_os_pd_create(struct mlx5_dev_ctx *dev_ctx);
+__rte_internal
+struct devx_device_bdf *mlx5_os_get_devx_device(struct rte_device *dev);
 
 
 #endif /* RTE_PMD_MLX5_COMMON_H_ */
diff --git a/drivers/common/mlx5/version.map b/drivers/common/mlx5/version.map
index 6a88105d02..18856c198e 100644
--- a/drivers/common/mlx5/version.map
+++ b/drivers/common/mlx5/version.map
@@ -145,6 +145,7 @@ INTERNAL {
mlx5_os_dealloc_pd;
mlx5_os_dereg_mr;
mlx5_os_get_ibv_dev; # WINDOWS_NO_EXPORT
+   mlx5_os_get_devx_device;
mlx5_os_reg_mr;
mlx5_os_umem_dereg;
mlx5_os_umem_reg;
diff --git a/drivers/common/mlx5/windows/mlx5_common_os.c 
b/drivers/common/mlx5/windows/mlx5_common_os.c
index 5d178b0452..12819383c1 100644
--- a/drivers/common/mlx5/windows/mlx5_common_os.c
+++ b/drivers/common/mlx5/windows/mlx5_common_os.c
@@ -144,7 +144,7 @@ mlx5_match_devx_devices_to_addr(struct devx_device_bdf 
*devx_bdf,
  * @return
  *   A device match on success, NULL otherwise and rte_errno is set.
  */
-static struct devx_device_bdf *
+struct devx_device_bdf *
 mlx5_os_get_devx_device(struct rte_device *dev)
 {
int n;
diff --git a/drivers/net/mlx5/windows/mlx5_os.c 
b/drivers/net/mlx5/windows/mlx5_os.c
index 7e1df1c751..0ff9e70d96 100644
--- a/drivers/net/mlx5/windows/mlx5_os.c
+++ b/drivers/net/mlx5/windows/mlx5_os.c
@@ -904,68 +904,6 @@ mlx5_os_set_allmulti(struct rte_eth_dev *dev, int enable)
return -ENOTSUP;
 }
 
-/**
- * Detect if a devx_device_bdf object has identical DBDF values to the
- * rte_pci_addr found in bus/pci probing
- *
- * @param[in] devx_bdf
- *   Pointer to the devx_device_bdf structure.
- * @param[in] addr
- *   Pointer to the rte_pci_addr structure.
- *
- * @return
- *   1 on Device match, 0 on mismatch.
- */
-static int
-mlx5_match_devx_bdf_to_addr(struct devx_device_bdf *devx_bdf,
-   struct rte_pci_addr *addr)
-{
-   if (addr->domain != (devx_bdf->bus_id >> 8) ||
-   addr->bus != (devx_bdf->bus_id & 0xff) ||
-   addr->devid != devx_bdf->dev_id ||
-   addr->function != devx_bdf->fnc_id) {
-   return 0;
-   }
-   return 1;
-}
-
-/**
- * Detect if a devx_device_bdf object matches the rte_pci_addr
- * found in bus/pci probing
- * Compare both the Native/PF BDF and the raw_bdf representing a VF BDF.
- *
- * @param[in] devx_bdf
- *   Pointer to the devx_device_bdf structure.
- * @param[in] addr
- *   Pointer to the rte_pci_addr structure.
- *
- * @return
- *   1 on Device match, 0 on mismatch, rte_errno code on failure.
- */
-static int
-mlx5_match_devx_devices_to_addr(struct devx_device_bdf *devx_bdf,
-   struct rte_pci_addr *addr)
-{
-   int err;
-   struct devx_device mlx5_dev;
-
-   if (mlx5_match_devx_bdf_to_addr(devx_bdf, addr))
-   return 1;
-   /**
-* Didn't match on Native/PF BDF, could still
-* Match a VF BDF, check it next
-*/
-   err = mlx5_glue->query_device(devx_bdf, &mlx5_dev);
-   if (err) {
-   DRV_LOG(ERR, "query_device failed");
-   rte_errno = err;
-   return rte_errno;
-   }
-   if (mlx5_match_devx_bdf_to_addr(&mlx5_dev.raw_bdf, addr))
-   return 1;
-   return 0;
-}
-
 /**
  * DPDK callback to register a PCI device.
  *
@@ -981,39 +919,15 @@ int
 mlx5_os_net_probe(struct rte_device *dev)
 {
struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(dev);
-   struct devx_device_bdf *devx_bdf_devs, *orig_devx_bdf_devs;
-   /*
-* Number of found IB Devices matching with requested PCI BDF.
-* nd != 1 means there are multiple IB devices over the same
-* PCI device and we have representors and master.
-*/
-   unsigned int nd = 0;
-   /*
-* Number of found IB device Ports. nd = 1 and np = 1..n means
-* we have the single multiport IB device, and there may be
-* representors attached to some of found ports.
-* Currently not supported.
-* unsigned int np = 0;
-*/
-
-   /*
-* Number 

[dpdk-dev] [RFC 10/21] net/mlx5: use context device structure

[Michael Baum]

Use common context device structure as a sh field.

Signed-off-by: Michael Baum 
---
 drivers/common/mlx5/mlx5_common.c|   2 +-
 drivers/common/mlx5/mlx5_common.h|   6 +-
 drivers/common/mlx5/version.map  |   2 +-
 drivers/common/mlx5/windows/mlx5_common_os.c |   2 +-
 drivers/net/mlx5/linux/mlx5_ethdev_os.c  |   8 +-
 drivers/net/mlx5/linux/mlx5_mp_os.c  |   9 +-
 drivers/net/mlx5/linux/mlx5_os.c | 432 ++-
 drivers/net/mlx5/linux/mlx5_verbs.c  |  55 +--
 drivers/net/mlx5/mlx5.c  | 103 +++--
 drivers/net/mlx5/mlx5.h  |  12 +-
 drivers/net/mlx5/mlx5_devx.c |  34 +-
 drivers/net/mlx5/mlx5_flow.c |   6 +-
 drivers/net/mlx5/mlx5_flow_aso.c |  24 +-
 drivers/net/mlx5/mlx5_flow_dv.c  |  51 +--
 drivers/net/mlx5/mlx5_flow_verbs.c   |   4 +-
 drivers/net/mlx5/mlx5_mr.c   |  14 +-
 drivers/net/mlx5/mlx5_txpp.c |  17 +-
 drivers/net/mlx5/windows/mlx5_ethdev_os.c|  14 +-
 drivers/net/mlx5/windows/mlx5_os.c   | 113 ++---
 19 files changed, 453 insertions(+), 455 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_common.c 
b/drivers/common/mlx5/mlx5_common.c
index be3d0f2627..ffd2c2c129 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -152,7 +152,7 @@ mlx5_common_args_check(const char *key, const char *val, 
void *opaque)
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
-static int
+int
 mlx5_parse_db_map_arg(struct rte_devargs *devargs, int *dbnc)
 {
struct rte_kvargs *kvlist;
diff --git a/drivers/common/mlx5/mlx5_common.h 
b/drivers/common/mlx5/mlx5_common.h
index 10061f364f..c4e86c3175 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -459,14 +459,16 @@ __rte_internal
 bool
 mlx5_dev_is_pci(const struct rte_device *dev);
 
+__rte_internal
+int
+mlx5_parse_db_map_arg(struct rte_devargs *devargs, int *dbnc);
+
 /* mlx5_common_os.c */
 
 int mlx5_os_devx_open_device(struct mlx5_dev_ctx *dev_ctx,
 struct rte_device *dev, int dbnc,
 uint32_t classes);
 int mlx5_os_pd_create(struct mlx5_dev_ctx *dev_ctx);
-__rte_internal
-struct devx_device_bdf *mlx5_os_get_devx_device(struct rte_device *dev);
 
 
 #endif /* RTE_PMD_MLX5_COMMON_H_ */
diff --git a/drivers/common/mlx5/version.map b/drivers/common/mlx5/version.map
index 18856c198e..a1a8bae5bd 100644
--- a/drivers/common/mlx5/version.map
+++ b/drivers/common/mlx5/version.map
@@ -9,6 +9,7 @@ INTERNAL {
 
mlx5_common_init;
 
+   mlx5_parse_db_map_arg; # WINDOWS_NO_EXPORT
mlx5_dev_ctx_release;
mlx5_dev_ctx_prepare;
 
@@ -145,7 +146,6 @@ INTERNAL {
mlx5_os_dealloc_pd;
mlx5_os_dereg_mr;
mlx5_os_get_ibv_dev; # WINDOWS_NO_EXPORT
-   mlx5_os_get_devx_device;
mlx5_os_reg_mr;
mlx5_os_umem_dereg;
mlx5_os_umem_reg;
diff --git a/drivers/common/mlx5/windows/mlx5_common_os.c 
b/drivers/common/mlx5/windows/mlx5_common_os.c
index 12819383c1..5d178b0452 100644
--- a/drivers/common/mlx5/windows/mlx5_common_os.c
+++ b/drivers/common/mlx5/windows/mlx5_common_os.c
@@ -144,7 +144,7 @@ mlx5_match_devx_devices_to_addr(struct devx_device_bdf 
*devx_bdf,
  * @return
  *   A device match on success, NULL otherwise and rte_errno is set.
  */
-struct devx_device_bdf *
+static struct devx_device_bdf *
 mlx5_os_get_devx_device(struct rte_device *dev)
 {
int n;
diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c 
b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
index f34133e2c6..b4bbf841cc 100644
--- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c
+++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
@@ -324,7 +324,7 @@ int
 mlx5_read_clock(struct rte_eth_dev *dev, uint64_t *clock)
 {
struct mlx5_priv *priv = dev->data->dev_private;
-   struct ibv_context *ctx = priv->sh->ctx;
+   struct ibv_context *ctx = priv->sh->dev_ctx->ctx;
struct ibv_values_ex values;
int err = 0;
 
@@ -778,7 +778,7 @@ mlx5_dev_interrupt_handler(void *cb_arg)
struct rte_eth_dev *dev;
uint32_t tmp;
 
-   if (mlx5_glue->get_async_event(sh->ctx, &event))
+   if (mlx5_glue->get_async_event(sh->dev_ctx->ctx, &event))
break;
/* Retrieve and check IB port index. */
tmp = (uint32_t)event.element.port_num;
@@ -987,10 +987,10 @@ mlx5_set_link_up(struct rte_eth_dev *dev)
 int
 mlx5_is_removed(struct rte_eth_dev *dev)
 {
-   struct ibv_device_attr device_attr;
+   struct ibv_device_attr dev_attr;
struct mlx5_priv *priv = dev->data->dev_private;
 
-   if (mlx5_glue->query_device(priv->sh->ctx, &device_attr) == EIO)
+   if (mlx5_glue->query_device(priv->sh->dev_ctx->ctx, &dev_attr) == EIO)
  

[dpdk-dev] [RFC 11/21] net/mlx5: move NUMA node field to context device

[Michael Baum]

Remove numa node field from sh structure, and use instead in context
device structure.

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/mlx5.c  |  3 +--
 drivers/net/mlx5/mlx5.h  |  1 -
 drivers/net/mlx5/mlx5_devx.c | 11 ++-
 drivers/net/mlx5/mlx5_txpp.c | 10 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index f5f325d35a..b695f2f6d3 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1142,7 +1142,6 @@ mlx5_alloc_shared_dev_ctx(const struct 
mlx5_dev_spawn_data *spawn,
goto exit;
}
sh->devx = config->devx;
-   sh->numa_node = dev_ctx->numa_node;
if (spawn->bond_info)
sh->bond = *spawn->bond_info;
pthread_mutex_init(&sh->txpp.mutex, NULL);
@@ -1207,7 +1206,7 @@ mlx5_alloc_shared_dev_ctx(const struct 
mlx5_dev_spawn_data *spawn,
 */
err = mlx5_mr_btree_init(&sh->share_cache.cache,
 MLX5_MR_BTREE_CACHE_N * 2,
-sh->numa_node);
+dev_ctx->numa_node);
if (err) {
err = rte_errno;
goto error;
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 1e52b9ac9a..f6d8e1d817 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1145,7 +1145,6 @@ struct mlx5_dev_ctx_shared {
char ibdev_name[MLX5_FS_NAME_MAX]; /* SYSFS dev name. */
char ibdev_path[MLX5_FS_PATH_MAX]; /* SYSFS dev path for secondary */
struct mlx5_dev_attr device_attr; /* Device properties. */
-   int numa_node; /* Numa node of backing physical device. */
LIST_ENTRY(mlx5_dev_ctx_shared) mem_event_cb;
/**< Called by memory event callback. */
struct mlx5_mr_share_cache share_cache;
diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index 3cafd46837..787c771167 100644
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -366,7 +366,7 @@ mlx5_rxq_create_devx_cq_resources(struct rte_eth_dev *dev, 
uint16_t idx)
log_cqe_n = log2above(cqe_n);
/* Create CQ using DevX API. */
ret = mlx5_devx_cq_create(sh->dev_ctx->ctx, &rxq_ctrl->obj->cq_obj,
- log_cqe_n, &cq_attr, sh->numa_node);
+ log_cqe_n, &cq_attr, sh->dev_ctx->numa_node);
if (ret)
return ret;
cq_obj = &rxq_ctrl->obj->cq_obj;
@@ -981,6 +981,7 @@ mlx5_txq_create_devx_sq_resources(struct rte_eth_dev *dev, 
uint16_t idx,
  uint16_t log_desc_n)
 {
struct mlx5_priv *priv = dev->data->dev_private;
+   struct mlx5_dev_ctx *dev_ctx = priv->sh->dev_ctx;
struct mlx5_txq_data *txq_data = (*priv->txqs)[idx];
struct mlx5_txq_ctrl *txq_ctrl =
container_of(txq_data, struct mlx5_txq_ctrl, txq);
@@ -994,15 +995,15 @@ mlx5_txq_create_devx_sq_resources(struct rte_eth_dev 
*dev, uint16_t idx,
.tis_lst_sz = 1,
.tis_num = priv->sh->tis->id,
.wq_attr = (struct mlx5_devx_wq_attr){
-   .pd = priv->sh->dev_ctx->pdn,
+   .pd = dev_ctx->pdn,
.uar_page =
 mlx5_os_get_devx_uar_page_id(priv->sh->tx_uar),
},
.ts_format = mlx5_ts_format_conv(priv->sh->sq_ts_format),
};
/* Create Send Queue object with DevX. */
-   return mlx5_devx_sq_create(priv->sh->dev_ctx->ctx, &txq_obj->sq_obj,
-  log_desc_n, &sq_attr, priv->sh->numa_node);
+   return mlx5_devx_sq_create(dev_ctx->ctx, &txq_obj->sq_obj, log_desc_n,
+  &sq_attr, dev_ctx->numa_node);
 }
 #endif
 
@@ -1059,7 +1060,7 @@ mlx5_txq_devx_obj_new(struct rte_eth_dev *dev, uint16_t 
idx)
}
/* Create completion queue object with DevX. */
ret = mlx5_devx_cq_create(sh->dev_ctx->ctx, &txq_obj->cq_obj,
- log_desc_n, &cq_attr, sh->numa_node);
+ log_desc_n, &cq_attr, sh->dev_ctx->numa_node);
if (ret) {
DRV_LOG(ERR, "Port %u Tx queue %u CQ creation failure.",
dev->data->port_id, idx);
diff --git a/drivers/net/mlx5/mlx5_txpp.c b/drivers/net/mlx5/mlx5_txpp.c
index ff1c3d204c..b49a47bd77 100644
--- a/drivers/net/mlx5/mlx5_txpp.c
+++ b/drivers/net/mlx5/mlx5_txpp.c
@@ -247,7 +247,7 @@ mlx5_txpp_create_rearm_queue(struct mlx5_dev_ctx_shared *sh)
/* Create completion queue object for Rearm Queue. */
ret = mlx5_devx_cq_create(sh->dev_ctx->ctx, &wq->cq_obj,
  log2above(MLX5_TXPP_REARM_CQ_SIZE), &cq_attr,
- sh->numa_node);
+ sh->dev_ctx->numa_node);
if (re

[dpdk-dev] [RFC 13/21] vdpa/mlx5: use context device structure

[Michael Baum]

Use common context device structure as a priv field.

Signed-off-by: Michael Baum 
---
 drivers/vdpa/mlx5/mlx5_vdpa.c   | 185 
 drivers/vdpa/mlx5/mlx5_vdpa.h   |   4 +-
 drivers/vdpa/mlx5/mlx5_vdpa_event.c |  19 +--
 drivers/vdpa/mlx5/mlx5_vdpa_lm.c|   6 +-
 drivers/vdpa/mlx5/mlx5_vdpa_mem.c   |  13 +-
 drivers/vdpa/mlx5/mlx5_vdpa_steer.c |  10 +-
 drivers/vdpa/mlx5/mlx5_vdpa_virtq.c |  16 +--
 7 files changed, 61 insertions(+), 192 deletions(-)

diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c
index 6d17d7a6f3..f773ac8711 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa.c
@@ -189,37 +189,6 @@ mlx5_vdpa_features_set(int vid)
return 0;
 }
 
-static int
-mlx5_vdpa_pd_create(struct mlx5_vdpa_priv *priv)
-{
-#ifdef HAVE_IBV_FLOW_DV_SUPPORT
-   priv->pd = mlx5_glue->alloc_pd(priv->ctx);
-   if (priv->pd == NULL) {
-   DRV_LOG(ERR, "Failed to allocate PD.");
-   return errno ? -errno : -ENOMEM;
-   }
-   struct mlx5dv_obj obj;
-   struct mlx5dv_pd pd_info;
-   int ret = 0;
-
-   obj.pd.in = priv->pd;
-   obj.pd.out = &pd_info;
-   ret = mlx5_glue->dv_init_obj(&obj, MLX5DV_OBJ_PD);
-   if (ret) {
-   DRV_LOG(ERR, "Fail to get PD object info.");
-   mlx5_glue->dealloc_pd(priv->pd);
-   priv->pd = NULL;
-   return -errno;
-   }
-   priv->pdn = pd_info.pdn;
-   return 0;
-#else
-   (void)priv;
-   DRV_LOG(ERR, "Cannot get pdn - no DV support.");
-   return -ENOTSUP;
-#endif /* HAVE_IBV_FLOW_DV_SUPPORT */
-}
-
 static int
 mlx5_vdpa_mtu_set(struct mlx5_vdpa_priv *priv)
 {
@@ -238,7 +207,8 @@ mlx5_vdpa_mtu_set(struct mlx5_vdpa_priv *priv)
DRV_LOG(DEBUG, "Vhost MTU is 0.");
return ret;
}
-   ret = mlx5_get_ifname_sysfs(priv->ctx->device->ibdev_path,
+   ret = mlx5_get_ifname_sysfs(mlx5_os_get_ctx_device_path
+  (priv->dev_ctx->ctx),
request.ifr_name);
if (ret) {
DRV_LOG(DEBUG, "Cannot get kernel IF name - %d.", ret);
@@ -289,10 +259,6 @@ mlx5_vdpa_dev_close(int vid)
mlx5_vdpa_virtqs_release(priv);
mlx5_vdpa_event_qp_global_release(priv);
mlx5_vdpa_mem_dereg(priv);
-   if (priv->pd) {
-   claim_zero(mlx5_glue->dealloc_pd(priv->pd));
-   priv->pd = NULL;
-   }
priv->configured = 0;
priv->vid = 0;
/* The mutex may stay locked after event thread cancel - initiate it. */
@@ -320,8 +286,7 @@ mlx5_vdpa_dev_config(int vid)
if (mlx5_vdpa_mtu_set(priv))
DRV_LOG(WARNING, "MTU cannot be set on device %s.",
vdev->device->name);
-   if (mlx5_vdpa_pd_create(priv) || mlx5_vdpa_mem_register(priv) ||
-   mlx5_vdpa_err_event_setup(priv) ||
+   if (mlx5_vdpa_mem_register(priv) || mlx5_vdpa_err_event_setup(priv) ||
mlx5_vdpa_virtqs_prepare(priv) || mlx5_vdpa_steer_setup(priv) ||
mlx5_vdpa_cqe_event_setup(priv)) {
mlx5_vdpa_dev_close(vid);
@@ -343,7 +308,7 @@ mlx5_vdpa_get_device_fd(int vid)
DRV_LOG(ERR, "Invalid vDPA device: %s.", vdev->device->name);
return -EINVAL;
}
-   return priv->ctx->cmd_fd;
+   return ((struct ibv_context *)priv->dev_ctx->ctx)->cmd_fd;
 }
 
 static int
@@ -472,98 +437,6 @@ static struct rte_vdpa_dev_ops mlx5_vdpa_ops = {
.reset_stats = mlx5_vdpa_reset_stats,
 };
 
-/* Try to disable ROCE by Netlink\Devlink. */
-static int
-mlx5_vdpa_nl_roce_disable(const char *addr)
-{
-   int nlsk_fd = mlx5_nl_init(NETLINK_GENERIC);
-   int devlink_id;
-   int enable;
-   int ret;
-
-   if (nlsk_fd < 0)
-   return nlsk_fd;
-   devlink_id = mlx5_nl_devlink_family_id_get(nlsk_fd);
-   if (devlink_id < 0) {
-   ret = devlink_id;
-   DRV_LOG(DEBUG, "Failed to get devlink id for ROCE operations by"
-   " Netlink.");
-   goto close;
-   }
-   ret = mlx5_nl_enable_roce_get(nlsk_fd, devlink_id, addr, &enable);
-   if (ret) {
-   DRV_LOG(DEBUG, "Failed to get ROCE enable by Netlink: %d.",
-   ret);
-   goto close;
-   } else if (!enable) {
-   DRV_LOG(INFO, "ROCE has already disabled(Netlink).");
-   goto close;
-   }
-   ret = mlx5_nl_enable_roce_set(nlsk_fd, devlink_id, addr, 0);
-   if (ret)
-   DRV_LOG(DEBUG, "Failed to disable ROCE by Netlink: %d.", ret);
-   else
-   DRV_LOG(INFO, "ROCE is disabled by Netlink successfully.");
-close:
-   close(nlsk_fd);
-   return ret;
-}
-
-/* Try to disable ROCE by sysfs. */
-static int
-mlx5_vdpa_sys_roce_disable(const char *addr)
-{
- 

[dpdk-dev] [RFC 14/21] mlx5: update device sent to probing

[Michael Baum]

Use mlx5 device structure as a parameter to probe function.
This structure will contain the shared device context.

Signed-off-by: Michael Baum 
---
 drivers/common/mlx5/mlx5_common.c |  4 ++--
 drivers/common/mlx5/mlx5_common.h | 10 +++--
 drivers/common/mlx5/mlx5_common_private.h |  6 --
 drivers/compress/mlx5/mlx5_compress.c | 12 +--
 drivers/crypto/mlx5/mlx5_crypto.c | 15 +++---
 drivers/net/mlx5/linux/mlx5_os.c  | 25 ---
 drivers/net/mlx5/mlx5.c   |  6 +++---
 drivers/net/mlx5/mlx5.h   |  4 ++--
 drivers/net/mlx5/windows/mlx5_os.c| 10 -
 drivers/regex/mlx5/mlx5_regex.c   | 12 +--
 drivers/vdpa/mlx5/mlx5_vdpa.c | 12 +--
 11 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_common.c 
b/drivers/common/mlx5/mlx5_common.c
index ffd2c2c129..0870ee0718 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -404,7 +404,7 @@ drivers_remove(struct mlx5_common_device *dev, uint32_t 
enabled_classes)
while (enabled_classes) {
driver = driver_get(RTE_BIT64(i));
if (driver != NULL) {
-   local_ret = driver->remove(dev->dev);
+   local_ret = driver->remove(dev);
if (local_ret == 0)
dev->classes_loaded &= ~RTE_BIT64(i);
else if (ret == 0)
@@ -438,7 +438,7 @@ drivers_probe(struct mlx5_common_device *dev, uint32_t 
user_classes)
ret = -EEXIST;
goto probe_err;
}
-   ret = driver->probe(dev->dev);
+   ret = driver->probe(dev);
if (ret < 0) {
DRV_LOG(ERR, "Failed to load driver %s",
driver->name);
diff --git a/drivers/common/mlx5/mlx5_common.h 
b/drivers/common/mlx5/mlx5_common.h
index c4e86c3175..c5f2a6285f 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -335,6 +335,12 @@ struct mlx5_dev_ctx {
int numa_node;  /* Numa node of device. */
 };
 
+struct mlx5_common_device {
+   struct rte_device *dev;
+   TAILQ_ENTRY(mlx5_common_device) next;
+   uint32_t classes_loaded;
+};
+
 /**
  * Uninitialize context device and release all its resources.
  *
@@ -367,12 +373,12 @@ int mlx5_dev_ctx_prepare(struct mlx5_dev_ctx *dev_ctx, 
struct rte_device *dev,
 /**
  * Initialization function for the driver called during device probing.
  */
-typedef int (mlx5_class_driver_probe_t)(struct rte_device *dev);
+typedef int (mlx5_class_driver_probe_t)(struct mlx5_common_device *dev);
 
 /**
  * Uninitialization function for the driver called during hot-unplugging.
  */
-typedef int (mlx5_class_driver_remove_t)(struct rte_device *dev);
+typedef int (mlx5_class_driver_remove_t)(struct mlx5_common_device *dev);
 
 /**
  * Driver-specific DMA mapping. After a successful call the device
diff --git a/drivers/common/mlx5/mlx5_common_private.h 
b/drivers/common/mlx5/mlx5_common_private.h
index a038330375..04c0af3763 100644
--- a/drivers/common/mlx5/mlx5_common_private.h
+++ b/drivers/common/mlx5/mlx5_common_private.h
@@ -16,12 +16,6 @@ extern "C" {
 
 /* Common bus driver: */
 
-struct mlx5_common_device {
-   struct rte_device *dev;
-   TAILQ_ENTRY(mlx5_common_device) next;
-   uint32_t classes_loaded;
-};
-
 int mlx5_common_dev_probe(struct rte_device *eal_dev);
 int mlx5_common_dev_remove(struct rte_device *eal_dev);
 int mlx5_common_dev_dma_map(struct rte_device *dev, void *addr, uint64_t iova,
diff --git a/drivers/compress/mlx5/mlx5_compress.c 
b/drivers/compress/mlx5/mlx5_compress.c
index e906ddb066..8348ea8ea3 100644
--- a/drivers/compress/mlx5/mlx5_compress.c
+++ b/drivers/compress/mlx5/mlx5_compress.c
@@ -748,7 +748,7 @@ mlx5_compress_mr_mem_event_cb(enum rte_mem_event 
event_type, const void *addr,
 }
 
 static int
-mlx5_compress_dev_probe(struct rte_device *dev)
+mlx5_compress_dev_probe(struct mlx5_common_device *dev)
 {
struct rte_compressdev *cdev;
struct mlx5_dev_ctx *dev_ctx;
@@ -756,7 +756,7 @@ mlx5_compress_dev_probe(struct rte_device *dev)
struct mlx5_hca_attr att = { 0 };
struct rte_compressdev_pmd_init_params init_params = {
.name = "",
-   .socket_id = dev->numa_node,
+   .socket_id = dev->dev->numa_node,
};
const char *ibdev_name;
int ret;
@@ -773,7 +773,7 @@ mlx5_compress_dev_probe(struct rte_device *dev)
rte_errno = ENOMEM;
return -rte_errno;
}
-   ret = mlx5_dev_ctx_prepare(dev_ctx, dev, MLX5_CLASS_COMPRESS);
+   ret = mlx5_dev_ctx_prepare(dev_ctx, dev->dev, MLX5_CLASS_COMPRESS);
if (ret < 0) {
DRV_LOG(ERR, "Failed to create device context.")

[dpdk-dev] [RFC 16/21] common/mlx5: add HCA attributes to context device structure

[Michael Baum]

Add HCA attributes structure as a field of context device structure.
It query in common probing, and check if the device supports the chosen
classes.

Signed-off-by: Michael Baum 
---
 drivers/common/mlx5/mlx5_common.c | 67 ++-
 drivers/common/mlx5/mlx5_common.h |  9 +++--
 2 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_common.c 
b/drivers/common/mlx5/mlx5_common.c
index b500e7834e..e4c1984700 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -310,6 +310,56 @@ mlx5_dev_to_pci_str(const struct rte_device *dev, char 
*addr, size_t size)
 #endif
 }
 
+/**
+ * Validate HCA attributes.
+ *
+ * @param attr
+ *   Attributes device values.
+ * @param classes
+ *   Chosen classes come from device arguments.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+mlx5_hca_attr_validate(struct mlx5_hca_attr *attr, uint32_t classes)
+{
+   if (classes & MLX5_CLASS_VDPA) {
+   if (!attr->vdpa.valid || !attr->vdpa.max_num_virtio_queues) {
+   DRV_LOG(ERR,
+   "Not enough capabilities to support vDPA, maybe 
old FW/OFED version?");
+   rte_errno = ENOTSUP;
+   return -rte_errno;
+   }
+   }
+   if (classes & MLX5_CLASS_REGEX) {
+   if (!attr->regex || attr->regexp_num_of_engines == 0) {
+   DRV_LOG(ERR,
+   "Not enough capabilities to support RegEx, 
maybe old FW/OFED version?");
+   rte_errno = ENOTSUP;
+   return -rte_errno;
+   }
+   }
+   if (classes & MLX5_CLASS_COMPRESS) {
+   if (attr->mmo_compress_en == 0 ||
+   attr->mmo_decompress_en == 0 || attr->mmo_dma_en == 0) {
+   DRV_LOG(ERR,
+   "Not enough capabilities to support compress 
operations, maybe old FW/OFED version?");
+   rte_errno = ENOTSUP;
+   return -ENOTSUP;
+   }
+   }
+   if (classes & MLX5_CLASS_CRYPTO) {
+   if (attr->crypto == 0 || attr->aes_xts == 0) {
+   DRV_LOG(ERR,
+   "Not enough capabilities to support crypto 
operations, maybe old FW/OFED version?");
+   rte_errno = ENOTSUP;
+   return -ENOTSUP;
+   }
+   }
+   return 0;
+}
+
 /**
  * Uninitialize context device and release all its resources.
  *
@@ -379,6 +429,13 @@ mlx5_dev_ctx_prepare(struct mlx5_dev_ctx *dev_ctx, struct 
rte_device *dev,
ret = mlx5_os_pd_create(dev_ctx);
if (ret)
goto error;
+   /* Query HCA attributes. */
+   ret = mlx5_devx_cmd_query_hca_attr(dev_ctx->ctx, &dev_ctx->hca_attr);
+   if (ret) {
+   DRV_LOG(ERR, "Unable to read HCA capabilities.");
+   rte_errno = ENOTSUP;
+   goto error;
+   }
return ret;
 error:
mlx5_dev_ctx_release(dev_ctx);
@@ -507,13 +564,19 @@ mlx5_common_dev_probe(struct rte_device *eal_dev)
new_device = true;
} else {
/* Validate combination here. */
-   ret = is_valid_class_combination(classes |
-dev->classes_loaded);
+   ret = is_valid_class_combination(classes | dev->classes_loaded);
if (ret != 0) {
DRV_LOG(ERR, "Unsupported mlx5 classes combination.");
return ret;
}
}
+   if (dev->ctx.ctx) {
+   /* Validate HCA attributes here. */
+   ret = mlx5_hca_attr_validate(&dev->ctx.hca_attr,
+classes | dev->classes_loaded);
+   if (ret)
+   goto class_err;
+   }
ret = drivers_probe(dev, classes);
if (ret)
goto class_err;
diff --git a/drivers/common/mlx5/mlx5_common.h 
b/drivers/common/mlx5/mlx5_common.h
index 644dc58bc9..da03e160d2 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -329,10 +329,11 @@ void mlx5_common_init(void);
  * Contains HW device objects which belong to same device with multiple 
drivers.
  */
 struct mlx5_dev_ctx {
-   void *ctx;  /* Verbs/DV/DevX context. */
-   void *pd;   /* Protection Domain. */
-   uint32_t pdn;   /* Protection Domain Number. */
-   int numa_node;  /* Numa node of device. */
+   void *ctx;  /* Verbs/DV/DevX context. */
+   void *pd;   /* Protection Domain. */
+   uint32_t pdn;   /* Protection Domain Number. */
+   int numa_node;  /* Numa node of device. */
+   struct mlx5_

[dpdk-dev] [RFC 17/21] regex/mlx5: use HCA attributes from context device

[Michael Baum]

Use HCA attributes from context device structure, instead of query it
for itself.

Signed-off-by: Michael Baum 
---
 drivers/regex/mlx5/mlx5_regex.c | 18 +++---
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c
index 3772007d24..ed3cd8972e 100644
--- a/drivers/regex/mlx5/mlx5_regex.c
+++ b/drivers/regex/mlx5/mlx5_regex.c
@@ -126,24 +126,12 @@ mlx5_regex_dev_probe(struct mlx5_common_device *mlx5_dev)
 {
struct mlx5_regex_priv *priv = NULL;
struct mlx5_dev_ctx *dev_ctx = &mlx5_dev->ctx;
-   struct mlx5_hca_attr attr;
char name[RTE_REGEXDEV_NAME_MAX_LEN];
const char *ibdev_name = mlx5_os_get_ctx_device_name(dev_ctx->ctx);
int ret;
uint32_t val;
 
DRV_LOG(INFO, "Probe device \"%s\".", ibdev_name);
-   ret = mlx5_devx_cmd_query_hca_attr(dev_ctx->ctx, &attr);
-   if (ret) {
-   DRV_LOG(ERR, "Unable to read HCA capabilities.");
-   rte_errno = ENOTSUP;
-   return -rte_errno;
-   } else if (!attr.regex || attr.regexp_num_of_engines == 0) {
-   DRV_LOG(ERR, "Not enough capabilities to support RegEx, maybe "
-   "old FW/OFED version?");
-   rte_errno = ENOTSUP;
-   return -rte_errno;
-   }
if (mlx5_regex_engines_status(dev_ctx->ctx, 2)) {
DRV_LOG(ERR, "RegEx engine error.");
rte_errno = ENOMEM;
@@ -156,7 +144,7 @@ mlx5_regex_dev_probe(struct mlx5_common_device *mlx5_dev)
rte_errno = ENOMEM;
return -rte_errno;
}
-   priv->sq_ts_format = attr.sq_ts_format;
+   priv->sq_ts_format = dev_ctx->hca_attr.sq_ts_format;
priv->dev_ctx = dev_ctx;
priv->nb_engines = 2; /* attr.regexp_num_of_engines */
ret = mlx5_devx_regex_register_read(priv->dev_ctx->ctx, 0,
@@ -190,8 +178,8 @@ mlx5_regex_dev_probe(struct mlx5_common_device *mlx5_dev)
priv->regexdev->dev_ops = &mlx5_regexdev_ops;
priv->regexdev->enqueue = mlx5_regexdev_enqueue;
 #ifdef HAVE_MLX5_UMR_IMKEY
-   if (!attr.umr_indirect_mkey_disabled &&
-   !attr.umr_modify_entity_size_disabled)
+   if (!dev_ctx->hca_attr.umr_indirect_mkey_disabled &&
+   !dev_ctx->hca_attr.umr_modify_entity_size_disabled)
priv->has_umr = 1;
if (priv->has_umr)
priv->regexdev->enqueue = mlx5_regexdev_enqueue_gga;
-- 
2.25.1

[dpdk-dev] [RFC 19/21] compress/mlx5: use HCA attributes from context device

[Michael Baum]

Use HCA attributes from context device structure, instead of query it
for itself.

Signed-off-by: Michael Baum 
---
 drivers/compress/mlx5/mlx5_compress.c | 13 ++---
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/compress/mlx5/mlx5_compress.c 
b/drivers/compress/mlx5/mlx5_compress.c
index 93b0cc8ea6..e5d900568d 100644
--- a/drivers/compress/mlx5/mlx5_compress.c
+++ b/drivers/compress/mlx5/mlx5_compress.c
@@ -753,7 +753,6 @@ mlx5_compress_dev_probe(struct mlx5_common_device *dev)
struct rte_compressdev *cdev;
struct mlx5_dev_ctx *dev_ctx = &dev->ctx;
struct mlx5_compress_priv *priv;
-   struct mlx5_hca_attr att = { 0 };
struct rte_compressdev_pmd_init_params init_params = {
.name = "",
.socket_id = dev->dev->numa_node,
@@ -765,14 +764,6 @@ mlx5_compress_dev_probe(struct mlx5_common_device *dev)
rte_errno = ENOTSUP;
return -rte_errno;
}
-   if (mlx5_devx_cmd_query_hca_attr(dev_ctx->ctx, &att) != 0 ||
-   att.mmo_compress_en == 0 || att.mmo_decompress_en == 0 ||
-   att.mmo_dma_en == 0) {
-   DRV_LOG(ERR, "Not enough capabilities to support compress "
-   "operations, maybe old FW/OFED version?");
-   rte_errno = ENOTSUP;
-   return -ENOTSUP;
-   }
cdev = rte_compressdev_pmd_create(ibdev_name, dev->dev,
  sizeof(*priv), &init_params);
if (cdev == NULL) {
@@ -788,8 +779,8 @@ mlx5_compress_dev_probe(struct mlx5_common_device *dev)
priv = cdev->data->dev_private;
priv->dev_ctx = dev_ctx;
priv->cdev = cdev;
-   priv->min_block_size = att.compress_min_block_size;
-   priv->sq_ts_format = att.sq_ts_format;
+   priv->min_block_size = dev_ctx->hca_attr.compress_min_block_size;
+   priv->sq_ts_format = dev_ctx->hca_attr.sq_ts_format;
if (mlx5_compress_hw_global_prepare(priv) != 0) {
rte_compressdev_pmd_destroy(priv->cdev);
return -1;
-- 
2.25.1

[dpdk-dev] [RFC 15/21] mlx5: share context device structure between drivers

[Michael Baum]

Create and initialize context device structure ones in common probing,
and give a pointer to it for each driver.

Signed-off-by: Michael Baum 
---
 drivers/common/mlx5/mlx5_common.c | 40 +--
 drivers/common/mlx5/mlx5_common.h | 30 +---
 drivers/common/mlx5/version.map   |  2 --
 drivers/compress/mlx5/mlx5_compress.c | 31 ++---
 drivers/crypto/mlx5/mlx5_crypto.c | 34 ++-
 drivers/net/mlx5/linux/mlx5_os.c  | 36 
 drivers/net/mlx5/mlx5.c   | 32 -
 drivers/net/mlx5/windows/mlx5_os.c| 22 ++-
 drivers/regex/mlx5/mlx5_regex.c   | 35 ---
 drivers/vdpa/mlx5/mlx5_vdpa.c | 35 ---
 10 files changed, 64 insertions(+), 233 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_common.c 
b/drivers/common/mlx5/mlx5_common.c
index 0870ee0718..b500e7834e 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -319,7 +319,7 @@ mlx5_dev_to_pci_str(const struct rte_device *dev, char 
*addr, size_t size)
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
-void
+static void
 mlx5_dev_ctx_release(struct mlx5_dev_ctx *dev_ctx)
 {
if (dev_ctx->pd != NULL) {
@@ -345,7 +345,7 @@ mlx5_dev_ctx_release(struct mlx5_dev_ctx *dev_ctx)
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
-int
+static int
 mlx5_dev_ctx_prepare(struct mlx5_dev_ctx *dev_ctx, struct rte_device *dev,
 uint32_t classes_loaded)
 {
@@ -386,12 +386,36 @@ mlx5_dev_ctx_prepare(struct mlx5_dev_ctx *dev_ctx, struct 
rte_device *dev,
 }
 
 static void
-dev_release(struct mlx5_common_device *dev)
+mlx5_common_dev_release(struct mlx5_common_device *dev)
 {
TAILQ_REMOVE(&devices_list, dev, next);
+   mlx5_dev_ctx_release(&dev->ctx);
rte_free(dev);
 }
 
+static struct mlx5_common_device *
+mlx5_common_dev_create(struct rte_device *eal_dev, uint32_t classes)
+{
+   struct mlx5_common_device *dev;
+   int ret;
+
+   dev = rte_zmalloc("mlx5_common_device", sizeof(*dev), 0);
+   if (!dev) {
+   DRV_LOG(ERR, "Device allocation failure.");
+   rte_errno = ENOMEM;
+   return NULL;
+   }
+   ret = mlx5_dev_ctx_prepare(&dev->ctx, eal_dev, classes);
+   if (ret) {
+   DRV_LOG(ERR, "Failed to create device context.");
+   rte_free(dev);
+   return NULL;
+   }
+   dev->dev = eal_dev;
+   TAILQ_INSERT_HEAD(&devices_list, dev, next);
+   return dev;
+}
+
 static int
 drivers_remove(struct mlx5_common_device *dev, uint32_t enabled_classes)
 {
@@ -477,11 +501,9 @@ mlx5_common_dev_probe(struct rte_device *eal_dev)
classes = MLX5_CLASS_ETH;
dev = to_mlx5_device(eal_dev);
if (!dev) {
-   dev = rte_zmalloc("mlx5_common_device", sizeof(*dev), 0);
+   dev = mlx5_common_dev_create(eal_dev, classes);
if (!dev)
-   return -ENOMEM;
-   dev->dev = eal_dev;
-   TAILQ_INSERT_HEAD(&devices_list, dev, next);
+   return -rte_errno;
new_device = true;
} else {
/* Validate combination here. */
@@ -498,7 +520,7 @@ mlx5_common_dev_probe(struct rte_device *eal_dev)
return 0;
 class_err:
if (new_device)
-   dev_release(dev);
+   mlx5_common_dev_release(dev);
return ret;
 }
 
@@ -514,7 +536,7 @@ mlx5_common_dev_remove(struct rte_device *eal_dev)
/* Matching device found, cleanup and unload drivers. */
ret = drivers_remove(dev, dev->classes_loaded);
if (ret != 0)
-   dev_release(dev);
+   mlx5_common_dev_release(dev);
return ret;
 }
 
diff --git a/drivers/common/mlx5/mlx5_common.h 
b/drivers/common/mlx5/mlx5_common.h
index c5f2a6285f..644dc58bc9 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -339,37 +339,9 @@ struct mlx5_common_device {
struct rte_device *dev;
TAILQ_ENTRY(mlx5_common_device) next;
uint32_t classes_loaded;
+   struct mlx5_dev_ctx ctx;
 };
 
-/**
- * Uninitialize context device and release all its resources.
- *
- * @param dev_ctx
- *   Pointer to the context device data structure.
- *
- * @return
- *   0 on success, a negative errno value otherwise and rte_errno is set.
- */
-__rte_internal
-void mlx5_dev_ctx_release(struct mlx5_dev_ctx *dev_ctx);
-
-/**
- * Initialize context device and allocate all its resources.
- *
- * @param dev_ctx
- *   Pointer to the context device data structure.
- * @param dev
- *   Pointer to mlx5 device structure.
- * @param classes_loaded
- *   Chosen classes come from device arguments.
- *
- * @return
- *   0 on success, a negative errno 

[dpdk-dev] [RFC 20/21] crypto/mlx5: use HCA attributes from context device

[Michael Baum]

Use HCA attributes from context device structure, instead of query it
for itself.

Signed-off-by: Michael Baum 
---
 drivers/crypto/mlx5/mlx5_crypto.c | 8 
 1 file changed, 8 deletions(-)

diff --git a/drivers/crypto/mlx5/mlx5_crypto.c 
b/drivers/crypto/mlx5/mlx5_crypto.c
index 4f390c8bf4..734ca63d89 100644
--- a/drivers/crypto/mlx5/mlx5_crypto.c
+++ b/drivers/crypto/mlx5/mlx5_crypto.c
@@ -949,7 +949,6 @@ mlx5_crypto_dev_probe(struct mlx5_common_device *dev)
struct mlx5_devx_obj *login;
struct mlx5_crypto_priv *priv;
struct mlx5_crypto_devarg_params devarg_prms = { 0 };
-   struct mlx5_hca_attr attr = { 0 };
struct rte_cryptodev_pmd_init_params init_params = {
.name = "",
.private_data_size = sizeof(struct mlx5_crypto_priv),
@@ -966,13 +965,6 @@ mlx5_crypto_dev_probe(struct mlx5_common_device *dev)
rte_errno = ENOTSUP;
return -rte_errno;
}
-   if (mlx5_devx_cmd_query_hca_attr(dev_ctx->ctx, &attr) != 0 ||
-   attr.crypto == 0 || attr.aes_xts == 0) {
-   DRV_LOG(ERR, "Not enough capabilities to support crypto "
-   "operations, maybe old FW/OFED version?");
-   rte_errno = ENOTSUP;
-   return -ENOTSUP;
-   }
ret = mlx5_crypto_parse_devargs(dev->dev->devargs, &devarg_prms);
if (ret) {
DRV_LOG(ERR, "Failed to parse devargs.");
-- 
2.25.1

[dpdk-dev] [RFC 21/21] net/mlx5: use HCA attributes from context device

[Michael Baum]

Use HCA attributes from context device structure, instead of query it
for itself.

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/linux/mlx5_os.c   | 7 +--
 drivers/net/mlx5/windows/mlx5_os.c | 7 +--
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index c8134f064f..a8a1cbc729 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -1380,12 +1380,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
config->mps == MLX5_MPW ? "legacy " : "",
config->mps != MLX5_MPW_DISABLED ? "enabled" : "disabled");
if (config->devx) {
-   err = mlx5_devx_cmd_query_hca_attr(sh->dev_ctx->ctx,
-  &config->hca_attr);
-   if (err) {
-   err = -err;
-   goto error;
-   }
+   config->hca_attr = dev_ctx->hca_attr;
/* Check relax ordering support. */
if (!haswell_broadwell_cpu) {
sh->cmng.relaxed_ordering_write =
diff --git a/drivers/net/mlx5/windows/mlx5_os.c 
b/drivers/net/mlx5/windows/mlx5_os.c
index d269cf2f74..49b9c258fa 100644
--- a/drivers/net/mlx5/windows/mlx5_os.c
+++ b/drivers/net/mlx5/windows/mlx5_os.c
@@ -443,12 +443,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
config->cqe_comp = 0;
}
if (config->devx) {
-   err = mlx5_devx_cmd_query_hca_attr(sh->dev_ctx->ctx,
-  &config->hca_attr);
-   if (err) {
-   err = -err;
-   goto error;
-   }
+   config->hca_attr = dev_ctx->hca_attr;
/* Check relax ordering support. */
sh->cmng.relaxed_ordering_read = 0;
sh->cmng.relaxed_ordering_write = 0;
-- 
2.25.1

[dpdk-dev] [RFC 18/21] vdpa/mlx5: use HCA attributes from context device

[Michael Baum]

Use HCA attributes from context device structure, instead of query it
for itself.

Signed-off-by: Michael Baum 
---
 drivers/vdpa/mlx5/mlx5_vdpa.c | 28 
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c
index 2b1b521313..317d2e8ed4 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa.c
@@ -506,36 +506,24 @@ static int
 mlx5_vdpa_dev_probe(struct mlx5_common_device *dev)
 {
struct mlx5_vdpa_priv *priv = NULL;
-   struct mlx5_hca_attr attr;
-   int ret;
+   struct mlx5_hca_attr *attr = &dev->ctx.hca_attr;
 
-   ret = mlx5_devx_cmd_query_hca_attr(dev->ctx.ctx, &attr);
-   if (ret) {
-   DRV_LOG(ERR, "Unable to read HCA capabilities.");
-   rte_errno = ENOTSUP;
-   return -rte_errno;
-   } else if (!attr.vdpa.valid || !attr.vdpa.max_num_virtio_queues) {
-   DRV_LOG(ERR, "Not enough capabilities to support vdpa, maybe "
-   "old FW/OFED version?");
-   rte_errno = ENOTSUP;
-   return -rte_errno;
-   }
-   if (!attr.vdpa.queue_counters_valid)
+   if (!attr->vdpa.queue_counters_valid)
DRV_LOG(DEBUG, "No capability to support virtq statistics.");
priv = rte_zmalloc("mlx5 vDPA device private", sizeof(*priv) +
   sizeof(struct mlx5_vdpa_virtq) *
-  attr.vdpa.max_num_virtio_queues * 2,
+  attr->vdpa.max_num_virtio_queues * 2,
   RTE_CACHE_LINE_SIZE);
if (!priv) {
DRV_LOG(ERR, "Failed to allocate private memory.");
rte_errno = ENOMEM;
return -rte_errno;
}
-   priv->caps = attr.vdpa;
-   priv->log_max_rqt_size = attr.log_max_rqt_size;
-   priv->num_lag_ports = attr.num_lag_ports;
-   priv->qp_ts_format = attr.qp_ts_format;
-   if (attr.num_lag_ports == 0)
+   priv->caps = attr->vdpa;
+   priv->log_max_rqt_size = attr->log_max_rqt_size;
+   priv->num_lag_ports = attr->num_lag_ports;
+   priv->qp_ts_format = attr->qp_ts_format;
+   if (attr->num_lag_ports == 0)
priv->num_lag_ports = 1;
priv->dev_ctx = &dev->ctx;
priv->var = mlx5_glue->dv_alloc_var(priv->dev_ctx->ctx, 0);
-- 
2.25.1

[dpdk-dev] [PATCH] test/crypto-perf: support lookaside IPsec

[Akhil Goyal]

Added support for lookaside IPsec protocol offload.
Supported cases:
-AEAD
-Cipher+auth

Command used for testing:
./dpdk-test-crypto-perf -c 0xf -- --devtype crypto_octeontx2 --ptest
throughput --optype ipsec --cipher-algo aes-cbc --pool-sz 16384
--cipher-op encrypt --cipher-key-sz 16 --cipher-iv-sz 16 --auth-algo
sha1-hmac --auth-op generate --digest-sz 16 --total-ops 1000
--burst-sz 32 --buffer-sz 64,128,256,512,1024,1280,2048

./dpdk-test-crypto-perf -c 0xf -- --devtype crypto_octeontx2 --ptest
throughput --optype ipsec --aead-algo aes-gcm --pool-sz 16384
--aead-op encrypt --aead-key-sz 32 --aead-iv-sz 12 --aead-aad-sz 16
--digest-sz 16 --total-ops 1000 --burst-sz 32
--buffer-sz 64,128,256,512,1024,1280,2048

Signed-off-by: Akhil Goyal 
---
This patch is rebased over following patch to
avoid conflict
https://mails.dpdk.org/archives/dev/2021-August/216795.html


 app/test-crypto-perf/cperf_ops.c | 179 ---
 app/test-crypto-perf/cperf_options.h |   1 +
 app/test-crypto-perf/cperf_options_parsing.c |   4 +
 app/test-crypto-perf/cperf_test_throughput.c |   3 +-
 app/test-crypto-perf/cperf_test_vectors.c|   6 +-
 app/test-crypto-perf/main.c  |   3 +-
 6 files changed, 165 insertions(+), 31 deletions(-)

diff --git a/app/test-crypto-perf/cperf_ops.c b/app/test-crypto-perf/cperf_ops.c
index 4b7d66edb2..b2073f0738 100644
--- a/app/test-crypto-perf/cperf_ops.c
+++ b/app/test-crypto-perf/cperf_ops.c
@@ -62,7 +62,13 @@ cperf_set_ops_security(struct rte_crypto_op **ops,
sym_op->m_src = (struct rte_mbuf *)((uint8_t *)ops[i] +
src_buf_offset);
 
-   if (options->op_type == CPERF_PDCP) {
+   if (options->op_type == CPERF_PDCP ||
+   options->op_type == CPERF_IPSEC) {
+   /* In case of IPsec, headroom is consumed by PMD,
+* hence resetting it.
+*/
+   sym_op->m_src->data_off = options->headroom_sz;
+
sym_op->m_src->buf_len = options->segment_sz;
sym_op->m_src->data_len = options->test_buffer_size;
sym_op->m_src->pkt_len = sym_op->m_src->data_len;
@@ -565,6 +571,123 @@ cperf_set_ops_aead(struct rte_crypto_op **ops,
return 0;
 }
 
+static struct rte_cryptodev_sym_session *
+create_ipsec_session(struct rte_mempool *sess_mp,
+   struct rte_mempool *priv_mp,
+   uint8_t dev_id,
+   const struct cperf_options *options,
+   const struct cperf_test_vector *test_vector,
+   uint16_t iv_offset)
+{
+   struct rte_crypto_sym_xform xform = {0};
+   struct rte_crypto_sym_xform auth_xform = {0};
+
+   if (options->aead_algo != 0) {
+   /* Setup AEAD Parameters */
+   xform.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+   xform.next = NULL;
+   xform.aead.algo = options->aead_algo;
+   xform.aead.op = options->aead_op;
+   xform.aead.iv.offset = iv_offset;
+   xform.aead.key.data = test_vector->aead_key.data;
+   xform.aead.key.length = test_vector->aead_key.length;
+   xform.aead.iv.length = test_vector->aead_iv.length;
+   xform.aead.digest_length = options->digest_sz;
+   xform.aead.aad_length = options->aead_aad_sz;
+   } else if (options->cipher_algo != 0 && options->auth_algo != 0) {
+   /* Setup Cipher Parameters */
+   xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+   xform.next = NULL;
+   xform.cipher.algo = options->cipher_algo;
+   xform.cipher.op = options->cipher_op;
+   xform.cipher.iv.offset = iv_offset;
+   xform.cipher.iv.length = test_vector->cipher_iv.length;
+   /* cipher different than null */
+   if (options->cipher_algo != RTE_CRYPTO_CIPHER_NULL) {
+   xform.cipher.key.data = test_vector->cipher_key.data;
+   xform.cipher.key.length =
+   test_vector->cipher_key.length;
+   } else {
+   xform.cipher.key.data = NULL;
+   xform.cipher.key.length = 0;
+   }
+
+   /* Setup Auth Parameters */
+   auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+   auth_xform.next = NULL;
+   auth_xform.auth.algo = options->auth_algo;
+   auth_xform.auth.op = options->auth_op;
+   auth_xform.auth.iv.offset = iv_offset +
+   xform.cipher.iv.length;
+   /* auth different than null */
+   if (options->auth_algo != RTE_CRYPTO_AUTH_NULL) {
+   auth_xform.auth.digest_length = options->digest_sz;
+   auth_xfo

Re: [dpdk-dev] [PATCH] eal: allow hugetlbfs sub-directories

[John Levon]

On Mon, Aug 09, 2021 at 12:24:34PM +0100, John Levon wrote:

> get_hugepage_dir() was implemented in such a way that a --huge-dir
> option had to exactly match the mountpoint, but there's no reason for
> this restriction: DPDK might not be the only user of hugepages, and
> shouldn't assume it owns an entire mountpoint. For example, if I have
> /dev/hugepages/myapp, and /dev/hugepages/dpdk, I should be able to
> specify:
> 
> --huge-dir=/dev/hugepages/dpdk/
> 
> and have DPDK only use that sub-directory.
> 
> Fix the implementation to allow a sub-directory within a suitable
> hugetlbfs mountpoint to be specified, preferring the closest match.
> 
> Signed-off-by: John Levon 
> ---
> v2: prefer closer matches
> v3: checkpatch fixes
> v4: fix docs, added tests

Anyone like to (re) review?

thanks
john

> 
>  app/test/test_eal_flags.c | 116 --
>  doc/guides/linux_gsg/linux_eal_parameters.rst |   3 +-
>  lib/eal/linux/eal_hugepage_info.c |  83 +
>  3 files changed, 138 insertions(+), 64 deletions(-)
> 
> diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
> index b4880ee802..1d18a0ba8f 100644
> --- a/app/test/test_eal_flags.c
> +++ b/app/test/test_eal_flags.c
> @@ -14,8 +14,9 @@
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
> +#include 
> +#include 
>  #include 
>  #include 
>  
> @@ -800,6 +801,9 @@ static int
>  test_misc_flags(void)
>  {
>   char hugepath[PATH_MAX] = {0};
> + char hugepath_dir[PATH_MAX] = {0};
> + char hugepath_dir2[PATH_MAX] = {0};
> + char hugepath_dir3[PATH_MAX] = {0};
>  #ifdef RTE_EXEC_ENV_FREEBSD
>   /* BSD target doesn't support prefixes at this point */
>   const char * prefix = "";
> @@ -810,6 +814,7 @@ test_misc_flags(void)
>   FILE * hugedir_handle = NULL;
>   char line[PATH_MAX] = {0};
>   unsigned i, isempty = 1;
> +
>   if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
>   printf("Error - unable to get current prefix!\n");
>   return -1;
> @@ -849,6 +854,20 @@ test_misc_flags(void)
>   }
>  #endif
>  
> + snprintf(hugepath_dir, sizeof(hugepath_dir), "%s/dpdk.missing", 
> hugepath);
> + snprintf(hugepath_dir2, sizeof(hugepath_dir2), "%s/dpdk.dir", hugepath);
> +
> + if (mkdir(hugepath_dir2, 0700) != 0 && errno != EEXIST) {
> + printf("Error - failed to mkdir(%s)\n", hugepath_dir2);
> + return -1;
> + }
> +
> + snprintf(hugepath_dir3, sizeof(hugepath_dir3), "%s/dpdk.dir/sub", 
> hugepath);
> +
> + if (mkdir(hugepath_dir3, 0700) != 0 && errno != EEXIST) {
> + printf("Error - failed to mkdir(%s)\n", hugepath_dir3);
> + goto fail;
> + }
>  
>   /* check that some general flags don't prevent things from working.
>* All cases, apart from the first, app should run.
> @@ -881,60 +900,66 @@ test_misc_flags(void)
>   /* With invalid --huge-dir */
>   const char *argv9[] = {prgname, "-m", DEFAULT_MEM_SIZE,
>   "--file-prefix=hugedir", "--huge-dir", "invalid"};
> + /* With invalid --huge-dir sub-directory */
> + const char *argv10[] = {prgname, "-m", DEFAULT_MEM_SIZE,
> + "--file-prefix=hugedir", "--huge-dir", hugepath_dir};
> + /* With valid --huge-dir sub-directory */
> + const char *argv11[] = {prgname, "-m", DEFAULT_MEM_SIZE,
> + "--file-prefix=hugedir", "--huge-dir", hugepath_dir2};
>   /* Secondary process with invalid --huge-dir (should run as flag has no
>* effect on secondary processes) */
> - const char *argv10[] = {prgname, prefix, mp_flag,
> + const char *argv12[] = {prgname, prefix, mp_flag,
>   "--huge-dir", "invalid"};
>  
>   /* try running with base-virtaddr param */
> - const char *argv11[] = {prgname, "--file-prefix=virtaddr",
> + const char *argv13[] = {prgname, "--file-prefix=virtaddr",
>   "--base-virtaddr=0x12345678"};
>  
>   /* try running with --vfio-intr INTx flag */
> - const char *argv12[] = {prgname, "--file-prefix=intr",
> + const char *argv14[] = {prgname, "--file-prefix=intr",
>   "--vfio-intr=legacy"};
>  
>   /* try running with --vfio-intr MSI flag */
> - const char *argv13[] = {prgname, "--file-prefix=intr",
> + const char *argv15[] = {prgname, "--file-prefix=intr",
>   "--vfio-intr=msi"};
>  
>   /* try running with --vfio-intr MSI-X flag */
> - const char *argv14[] = {prgname, "--file-prefix=intr",
> + const char *argv16[] = {prgname, "--file-prefix=intr",
>   "--vfio-intr=msix"};
>  
>   /* try running with --vfio-intr invalid flag */
> - const char *argv15[] = {prgname, "--file-prefix=intr",
> + const char *argv17[] = {prgname, "--file-prefix=intr",
>   "--vfio-intr=invalid"};
>  
>   /* With process type as auto-detect *

Re: [dpdk-dev] [PATCH v6] eal: remove sys/queue.h from public headers.

[Dmitry Kozlyuk]

Hi William,
just a few minor corrections remain, please see inline.

2021-08-14 02:51 (UTC+), William Tu:
[...]
> diff --git a/lib/eal/common/eal_common_devargs.c 
> b/lib/eal/common/eal_common_devargs.c
> index 23aaf8b7e4..7edc6798fe 100644
> --- a/lib/eal/common/eal_common_devargs.c
> +++ b/lib/eal/common/eal_common_devargs.c
> @@ -9,6 +9,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  
>  #include 
>  #include 
> @@ -18,6 +19,7 @@
>  #include 
>  #include 
>  #include 
> +#include 

Not needed, included by `rte_bus.h` -> `rte_common.h` -> `rte_os.h`.

>  #include 
>  #include "eal_private.h"

If you included  from `eal_private.h`,
you would need to modify much fewer files in EAL.

>  
> @@ -291,7 +293,7 @@ rte_devargs_insert(struct rte_devargs **da)
>   if (*da == NULL || (*da)->bus == NULL)
>   return -1;
>  
> - TAILQ_FOREACH_SAFE(listed_da, &devargs_list, next, tmp) {
> + RTE_TAILQ_FOREACH_SAFE(listed_da, &devargs_list, next, tmp) {
>   if (listed_da == *da)
>   /* devargs already in the list */
>   return 0;
> @@ -358,7 +360,7 @@ rte_devargs_remove(struct rte_devargs *devargs)
>   if (devargs == NULL || devargs->bus == NULL)
>   return -1;
>  
> - TAILQ_FOREACH_SAFE(d, &devargs_list, next, tmp) {
> + RTE_TAILQ_FOREACH_SAFE(d, &devargs_list, next, tmp) {
>   if (strcmp(d->bus->name, devargs->bus->name) == 0 &&
>   strcmp(d->name, devargs->name) == 0) {
>   TAILQ_REMOVE(&devargs_list, d, next);
[...]
> diff --git a/lib/eal/windows/include/rte_os.h 
> b/lib/eal/windows/include/rte_os.h
> index 66c711d458..54892ab89c 100644
> --- a/lib/eal/windows/include/rte_os.h
> +++ b/lib/eal/windows/include/rte_os.h
> @@ -18,6 +18,37 @@
>  extern "C" {
>  #endif

Comment about compatibility with the bundled sys/queue.h is lost.

> +#define RTE_TAILQ_HEAD(name, type) \
> +struct name { \
> + struct type *tqh_first; /* first element */ \
> + struct type **tqh_last; /* addr of last next element */ \
> +}
> +#define RTE_TAILQ_ENTRY(type) \
> +struct { \
> + struct type *tqe_next; /* next element */ \
> + struct type **tqe_prev; /* address of previous next element */ \
> +}
> +#define RTE_TAILQ_FOREACH(var, head, field) \
> + for ((var) = RTE_TAILQ_FIRST((head)); \
> + (var); \
> + (var) = RTE_TAILQ_NEXT((var), field))
> +#define RTE_TAILQ_FOREACH_SAFE(var, head, field, tvar) \
> + for ((var) = TAILQ_FIRST((head)); \
> + (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \
> + (var) = (tvar))
> +#define RTE_TAILQ_FIRST(head) ((head)->tqh_first)
> +#define RTE_TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
> +#define RTE_STAILQ_HEAD(name, type) \
> +struct name { \
> + struct type *stqh_first;/* first element */ \
> + struct type **stqh_last;/* addr of last next element */ \
> +}
> +#define RTE_STAILQ_ENTRY(type) \
> +struct { \
> + struct type *stqe_next; /* next element */ \
> +}
> +
> +

Redundant newline.

Re: [dpdk-dev] [PATCH v2] bus/vmbus: Fix crash when handling packets in secondary process

[Long Li]

In the 2nd part, the mapped addresses for the sub-channels in the second 
process should be the same as those mapped addresses in the primary process.

You are correct on seting br->vbr to mapaddr. (To the same addresses used by 
the primary process) This can be done by recording the mapped addresses for all 
the sub-channels in the primary process to vmbus_tailq. Later when the 
secondary process re-creates those channels, it can call 
vmbus_uio_find_resource() to find out the addresses for the same sub-channels 
mapped by the primary process.


From: Jonathan Erb 
Sent: Friday, August 13, 2021 3:10 PM
To: Long Li ; Stephen Hemminger 
Cc: dev@dpdk.org; sta...@dpdk.org
Subject: Re: [PATCH v2] bus/vmbus: Fix crash when handling packets in secondary 
process


The first part makes sense. There are several ways to iterate over all the 
subchannels.

I'm probably not fully understanding the second part. 
vmbus_uio_map_secondary_subchan() wants to map to br->vbr but that does not 
appear to be initialized anywhere. In fact, it looks like we should set br->vbr 
to mapaddr which is what vmbus_uio_map_subchan() does.

Jonathan
On 8/11/21 6:06 PM, Long Li wrote:
I think the code is on the right track.

Instead of using vmbus_uio_get_num_subchan() and calling 
vmbus_uio_get_subchan() on each channel, you can just create a new function 
vmbus_uio_get_secondary_subchan(). This function goes through all subchannels 
and map ring buffers to the same addresses used by the primary process.

In the original code, vmbus_uio_map_secondary_subchan() has a check for "if 
(mapaddr == ring_buf)". If the address is mapped to somewhere else, the address 
won't work for the secondary process. So we need to keep this check.

From: Stephen Hemminger 
Sent: Wednesday, August 11, 2021 8:26 AM
To: Jonathan Erb 
; Long Li 

Cc: dev@dpdk.org; sta...@dpdk.org
Subject: RE: [PATCH v2] bus/vmbus: Fix crash when handling packets in secondary 
process

Looks fine, only comments would be to keep to original style and add check if 
primary channel not found?

From: Jonathan Erb 
mailto:jonathan@banduracyber.com>>
Sent: Monday, August 9, 2021 9:07 AM
To: Long Li mailto:lon...@microsoft.com>>; Stephen 
Hemminger mailto:sthem...@microsoft.com>>
Cc: dev@dpdk.org; sta...@dpdk.org
Subject: Re: [PATCH v2] bus/vmbus: Fix crash when handling packets in secondary 
process

You don't often get email from 
jonathan@banduracyber.com. Learn why 
this is important

Would it be possible to resolve the lack of subchannels in secondary processes 
as follows:



1. Create the following function in vmbus_uio.c to obtain the count of 
subchannels created by the primary:
int vmbus_uio_get_num_subchan(struct vmbus_channel *primary)
{

const struct rte_vmbus_device *dev = primary->device;
char chan_path[PATH_MAX];
struct dirent *ent;
DIR *chan_dir;
int err;
int subchan_cnt = 0;

snprintf(chan_path, sizeof(chan_path),
 "%s/%s/channels",
 SYSFS_VMBUS_DEVICES, dev->device.name);

chan_dir = opendir(chan_path);
if (!chan_dir) {
VMBUS_LOG(ERR, "cannot open %s: %s",
  chan_path, strerror(errno));
return 0;
}

while ((ent = readdir(chan_dir))) {
unsigned long relid, subid, monid;
char *endp;

if (ent->d_name[0] == '.')
continue;

errno = 0;
relid = strtoul(ent->d_name, &endp, 0);
if (*endp || errno != 0 || relid > UINT16_MAX) {
VMBUS_LOG(NOTICE, "not a valid channel relid: %s",
  ent->d_name);
continue;
}
subchan_cnt++;
}

closedir(chan_dir);
//Less one for primary channel
return subchan_cnt - 1;

}



2. Then change the bottom of vmbus_uio_map_secondary() to be simply:
/* fd is not needed in secondary process, close it */
close(fd);

if (vmbus_chan_create(dev, dev->relid, 0,
dev->monitor_id, &dev->primary)) {
VMBUS_LOG(ERR, "cannot create primary channel");
return -1;
}

int subchannels_cnt = vmbus_uio_get_num_subchan(dev->primary);
for (i = 0; i < subchannels_cnt; i++) {
if(vmbus_uio_get_subchan(dev->primary, &chan))
return -1;
STAILQ_INSERT_TAIL(&dev->primary->subchannel_list, chan, next);
}
return 0;
}



In this way the secondary processes detect the number of subchannels created by 
the primary, then perform their own mappings as needed. All this can occur 
before rte_eal_init has completed.



Jonathan




On 7/26/21 6:16 PM, Long Li wrote:

Subject: [PATCH v2] bus/vmbus: Fix crash when handling packets in

secondary process



Have secondary processes construct their own copy of prima

Re: [dpdk-dev] [PATCH v1] net/ice: fix memzone leak when device init failed

[Wang, Haiyue]

> -Original Message-
> From: David Marchand 
> Sent: Tuesday, August 17, 2021 17:19
> To: Wang, Haiyue 
> Cc: dev ; Zhang, Qi Z ; dpdk stable 
> ; Yang,
> Qiming ; Xiaolong Ye ; Xing, 
> Beilei
> ; Wang, Ying A 
> Subject: Re: [PATCH v1] net/ice: fix memzone leak when device init failed
> 
> On Fri, Aug 13, 2021 at 8:45 AM Haiyue Wang  wrote:
> >
> > When flow engine initialization or FXP resource reset failed, it needs
> > to free the memory zone and unregister the interrupt callback.
> >
> > Bugzilla ID: 752
> > Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine")
> > Fixes: 7615a6895009 ("net/ice: rework for generic flow enabling")
> > Fixes: 7edc7158d771 ("net/ice: cleanup RSS/FDIR profile on device init")
> > Cc: sta...@dpdk.org
> >
> > Reported-by: David Marchand 
> > Signed-off-by: Haiyue Wang 
> > ---
> >  drivers/net/ice/ice_ethdev.c  | 10 --
> >  drivers/net/ice/ice_fdir_filter.c |  2 ++
> >  2 files changed, 10 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
> > index 64ee569525..8d62b84805 100644
> > --- a/drivers/net/ice/ice_ethdev.c
> > +++ b/drivers/net/ice/ice_ethdev.c
> > @@ -2139,20 +2139,26 @@ ice_dev_init(struct rte_eth_dev *dev)
> > ret = ice_flow_init(ad);
> > if (ret) {
> > PMD_INIT_LOG(ERR, "Failed to initialize flow");
> > -   return ret;
> > +   goto err_flow_init;
> 
> Is it safe to call flow engine uninit callbacks when ice_flow_init() fails?

If each engine->init/uninit handles its internal setting correctly, yes,
it's safe, if not, this single engine has BUG, let's fix it. ;-)

int
ice_flow_init(struct ice_adapter *ad)
{

TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) {
if (engine->init == NULL) {
PMD_INIT_LOG(ERR, "Invalid engine type (%d)",
engine->type);
return -ENOTSUP;
}

ret = engine->init(ad);
if (ret) {
PMD_INIT_LOG(ERR, "Failed to initialize engine %d",
engine->type);
return ret;
}
}

}

void
ice_flow_uninit(struct ice_adapter *ad)
{
struct ice_pf *pf = &ad->pf;
struct ice_flow_engine *engine;
struct rte_flow *p_flow;
struct ice_flow_parser_node *p_parser;
void *temp;

TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) {
if (engine->uninit)
engine->uninit(ad);
}

}

> 
> 
> > }
> > }
> >
> > ret = ice_reset_fxp_resource(hw);
> > if (ret) {
> > PMD_INIT_LOG(ERR, "Failed to reset fxp resource");
> > -   return ret;
> > +   goto err_flow_init;
> > }
> >
> > pf->supported_rxdid = ice_get_supported_rxdid(hw);
> >
> > return 0;
> >
> > +err_flow_init:
> > +   ice_flow_uninit(ad);
> > +   rte_intr_disable(intr_handle);
> > +   ice_pf_disable_irq0(hw);
> > +   rte_intr_callback_unregister(intr_handle,
> > +ice_interrupt_handler, dev);
> >  err_pf_setup:
> > ice_res_pool_destroy(&pf->msix_pool);
> >  err_msix_pool_init:
> 
> 
> --
> David Marchand

[dpdk-dev] [PATCH v5] ethdev: add IPv4 and L4 checksum RSS offload types

[Alvin Zhang]

This patch defines new RSS offload types for IPv4 and
L4(TCP/UDP/SCTP) checksum, which are required when users want
to distribute packets based on the IPv4 or L4 checksum field.

For example "flow create 0 ingress pattern eth / ipv4 / end
actions rss types ipv4-chksum end queues end / end", this flow
causes all matching packets to be distributed to queues on
basis of IPv4 checksum.

Signed-off-by: Alvin Zhang 
Acked-by: Ajit Khaparde 
Acked-by: Aman Deep Singh 
---

v5: Add release note and code commands.
---
 app/test-pmd/cmdline.c |  4 ++-
 app/test-pmd/config.c  |  2 ++
 doc/guides/rel_notes/release_21_11.rst | 61 ++
 lib/ethdev/rte_ethdev.h| 23 +
 4 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 doc/guides/rel_notes/release_21_11.rst

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 82253bc..656a311 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -2252,6 +2252,8 @@ struct cmd_config_rss {
rss_conf.rss_hf = ETH_RSS_ECPRI;
else if (!strcmp(res->value, "mpls"))
rss_conf.rss_hf = ETH_RSS_MPLS;
+   else if (!strcmp(res->value, "ipv4-chksum"))
+   rss_conf.rss_hf = ETH_RSS_IPV4_CHKSUM;
else if (!strcmp(res->value, "none"))
rss_conf.rss_hf = 0;
else if (!strcmp(res->value, "level-default")) {
@@ -2323,7 +2325,7 @@ struct cmd_config_rss {
.help_str = "port config all rss "
"all|default|eth|vlan|ip|tcp|udp|sctp|ether|port|vxlan|geneve|"

"nvgre|vxlan-gpe|l2tpv3|esp|ah|pfcp|ecpri|mpls|none|level-default|"
-   "level-outer|level-inner|",
+   "level-outer|level-inner|ipv4-chksum|",
.tokens = {
(void *)&cmd_config_rss_port,
(void *)&cmd_config_rss_keyword,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 31d8ba1..ece78f2 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -140,6 +140,8 @@
{ "gtpu", ETH_RSS_GTPU },
{ "ecpri", ETH_RSS_ECPRI },
{ "mpls", ETH_RSS_MPLS },
+   { "ipv4-chksum", ETH_RSS_IPV4_CHKSUM },
+   { "l4-chksum", ETH_RSS_L4_CHKSUM },
{ NULL, 0 },
 };
 
diff --git a/doc/guides/rel_notes/release_21_11.rst 
b/doc/guides/rel_notes/release_21_11.rst
new file mode 100644
index 000..1017550
--- /dev/null
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -0,0 +1,61 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+   Copyright 2021 The DPDK contributors
+
+.. include:: 
+
+DPDK Release 21.11
+==
+
+.. **Read this first.**
+
+   The text in the sections below explains how to update the release notes.
+
+   Use proper spelling, capitalization and punctuation in all sections.
+
+   Variable and config names should be quoted as fixed width text:
+   ``LIKE_THIS``.
+
+   Build the docs and view the output file to ensure the changes are correct::
+
+  make doc-guides-html
+  xdg-open build/doc/html/guides/rel_notes/release_21_11.html
+
+
+New Features
+
+
+.. This section should contain new features added in this release.
+   Sample format:
+
+   * **Add a title in the past tense with a full stop.**
+
+ Add a short 1-2 sentence description in the past tense.
+ The description should be enough to allow someone scanning
+ the release notes to understand the new feature.
+
+ If the feature adds a lot of sub-features you can use a bullet list
+ like this:
+
+ * Added feature foo to do something.
+ * Enhanced feature bar to do something else.
+
+ Refer to the previous release notes for examples.
+
+ Suggested order in release notes items:
+ * Core libs (EAL, mempool, ring, mbuf, buses)
+ * Device abstraction libs and PMDs (ordered alphabetically by vendor name)
+   - ethdev (lib, PMDs)
+   - cryptodev (lib, PMDs)
+   - eventdev (lib, PMDs)
+   - etc
+ * Other libs
+ * Apps, Examples, Tools (if significant)
+
+ This section is a comment. Do not overwrite or remove it.
+ Also, make sure to start the actual text at the margin.
+ ===
+
+* **Add new RSS offload types for IPv4/L4 checksum in RSS flow.**
+
+ Add macros ETH_RSS_IPV4_CHKSUM and ETH_RSS_L4_CHKSUM, now IPv4 and
+ TCP/UDP/SCTP header checksum field can be used as input set for RSS.
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index d2b27c3..9a59e7b 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -537,6 +537,29 @@ struct rte_eth_rss_conf {
 #define ETH_RSS_PPPOE (1ULL << 31)
 #define ETH_RSS_ECPRI (1ULL << 32)
 #define ETH_RSS_MPLS  (1ULL << 33)
+#define ETH_RSS_IPV4_CHKSUM   (1ULL << 34)
+
+/**
+ * The ETH_RSS_L4_CHKSUM generally refers to a type of checksum field for
+ * any L4 header, such as TCP, UDP and SC

[dpdk-dev] [PATCH v11] eventdev: simplify Rx adapter event vector config

[pbhagavatula]

From: Pavan Nikhilesh 

Include vector configuration into the structure
``rte_event_eth_rx_adapter_queue_conf`` used when configuring rest
of the Rx adapter ethernet device Rx queue parameters.
This simplifies event vector configuration as it avoids splitting
configuration per Rx queue.

Signed-off-by: Pavan Nikhilesh 
Acked-by: Jay Jayatheerthan 
Change-Id: I6bbb90c956d82a9a676ede567db3fea547276c44
---
 app/test-eventdev/test_pipeline_common.c |  16 +-
 doc/guides/rel_notes/deprecation.rst |   9 --
 lib/eventdev/eventdev_pmd.h  |  29 
 lib/eventdev/rte_event_eth_rx_adapter.c  | 179 ---
 lib/eventdev/rte_event_eth_rx_adapter.h  |  30 
 lib/eventdev/version.map |   1 -
 6 files changed, 63 insertions(+), 201 deletions(-)

diff --git a/app/test-eventdev/test_pipeline_common.c 
b/app/test-eventdev/test_pipeline_common.c
index 6ee530d4cd..2697547641 100644
--- a/app/test-eventdev/test_pipeline_common.c
+++ b/app/test-eventdev/test_pipeline_common.c
@@ -332,7 +332,6 @@ pipeline_event_rx_adapter_setup(struct evt_options *opt, 
uint8_t stride,
uint16_t prod;
struct rte_mempool *vector_pool = NULL;
struct rte_event_eth_rx_adapter_queue_conf queue_conf;
-   struct rte_event_eth_rx_adapter_event_vector_config vec_conf;
 
memset(&queue_conf, 0,
sizeof(struct rte_event_eth_rx_adapter_queue_conf));
@@ -398,8 +397,12 @@ pipeline_event_rx_adapter_setup(struct evt_options *opt, 
uint8_t stride,
}
 
if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_EVENT_VECTOR) {
+   queue_conf.vector_sz = opt->vector_size;
+   queue_conf.vector_timeout_ns =
+   opt->vector_tmo_nsec;
queue_conf.rx_queue_flags |=
RTE_EVENT_ETH_RX_ADAPTER_QUEUE_EVENT_VECTOR;
+   queue_conf.vector_mp = vector_pool;
} else {
evt_err("Rx adapter doesn't support event 
vector");
return -EINVAL;
@@ -419,17 +422,6 @@ pipeline_event_rx_adapter_setup(struct evt_options *opt, 
uint8_t stride,
return ret;
}
 
-   if (opt->ena_vector) {
-   vec_conf.vector_sz = opt->vector_size;
-   vec_conf.vector_timeout_ns = opt->vector_tmo_nsec;
-   vec_conf.vector_mp = vector_pool;
-   if (rte_event_eth_rx_adapter_queue_event_vector_config(
-   prod, prod, -1, &vec_conf) < 0) {
-   evt_err("Failed to configure event 
vectorization for Rx adapter");
-   return -EINVAL;
-   }
-   }
-
if (!(cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT)) {
uint32_t service_id = -1U;
 
diff --git a/doc/guides/rel_notes/deprecation.rst 
b/doc/guides/rel_notes/deprecation.rst
index 76a4abfd6b..2c37d7222c 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -257,15 +257,6 @@ Deprecation Notices
   An 8-byte reserved field will be added to the structure ``rte_event_timer`` 
to
   support future extensions.
 
-* eventdev: The structure ``rte_event_eth_rx_adapter_queue_conf`` will be
-  extended to include ``rte_event_eth_rx_adapter_event_vector_config`` elements
-  and the function ``rte_event_eth_rx_adapter_queue_event_vector_config`` will
-  be removed in DPDK 21.11.
-
-  An application can enable event vectorization by passing the desired vector
-  values to the function ``rte_event_eth_rx_adapter_queue_add`` using
-  the structure ``rte_event_eth_rx_adapter_queue_add``.
-
 * eventdev: Reserved bytes of ``rte_event_crypto_request`` is a space holder
   for ``response_info``. Both should be decoupled for better clarity.
   New space for ``response_info`` can be made by changing
diff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h
index 0f724ac85d..63b3bc4b51 100644
--- a/lib/eventdev/eventdev_pmd.h
+++ b/lib/eventdev/eventdev_pmd.h
@@ -667,32 +667,6 @@ typedef int (*eventdev_eth_rx_adapter_vector_limits_get_t)(
const struct rte_eventdev *dev, const struct rte_eth_dev *eth_dev,
struct rte_event_eth_rx_adapter_vector_limits *limits);
 
-struct rte_event_eth_rx_adapter_event_vector_config;
-/**
- * Enable event vector on an given Rx queue of a ethernet devices belonging to
- * the Rx adapter.
- *
- * @param dev
- *   Event device pointer
- *
- * @param eth_dev
- *   Ethernet device pointer
- *
- * @param rx_queue_id
- *   The Rx queue identifier
- *
- * @param config
- *   Pointer to the event vector configuration structure.
- *
- * @return
- *   - 0: Success.
- *   - <0: Error code returned by the driver function.
- */

[dpdk-dev] [PATCH v12] eventdev: simplify Rx adapter event vector config

[pbhagavatula]

From: Pavan Nikhilesh 

Include vector configuration into the structure
``rte_event_eth_rx_adapter_queue_conf`` used when configuring rest
of the Rx adapter ethernet device Rx queue parameters.
This simplifies event vector configuration as it avoids splitting
configuration per Rx queue.

Signed-off-by: Pavan Nikhilesh 
Acked-by: Jay Jayatheerthan 
---
 v12 Changes:
 - Remove deprication notice.
 - Remove unnecessary change Id.

 app/test-eventdev/test_pipeline_common.c |  16 +-
 doc/guides/rel_notes/deprecation.rst |   9 --
 lib/eventdev/eventdev_pmd.h  |  29 
 lib/eventdev/rte_event_eth_rx_adapter.c  | 179 ---
 lib/eventdev/rte_event_eth_rx_adapter.h  |  30 
 lib/eventdev/version.map |   1 -
 6 files changed, 63 insertions(+), 201 deletions(-)

diff --git a/app/test-eventdev/test_pipeline_common.c 
b/app/test-eventdev/test_pipeline_common.c
index 6ee530d4cd..2697547641 100644
--- a/app/test-eventdev/test_pipeline_common.c
+++ b/app/test-eventdev/test_pipeline_common.c
@@ -332,7 +332,6 @@ pipeline_event_rx_adapter_setup(struct evt_options *opt, 
uint8_t stride,
uint16_t prod;
struct rte_mempool *vector_pool = NULL;
struct rte_event_eth_rx_adapter_queue_conf queue_conf;
-   struct rte_event_eth_rx_adapter_event_vector_config vec_conf;

memset(&queue_conf, 0,
sizeof(struct rte_event_eth_rx_adapter_queue_conf));
@@ -398,8 +397,12 @@ pipeline_event_rx_adapter_setup(struct evt_options *opt, 
uint8_t stride,
}

if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_EVENT_VECTOR) {
+   queue_conf.vector_sz = opt->vector_size;
+   queue_conf.vector_timeout_ns =
+   opt->vector_tmo_nsec;
queue_conf.rx_queue_flags |=
RTE_EVENT_ETH_RX_ADAPTER_QUEUE_EVENT_VECTOR;
+   queue_conf.vector_mp = vector_pool;
} else {
evt_err("Rx adapter doesn't support event 
vector");
return -EINVAL;
@@ -419,17 +422,6 @@ pipeline_event_rx_adapter_setup(struct evt_options *opt, 
uint8_t stride,
return ret;
}

-   if (opt->ena_vector) {
-   vec_conf.vector_sz = opt->vector_size;
-   vec_conf.vector_timeout_ns = opt->vector_tmo_nsec;
-   vec_conf.vector_mp = vector_pool;
-   if (rte_event_eth_rx_adapter_queue_event_vector_config(
-   prod, prod, -1, &vec_conf) < 0) {
-   evt_err("Failed to configure event 
vectorization for Rx adapter");
-   return -EINVAL;
-   }
-   }
-
if (!(cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT)) {
uint32_t service_id = -1U;

diff --git a/doc/guides/rel_notes/deprecation.rst 
b/doc/guides/rel_notes/deprecation.rst
index 76a4abfd6b..2c37d7222c 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -257,15 +257,6 @@ Deprecation Notices
   An 8-byte reserved field will be added to the structure ``rte_event_timer`` 
to
   support future extensions.

-* eventdev: The structure ``rte_event_eth_rx_adapter_queue_conf`` will be
-  extended to include ``rte_event_eth_rx_adapter_event_vector_config`` elements
-  and the function ``rte_event_eth_rx_adapter_queue_event_vector_config`` will
-  be removed in DPDK 21.11.
-
-  An application can enable event vectorization by passing the desired vector
-  values to the function ``rte_event_eth_rx_adapter_queue_add`` using
-  the structure ``rte_event_eth_rx_adapter_queue_add``.
-
 * eventdev: Reserved bytes of ``rte_event_crypto_request`` is a space holder
   for ``response_info``. Both should be decoupled for better clarity.
   New space for ``response_info`` can be made by changing
diff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h
index 0f724ac85d..63b3bc4b51 100644
--- a/lib/eventdev/eventdev_pmd.h
+++ b/lib/eventdev/eventdev_pmd.h
@@ -667,32 +667,6 @@ typedef int (*eventdev_eth_rx_adapter_vector_limits_get_t)(
const struct rte_eventdev *dev, const struct rte_eth_dev *eth_dev,
struct rte_event_eth_rx_adapter_vector_limits *limits);

-struct rte_event_eth_rx_adapter_event_vector_config;
-/**
- * Enable event vector on an given Rx queue of a ethernet devices belonging to
- * the Rx adapter.
- *
- * @param dev
- *   Event device pointer
- *
- * @param eth_dev
- *   Ethernet device pointer
- *
- * @param rx_queue_id
- *   The Rx queue identifier
- *
- * @param config
- *   Pointer to the event vector configuration structure.
- *
- * @return
- *   - 0: Success.
- *   - <0: Error code returned by the dri

[dpdk-dev] [PATCH v1 02/13] driver/mempool: build mempool stack on Windows

[Jie Zhou]

From: Jie Zhou 

mempool_autotest failed on Windows at setting the "stack" handler
test case. Per debugging, in rte_mempool_ops_table, there are only
6 ring ops registered, and no "stack" ops registered which caused
the failure of rte_mempool_set_ops_byname and thus the test failed.
Per code investigation, the "stack" ops are registered in
rte_mempool_stack.c:
MEMPOOL_REGISTER_OPS(ops_stack);
MEMPOOL_REGISTER_OPS(ops_lf_stack);

The reason these two ops are not registered is because currently
driver\mempool\stack is not build on Windows. After building stack
on Windows, the mempool_autotest now completed as pass.

Signed-off-by: Jie Zhou 
---
 drivers/mempool/stack/meson.build | 5 -
 1 file changed, 5 deletions(-)

diff --git a/drivers/mempool/stack/meson.build 
b/drivers/mempool/stack/meson.build
index 371cf131b1..580dde79eb 100644
--- a/drivers/mempool/stack/meson.build
+++ b/drivers/mempool/stack/meson.build
@@ -1,11 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017-2019 Intel Corporation
 
-if is_windows
-build = false
-reason = 'not supported on Windows'
-endif
-
 sources = files('rte_mempool_stack.c')
 
 deps += ['stack']
-- 
2.32.0.windows.2

[dpdk-dev] [PATCH v1 03/13] eal/windows: return ENOTSUP for not supported API

[Jie Zhou]

UT memory_autotest on Windows has 2 failed cases on eal APIs
eal_memalloc_get_seg_fd and eal_memalloc_get_seg_fd_offset. These 2
APIs are not supported on Windows yet. Should return ENOTSUP such that
in test_memory.c these 2 ENOTSUP cases will not be marked as failures,
same as other ENOTSUP cases.

Signed-off-by: Jie Zhou 
---
 lib/eal/windows/eal_memalloc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/eal/windows/eal_memalloc.c b/lib/eal/windows/eal_memalloc.c
index 4459d59b1a..fffdd5b976 100644
--- a/lib/eal/windows/eal_memalloc.c
+++ b/lib/eal/windows/eal_memalloc.c
@@ -17,7 +17,7 @@ eal_memalloc_get_seg_fd(int list_idx, int seg_idx)
RTE_SET_USED(list_idx);
RTE_SET_USED(seg_idx);
EAL_LOG_NOT_IMPLEMENTED();
-   return -1;
+   return -ENOTSUP;
 }
 
 int
@@ -28,7 +28,7 @@ eal_memalloc_get_seg_fd_offset(int list_idx, int seg_idx, 
size_t *offset)
RTE_SET_USED(seg_idx);
RTE_SET_USED(offset);
EAL_LOG_NOT_IMPLEMENTED();
-   return -1;
+   return -ENOTSUP;
 }
 
 static int
@@ -433,7 +433,7 @@ eal_memalloc_sync_with_primary(void)
 {
/* No multi-process support. */
EAL_LOG_NOT_IMPLEMENTED();
-   return -1;
+   return -ENOTSUP;
 }
 
 int
-- 
2.32.0.windows.2

[dpdk-dev] [PATCH v1 00/13] app/test: enable subset of tests on Windows

[Jie Zhou]

This patchset is to enable a subset of unit tests on Windows. It mainly 
includes:
- Enable building libraries on Windows that some tests depend on
- Replace POSIX specific codes
- Fix some lib and tests per failures investigation
- Replace .sh scripts with .py scripts for meson.build
- Enable build and run subset of unit tests on Windows

Future work:
- Continue investigate known failure to enable more tests
- Work with CI/CD lab to onboard unit tests on Windows to capture regression

Following are the unit tests on Windows baseline state:
(lab setup: a system with XL710, NetUIO and Virt2Phy installed, huge-page 
enabled)
c:\DPDKUpstream\dpdk\amd64\chk>meson test
ninja: Entering directory `c:\DPDKUpstream\dpdk\amd64\chk'
ninja: no work to do.
 1/60 DPDK:fast-tests / alarm_autotest  OK  
 1.62s
 2/60 DPDK:fast-tests / bitops_autotest OK  
 1.58s
 3/60 DPDK:fast-tests / byteorder_autotest  OK  
 1.58s
 4/60 DPDK:fast-tests / cmdline_autotestOK  
 1.58s
 5/60 DPDK:fast-tests / common_autotest OK  
 3.77s
 6/60 DPDK:fast-tests / cpuflags_autotest   OK  
 1.58s
 7/60 DPDK:fast-tests / errno_autotest  OK  
 1.59s
 8/60 DPDK:fast-tests / ethdev_link_status  OK  
 1.58s
 9/60 DPDK:fast-tests / hash_autotest   OK  
 2.26s
10/60 DPDK:fast-tests / interrupt_autotest  SKIP
 1.59s   exit status 77
11/60 DPDK:fast-tests / logs_autotest   OK  
 1.58s
12/60 DPDK:fast-tests / lpm_autotestOK  
 3.78s
13/60 DPDK:fast-tests / mcslock_autotestOK  
 7.37s
14/60 DPDK:fast-tests / memory_autotest OK  
 1.62s
15/60 DPDK:fast-tests / mempool_autotestOK  
 2.23s
16/60 DPDK:fast-tests / memzone_autotestOK  
 1.62s
17/60 DPDK:fast-tests / meter_autotest  OK  
 1.58s
18/60 DPDK:fast-tests / per_lcore_autotest  OK  
 1.69s
19/60 DPDK:fast-tests / prefetch_autotest   OK  
 1.58s
20/60 DPDK:fast-tests / rcu_qsbr_autotest   OK  
 1.93s
21/60 DPDK:fast-tests / rib_autotestOK  
 6.97s
22/60 DPDK:fast-tests / rib6_autotest   OK  
 6.98s
23/60 DPDK:fast-tests / ring_autotest   OK  
 1.64s
24/60 DPDK:fast-tests / rwlock_test1_autotest   OK  
 3.68s
25/60 DPDK:fast-tests / rwlock_rda_autotest OK  
 6.58s
26/60 DPDK:fast-tests / rwlock_rds_wrm_autotest OK  
 6.65s
27/60 DPDK:fast-tests / rwlock_rde_wro_autotest OK  
 6.59s
28/60 DPDK:fast-tests / spinlock_autotest   OK  
 1.82s
29/60 DPDK:fast-tests / stack_autotest  OK  
 3.56s
30/60 DPDK:fast-tests / stack_lf_autotest   OK  
 5.84s
31/60 DPDK:fast-tests / string_autotest OK  
 1.59s
32/60 DPDK:fast-tests / tailq_autotest  OK  
 1.58s
33/60 DPDK:fast-tests / ticketlock_autotest OK  
 1.84s
34/60 DPDK:fast-tests / user_delay_us   OK  
 1.58s
35/60 DPDK:fast-tests / version_autotestOK  
 1.59s
36/60 DPDK:fast-tests / crc_autotestOK  
 1.58s
37/60 DPDK:fast-tests / fbarray_autotestOK  
 1.58s
38/60 DPDK:fast-tests / hash_readwrite_func_autotestOK  
 4.01s
39/60 DPDK:fast-tests / kvargs_autotest OK  
 1.58s
40/60 DPDK:fast-tests / metrics_autotestOK  
 1.58s
41/60 DPDK:fast-tests / reorder_autotestOK  
 1.62s
42/60 DPDK:fast-tests / service_autotestOK  
 5.20s
43/60 DPDK:fast-tests / thash_autotest  OK  
 1.58s
44/60 DPDK:perf-tests / atomic_autotest OK  
35.04s
45/60 DPDK:perf-tests / memcpy_autotest OK  
11.36s
46/60 DPDK:perf-tests / ring_perf_autotest  OK  
29.48s
47/60 DPDK:perf-tests / timer_autotest  OK  
13.02s
48/60 DPDK:perf-tests / timer_perf_autotest OK  
13.81s
49/6

[dpdk-dev] [PATCH v1 01/13] lib: build libraries that some tests depend on

[Jie Zhou]

Enable building subset of libraries that tests depend on for Windows

Signed-off-by: Jie Zhou 
---
 lib/meson.build | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/lib/meson.build b/lib/meson.build
index 1673ca4323..f109d6987d 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -81,10 +81,16 @@ if is_windows
 'timer',
 'bitratestats',
 'cfgfile',
+'efd',
 'gro',
 'gso',
+'ip_frag',
 'latencystats',
+'lpm',
 'pdump',
+'rib',
+'reorder',
+'stack',
 ] # only supported libraries for windows
 endif
 
-- 
2.32.0.windows.2